From 8e7247624f590a209099707b6b920f66d03f21c7 Mon Sep 17 00:00:00 2001 From: "ARA (OpenERP)" Date: Thu, 21 Jul 2011 14:44:32 +0530 Subject: [PATCH 1/3] [FIX] res_partner bank - IBAN must check for SWIFT/BIC in res_bank lp bug: https://launchpad.net/bugs/805996 fixed bzr revid: ara@tinyerp.com-20110721091432-xavmr81nh4s4q237 --- addons/base_iban/base_iban.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/addons/base_iban/base_iban.py b/addons/base_iban/base_iban.py index f473bd090c0..feb36dd8a47 100644 --- a/addons/base_iban/base_iban.py +++ b/addons/base_iban/base_iban.py @@ -120,6 +120,15 @@ class res_partner_bank(osv.osv): return _('The IBAN does not seem to be correct. You should have entered something like this %s'), (iban_example) return _('The IBAN is invalid, It should begin with the country code'), () + def _check_bank(self, cr, uid, ids, context=None): + if context is None: + context = {} + banks = self.browse(cr, uid, ids, context=context) + for bank in banks: + if bank.state == 'iban' and not bank.bank.bic: + return False + return True + def name_get(self, cr, uid, ids, context=None): res = [] to_check_ids = [] @@ -172,8 +181,7 @@ class res_partner_bank(osv.osv): _columns = { 'iban': fields.char('IBAN', size=34, readonly=True, help="International Bank Account Number"), } - - _constraints = [(check_iban, _construct_constraint_msg, ["iban"])] + _constraints = [(check_iban, _construct_constraint_msg, ["iban"]), (_check_bank, '\nPlease define BIC/Swift code on bank for bank type IBAN Account to make valid payments', ['BIC/Swift code'])] res_partner_bank() From 4df2c92250819fb18360b177144967498e740ab1 Mon Sep 17 00:00:00 2001 From: "ARA (OpenERP)" Date: Mon, 25 Jul 2011 14:51:57 +0530 Subject: [PATCH 2/3] [FIX] res_partner bank - IBAN must check for SWIFT/BIC in res_bank bzr revid: ara@tinyerp.com-20110725092157-pxtdtjf930usk3dl --- addons/base_iban/base_iban.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/addons/base_iban/base_iban.py b/addons/base_iban/base_iban.py index feb36dd8a47..446db474f65 100644 --- a/addons/base_iban/base_iban.py +++ b/addons/base_iban/base_iban.py @@ -121,11 +121,8 @@ class res_partner_bank(osv.osv): return _('The IBAN is invalid, It should begin with the country code'), () def _check_bank(self, cr, uid, ids, context=None): - if context is None: - context = {} - banks = self.browse(cr, uid, ids, context=context) - for bank in banks: - if bank.state == 'iban' and not bank.bank.bic: + for partner_bank in self.browse(cr, uid, ids, context=context): + if partner_bank.state == 'iban' and not partner_bank.bank.bic: return False return True From 161b3bd233e3146ed7211019fc069ad40468cbb6 Mon Sep 17 00:00:00 2001 From: "ARA (OpenERP)" Date: Thu, 28 Jul 2011 14:48:10 +0530 Subject: [PATCH 3/3] [FIX] res_partner bank - IBAN must check for SWIFT/BIC in res_bank bzr revid: ara@tinyerp.com-20110728091810-akm54utmf4wrbs98 --- addons/base_iban/base_iban.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_iban/base_iban.py b/addons/base_iban/base_iban.py index 446db474f65..ef752203c3f 100644 --- a/addons/base_iban/base_iban.py +++ b/addons/base_iban/base_iban.py @@ -178,7 +178,7 @@ class res_partner_bank(osv.osv): _columns = { 'iban': fields.char('IBAN', size=34, readonly=True, help="International Bank Account Number"), } - _constraints = [(check_iban, _construct_constraint_msg, ["iban"]), (_check_bank, '\nPlease define BIC/Swift code on bank for bank type IBAN Account to make valid payments', ['BIC/Swift code'])] + _constraints = [(check_iban, _construct_constraint_msg, ["iban"]), (_check_bank, '\nPlease define BIC/Swift code on bank for bank type IBAN Account to make valid payments', ['bic'])] res_partner_bank()