BASE: improve bank definition

bzr revid: ced-8f7ffd576b9fb1cb348c46d0d6299b13e1568f09

diff --git a/addons/base_iban/base_iban.py b/addons/base_iban/base_iban.py
index f4c3a65..6e9e092 100644 (file)
--- a/addons/base_iban/base_iban.py
+++ b/addons/base_iban/base_iban.py
@@ -32,7 +32,7 @@ class res_partner_bank(osv.osv):
        _inherit = "res.partner.bank"
        _columns = {
                'iban': fields.char('IBAN', size=34, readonly=True, help="International Bank Account Number"),
-               'swift': fields.char('BIC/Swift code', size=11, readonly=True, help="Bank Identifier Code"),
+               'bic': fields.char('BIC/Swift code', size=11, readonly=True, help="Bank Identifier Code"),
        }
 res_partner_bank()
 

diff --git a/addons/base_iban/base_iban_data.xml b/addons/base_iban/base_iban_data.xml
index 033d90a..a706f96 100644 (file)
--- a/addons/base_iban/base_iban_data.xml
+++ b/addons/base_iban/base_iban_data.xml
@@ -10,7 +10,7 @@
                        <field name="arch" type="xml">
                                <field name="acc_number" position="after">
                                        <newline/>
-                                       <field name="swift"/>
+                                       <field name="bic"/>
                                        <field name="iban"/>
                                        <newline/>
                                </field>
@@ -31,7 +31,7 @@
                        <field name="readonly" eval="False"/>
                </record>
                <record model="res.partner.bank.type.field" id="bank_swift_field">
-                       <field name="name">swift</field>
+                       <field name="name">bic</field>
                        <field name="bank_type_id" ref="bank_iban"/>
                        <field name="required" eval="True"/>
                        <field name="readonly" eval="False"/>
@@ -39,13 +39,13 @@
                <record model="res.partner.bank.type.field" id="bank_country_field">
                        <field name="name">country_id</field>
                        <field name="bank_type_id" ref="bank_iban"/>
-                       <field name="required" eval="True"/>
+                       <field name="required" eval="False"/>
                        <field name="readonly" eval="False"/>
                </record>
                <record model="res.partner.bank.type.field" id="bank_zip_field">
                        <field name="name">zip</field>
                        <field name="bank_type_id" ref="bank_iban"/>
-                       <field name="required" eval="True"/>
+                       <field name="required" eval="False"/>
                        <field name="readonly" eval="False"/>
                </record>
                <record model="res.partner.bank.type.field" id="bank_acc_number_field">