From 30660ef5901974ea94d34a0078c7411e8a79b0f6 Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Tue, 26 May 2009 17:24:30 +0530 Subject: [PATCH] [FIX] Bug 369902 : Tax Calculation for Price methods(inclusive,exclusive) corrected(ref:SSH) bzr revid: jvo@tinyerp.com-20090526115430-x3hs2o2o75d5jwfa --- addons/account/account.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index c330bbd0e6d..ed2040393a3 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1392,13 +1392,17 @@ class account_tax(osv.osv): res = [] taxes.reverse() - cur_price_unit=price_unit + cur_price_unit = price_unit tax_parent_tot = 0.0 for tax in taxes: if (tax.type=='percent') and not tax.include_base_amount: - tax_parent_tot+=tax.amount - + tax_parent_tot += tax.amount + + for tax in taxes: + if (tax.type=='fixed') and not tax.include_base_amount: + cur_price_unit -= tax.amount + for tax in taxes: if tax.type=='percent': if tax.include_base_amount: