BASE: improve bank definition

bzr revid: ced-c29362c3e55ab20986e065694d2b8aac832a7642

diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index af8f618..a6b3927 100644 (file)
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -361,7 +361,6 @@ class res_partner_bank_type(osv.osv):
        _columns = {
                'name': fields.char('Name', size=64, required=True),
                'code': fields.char('Code', size=64, required=True),
-               'elec_pay': fields.char('Electronic Payment', size=64),
                'field_ids': fields.one2many('res.partner.bank.type.field', 'bank_type_id', 'Type fields'),
        }
 res_partner_bank_type()
@@ -382,6 +381,7 @@ res_partner_bank_type_fields()
 class res_partner_bank(osv.osv):
        _description='Bank Details'
        _name = "res.partner.bank"
+       _rec_name = "state"
        def _bank_type_get(self, cr, uid, *args):
                result = []
                type_ids = self.pool.get('res.partner.bank.type').search(cr, uid, [])
@@ -391,7 +391,6 @@ class res_partner_bank(osv.osv):
                return result
 
        _columns = {
-               'name': fields.char('Account Name', size=64, required=True),
                'acc_number': fields.char('Account Number', size=64, required=False),
                'bank_id': fields.many2one('res.partner', 'Bank'),
                'bank_address_id': fields.many2one('res.partner.address', 'Bank address'),
@@ -416,6 +415,11 @@ class res_partner_bank(osv.osv):
                                        res[f.name]['states'][t.code] = [('readonly',f.readonly),('required',f.required)]
                return res
 
+       def name_get(self, cr, uid, ids, context={}):
+               if not len(ids):
+                       return []
+               return [(r['id'], r[self._rec_name] + (r['owner_name'] and (' ' + r['owner_name']))) for r in self.read(cr, uid, ids, [self._rec_name, 'owner_name'], context, load='_classic_write')]
+
 res_partner_bank()
 
 

diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 42a3bdb..6b6c5a3 100644 (file)
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -362,8 +362,7 @@
                <field name="arch" type="xml">
                        <form string="Bank Account Type">
                                <field name="name" select="1"/>
-                               <field name="code" />
-                               <field name="elec_pay" select="1"/>
+                               <field name="code" select="1"/>
                        </form>
                </field>
        </record>
@@ -375,8 +374,7 @@
                <field name="arch" type="xml">
                        <tree string="Bank Account Type">
                                <field name="name" select="1"/>
-                               <field name="code" />
-                               <field name="elec_pay" select="1"/>
+                               <field name="code" select="1"/>
                        </tree>
                </field>
        </record>
@@ -388,7 +386,6 @@
                <field name="type">form</field>
                <field name="arch" type="xml">
                        <form string="Bank account">
-                               <field name="name" select="1"/>
                                <field name="state" select="2"/>
                                <newline/>
                                <field name="acc_number" select="1"/>
@@ -410,8 +407,8 @@
                <field name="type">tree</field>
                <field name="arch" type="xml">
                        <tree string="Bank Details">
-                               <field name="name"/>
                                <field name="state"/>
+                               <field name="owner_name"/>
                        </tree>
                </field>
        </record>