← Back to team overview

openerp-community-reviewer team mailing list archive

[Merge] lp:~agilebg/account-consolidation/7.0-fix-1334645-elbati into lp:account-consolidation/7.0

 

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

Requested reviews:
  Account Core Editors (account-core-editors)
Related bugs:
  Bug #1334645 in Account - Consolidation: "account_parallel_currency: test failure test/mapping_parallel_accounts.yml"
  https://bugs.launchpad.net/account-consolidation/+bug/1334645

For more details, see:
https://code.launchpad.net/~agilebg/account-consolidation/7.0-fix-1334645-elbati/+merge/225266
-- 
https://code.launchpad.net/~agilebg/account-consolidation/7.0-fix-1334645-elbati/+merge/225266
Your team Account Core Editors is requested to review the proposed merge of lp:~agilebg/account-consolidation/7.0-fix-1334645-elbati into lp:account-consolidation/7.0.
=== modified file 'account_parallel_currency/account.py'
--- account_parallel_currency/account.py	2014-03-24 18:16:13 +0000
+++ account_parallel_currency/account.py	2014-07-02 07:17:41 +0000
@@ -455,8 +455,8 @@
         for tax_code in self.browse(cr, SUPERUSER_ID, ids, context):
             for parallel_company in tax_code.company_id.parallel_company_ids:
                 if not tax_code.parent_id:
-                    raise orm.except_orm(_('Error'),_('Tax code %s does not have parent')
-                        % tax_code.code)
+                    # can't do the mapping as it's based on parent tax code
+                    return True
                 existing_ids = self.search(cr, SUPERUSER_ID, [
                     ('code', '=', tax_code.code),
                     ('company_id', '=', parallel_company.id),


Follow ups