Add new patch, issue12018.

This commit is contained in:
Juanjo Garcia 2023-01-18 12:16:31 +01:00
parent 022dbae0e9
commit 75bbb74cd9
2 changed files with 28 additions and 0 deletions

26
issue12018.diff Normal file
View file

@ -0,0 +1,26 @@
diff --git a/tryton/modules/commission/invoice.py b/tryton/modules/commission/invoice.py
index f7e2fb3d9e..b3dbee52ea 100644
--- a/tryton/modules/commission/invoice.py
+++ b/tryton/modules/commission/invoice.py
@@ -168,7 +168,7 @@ class InvoiceLine(metaclass=PoolMeta):
continue
with Transaction().set_context(date=self.invoice.currency_date):
base_amount = Currency.compute(self.invoice.currency,
- self.amount, agent.currency, round=False)
+ self.amount, agent.currency, round=True)
amount = self._get_commission_amount(base_amount, plan)
if amount:
amount = round_price(amount)
diff --git a/tryton/modules/commission/commission.py b/tryton/modules/commission/commission.py
index 08c693bdf1..2eabebc3e6 100644
--- a/tryton/modules/commission/commission.py
+++ b/tryton/modules/commission/commission.py
@@ -344,7 +344,7 @@ class Commission(ModelSQL, ModelView):
states=_readonly_states,
help="The product that is used on the invoice line.")
base_amount = Monetary(
- "Base Amount", currency='currency', digits='currency',
+ "Base Amount", currency='currency', digits=price_digits,
states=_readonly_states)
amount = Monetary(
"Amount", currency='currency', required=True, digits=price_digits,

2
series
View file

@ -39,3 +39,5 @@ issue11582.diff # [trytond] Add authentication services
issue11582-sao.diff # [sao] Add authentication services
issue11998.diff # [sale_shipment_grouping] KeyError when processing a sale with modules sale_shipment_cost and sale_shipment_grouping installed.
issue12018.diff # [commission] Commissions: Incorrect round to Base Amount Field