From 670c6b4d14b737fa3d8e5d867b503e54fc1e1cb2 Mon Sep 17 00:00:00 2001 From: Mohammad Alhashash Date: Thu, 6 Nov 2014 22:47:15 +0200 Subject: [PATCH] [FIX] Fixes incorrect merge 3e1d5be951fb8 Merge conflict at account/account_invoice.py (commit ab797f0cd8) was incorrectly resolved. As a result, cannot validate invoices with tax line. --- addons/account/account_invoice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index 675a9f5..0deaee7 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -1768,7 +1768,7 @@ class account_invoice_tax(osv.osv): if not val.get('account_analytic_id') and line.account_analytic_id and val['account_id'] == line.account_id.id: val['account_analytic_id'] = line.account_analytic_id.id - key = (val['tax_code_id'], val['base_code_id'], val['account_id'], val['account_analytic_id']) + key = (val['tax_code_id'], val['base_code_id'], val['account_id']) if not key in tax_grouped: tax_grouped[key] = val else: -- 1.7.10.4