Merge lp:~akretion-team/openobject-addons/trunk-addons-fix-analytic into lp:openobject-addons

[Alexis de Lattre]

This merge proposal fixes a regression that I introduced in my branch https://code.launchpad.net/~akretion-team/openobject-addons/trunk-addons-analytic-on-tax-v2/+merge/114287 that was merged yesterday.

My error comes from the confusion in field names :
- on account.invoice.line and account.invoice.tax, the "Analytic account" is named "account_analytic_id"
- on account.move.line, the same field is named "analytic_account_id"

[Alexis de Lattre (alexis-via)]

The runbot is green on this branch.

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2012-07-10 21:21:15 +0000
+++ account/account_invoice.py	2012-07-12 21:17:20 +0000
@@ -1002,7 +1002,7 @@
             'quantity': x.get('quantity',1.00),
             'product_id': x.get('product_id', False),
             'product_uom_id': x.get('uos_id', False),
-            'analytic_account_id': x.get('analytic_account_id', False),
+            'analytic_account_id': x.get('account_analytic_id', False),
         }
 
     def action_number(self, cr, uid, ids, context=None):
@@ -1691,7 +1691,7 @@
                 'account_id': t['account_id'],
                 'tax_code_id': t['tax_code_id'],
                 'tax_amount': t['tax_amount'],
-                'analytic_account_id': t['account_analytic_id'],
+                'account_analytic_id': t['account_analytic_id'],
             })
         return res