diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml
index c03d19c908e..0ef71e16cda 100644
--- a/addons/fleet/demo.xml
+++ b/addons/fleet/demo.xml
@@ -1923,216 +1923,284 @@ gg==
 
       <record id="type_service_1" model="fleet.service.type">
           <field name="name">A/C Compressor Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_2" model="fleet.service.type">
           <field name="name">A/C Condenser Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_3" model="fleet.service.type">
           <field name="name">A/C Diagnosis</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_4" model="fleet.service.type">
           <field name="name">A/C Evaporator Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_5" model="fleet.service.type">
           <field name="name">A/C Recharge</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_6" model="fleet.service.type">
           <field name="name">Air Filter Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_7" model="fleet.service.type">
           <field name="name">Alternator Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_8" model="fleet.service.type">
           <field name="name">Ball Joint Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_9" model="fleet.service.type">
           <field name="name">Battery Inspection</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_10" model="fleet.service.type">
           <field name="name">Battery Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_11" model="fleet.service.type">
           <field name="name">Brake Caliper Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_12" model="fleet.service.type">
           <field name="name">Brake Inspection</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_13" model="fleet.service.type">
           <field name="name">Brake Pad(s) Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_14" model="fleet.service.type">
           <field name="name">Car Wash</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_15" model="fleet.service.type">
           <field name="name">Catalytic Converter Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_16" model="fleet.service.type">
           <field name="name">Charging System Diagnosis</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_17" model="fleet.service.type">
           <field name="name">Door Window Motor/Regulator Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_18" model="fleet.service.type">
           <field name="name">Engine Belt Inspection</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_19" model="fleet.service.type">
           <field name="name">Engine Coolant Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_20" model="fleet.service.type">
           <field name="name">Engine/Drive Belt(s) Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_21" model="fleet.service.type">
           <field name="name">Exhaust Manifold Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_22" model="fleet.service.type">
           <field name="name">Fuel Injector Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_23" model="fleet.service.type">
           <field name="name">Fuel Pump Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_24" model="fleet.service.type">
           <field name="name">Head Gasket(s) Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_25" model="fleet.service.type">
           <field name="name">Heater Blower Motor Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_26" model="fleet.service.type">
           <field name="name">Heater Control Valve Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_27" model="fleet.service.type">
           <field name="name">Heater Core Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_28" model="fleet.service.type">
           <field name="name">Heater Hose Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_29" model="fleet.service.type">
           <field name="name">Ignition Coil Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_30" model="fleet.service.type">
           <field name="name">Intake Manifold Gasket Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_31" model="fleet.service.type">
           <field name="name">Oil Change</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_32" model="fleet.service.type">
           <field name="name">Oil Pump Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_33" model="fleet.service.type">
           <field name="name">Other Maintenance</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_34" model="fleet.service.type">
           <field name="name">Oxygen Sensor Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_35" model="fleet.service.type">
           <field name="name">Power Steering Hose Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_36" model="fleet.service.type">
           <field name="name">Power Steering Pump Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_37" model="fleet.service.type">
           <field name="name">Radiator Repair</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_38" model="fleet.service.type">
           <field name="name">Resurface Rotors</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_39" model="fleet.service.type">
           <field name="name">Rotate Tires</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_40" model="fleet.service.type">
           <field name="name">Rotor Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_41" model="fleet.service.type">
           <field name="name">Spark Plug Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_42" model="fleet.service.type">
           <field name="name">Starter Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_43" model="fleet.service.type">
           <field name="name">Thermostat Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_44" model="fleet.service.type">
           <field name="name">Tie Rod End Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_45" model="fleet.service.type">
           <field name="name">Tire Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_46" model="fleet.service.type">
           <field name="name">Tire Service</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_47" model="fleet.service.type">
           <field name="name">Transmission Filter Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_48" model="fleet.service.type">
           <field name="name">Transmission Fluid Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_49" model="fleet.service.type">
           <field name="name">Transmission Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_50" model="fleet.service.type">
           <field name="name">Water Pump Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_51" model="fleet.service.type">
           <field name="name">Wheel Alignment</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_52" model="fleet.service.type">
           <field name="name">Wheel Bearing Replacement</field>
+          <field name="category">service</field>
       </record>
 
       <record id="type_service_53" model="fleet.service.type">
           <field name="name">Windshield Wiper(s) Replacement</field>
+          <field name="category">service</field>
       </record>
 
+      <record id="type_service_54" model="fleet.service.type">
+          <field name="name">Omium</field>
+          <field name="category">contract</field>
+      </record>  
+
+      <record id="type_service_55" model="fleet.service.type">
+          <field name="name">Big risks</field>
+          <field name="category">contract</field>
+      </record>
+
+      <record id="type_service_56" model="fleet.service.type">
+          <field name="name">Small risks</field>
+          <field name="category">contract</field>
+      </record>    
+
       <record id="log_odometer_1" model="fleet.vehicle.odometer">
           <field name="vehicle_id" ref="vehicle_1" />
           <field name="date">2012-01-01</field>
diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index 9cdea1091bf..36ce0110f60 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -653,6 +653,10 @@ class fleet_service_type(osv.Model):
     _name = 'fleet.service.type'
     _columns = {
         'name': fields.char('Name', required=True, translate=True),
+        'category': fields.selection([('contract', 'Contract'), ('service', 'Service'),('both', 'Both')], 'Category', readonly=True, help='Choose wheter the service refer to contracts, vehicle services or both'),
+    }
+    _defaults = {
+        'category': 'both'
     }
 
 ############################
@@ -748,6 +752,8 @@ class fleet_vehicle_log_contract(osv.Model):
         #'name' : fields.char('Name',size=64),
         'date' :fields.date('Contract Date',help='Date when the contract has been signed'),
 
+        'cost_type': fields.many2one('fleet.service.type', 'Service type', required=False, help='Service type purchased with this cost', domain="[('category','=','contract')]"),
+
         'start_date' : fields.date('Start Date', required=False, help='Date when the coverage of the contract begins'),
         'expiration_date' : fields.date('Expiration Date', required=False, help='Date when the coverage of the contract expirates (by default, one year after begin date)'),
         'warning_date' : fields.function(get_warning_date,type='integer',string='Warning Date',store=False),
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 6ff1485d727..36ab332c85e 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -354,8 +354,7 @@
                         <group col="2">
                             <group string="Contract details">
                                 <field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
-
-                                <field name="cost_type" required="1"/>
+                                <field name="cost_type" required="1" domain="[('category','=','contract')]"/>
                             </group>
                             <group string="Odometer details">
                                 <label for="odometer"/>
@@ -513,6 +512,7 @@
                         </group>
                         <group col="2">
                             <group string="Odometer Details">
+                                <label for="odometer"/>
                                 <div>
                                     <field name="odometer" class="oe_inline"/>
                                     <field name="odometer_unit" class="oe_inline"/>
@@ -584,8 +584,10 @@
                         <group col="2">
                             <group string="Vehicle Details">
                                 <field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
+                                <field name="cost_type" domain="[('category','=','contract')]"/>
                             </group>
                             <group string="Odometer Details">
+                                <label for="odometer"/>
                                 <div>
                                     <field name="odometer" class="oe_inline"/>
                                     <field name="odometer_unit" class="oe_inline"/>