← Back to team overview

openerp-community-reviewer team mailing list archive

[Merge] lp:~agilebg/account-consolidation/7.0-bug-1296740-elbati into lp:account-consolidation/7.0

 

Lorenzo Battistini - Agile BG has proposed merging lp:~agilebg/account-consolidation/7.0-bug-1296740-elbati into lp:account-consolidation/7.0.

Requested reviews:
  Account Core Editors (account-core-editors)
Related bugs:
  Bug #1296740 in Account - Consolidation: "7.0 account_parallel_currency: uses undefined account.account field 'centralized'"
  https://bugs.launchpad.net/account-consolidation/+bug/1296740

For more details, see:
https://code.launchpad.net/~agilebg/account-consolidation/7.0-bug-1296740-elbati/+merge/212487
-- 
https://code.launchpad.net/~agilebg/account-consolidation/7.0-bug-1296740-elbati/+merge/212487
Your team Account Core Editors is requested to review the proposed merge of lp:~agilebg/account-consolidation/7.0-bug-1296740-elbati into lp:account-consolidation/7.0.
=== 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(


Follow ups