From 03e11de61a5652cdd5e6bb011e3c60fe742e2cc5 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Wed, 25 Apr 2012 18:11:09 +0200 Subject: [PATCH] [FIX] account_coda: errors in constraints bzr revid: qdp-launchpad@openerp.com-20120425161109-8738t6u3w5i9lukt --- addons/account_coda/account_coda.py | 7 +++++-- addons/account_coda/wizard/account_coda_import.py | 6 ------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/addons/account_coda/account_coda.py b/addons/account_coda/account_coda.py index e3cc6f40a0c..72106cd966b 100644 --- a/addons/account_coda/account_coda.py +++ b/addons/account_coda/account_coda.py @@ -32,8 +32,11 @@ class coda_bank_account(osv.osv): def _check_currency(self, cr, uid, ids, context=None): obj_cba = self.browse(cr, uid, ids[0], context=context) - if (obj_cba.state == 'normal') and obj_cba.journal and (obj_cba.currency != obj_cba.journal.currency): - return False + if (obj_cba.state == 'normal') and obj_cba.journal: + if obj_cba.journal.currency and (obj_cba.currency != obj_cba.journal.currency): + return False + if not obj_cba.journal.currency and (obj_cba.currency != obj_cba.company_id.currency_id): + return False return True _columns = { diff --git a/addons/account_coda/wizard/account_coda_import.py b/addons/account_coda/wizard/account_coda_import.py index c49eb9f1dbd..96be4d5b58e 100644 --- a/addons/account_coda/wizard/account_coda_import.py +++ b/addons/account_coda/wizard/account_coda_import.py @@ -630,12 +630,6 @@ class account_coda_import(osv.osv_memory): err_string += _('\nConfiguration Error in journal %s!' \ '\nPlease verify the Default Debit and Credit Account settings.') % journal.name break - if balance_start_check <> statement['balance_start']: - nb_err += 1 - err_string += _('\nThe CODA Statement %s Starting Balance (%.2f) does not correspond with the previous Closing Balance (%.2f) in journal %s!') \ - % (statement['name'], statement['balance_start'], balance_start_check, journal.name) - break - bk_st_id = bank_st_obj.create(cr, uid, { 'name': statement['name'], 'journal_id': statement['journal_id'],