[REF]change some field name, remove useless line in access rules

bzr revid: csn@openerp.com-20121206105033-6dcffqm1626jt5r8

4 files changed, 102 insertions, 103 deletions

diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index e74ac4839f4..db999d41d12 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -66,8 +66,8 @@ class fleet_vehicle_cost(osv.Model):
         res = {}
         for record in self.browse(cr, uid, ids, context=context):
             name = record.vehicle_id.name
-            if record.cost_subtype.name:
-                name += ' / '+ record.cost_subtype.name
+            if record.cost_subtype_id.name:
+                name += ' / '+ record.cost_subtype_id.name
             if record.date:
                 name += ' / '+ record.date
             res[record.id] = name
@@ -76,7 +76,7 @@ class fleet_vehicle_cost(osv.Model):
     _columns = {
         'name': fields.function(_cost_name_get_fnc, type="char", string='Name', store=True),
         'vehicle_id': fields.many2one('fleet.vehicle', 'Vehicle', required=True, help='Vehicle concerned by this log'),
-        'cost_subtype': fields.many2one('fleet.service.type', 'Type', help='Cost type purchased with this cost'),
+        'cost_subtype_id': fields.many2one('fleet.service.type', 'Type', help='Cost type purchased with this cost'),
         'amount': fields.float('Total Price'),
         'cost_type': fields.selection([('contract', 'Contract'), ('services','Services'), ('fuel','Fuel'), ('other','Other')], 'Category of the cost', help='For internal purpose only', required=True),
         'parent_id': fields.many2one('fleet.vehicle.cost', 'Parent', help='Parent cost to this current cost'),
@@ -104,7 +104,7 @@ class fleet_vehicle_cost(osv.Model):
         if 'contract_id' in data and data['contract_id']:
             contract = self.pool.get('fleet.vehicle.log.contract').browse(cr, uid, data['contract_id'], context=context)
             data['vehicle_id'] = contract.vehicle_id.id
-            data['cost_subtype'] = contract.cost_subtype.id
+            data['cost_subtype_id'] = contract.cost_subtype_id.id
             data['cost_type'] = contract.cost_type
         if 'odometer' in data and not data['odometer']:
             #if received value for odometer is 0, then remove it from the data as it would result to the creation of a
@@ -135,8 +135,8 @@ class fleet_vehicle_model(osv.Model):
         res = {}
         for record in self.browse(cr, uid, ids, context=context):
             name = record.modelname
-            if record.brand.name:
-                name = record.brand.name + ' / ' + name
+            if record.brand_id.name:
+                name = record.brand_id.name + ' / ' + name
             res[record.id] = name
         return res
 
@@ -157,11 +157,11 @@ class fleet_vehicle_model(osv.Model):
     _columns = {
         '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=True, help='Brand of the vehicle'),
+        'brand_id': fields.many2one('fleet.vehicle.model.brand', 'Model Brand', required=True, help='Brand of the vehicle'),
         'vendors': fields.many2many('res.partner', 'fleet_vehicle_model_vendors', 'model_id', 'partner_id', string='Vendors'),
-        'image': fields.related('brand', 'image', type="binary", string="Logo"),
-        'image_medium': fields.related('brand', 'image_medium', type="binary", string="Logo"),
-        'image_small': fields.related('brand', 'image_small', type="binary", string="Logo"),
+        'image': fields.related('brand_id', 'image', type="binary", string="Logo"),
+        'image_medium': fields.related('brand_id', 'image_medium', type="binary", string="Logo"),
+        'image_small': fields.related('brand_id', 'image_small', type="binary", string="Logo"),
     }
 
 
@@ -210,7 +210,7 @@ class fleet_vehicle(osv.Model):
     def _vehicle_name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
         res = {}
         for record in self.browse(cr, uid, ids, context=context):
-            res[record.id] = record.model_id.brand.name + '/' + record.model_id.modelname + ' / ' + record.license_plate
+            res[record.id] = record.model_id.brand_id.name + '/' + record.model_id.modelname + ' / ' + record.license_plate
         return res
 
     def return_action_to_open(self, cr, uid, ids, context=None):
@@ -308,7 +308,7 @@ class fleet_vehicle(osv.Model):
                         ids = self.pool.get('fleet.vehicle.log.contract').search(cr,uid,[('vehicle_id', '=', record.id), ('state', 'in', ('open', 'toclose'))], limit=1, order='expiration_date asc')
                         if len(ids) > 0:
                             #we display only the name of the oldest overdue/due soon contract
-                            name=(self.pool.get('fleet.vehicle.log.contract').browse(cr, uid, ids[0], context=context).cost_subtype.name)
+                            name=(self.pool.get('fleet.vehicle.log.contract').browse(cr, uid, ids[0], context=context).cost_subtype_id.name)
 
             res[record.id] = {
                 'contract_renewal_overdue': overdue,
@@ -333,14 +333,14 @@ 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': 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'),
+        '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'),
         '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'),
         'color': fields.char('Color', size=32, help='Color of the vehicle'),
