From dd1eb03af5aa5ed9bec2c8ede8d4d2f4106c505d Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Fri, 9 Sep 2016 11:05:08 +0200 Subject: [PATCH] [FIX] account: base amount when tax calculated Commit 8ad0c0f3 introduces back the base amount taken into account for tax calculation. However, the way it calculates the amount is wrong in several cases: - the tax amount is a percentage - the tax is calculated thanks to Python code opw-686846 --- addons/account/models/account_invoice.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/account/models/account_invoice.py b/addons/account/models/account_invoice.py index 47e5da9af7c..eb3d5cde5e3 100644 --- a/addons/account/models/account_invoice.py +++ b/addons/account/models/account_invoice.py @@ -1287,9 +1287,10 @@ class AccountInvoiceTax(models.Model): base = 0.0 for line in tax.invoice_id.invoice_line_ids: if tax.tax_id in line.invoice_line_tax_ids: - base += line.price_subtotal - # To add include base amount taxes - base += sum((line.invoice_line_tax_ids.filtered(lambda t: t.include_base_amount) - tax.tax_id).mapped('amount')) + price_unit = line.price_unit * (1 - (line.discount or 0.0) / 100.0) + base += (line.invoice_line_tax_ids - tax.tax_id).compute_all( + price_unit, line.invoice_id.currency_id, line.quantity, line.product_id, line.invoice_id.partner_id + )['base'] tax.base = base invoice_id = fields.Many2one('account.invoice', string='Invoice', ondelete='cascade', index=True)