OLD 7.0 2014 11 05

Note

This conflict resolution was amended in https://github.com/OCA/OCB/commit/fccea9a09209c1a4b28b8fb92cf9e3a04f8fe2df

Conflict

diff --cc addons/account/account_invoice.py
index 2453c2e,febddd3..0000000
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@@ -1761,14 -1744,14 +1761,24 @@@ class account_invoice_tax(osv.osv)
                      val['account_analytic_id'] = tax['account_analytic_paid_id']
  
                  # If the taxes generate moves on the same financial account as the invoice line
++<<<<<<< HEAD
 +                # and no default analytic account is defined at the tax level, propagate the 
 +                # analytic account from the invoice line to the tax line. This is necessary
 +                # in situations were (part of) the taxes cannot be reclaimed, 
++=======
+                 # and no default analytic account is defined at the tax level, propagate the
+                 # analytic account from the invoice line to the tax line. This is necessary
+                 # in situations were (part of) the taxes cannot be reclaimed,
++>>>>>>> odoo/7.0
                  # to ensure the tax move is allocated to the proper analytic account.
                  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
  
++<<<<<<< HEAD
 +                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'])
++>>>>>>> odoo/7.0
                  if not key in tax_grouped:
                      tax_grouped[key] = val
                  else:

Resolution

Retain upstream's formatting of the comment from https://github.com/OCA/OCB/commit/7b7ca96e654b67481f824e2ccead757ab4ae81c6, but keep key from https://github.com/OCA/OCB/commit/fb7120d7b60aa04d5eb6580fb7dc769f8a46720c

Committed as https://github.com/OCA/OCB/commit/3e1d5be951fb80a958a5c61b0d41e874df261105 by @hbrunn