From 601fefe9661e70b2f4c14847d8563a7cbd2ce2f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sat, 21 Aug 2021 09:09:55 +0200
Subject: [PATCH] Add monetary field

issue10598
review338511002
---
 dunning.py                              | 15 ++++-----------
 view/dunning_fee_dunning_level_form.xml |  2 +-
 view/dunning_fee_dunning_level_list.xml |  1 -
 3 files changed, 5 insertions(+), 13 deletions(-)

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. -->
     <field name="level"/>
     <label name="amount"/>
     <group col="2" id="amount_currency">
-        <field name="amount"/>
+        <field name="amount" symbol=""/>
         <field name="currency"/>
     </group>
     <field name="moves" colspan="4"/>
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. -->
     <field name="dunning" expand="2"/>
     <field name="level" expand="1"/>
     <field name="amount"/>
-    <field name="currency"/>
 </tree>