Add monetary field

issue10598
review338511002

dunning.py

@@ -13,6 +13,8 @@ from trytond.wizard import Wizard, StateView, StateAction, StateTransition, \
     Button
 from trytond.pool import Pool
 
+from trytond.modules.currency.fields import Monetary
+
 
 class Procedure(ModelSQL, ModelView):
     'Account Dunning Procedure'
@@ -113,28 +115,23 @@ class Dunning(ModelSQL, ModelView):
                 },
             depends=['company']),
         'get_line_field', searcher='search_line_field')
-    amount = fields.Function(fields.Numeric('Amount',
-            digits=(16, Eval('currency_digits', 2)),
-            depends=['currency_digits']),
+    amount = fields.Function(Monetary(
+            "Amount", currency='currency', digits='currency'),
         'get_amount')
     currency = fields.Function(fields.Many2One(
             'currency.currency', "Currency"), 'get_line_field')
-    currency_digits = fields.Function(fields.Integer('Currency Digits'),
-        'get_line_field')
     maturity_date = fields.Function(fields.Date('Maturity Date'),
         'get_line_field', searcher='search_line_field')
-    amount_second_currency = fields.Function(fields.Numeric(
+    amount_second_currency = fields.Function(Monetary(
             'Amount Second Currency',
-            digits=(16, Eval('second_currency_digits', 2)),
+            currency='second_currency', digits='second_currency',
             states={
                 'invisible': Eval('currency') == Eval('second_currency'),
                 },
-            depends=['second_currency_digits', 'currency', 'second_currency']),
+            depends=['currency', 'second_currency']),
         'get_amount_second_currency')
     second_currency = fields.Function(fields.Many2One('currency.currency',
             'Second Currency'), 'get_second_currency')
-    second_currency_digits = fields.Function(fields.Integer(
-            'Second Currency Digits'), 'get_second_currency_digits')
 
     @classmethod
     def __setup__(cls):
@@ -201,12 +198,6 @@ class Dunning(ModelSQL, ModelView):
         else:
             return self.line.account.company.currency.id
 
-    def get_second_currency_digits(self, name):
-        if self.line.second_currency:
-            return self.line.second_currency.digits
-        else:
-            return self.line.account.company.currency.digits
-
     @classmethod
     def search_active(cls, name, clause):
         reverse = {

view/dunning_form.xml

@@ -12,8 +12,8 @@ this repository contains the full copyright notices and license terms. -->
     <field name="level"/>
     <label name="amount"/>
     <group id="amounts" col="-1">
-        <field name="amount" symbol="currency"/>
-        <field name="amount_second_currency" symbol="amount_second_currency"/>
+        <field name="amount"/>
+        <field name="amount_second_currency"/>
     </group>
     <button name="reschedule" colspan="2"/>
     <label name="blocked"/>

view/dunning_list.xml

@@ -4,8 +4,8 @@ this repository contains the full copyright notices and license terms. -->
 <tree>
     <field name="line" expand="1"/>
     <field name="party" expand="2"/>
-    <field name="amount" symbol="currency"/>
-    <field name="amount_second_currency" symbol="second_currency"/>
+    <field name="amount"/>
+    <field name="amount_second_currency"/>
     <field name="maturity_date"/>
     <field name="level" expand="1"/>
     <field name="blocked"/>