Merge lp:~alanbell/openobject-addons/openobject-addons into lp:openobject-addons

[Alan Bell]

fixes bug lp:1108801 and doesn't merge different taxes that happen to have the same categories

Unmerged revisions

9253. By Alan Bell on 2014-03-26

fix lp:1108801 don't merge different taxes

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2014-02-12 17:51:41 +0000
+++ account/account_invoice.py	2014-03-26 12:19:54 +0000
@@ -843,7 +843,7 @@
             for tax in inv.tax_line:
                 if tax.manual:
                     continue
-                key = (tax.tax_code_id.id, tax.base_code_id.id, tax.account_id.id, tax.account_analytic_id.id)
+                key = (tax.tax_code_id.id, tax.base_code_id.id, tax.account_id.id, tax.account_analytic_id.id,tax.name)
                 tax_key.append(key)
                 if not key in compute_taxes:
                     raise osv.except_osv(_('Warning!'), _('Global taxes defined, but they are not in invoice lines !'))
@@ -1759,7 +1759,7 @@
                     val['account_id'] = tax['account_paid_id'] or line.account_id.id
                     val['account_analytic_id'] = tax['account_analytic_paid_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'], val['account_analytic_id'],val['name'])
                 if not key in tax_grouped:
                     tax_grouped[key] = val
                 else: