Merge lp:~therp-nl/banking-addons/6.1-lp933472-bic-not-required into lp:banking-addons/6.1

[Holger Brunn (Therp)]

[lp:~therp-nl/banking-addons/6.1-lp933472-bic-not-required]

138. By Holger Brunn (Therp) on 2012-06-14

[FIX] (account_banking) overriden _check_bank method in res_partner_bank
was not actually called

[Stefan Rijnhart (Opener) (stefan-opener)]

Looks good, thanks!

review: Approve

[Stefan Rijnhart (Opener) (stefan-opener)]

Needs refactoring into a separate module, as the BIC requirement will be dropped in various countries at various times. E.g. for most Dutch banks, the requirement will be dropped in februari 2013.

review: Needs Fixing

Unmerged revisions

138. By Holger Brunn (Therp) on 2012-06-14

[FIX] (account_banking) overriden _check_bank method in res_partner_bank
was not actually called

137. By Holger Brunn (Therp) on 2012-06-12

[FIX] lp:933472 suppress base_iban's constraint to enforce BICs for IBANs

=== modified file 'account_banking/account_banking.py'
--- account_banking/account_banking.py	2012-05-02 15:09:49 +0000
+++ account_banking/account_banking.py	2012-06-14 07:30:26 +0000
@@ -1511,10 +1511,16 @@
                        _("The IBAN number doesn't seem to be correct")
                       )
 
+    def _check_bank(self, cr, uid, ids, context=None):
+        #suppress base_iban's constraint to enforce BICs for IBANs
+        #workaround for lp:933472
+        return True
+
     _constraints = [
         # Cannot have this as a constraint as it is rejecting valid numbers from GB and DE
         # It works much better without this constraint!
         #(check_iban, _("The IBAN number doesn't seem to be correct"), ["acc_number"])
+        (_check_bank, '\nPlease define BIC/Swift code on bank for bank type IBAN Account to make valid payments', ['bic'])
     ]
 
 res_partner_bank()