Merge lp:~therp-nl/banking-addons/ba70-bic_not_required into lp:banking-addons

[Stefan Rijnhart (Opener)]

[lp:~therp-nl/banking-addons/ba70-bic_not_required]

177. By Stefan Rijnhart (Opener) on 2013-07-24

[FIX] OpenERP version

[Stéphane Bidoul (Acsone) (sbi)]

Hi Stefan,

I noticed base_iban makes the bank_bic field required in addition to the in-code constraint (see base_iban/base_iban_data.xml)

        <record id="bank_swift_field" model="res.partner.bank.type.field">
            <field name="name">bank_bic</field>
            <field name="bank_type_id" ref="bank_iban"/>
            <field eval="True" name="required"/>
            <field eval="False" name="readonly"/>
        </record>

I believe this should be reverted by your module too, otherwise the bank account creation wizard still requires the BIC.

review: Needs Information (code review and test)

[lp:~therp-nl/banking-addons/ba70-bic_not_required]

178. By Stefan Rijnhart (Opener) on 2013-07-28

[RFR] Move remnant of earlier implementation to dedicated module

179. By Stefan Rijnhart (Opener) on 2013-07-28

[FIX] Remove copy/paste comment

180. By Stefan Rijnhart (Opener) on 2013-07-28

[IMP] Inline documentation, line length

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

Thanks for noticing this. This code was already present in a preliminary implementation in the account_banking module itself. I moved it to the new module, as it does not depend on account_banking.

[Stéphane Bidoul (Acsone) (sbi)]

review: Approve (code review and test)

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM

review: Approve (code review, no test)

=== modified file 'account_banking/data/account_banking_data.xml'
--- account_banking/data/account_banking_data.xml	2013-03-16 16:44:19 +0000
+++ account_banking/data/account_banking_data.xml	2013-07-28 19:52:26 +0000
@@ -13,12 +13,5 @@
             <field eval="False" name="required"/>
             <field eval="False" name="readonly"/>
         </record>
-        <!-- 
-             BIC is not legally required
-             See https://bugs.launchpad.net/bugs/933472
-        -->
-        <record id="base_iban.bank_swift_field" model="res.partner.bank.type.field">
-            <field eval="False" name="required"/>
-        </record>
     </data>
 </openerp>
 
=== added directory 'base_iban_bic_not_required'
=== added file 'base_iban_bic_not_required/__init__.py'
--- base_iban_bic_not_required/__init__.py	1970-01-01 00:00:00 +0000
+++ base_iban_bic_not_required/__init__.py	2013-07-28 19:52:26 +0000
@@ -0,0 +1,1 @@
+import model
 
=== added file 'base_iban_bic_not_required/__openerp__.py'
--- base_iban_bic_not_required/__openerp__.py	1970-01-01 00:00:00 +0000
+++ base_iban_bic_not_required/__openerp__.py	2013-07-28 19:52:26 +0000
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013 Therp BV (<http://therp.nl>).
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'IBAN - Bic not required',
+    'version': '0.1',
+    'license': 'AGPL-3',
+    'author': 'Banking addons community',
+    'website': 'https://launchpad.net/banking-addons',
+    'category': 'Banking addons',
+    'depends': [
+        'base_iban',
+        ],
+    'description': '''
+The account_iban module in OpenERP mandates the presence of a BIC
+code on an IBAN account number through a constraint. However, as of
+Februari 2012 there is a resolution from the EU that drops this requirement
+(see section 8 of [1]). This module reverts the constraint on BICs in the
+base_iban module.
+
+See also https://bugs.launchpad.net/openobject-addons/+bug/933472
+
+[1] http://www.europarl.europa.eu/sides/getDoc.do?pubRef=-//EP//TEXT+TA+P7-TA-2012-0037+0+DOC+XML+V0//EN&language=EN#BKMD-9
+    ''',
+    'data': [
+        'data/res_partner_bank_type_field.xml',
+        ],
+    'installable': True,
+}
 
=== added directory 'base_iban_bic_not_required/data'
=== added file 'base_iban_bic_not_required/data/res_partner_bank_type_field.xml'
--- base_iban_bic_not_required/data/res_partner_bank_type_field.xml	1970-01-01 00:00:00 +0000
+++ base_iban_bic_not_required/data/res_partner_bank_type_field.xml	2013-07-28 19:52:26 +0000
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="base_iban.bank_swift_field"
+                model="res.partner.bank.type.field">
+            <field eval="False" name="required"/>
+        </record>
+    </data>
+</openerp>
 
=== added directory 'base_iban_bic_not_required/model'
=== added file 'base_iban_bic_not_required/model/__init__.py'
--- base_iban_bic_not_required/model/__init__.py	1970-01-01 00:00:00 +0000
+++ base_iban_bic_not_required/model/__init__.py	2013-07-28 19:52:26 +0000
@@ -0,0 +1,1 @@
+import res_partner_bank
 
=== added file 'base_iban_bic_not_required/model/res_partner_bank.py'
--- base_iban_bic_not_required/model/res_partner_bank.py	1970-01-01 00:00:00 +0000
+++ base_iban_bic_not_required/model/res_partner_bank.py	2013-07-28 19:52:26 +0000
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013 Therp BV (<http://therp.nl>).
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from openerp.osv import orm
+
+
+class res_partner_bank(orm.Model):
+    _inherit = 'res.partner.bank'
+
+    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
+
+    # Redefine constraint to update its function reference
+    _constraints = [
+        (_check_bank, 
+         '\nPlease define BIC/Swift code on bank for bank '
+         'type IBAN Account to make valid payments',
+         ['bic'])
+    ]