Remove account_asset_update_asset patch
From Add monetary field - issue10598
This commit is contained in:
parent
2571d1a418
commit
44797bd54b
|
@ -1,58 +0,0 @@
|
|||
diff --git a/trytond/trytond/modules/account_asset/asset.py b/trytond/trytond/modules/account_asset/asset.py
|
||||
index 35a24f4..569423d 100644
|
||||
--- a/trytond/trytond/modules/account_asset/asset.py
|
||||
+++ b/trytond/trytond/modules/account_asset/asset.py
|
||||
@@ -801,15 +801,32 @@ class CreateMoves(Wizard):
|
||||
class UpdateAssetStart(ModelView):
|
||||
'Update Asset Start'
|
||||
__name__ = 'account.asset.update.start'
|
||||
- value = fields.Numeric('Asset Value', required=True)
|
||||
- residual_value = fields.Numeric('Residual Value', required=True)
|
||||
+ value = fields.Numeric('Asset Value',
|
||||
+ digits=(16, Eval('currency_digits', 2)),
|
||||
+ depends=['currency_digits'], required=True)
|
||||
+ residual_value = fields.Numeric('Residual Value',
|
||||
+ digits=(16, Eval('currency_digits', 2)),
|
||||
+ depends=['currency_digits'], required=True)
|
||||
end_date = fields.Date('End Date', required=True)
|
||||
+ currency_digits = fields.Integer('Currency Digits', required=True)
|
||||
+
|
||||
+ @staticmethod
|
||||
+ def default_currency_digits():
|
||||
+ Asset = Pool().get('account.asset')
|
||||
+
|
||||
+ context = Transaction().context
|
||||
+ active_id = context.get('active_id')
|
||||
+ if active_id:
|
||||
+ return Asset(active_id).currency_digits
|
||||
+ return 2
|
||||
|
||||
|
||||
class UpdateAssetShowDepreciation(ModelView):
|
||||
'Update Asset Show Depreciation'
|
||||
__name__ = 'account.asset.update.show_depreciation'
|
||||
- amount = fields.Numeric('Amount', readonly=True)
|
||||
+ amount = fields.Numeric('Amount',
|
||||
+ digits=(16, Eval('currency_digits', 2)),
|
||||
+ depends=['currency_digits'], readonly=True)
|
||||
date = fields.Date('Date', required=True,
|
||||
domain=[
|
||||
('date', '>=', Eval('latest_move_date')),
|
||||
@@ -825,6 +842,17 @@ class UpdateAssetShowDepreciation(ModelView):
|
||||
'Depreciation Account', readonly=True)
|
||||
counterpart_account = fields.Many2One('account.account',
|
||||
'Counterpart Account')
|
||||
+ currency_digits = fields.Integer('Currency Digits', required=True)
|
||||
+
|
||||
+ @staticmethod
|
||||
+ def default_currency_digits():
|
||||
+ Asset = Pool().get('account.asset')
|
||||
+
|
||||
+ context = Transaction().context
|
||||
+ active_id = context.get('active_id')
|
||||
+ if active_id:
|
||||
+ return Asset(active_id).currency_digits
|
||||
+ return 2
|
||||
|
||||
|
||||
class UpdateAsset(Wizard):
|
2
series
2
series
|
@ -25,6 +25,4 @@ issue9797.diff # [account_payment_sepa] Slowness processing sepa
|
|||
|
||||
issue9802.diff # [stock] Improve performance when partially assigning moves
|
||||
|
||||
account_asset_update_asset.diff # [account_asset] decimals when updata asset #044767
|
||||
|
||||
issue10464.diff # [currency] Update currency rates fails
|
||||
|
|
Loading…
Reference in New Issue