Merge lp:~agilebg/account-consolidation/7.0-bug-1296740-elbati into lp:~account-core-editors/account-consolidation/7.0

[Lorenzo Battistini]

[Pedro Manuel Baeza (pedro.baeza)]

LGTM

Regards.

review: Approve (code review)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

centralized is defined in account-financial-report/account_financial_report_webkit/account.py

It seams there is no dependancy on it and I think no dependancy should be there.
But simply removing it will break compatibility with account_financial_report_webkit

However, a link module by extracting centralized can be added to ensure account_financial_report_webkit and account_parralel_currency are still compatible.

Can you extract centralized copying in a new module in auto-install when account_financial_report_webkit and account_parralel_currency are installed?

review: Needs Fixing

[Lorenzo Battistini (elbati)]

Dear Yannick,

I don't think this MP would break compatibility with account_financial_report_webkit.
I installed account_financial_report_webkit and account_parralel_currency and I can use them without problems.

It just doesn't copy the centralized field to the parallel accounts. For that, a link module can be surely done. But I think it has less priority than fixing the linked bug.

[Ana Juaristi Olalde (ajuaristio)]

LGTM, thanks

review: Approve (code review)

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

I've reported a separate bug requestion the new module creation.

I'm approving this MP although the tests are failing because they were failing before too (lp:1334645)

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

review: Approve (code review, test)

=== modified file 'account_parallel_currency/account.py'
--- account_parallel_currency/account.py	2013-09-27 07:51:20 +0000
+++ account_parallel_currency/account.py	2014-03-24 18:18:16 +0000
@@ -85,8 +85,6 @@
             vals['user_type'] = account_vals['user_type']
         if 'active' in account_vals:
             vals['active'] = account_vals['active']
-        if 'centralized' in account_vals:
-            vals['centralized'] = account_vals['centralized']
         if 'parent_id' in account_vals:
             parent_account = self.browse(cr, uid, account_vals['parent_id'], context)
             parent_parallel_acc_id = self._search_parallel_account(
@@ -112,7 +110,6 @@
                     'type': account.type,
                     'user_type': account.user_type and account.user_type.id or False,
                     'active': account.active,
-                    'centralized': account.centralized,
                     })
                 cr.execute("insert into parallel_account_rel(parent_id,child_id) values (%d,%d)"
                     % (account.id, new_id))
@@ -443,8 +440,6 @@
             vals['user_type'] = tax_code_vals['user_type']
         if tax_code_vals.has_key('active'):
             vals['active'] = tax_code_vals['active']
-        if tax_code_vals.has_key('centralized'):
-            vals['centralized'] = tax_code_vals['centralized']
         if tax_code_vals.has_key('parent_id'):
             parent_tax_code = self.browse(cr, uid, tax_code_vals['parent_id'], context)
             parent_parallel_acc_id = self._search_parallel_tax_code(