diff --git a/dunning.py b/dunning.py
index ed2e16aacc..ba704add58 100644
--- a/dunning.py
+++ b/dunning.py
@@ -7,6 +7,8 @@ from trytond.pool import PoolMeta, Pool
from trytond.pyson import Eval
from trytond.transaction import Transaction
+from trytond.modules.currency.fields import Monetary
+
class Fee(DeactivableMixin, ModelSQL, ModelView):
'Account Dunning Fee'
@@ -86,14 +88,11 @@ class FeeDunningLevel(ModelSQL, ModelView):
dunning = fields.Many2One(
'account.dunning', 'Dunning', required=True, select=True)
level = fields.Many2One('account.dunning.level', 'Level', required=True)
- amount = fields.Numeric('Amount', digits=(16, Eval('currency_digits', 2)),
- depends=['currency_digits'])
+ amount = Monetary(
+ "Amount", currency='currency', digits='currency')
currency = fields.Many2One('currency.currency', 'Currency')
moves = fields.One2Many('account.move', 'origin', 'Moves', readonly=True)
- currency_digits = fields.Function(fields.Integer('Currency Digits'),
- 'on_change_with_currency_digits')
-
@classmethod
def __setup__(cls):
super(FeeDunningLevel, cls).__setup__()
@@ -103,12 +102,6 @@ class FeeDunningLevel(ModelSQL, ModelView):
'account_dunning_fee.msg_fee_dunning_level_unique'),
]
- @fields.depends('currency')
- def on_change_with_currency_digits(self, name=None):
- if self.currency:
- return self.currency.digits
- return 2
-
def get_rec_name(self, name):
return '%s @ %s' % (self.dunning.rec_name, self.level.rec_name)
diff --git a/view/dunning_fee_dunning_level_form.xml b/view/dunning_fee_dunning_level_form.xml
index 278d88456e..57df2bc4ff 100644
--- a/view/dunning_fee_dunning_level_form.xml
+++ b/view/dunning_fee_dunning_level_form.xml
@@ -8,7 +8,7 @@ this repository contains the full copyright notices and license terms. -->
-
+
diff --git a/view/dunning_fee_dunning_level_list.xml b/view/dunning_fee_dunning_level_list.xml
index 089b011c91..9696f0dcb6 100644
--- a/view/dunning_fee_dunning_level_list.xml
+++ b/view/dunning_fee_dunning_level_list.xml
@@ -5,5 +5,4 @@ this repository contains the full copyright notices and license terms. -->
-