From ea636eb033cc62516282fd73c4c431404e83d315 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Thu, 20 Sep 2012 17:21:21 +0200
Subject: [PATCH] [CHANGE]Correct some mistakes in an object name

bzr revid: csn@openerp.com-20120920152121-24nlyjripej2v502
---
 addons/fleet/fleet.py       | 9 +++++----
 addons/fleet/fleet_view.xml | 6 ++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index b219c702636..51e4e92d874 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -1,6 +1,6 @@
 from osv import osv, fields
 
-class fleet_vehicle_model(osv.Model):
+class fleet_vehicle_model_type(osv.Model):
     _name = 'fleet.vehicle.type'
     _description = 'Type of the vehicle'
     _columns = {
@@ -9,12 +9,13 @@ class fleet_vehicle_model(osv.Model):
 
 class fleet_vehicle_model(osv.Model):
     _name = 'fleet.vehicle.model'
-    _description = ''
+    _description = 'Model of a vehicle'
 
     _columns = {
+        'name' : fields.char('Name',size=32, required=True),
         'brand' : fields.many2one('fleet.vehicle.model.brand', 'Model brand', required=True),
         'type' : fields.many2one('fleet.vehicle.type', 'Vehicle Type', required=True),
-        'name' : fields.many2one('fleet.vehicle.model.name', 'Model name', required=True),
+        'modelname' : fields.many2one('fleet.vehicle.model.name', 'Model name', required=True),
         'make' : fields.many2one('fleet.vehicle.model.make', 'Model make', required=True),
         'partner_id': fields.many2many('res.partner','fleet_vehicle_model_vendors','model_id', 'partner_id',string='Vendors',required=False),
     }
@@ -47,7 +48,7 @@ class fleet_vehicle(osv.Model):
     _columns = {
         'registration' : fields.char('Registration', size=32, required=False),
         'vin_sn' : fields.char('VIN SN', size=32, required=False),
-        'driver' : fields.many2one('fleet.vehicle', 'employee_id', required=False),
+        'driver' : fields.many2one('hr.employee', 'Driver',required=False),
         'model_id' : fields.many2one('fleet.vehicle.model', 'Model', required=True),
         'log_ids' : fields.one2many('fleet.vehicle.log', 'vehicle_id', 'Logs'),
         'acquisition_date' : fields.date('Acquisition date', required=False),
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index c46d8b4afa6..ec242704053 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -6,9 +6,10 @@
             <field name="model">fleet.vehicle.model</field>
             <field name="arch" type="xml">
                 <form string="Model">
+                    <field name="name" />
                     <field name="type" />
                     <field name="brand" />
-                    <field name="name" />
+                    <field name="modelname" />
                     <field name="make" />
                     <field name="partner_id" />
                 </form>
@@ -19,9 +20,10 @@
             <field name="model">fleet.vehicle.model</field>
             <field name="arch" type="xml">
                 <tree string="Models" version="7.0">
+                    <field name="name" />
                     <field name="type" />
                     <field name="brand" />
-                    <field name="name" />
+                    <field name="modelname" />
                     <field name="make" />
                     <field name="partner_id" />
                 </tree>