-        'state': fields.many2one('fleet.vehicle.state', 'State', help='Current state of the vehicle', ondelete="set null"),
+        'state_id': fields.many2one('fleet.vehicle.state', 'State', help='Current state of the vehicle', ondelete="set null"),
         'location': fields.char('Location', size=128, help='Location of the vehicle (garage, ...)'),
         'seats': fields.integer('Seats Number', help='Number of seats of the vehicle'),
         'doors': fields.integer('Doors Number', help='Number of doors of the vehicle'),
@@ -366,7 +366,7 @@ class fleet_vehicle(osv.Model):
     _defaults = {
         'doors': 5,
         'odometer_unit': 'kilometers',
-        'state': _get_default_state,
+        'state_id': _get_default_state,
     }
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -408,13 +408,13 @@ class fleet_vehicle(osv.Model):
                 value = self.pool.get('fleet.vehicle.model').browse(cr,uid,vals['model_id'],context=context).name
                 oldmodel = vehicle.model_id.name or _('None')
                 changes.append(_("Model: from '%s' to '%s'") %(oldmodel, value))
-            if 'driver' in vals and vehicle.driver.id != vals['driver']:
-                value = self.pool.get('res.partner').browse(cr,uid,vals['driver'],context=context).name
-                olddriver = (vehicle.driver.name) or _('None')
+            if 'driver_id' in vals and vehicle.driver_id.id != vals['driver_id']:
+                value = self.pool.get('res.partner').browse(cr,uid,vals['driver_id'],context=context).name
+                olddriver = (vehicle.driver_id.name) or _('None')
                 changes.append(_("Driver: from '%s' to '%s'") %(olddriver, value))
-            if 'state' in vals and vehicle.state.id != vals['state']:
-                value = self.pool.get('fleet.vehicle.state').browse(cr,uid,vals['state'],context=context).name
-                oldstate = vehicle.state.name or _('None')
+            if 'state_id' in vals and vehicle.state_id.id != vals['state_id']:
+                value = self.pool.get('fleet.vehicle.state').browse(cr,uid,vals['state_id'],context=context).name
+                oldstate = vehicle.state_id.name or _('None')
                 changes.append(_("State: from '%s' to '%s'") %(oldstate, value))
             if 'license_plate' in vals and vehicle.license_plate != vals['license_plate']:
                 old_license_plate = vehicle.license_plate or _('None')
@@ -548,7 +548,7 @@ class fleet_vehicle_log_fuel(osv.Model):
     _defaults = {
         'purchaser_id': lambda self, cr, uid, ctx: uid,
         'date': fields.date.context_today,
-        'cost_subtype': _get_default_service_type,
+        'cost_subtype_id': _get_default_service_type,
         'cost_type': 'fuel',
     }
 
@@ -585,7 +585,7 @@ class fleet_vehicle_log_services(osv.Model):
     _defaults = {
         'purchaser_id': lambda self, cr, uid, ctx: uid,
         'date': fields.date.context_today,
-        'cost_subtype': _get_default_service_type,
+        'cost_subtype_id': _get_default_service_type,
         'cost_type': 'services'
     }
 
@@ -630,7 +630,7 @@ class fleet_vehicle_log_contract(osv.Model):
                     'amount': contract.cost_generated,
                     'date': startdate.strftime(tools.DEFAULT_SERVER_DATE_FORMAT),
                     'vehicle_id': contract.vehicle_id.id,
