2021-05-24 15:30:12 +02:00
|
|
|
diff --git a//trytond/trytond/modules/account_asset/asset.py b//trytond/trytond/modules/account_asset/asset.py
|
|
|
|
index cf5191f..661982a 100644
|
|
|
|
--- a//trytond/trytond/modules/account_asset/asset.py
|
|
|
|
+++ b//trytond/trytond/modules/account_asset/asset.py
|
2021-05-24 15:13:00 +02:00
|
|
|
@@ -745,15 +745,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():
|
2021-05-24 15:30:12 +02:00
|
|
|
+ Asset = Pool().get('account.asset')
|
2021-05-24 15:13:00 +02:00
|
|
|
+
|
|
|
|
+ context = Transaction().context
|
2021-05-24 15:30:12 +02:00
|
|
|
+ active_id = context.get('active_id')
|
|
|
|
+ if active_id:
|
|
|
|
+ return Asset(active_id).currency_digits
|
2021-05-24 15:13:00 +02:00
|
|
|
+ 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')),
|
|
|
|
@@ -769,6 +786,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():
|
2021-05-24 15:30:12 +02:00
|
|
|
+ Asset = Pool().get('account.asset')
|
2021-05-24 15:13:00 +02:00
|
|
|
+
|
|
|
|
+ context = Transaction().context
|
2021-05-24 15:30:12 +02:00
|
|
|
+ active_id = context.get('active_id')
|
|
|
|
+ if active_id:
|
|
|
|
+ return Asset(active_id).currency_digits
|
2021-05-24 15:13:00 +02:00
|
|
|
+ return 2
|
|
|
|
|
|
|
|
|
|
|
|
class UpdateAsset(Wizard):
|