*added an overwriting of name_get for res_partner_bank

*splitted the base_iban_data.xml into 2 files (added base_iban_view.xml) + modified __terp__ file accordingly
*improved the tree view of res_patner_bank to see the iban account

bzr revid: qdp-8a10efa3e6dba07d412e783d99104e41153474b6

diff --git a/addons/base_iban/__terp__.py b/addons/base_iban/__terp__.py
index 5875953..dc510f4 100644 (file)
--- a/addons/base_iban/__terp__.py
+++ b/addons/base_iban/__terp__.py
@@ -31,6 +31,7 @@
        "author" : "Tiny",
        "category" : "Generic Modules/Base",
        "depends" : ["base"],
+       "update_xml" : ["base_iban_view.xml"],
        "init_xml" : ["base_iban_data.xml"],
        "active": False,
        "installable": True

diff --git a/addons/base_iban/base_iban.py b/addons/base_iban/base_iban.py
index 780da7b..36587df 100644 (file)
--- a/addons/base_iban/base_iban.py
+++ b/addons/base_iban/base_iban.py
@@ -35,5 +35,17 @@ class res_partner_bank(osv.osv):
        _columns = {
                'iban': fields.char('IBAN', size=34, readonly=True, help="International Bank Account Number"),
        }
+
+       def name_get(self, cr, uid, ids, context=None):
+               res = []
+               to_check_ids = []
+               for id in self.browse(cr, uid, ids):
+                       if id.state=='iban':
+                               res.append((id.id,id.iban))
+                       else:
+                               to_check_ids.append(id.id)
+               res += super(res_partner_bank, self).name_get(cr, uid, to_check_ids, context)
+               return res
+
 res_partner_bank()
 

diff --git a/addons/base_iban/base_iban_data.xml b/addons/base_iban/base_iban_data.xml
index 7a2cb0d..daf1991 100644 (file)
--- a/addons/base_iban/base_iban_data.xml
+++ b/addons/base_iban/base_iban_data.xml
@@ -1,35 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        
-        <record id="view_partner_bank_iban_form" model="ir.ui.view">
-            <field name="name">res.partner.bank.form.iban.inherit</field>
-            <field name="model">res.partner.bank</field>
-            <field name="inherit_id" ref="base.view_partner_bank_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <field name="acc_number" position="after">
-                    <newline/>
-                    <field name="iban"/>
-                    <newline/>
-                </field>
-            </field>
-        </record>
-        
-        <record id="view_partner_iban_form" model="ir.ui.view">
-            <field name="name">res.partner.form.iban.inherit</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <field name="acc_number" position="after">
-                    <newline/>
-                    <field name="iban"/>
-                    <newline/>
-                </field>
-            </field>
-        </record>
-        
+
         <!--
                Default bank account description
                -->
@@ -68,4 +40,4 @@
             <field eval="True" name="readonly"/>
         </record>
     </data>
-</terp>
\ No newline at end of file
+</terp>

diff --git a/addons/base_iban/base_iban_view.xml b/addons/base_iban/base_iban_view.xml
new file mode 100644 (file)
index 0000000..b9f5258
--- /dev/null
+++ b/addons/base_iban/base_iban_view.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<terp>
+    <data>
+
+        <record id="view_partner_bank_iban_form" model="ir.ui.view">
+            <field name="name">res.partner.bank.form.iban.inherit</field>
+            <field name="model">res.partner.bank</field>
+            <field name="inherit_id" ref="base.view_partner_bank_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="acc_number" position="after">
+                    <newline/>
+                    <field name="iban"/>
+                    <newline/>
+                </field>
+            </field>
+        </record>
+        
+        <record id="view_partner_abnk_iban_tree" model="ir.ui.view">
+            <field name="name">res.partner.bank.tree.iban.inherit</field>
+            <field name="model">res.partner.bank</field>
+            <field name="inherit_id" ref="base.view_partner_bank_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="acc_number" position="after">
+                    <field name="iban"/>
+                </field>
+            </field>
+        </record>
+
+    <!-- view for res.partner -->
+        <record id="view_partner_iban_form" model="ir.ui.view">
+            <field name="name">res.partner.form.iban.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="acc_number" position="after">
+                    <newline/>
+                    <field name="iban"/>
+                    <newline/>
+                </field>
+            </field>
+        </record>
+
+    </data>
+</terp>