-                    'cost_subtype': contract.cost_subtype.id,
+                    'cost_subtype_id': contract.cost_subtype_id.id,
                     'contract_id': contract.id,
                     'auto_generated': True
                 }
@@ -664,8 +664,8 @@ class fleet_vehicle_log_contract(osv.Model):
         res = {}
         for record in self.browse(cr, uid, ids, context=context):
             name = record.vehicle_id.name
-            if record.cost_subtype.name:
-                name += ' / '+ record.cost_subtype.name
+            if record.cost_subtype_id.name:
+                name += ' / '+ record.cost_subtype_id.name
             if record.date:
                 name += ' / '+ record.date
             res[record.id] = name
@@ -789,7 +789,7 @@ class fleet_vehicle_log_contract(osv.Model):
         'state':'open',
         'expiration_date': lambda self, cr, uid, ctx: self.compute_next_year_date(fields.date.context_today(self, cr, uid, context=ctx)),
         'cost_frequency': 'no',
-        'cost_subtype': _get_default_contract_type,
+        'cost_subtype_id': _get_default_contract_type,
         'cost_type': 'contract',
     }
 
diff --git a/addons/fleet/fleet_demo.xml b/addons/fleet/fleet_demo.xml
index 4760e336dd1..0387d9cd41d 100644
--- a/addons/fleet/fleet_demo.xml
+++ b/addons/fleet/fleet_demo.xml
@@ -3,227 +3,227 @@
     <data>
       <record id="model_corsa" model="fleet.vehicle.model">
           <field name="modelname">Corsa</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_astra" model="fleet.vehicle.model">
           <field name="modelname">Astra</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_agila" model="fleet.vehicle.model">
           <field name="modelname">Agila</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_combotour" model="fleet.vehicle.model">
           <field name="modelname">Combo Tour</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_meriva" model="fleet.vehicle.model">
           <field name="modelname">Meriva</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_astragtc" model="fleet.vehicle.model">
           <field name="modelname">AstraGTC</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_zafira" model="fleet.vehicle.model">
           <field name="modelname">Zafira</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_zafiratourer" model="fleet.vehicle.model">
           <field name="modelname">Zafira Tourer</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_insignia" model="fleet.vehicle.model">
           <field name="modelname">Insignia</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_mokka" model="fleet.vehicle.model">
           <field name="modelname">Mokka</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_antara" model="fleet.vehicle.model">
           <field name="modelname">Antara</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_ampera" model="fleet.vehicle.model">
           <field name="modelname">Ampera</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_a1" model="fleet.vehicle.model">
           <field name="modelname">A1</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a3" model="fleet.vehicle.model">
           <field name="modelname">A3</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a4" model="fleet.vehicle.model">
           <field name="modelname">A4</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a5" model="fleet.vehicle.model">
           <field name="modelname">A5</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a6" model="fleet.vehicle.model">
           <field name="modelname">A6</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a7" model="fleet.vehicle.model">
           <field name="modelname">A7</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a8" model="fleet.vehicle.model">
           <field name="modelname">A8</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_q3" model="fleet.vehicle.model">
           <field name="modelname">Q3</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_q5" model="fleet.vehicle.model">
           <field name="modelname">Q5</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_q7" model="fleet.vehicle.model">
           <field name="modelname">Q7</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_tt" model="fleet.vehicle.model">
           <field name="modelname">TT</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_serie1" model="fleet.vehicle.model">
           <field name="modelname">Serie 1</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_serie3" model="fleet.vehicle.model">
           <field name="modelname">Serie 3</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_serie5" model="fleet.vehicle.model">
           <field name="modelname">Serie 5</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_serie6" model="fleet.vehicle.model">
           <field name="modelname">Serie 6</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_serie7" model="fleet.vehicle.model">
           <field name="modelname">Serie 7</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_seriex" model="fleet.vehicle.model">
           <field name="modelname">Serie X</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_seriez4" model="fleet.vehicle.model">
           <field name="modelname">Serie Z4</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_seriem" model="fleet.vehicle.model">
           <field name="modelname">Serie M</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_seriehybrid" model="fleet.vehicle.model">
           <field name="modelname">Serie Hybrid</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_classa" model="fleet.vehicle.model">
           <field name="modelname">Class A</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classb" model="fleet.vehicle.model">
           <field name="modelname">Class B</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classc" model="fleet.vehicle.model">
           <field name="modelname">Class C</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classcl" model="fleet.vehicle.model">
           <field name="modelname">Class CL</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classcls" model="fleet.vehicle.model">
           <field name="modelname">Class CLS</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classe" model="fleet.vehicle.model">
           <field name="modelname">Class E</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classm" model="fleet.vehicle.model">
           <field name="modelname">Class M</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classgl" model="fleet.vehicle.model">
           <field name="modelname">Class GL</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classglk" model="fleet.vehicle.model">
           <field name="modelname">Class GLK</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classr" model="fleet.vehicle.model">
           <field name="modelname">Class R</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classs" model="fleet.vehicle.model">
           <field name="modelname">Class S</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classslk" model="fleet.vehicle.model">
           <field name="modelname">Class SLK</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classsls" model="fleet.vehicle.model">
           <field name="modelname">SLS</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="vehicle_state_inshop" model="fleet.vehicle.state">
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 9cceb594884..1810cc5a938 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -10,7 +10,7 @@
                         <field name="image_medium" widget='image' class="oe_left oe_avatar"/>
                         <group col="2">
                             <group>
