Merge lp:~acsone-openerp/openobject-addons/7.0-bug-1084822-analytic-taxes into lp:openobject-addons/7.0

[Stéphane Bidoul (Acsone)]

bug 1084822

[lp:~acsone-openerp/openobject-addons/7.0-bug-1084822-analytic-taxes]

9181. By Stéphane Bidoul (Acsone) on 2014-01-20

Merge 7.0 in the hope it will become green on runbot

Unmerged revisions

9181. By Stéphane Bidoul (Acsone) on 2014-01-20

Merge 7.0 in the hope it will become green on runbot

9180. By Laetitia Gangloff (Acsone) on 2013-05-29

account_invoice: set analytic account on taxes if there is no default and it is the samefinancial account than the invoice line.

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2013-09-20 09:50:26 +0000
+++ account/account_invoice.py	2014-01-20 10:20:17 +0000
@@ -1655,7 +1655,7 @@
         'invoice_id': fields.many2one('account.invoice', 'Invoice Line', ondelete='cascade', select=True),
         'name': fields.char('Tax Description', size=64, required=True),
         'account_id': fields.many2one('account.account', 'Tax Account', required=True, domain=[('type','<>','view'),('type','<>','income'), ('type', '<>', 'closed')]),
-        'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'),
+        'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account', readonly=True),
         'base': fields.float('Base', digits_compute=dp.get_precision('Account')),
         'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')),
         'manual': fields.boolean('Manual'),
@@ -1733,6 +1733,14 @@
                     val['account_id'] = tax['account_paid_id'] or line.account_id.id
                     val['account_analytic_id'] = tax['account_analytic_paid_id']
 
+                # If the taxes generate moves on the same financial account as the invoice line
+                # 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, 
+                # 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
+
                 key = (val['tax_code_id'], val['base_code_id'], val['account_id'], val['account_analytic_id'])
                 if not key in tax_grouped:
                     tax_grouped[key] = val