From c0950806783bf28b65ccea62e5abc493fd84632e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 21 Aug 2021 09:09:56 +0200 Subject: [PATCH] Add monetary field issue10598 review338511002 --- sale.py | 9 +++++---- view/sale_line_form.xml | 4 ++-- view/sale_line_list.xml | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sale.py b/sale.py index ff385ae82c..9c18fb3aef 100644 --- a/sale.py +++ b/sale.py @@ -6,14 +6,15 @@ from trytond.model import fields from trytond.pool import PoolMeta, Pool from trytond.pyson import Eval +from trytond.modules.currency.fields import Monetary from trytond.modules.product import price_digits, round_price class Line(metaclass=PoolMeta): __name__ = 'sale.line' - base_price = fields.Numeric( - "Base Price", digits=price_digits, + base_price = Monetary( + "Base Price", currency='currency', digits=price_digits, states={ 'invisible': Eval('type') != 'line', 'readonly': Eval('sale_state') != 'draft', @@ -28,8 +29,8 @@ class Line(metaclass=PoolMeta): }, depends=['type', 'sale_state']), 'on_change_with_discount_rate', setter='set_discount_rate') - discount_amount = fields.Function(fields.Numeric( - "Discount Amount", digits=price_digits, + discount_amount = fields.Function(Monetary( + "Discount Amount", currency='currency', digits=price_digits, states={ 'invisible': Eval('type') != 'line', 'readonly': Eval('sale_state') != 'draft', diff --git a/view/sale_line_form.xml b/view/sale_line_form.xml index 54226d3116..cf3bff67db 100644 --- a/view/sale_line_form.xml +++ b/view/sale_line_form.xml @@ -4,14 +4,14 @@ this repository contains the full copyright notices and license terms. --> diff --git a/view/sale_line_list.xml b/view/sale_line_list.xml index 1e6ef2008d..b512aa9df3 100644 --- a/view/sale_line_list.xml +++ b/view/sale_line_list.xml @@ -3,10 +3,10 @@ this repository contains the full copyright notices and license terms. --> - + - +