-                                <field name="brand" on_change="on_change_brand(brand)"/>
+                                <field name="brand_id" on_change="on_change_brand(brand_id)"/>
                             </group>
                             <group>
                                 <field name="modelname" />   
@@ -30,7 +30,7 @@
             <field name="model">fleet.vehicle.model</field>
             <field name="arch" type="xml">
                 <tree string="Models" version="7.0">
-                    <field name="brand" />
+                    <field name="brand_id" />
                     <field name="modelname" />
                 </tree>
             </field>
@@ -135,7 +135,7 @@
         </record>
 
         <record model='ir.actions.act_window' id='fleet_vehicle_state_act'>
-            <field name="name">States of Vehicle</field>
+            <field name="name">Vehicle Status</field>
             <field name="res_model">fleet.vehicle.state</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -161,7 +161,7 @@
             <field name="arch" type="xml">
                 <form string="Vehicle" version="7.0">
                     <header>
-                        <field name="state"  widget="statusbar" clickable="True" />
+                        <field name="state_id"  widget="statusbar" clickable="True" />
                     </header>
                     <sheet> 
                         <field name="image_medium" widget='image' class="oe_left oe_avatar"/> 
@@ -186,7 +186,7 @@
                         </div> 
                         <group col="2" string="General Properties">
                             <group >
-                                <field name="driver" />
+                                <field name="driver_id" />
                                 <field name="location" />
                                 <field name="vin_sn" />
                                 <field name="company_id" groups="base.group_multi_company"/>
@@ -231,10 +231,10 @@
                 <tree string="Vehicle" version="7.0" colors="orange:contract_renewal_due_soon and not contract_renewal_overdue;red:contract_renewal_overdue">
                     <field name="license_plate" />
                     <field name="model_id" />
-                    <field name="driver" />
+                    <field name="driver_id" />
                     <field name="vin_sn" />
                     <field name="acquisition_date" />
-                    <field name="state"/>
+                    <field name="state_id"/>
                     <field name="odometer" />
                     <field name="odometer_unit" />
                     <field name="contract_renewal_due_soon" invisible="1"/>
@@ -250,11 +250,10 @@
             <field name="arch" type="xml">
                 <search string="All vehicles">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('license_plate','ilike',self)]" string="Vehicle"/>
-                    <field name="driver"/>
+                    <field name="driver_id"/>
                     <field name="tag_ids"/>
                     <field name="location"/>
-                    <field name="state" />
-                    <field name="state" />
+                    <field name="state_id" />
                     <filter name="alert_true" domain="['|',('contract_renewal_due_soon','=',True),('contract_renewal_overdue','=',True)]" string="Has Alert(s)"/>
                </search>
             </field>
@@ -268,9 +267,9 @@
                 <kanban>
                     <field name="license_plate" />
                     <field name="model_id" />
-                    <field name="driver" />
+                    <field name="driver_id" />
                     <field name="location" />
-                    <field name="state" />
+                    <field name="state_id" />
 
                     <field name="image" />
                     <field name="tag_ids" />
