From 33de7c58320735d0ee79428188fe5ccd61fb7373 Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Tue, 25 Sep 2012 09:47:20 +0200
Subject: [PATCH] [FIX]bug getname when brand deleted

bzr revid: dle@openerp.com-20120925074720-fosudvzez8lanhul
---
 addons/fleet/fleet.py       | 8 +++++---
 addons/fleet/fleet_view.xml | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index c17fc0a1fcd..d4c6607d2e1 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -18,7 +18,7 @@ class fleet_vehicle_model(osv.Model):
         res = []
         for record in reads:
             name = record.modelname
-            if record.brand:
+            if record.brand.name:
                 name = record.brand.name+' / '+name
             res.append((record.id, name))
         return res
@@ -64,8 +64,10 @@ class fleet_vehicle(osv.Model):
         for record in reads:
             if record.registration:
                 name = record.registration
-            if record.model_id:
-                name = record.model_id.brand.name+' / '+record.model_id.modelname + ' / ' + name
+            if record.model_id.modelname:
+                name = record.model_id.modelname + ' / ' + name
+            if record.model_id.brand.name:
+                name = record.model_id.brand.name+' / '+ name
             res.append((record.id, name))
         return res
 
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 9955e931112..0ee708ca38e 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -29,8 +29,8 @@
             <field name="model">fleet.vehicle.model</field>
             <field name="arch" type="xml">
                 <tree string="Models" version="7.0">
-                    <field name="name" />
                     <field name="brand" />
+                    <field name="modelname" />
                     <field name="vendors" />
                 </tree>
             </field>