From b3cc67fabd6e05d7375eeb3149070391a847a8ea Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Mon, 10 Dec 2012 10:15:02 +0100
Subject: [PATCH] [FIX]traceback when duplicating vehicle

bzr revid: csn@openerp.com-20121210091502-zhai3ohp0hnbdr4f
---
 addons/fleet/fleet.py       |  6 +++---
 addons/fleet/fleet_demo.xml | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index db999d41d12..28ff0c3dce8 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -333,9 +333,9 @@ class fleet_vehicle(osv.Model):
         'company_id': fields.many2one('res.company', 'Company'),
         'license_plate': fields.char('License Plate', size=32, required=True, help='License plate number of the vehicle (ie: plate number for a car)'),
         'vin_sn': fields.char('Chassis Number', size=32, help='Unique number written on the vehicle motor (VIN/SN number)'),
-        'driver_id': fields.many2one('res.partner', 'Driver', _idhelp='Driver of the vehicle'),
-        'model_id': fields.many2one('fleet.vehicle.model', 'Model', requ_idired=True, help='Model of the vehicle'),
-        'log_fuel': fields.one2many('fleet.vehicle.log.f_iduel', 'vehicle_id', 'Fuel Logs'),
+        'driver_id': fields.many2one('res.partner', 'Driver', help='Driver of the vehicle'),
+        'model_id': fields.many2one('fleet.vehicle.model', 'Model', required=True, help='Model of the vehicle'),
+        'log_fuel': fields.one2many('fleet.vehicle.log.fuel', 'vehicle_id', 'Fuel Logs'),
         'log_services': fields.one2many('fleet.vehicle.log.services', 'vehicle_id', 'Services Logs'),
         'log_contracts': fields.one2many('fleet.vehicle.log.contract', 'vehicle_id', 'Contracts'),
         'acquisition_date': fields.date('Acquisition Date', required=False, help='Date when the vehicle has been bought'),
diff --git a/addons/fleet/fleet_demo.xml b/addons/fleet/fleet_demo.xml
index 03e8bcd38f1..327dfe27c43 100644
--- a/addons/fleet/fleet_demo.xml
+++ b/addons/fleet/fleet_demo.xml
@@ -30,7 +30,7 @@
           <field name="doors">5</field>
           <field name="driver_id" ref="base.res_partner_address_18" />
           <field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
-          <field name="state" ref="vehicle_state_active"/>
+          <field name="state_id" ref="vehicle_state_active"/>
           <field name="odometer_unit">kilometers</field>
           <field name="car_value">20000</field>
           <field eval="[(6,0,[ref('vehicle_tag_leasing'),ref('fleet.vehicle_tag_break'),ref('fleet.vehicle_tag_senior')])]" name="tag_ids"/>
@@ -45,7 +45,7 @@
           <field name="doors">5</field>
           <field name="driver_id" ref="base.res_partner_address_19" />
           <field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
-          <field name="state" ref="vehicle_state_inactive"/>
+          <field name="state_id" ref="vehicle_state_inactive"/>
           <field name="odometer_unit">kilometers</field>
           <field name="car_value">16000</field>
           <field eval="[(6,0,[ref('vehicle_tag_leasing'),ref('fleet.vehicle_tag_compact'),ref('fleet.vehicle_tag_junior')])]" name="tag_ids"/>
@@ -60,7 +60,7 @@
           <field name="doors">3</field>
           <field name="driver_id" ref="base.res_partner_address_17" />
           <field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
-          <field name="state" ref="vehicle_state_active"/>
+          <field name="state_id" ref="vehicle_state_active"/>
           <field name="odometer_unit">kilometers</field>
           <field name="car_value">20000</field>
           <field eval="[(6,0,[ref('vehicle_tag_leasing'),ref('fleet.vehicle_tag_compact'),ref('fleet.vehicle_tag_senior')])]" name="tag_ids"/>
@@ -75,7 +75,7 @@
           <field name="doors">3</field>
           <field name="driver_id" ref="base.res_partner_address_16" />
           <field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
-          <field name="state" ref="vehicle_state_active"/>
+          <field name="state_id" ref="vehicle_state_active"/>
           <field name="odometer_unit">kilometers</field>
           <field name="car_value">20000</field>
           <field eval="[(6,0,[ref('vehicle_tag_leasing'),ref('fleet.vehicle_tag_compact'),ref('fleet.vehicle_tag_senior')])]" name="tag_ids"/>
@@ -90,7 +90,7 @@
           <field name="doors">5</field>
           <field name="driver_id" ref="base.res_partner_address_15" />
           <field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
-          <field name="state" ref="vehicle_state_active"/>
+          <field name="state_id" ref="vehicle_state_active"/>
           <field name="odometer_unit">kilometers</field>
           <field name="car_value">18000</field>
           <field eval="[(6,0,[ref('vehicle_tag_leasing'),ref('fleet.vehicle_tag_compact'),ref('fleet.vehicle_tag_senior')])]" name="tag_ids"/>