@@ -310,7 +309,7 @@
                                     
                                     <ul>
                                         <li>
-                                            <t t-if="record.driver.raw_value"><field name="driver"/></t>
+                                            <t t-if="record.driver_id.raw_value"><field name="driver_id"/></t>
                                         </li>
                                         <li>
                                             <t t-if="record.location.raw_value"><field name="location"/></t>
@@ -368,7 +367,7 @@
                         <group col="2">
                             <group string="Contract details">
                                 <field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
-                                <field name="cost_subtype" required="1" domain="['|',('category','=','contract'),('category','=','both')]"/>
+                                <field name="cost_subtype_id" required="1" domain="['|',('category','=','contract'),('category','=','both')]"/>
                                 <field name="amount" string="Activation Cost"/>
                                 <label for="cost_generated"/>
                                 <div>
@@ -401,7 +400,7 @@
                                 <group>
                                     <field name="cost_ids" context="{'vehicle_id': vehicle_id}" nolabel="1" on_change="on_change_indic_cost(cost_ids)">
                                         <tree version="7.0" editable="bottom">
-                                            <field name="cost_subtype" string="Service" domain="[('category','=','service')]"/>
+                                            <field name="cost_subtype_id" string="Service" domain="[('category','=','service')]"/>
                                             <field name="amount" sum="Price" string="Indicative Cost" />
                                         </tree>
                                     </field>
@@ -449,7 +448,7 @@
                     <field name="expiration_date" />
                     <field name="days_left" invisible="1"/>
                     <field name="vehicle_id" />
-                    <field name="cost_subtype"/>
+                    <field name="cost_subtype_id"/>
                     <field name="insurer_id" />
                     <field name="amount" string="Activation Cost"/>
                     <field name="cost_generated"/>
@@ -669,7 +668,7 @@
                         <group col="2">
                             <group string="Services Details">
                                 <field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
-                                <field name="cost_subtype" string="Service Type" domain="['|',('category','=','service'),('category','=','both')]" required="1"/>
+                                <field name="cost_subtype_id" string="Service Type" domain="['|',('category','=','service'),('category','=','both')]" required="1"/>
                                 <field name="amount" string="Price"/>
                             </group>
                             <group string="Odometer Details">
@@ -691,7 +690,7 @@
                         <group string="Included Services">
                             <field name="cost_ids" nolabel="1">
                                 <tree string="Included Services" version="7.0" editable="bottom">
-                                    <field name="cost_subtype" string="Service" domain="[('category','=','service')]"/>
+                                    <field name="cost_subtype_id" string="Service" domain="[('category','=','service')]"/>
                                     <field name="amount" sum="Price" string="Cost"/>
                                 </tree>
                             </field>
@@ -711,7 +710,7 @@
                 <tree string="Services Logs">
                     <field name="date" />
                     <field name="vehicle_id" />
-                    <field name="cost_subtype"/>
+                    <field name="cost_subtype_id"/>
                     <field name="purchaser_id"/>
                     <field name="vendor_id" />
                     <field name="inv_ref" />
@@ -787,7 +786,7 @@
                     <field name="date"/>
                     <field name="vehicle_id" />
                     <field name="cost_type"/>
-                    <field name="cost_subtype"/>
+                    <field name="cost_subtype_id"/>
                     <field name="amount" sum="Total Cost"/>
                     <field name="parent_id" invisible="1" />
                     <field name="year" invisible="1"/>
@@ -801,7 +800,7 @@
             <field name="arch" type="xml">
                 <search string="Vehicles costs" >
                     <field name="vehicle_id" />
-                    <field name="cost_subtype"/>
+                    <field name="cost_subtype_id"/>
                     <field name="year"/>
                     <field name="date"/>
                     <field name="parent_id"/>
@@ -811,7 +810,7 @@
                         <filter name="groupby_year" context="{'group_by' : 'year'}" string="Year"/>
                         <filter name="groupby_date" context="{'group_by' : 'date'}" string="Date"/>
                         <filter name="groupby_cost_type" context="{'group_by' : 'cost_type'}" string="Cost Type"/>
