Merge lp:~sbi/ocb-addons/bug_1084822 into lp:ocb-addons

[Stéphane Bidoul (Acsone)]

Automatically derived from https://code.launchpad.net/~acsone-openerp/openobject-addons/bug_1084822 for https://code.launchpad.net/~openerp/openobject-addons/7.0. Below is a copy of the original description.

bug 1084822

[Stefan Rijnhart (Opener) (stefan-opener)]

LGTM.

I noticed the 'invalidly stacked' warning on the branch. Did you run the clone script on a stand alone branch straight from Launchpad? I'm afraid the script is rather intolerant against other branch configurations. Not that it matters at this stage, but it probably took you a long time to upload this branch if it could not be stacked.

review: Approve

[Stéphane Bidoul (Acsone) (sbi)]

I noticed the invalid stacked too. I run the script again a standalone
branch and the upload was pretty quick so I don't know were it comes from.
Maybe due to previous experiments of mine trying to work on a lightweight
checkout or a stacked branch to shave some download time...

-sbi

On Tue, Jul 16, 2013 at 11:44 AM, Stefan Rijnhart (Therp)
<email address hidden>wrote:

> Review: Approve
>
> LGTM.
>
> I noticed the 'invalidly stacked' warning on the branch. Did you run the
> clone script on a stand alone branch straight from Launchpad? I'm afraid
> the script is rather intolerant against other branch configurations. Not
> that it matters at this stage, but it probably took you a long time to
> upload this branch if it could not be stacked.
>
>
> --
> https://code.launchpad.net/~sbi/ocb-addons/bug_1084822/+merge/174881
> You are the owner of lp:~sbi/ocb-addons/bug_1084822.
>

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review)

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2013-06-12 15:38:14 +0000
+++ account/account_invoice.py	2013-07-15 22:32:27 +0000
@@ -1668,7 +1668,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'),
@@ -1746,6 +1746,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