From a4b56f7455bfdc7f44c8133368d62e8b29475468 Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Fri, 21 Sep 2012 17:42:44 +0200
Subject: [PATCH] [ADD]Concatenate function to give Brand + model as complete
 name

bzr revid: dle@openerp.com-20120921154244-g7hv96uljkfvyevz
---
 addons/fleet/fleet.py       | 25 ++++++++++++++++++++++---
 addons/fleet/fleet_view.xml |  5 ++---
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index 316d2e69733..b95e4288c18 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -6,15 +6,34 @@ class fleet_vehicle_model_type(osv.Model):
     _columns = {
         'name' : fields.char('Name', size=32, required=True),
     }
-#comment to delete
+#comment to delete#comment to delete
 class fleet_vehicle_model(osv.Model):
 
+    def name_get(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        if not ids:
+            return []
+        reads = self.browse(cr, uid, ids, context=context)
+        res = []
+        for record in reads:
+            name = record.modelname
+            if record.brand:
+                name = record.brand.name+' / '+name
+            res.append((record.id, name))
+        return res
+
+    def _model_name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
+        res = self.name_get(cr, uid, ids, context=context)
+        return dict(res)
+
     _name = 'fleet.vehicle.model'
     _description = 'Model of a vehicle'
 
     _columns = {
-        'name' : fields.char('Brand Name',size=32, required=True),
-        'brand' : fields.many2one('fleet.vehicle.model.brand', 'Model brand', required=True, help='Brand of the vehicle'),
+        'name' : fields.function(_model_name_get_fnc, type="char", string='Name', store=True),
+        'modelname' : fields.char('Model name', size=32, required=True), 
+        'brand' : fields.many2one('fleet.vehicle.model.brand', 'Model brand', required=False, help='Brand of the vehicle'),
         'vendors': fields.many2many('res.partner','fleet_vehicle_model_vendors','model_id', 'partner_id',string='Vendors',required=False),
     }
 
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 3b2f7a41923..e54462c19ff 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -9,11 +9,10 @@
                     <sheet>
                         <group col="2">
                             <group>
-                                <field name="name" />
-                                
+                                <field name="brand" />
                             </group>
                             <group>
-                                <field name="brand" />   
+                                <field name="modelname" />   
                             </group>
                         </group>
                         <notebook>