-                        <filter name="groupby_cost_subtype" context="{'group_by' : 'cost_subtype'}" string="Cost Subtype"/>
+                        <filter name="groupby_cost_subtype_id" context="{'group_by' : 'cost_subtype_id'}" string="Cost Subtype"/>
                         <filter name="groupby_vehicle_id" context="{'group_by' : 'vehicle_id'}" string="Vehicle"/>
                         <filter name="groupby_parent_id" context="{'group_by' : 'parent_id'}" string="Parent"/>
                     </group>
@@ -828,7 +827,7 @@
                         <group col="2" string="Cost Details">
                             <group>
                                 <field name="vehicle_id" />
-                                <field name="cost_subtype"/>
+                                <field name="cost_subtype_id"/>
                                 <field name="amount"/>
                             </group>
                             <group>
diff --git a/addons/fleet/security/fleet_security.xml b/addons/fleet/security/fleet_security.xml
index 6351d23b55e..a7ad2ddf7ae 100644
--- a/addons/fleet/security/fleet_security.xml
+++ b/addons/fleet/security/fleet_security.xml
@@ -22,7 +22,7 @@
             <field name="perm_write" eval="False"/>
             <field name="perm_create" eval="False"/>
             <field name="perm_unlink" eval="False"/>
-            <field name="domain_force">[('cost_id.vehicle_id.driver.id','=',user.partner_id.id)]</field>
+            <field name="domain_force">[('cost_id.vehicle_id.driver','=',user.partner_id.id)]</field>
         </record>
         <record id="fleet_user_cost_visibility" model="ir.rule">
             <field name="name">User can only see his/her costs</field>
@@ -32,7 +32,7 @@
             <field name="perm_write" eval="True"/>
             <field name="perm_create" eval="True"/>
             <field name="perm_unlink" eval="False"/>
-            <field name="domain_force">[('vehicle_id.driver.id','=',user.partner_id.id)]</field>
+            <field name="domain_force">[('vehicle_id.driver','=',user.partner_id.id)]</field>
         </record>
         <record id="fleet_user_service_visibility" model="ir.rule">
             <field name="name">User can only see his/her vehicle's services</field>
@@ -42,7 +42,7 @@
             <field name="perm_write" eval="False"/>
             <field name="perm_create" eval="False"/>
             <field name="perm_unlink" eval="False"/>
-            <field name="domain_force">[('cost_id.vehicle_id.driver.id','=',user.partner_id.id)]</field>
+            <field name="domain_force">[('cost_id.vehicle_id.driver','=',user.partner_id.id)]</field>
         </record>
         <record id="fleet_user_odometer_visibility" model="ir.rule">
             <field name="name">User can only see his/her vehicle's odometer</field>
@@ -52,7 +52,7 @@
             <field name="perm_write" eval="True"/>
             <field name="perm_create" eval="True"/>
             <field name="perm_unlink" eval="True"/>
-            <field name="domain_force">[('vehicle_id.driver.id','=',user.partner_id.id)]</field>
+            <field name="domain_force">[('vehicle_id.driver','=',user.partner_id.id)]</field>
         </record>
         <record id="fleet_user_fuel_log_visibility" model="ir.rule">
             <field name="name">User can only see his/her vehicle's fuel log</field>
@@ -62,7 +62,7 @@
             <field name="perm_write" eval="True"/>
             <field name="perm_create" eval="True"/>
             <field name="perm_unlink" eval="True"/>
-            <field name="domain_force">[('cost_id.vehicle_id.driver.id','=',user.partner_id.id)]</field>
+            <field name="domain_force">[('cost_id.vehicle_id.driver','=',user.partner_id.id)]</field>
         </record>
         <record id="fleet_user_vehicle_visibility" model="ir.rule">
             <field name="name">User can only see his/her vehicle</field>
@@ -72,7 +72,7 @@
             <field name="perm_write" eval="True"/>
             <field name="perm_create" eval="False"/>
             <field name="perm_unlink" eval="False"/>
-            <field name="domain_force">[('driver.id','=',user.partner_id.id)]</field>
+            <field name="domain_force">[('driver','=',user.partner_id.id)]</field>
         </record>
         <record id="fleet_user_contract_visibility_manager" model="ir.rule">
             <field name="name">Manager has all rights on vehicle's contracts</field>