diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml
index aa0b89096ff..c95d51e89ba 100644
--- a/addons/fleet/demo.xml
+++ b/addons/fleet/demo.xml
@@ -1314,6 +1314,14 @@ Rm1dKAk3Mp4GITWvS2d3/9k=
         <field name="sequence">5</field>
       </record>
 
+      <record id="vehicle_insurance_pending" model="fleet.insurance.state">
+        <field name="name">In Progress</field>
+      </record>
+
+      <record id="vehicle_insurance_over" model="fleet.insurance.state">
+        <field name="name">Terminated</field>
+      </record>
+
       <record id="vehicle_1" model="fleet.vehicle">
           <field name="license_plate">1-ACK-205</field>
           <field name="vin_sn">5454541</field>
diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index f593ae08ea5..22f3969c52d 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -184,6 +184,36 @@ class fleet_vehicle(osv.Model):
         res = self.get_odometer(cr, uid, ids, context=context)
         return dict(res)
 
+    def get_next_insurance_reminder(self,cr,uid,ids,prop,unknow_none,context=None):
+        if context is None:
+            context={}
+        if not ids:
+            return dict([])
+        reads = self.browse(cr,uid,ids,context=context)
+        res=[]
+        for record in reads:
+            insurances = self.pool.get('fleet.vehicle.log.insurance').search(cr,uid,[('vehicle_id','=',record.id),('state','=','In Progress')],order='expiration_date')
+            if (len(insurances) > 0):
+                res.append((record.id,self.pool.get('fleet.vehicle.log.insurance').browse(cr,uid,insurances[0],context=context).expiration_date))
+            else:
+                res.append((record.id,None))
+        return dict(res)
+
+    def get_next_service_reminder(self,cr,uid,ids,prop,unknow_none,context=None):
+        if context is None:
+            context={}
+        if not ids:
+            return dict([])
+        reads = self.browse(cr,uid,ids,context=context)
+        res=[]
+        for record in reads:
+            services = self.pool.get('fleet.vehicle.log.services').search(cr,uid,[('vehicle_id','=',record.id)],order='date')
+            if (len(services) > 0):
+                res.append((record.id,self.pool.get('fleet.vehicle.log.services').browse(cr,uid,services[0],context=context).date))
+            else:
+                res.append((record.id,None))
+        return dict(res)
+
     _name = 'fleet.vehicle'
     _description = 'Fleet Vehicle'
 
@@ -220,6 +250,8 @@ class fleet_vehicle(osv.Model):
         'image_medium': fields.related('model_id','image_medium',type="binary",string="Logo",store=False),
         'image_small': fields.related('model_id','image_small',type="binary",string="Logo",store=False),
 
+        'next_insurance_date' : fields.function(get_next_insurance_reminder,type="date",string='Next Insurance Due Date',store=False),
+        'next_service_date' : fields.function(get_next_service_reminder,type="date",string='Next Service Due Date',store=False),
         }
 
     _defaults = {
@@ -395,6 +427,12 @@ class fleet_insurance_type(osv.Model):
         'name': fields.char('Name', required=True, translate=True),
     }
 
+class fleet_insurance_state(osv.Model):
+    _name = 'fleet.insurance.state'
+    _columns = {
+        'name':fields.char('Insurance Status',size=32),
+    }
+
 class fleet_vehicle_log_insurance(osv.Model):
     _inherits = {'fleet.vehicle.odometer': 'odometer_id'}
 
@@ -410,6 +448,7 @@ class fleet_vehicle_log_insurance(osv.Model):
             return {}
 
     _name = 'fleet.vehicle.log.insurance'
+    _order='expiration_date'
     _columns = {
 
         #'name' : fields.char('Name',size=64),
@@ -419,13 +458,15 @@ class fleet_vehicle_log_insurance(osv.Model):
         'expiration_date' : fields.date('Expiration Date', required=False, help='Date when the coverage of the insurance expirates (by default, one year after begin date)'),
         'price' : fields.float('Price', help="Cost of the insurance for the specified period"),
         'insurer_id' :fields.many2one('res.partner', 'Insurer', domain="[('supplier','=',True)]"),
-        'purchaser_id' : fields.many2one('res.partner', 'Purchaser'),
+        'purchaser_id' : fields.many2one('res.partner', 'Purchaser',domain="['|',('customer','=',True),('employee','=',True)]"),
         'ins_ref' : fields.char('Insurance Reference', size=64),
+        'state' : fields.many2one('fleet.insurance.state', 'Insurance Status', help='Choose wheter the insurance is still valid or not'),
         'notes' : fields.text('Terms and Conditions'),
     }
     _defaults = {
         'purchaser_id': lambda self, cr, uid, ctx: uid,
         'start_date' : time.strftime('%Y-%m-%d'),
+        #'state' : 'in_progress',
         #'expiration_date' : self.compute_next_year_date(time.strftime('%Y-%m-%d')),
     
     }
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index b2af0f5479a..957a515fb45 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -183,8 +183,10 @@
                     <field name="driver" />
                     <field name="vin_sn" />
                     <field name="acquisition_date" />
-                    <field name="state" />
+                    <field name="state"/>
                     <field name="odometer" />
+                    <field name="next_insurance_date" />
+                    <field name="next_service_date" />
                 </tree>
             </field>
         </record>
@@ -203,6 +205,7 @@
                     <field name="odometer_unit" />
                     <field name="image" />
                     <field name="tag_ids" />
+                    <field name="next_insurance_date" />
                     <templates>
                         <t t-name="kanban-box">
                             <div class="oe_kanban_vignette oe_semantic_html_override">
@@ -235,10 +238,14 @@
                                             <t t_if="record.odometer.raw_value"><field name="odometer" /></t>
                                             <t t_if="record.odometer_unit.raw_value"><field name="odometer_unit" /></t>
                                         </li>
+                                        <li>
+                                            <t t-if="record.next_insurance_date.raw_value">Insurance renewal due soon</t>
+                                        </li>
                                     </ul>
 
                                     
                                 </div>
+                                
                             </div>
                             <script>
                             $('.oe_picture').load(function() { if($(this).width() > $(this).height()) { $(this).addClass('oe_employee_picture_wide') } });
@@ -292,6 +299,9 @@
             <field name="model">fleet.vehicle.log.insurance</field>
             <field name="arch" type="xml">
                 <form string="Insurance logs" version="7.0">
+                    <header>
+                        <field name="state" widget="statusbar" clickable="True" />
+                    </header>
                     <sheet>
                         <group col="2">
                             <group string="Insurance details">
@@ -301,8 +311,6 @@
                                     <field name="expiration_date" />
                                     <field name="price" />
                             </group>
-                            
-
                         </group>
                         <group col="2">
                             <group string="Odometer details">
@@ -329,6 +337,7 @@
                 <tree string="Insurance logs" version="7.0">
                     <field name="vehicle_id" />
                     <field name="insurance_type" />
+                    <field name="state" />
                     <field name="start_date" />
                     <field name="expiration_date" />
                     <field name="insurer_id" />