pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] account: fix combination between fixed, percent, balance payment terms

Browse Source 
Combining a fixed payment term line with another type produced incorrect example calculations in the PT preview and stopped the user from confirming an invoice.

This PR allows for the fixed amount to impact the rest of the PT computation correctly, including
the eventually discounted amounts and tax amounts.

closes odoo/odoo#100483

Signed-off-by: Laurent Smet <las@odoo.com>
This commit is contained in:
Camille Spiritus
2022-09-20 11:33:54 +02:00
parent 5471bd4cb8
commit 6881472d2f
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/models/account_payment_term.py
+6 -1
View File
@@ -138,7 +138,12 @@ class AccountPaymentTerm(models.Model):
if line.value == 'fixed':
term_vals['company_amount'] = sign * company_currency.round(line.value_amount)
term_vals['foreign_amount'] = sign * currency.round(line.value_amount)
line_tax_amount = line_tax_amount_currency = line_untaxed_amount = line_untaxed_amount_currency = 0.0
company_proportion = tax_amount/untaxed_amount if untaxed_amount else 1
foreign_proportion = tax_amount_currency/untaxed_amount_currency if untaxed_amount_currency else 1
line_tax_amount = company_currency.round(line.value_amount * company_proportion) * sign
line_tax_amount_currency = currency.round(line.value_amount * foreign_proportion) * sign
line_untaxed_amount = term_vals['company_amount'] - line_tax_amount
line_untaxed_amount_currency = term_vals['foreign_amount'] - line_tax_amount_currency
elif line.value == 'percent':
term_vals['company_amount'] = company_currency.round(total_amount * (line.value_amount / 100.0))
term_vals['foreign_amount'] = currency.round(total_amount_currency * (line.value_amount / 100.0))