diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml
index 30fd1df2012..6770722ec73 100644
--- a/addons/fleet/demo.xml
+++ b/addons/fleet/demo.xml
@@ -84,7 +84,7 @@
-
+
5
500.0
@@ -96,7 +96,7 @@
-
+
6
@@ -109,6 +109,5 @@
kilometers
Trip to Paris
-
diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index e031390fd9c..29b089b7c36 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -218,7 +218,6 @@ class fleet_vehicle_odometer(osv.Model):
name = str(record.vehicle_id.name)
if record.date:
name = name+ ' / '+ str(record.date)
- print record.date
res.append((record.id, name))
return res
@@ -226,6 +225,22 @@ class fleet_vehicle_odometer(osv.Model):
res = self.name_get(cr, uid, ids, context=context)
return dict(res)
+ def get_month(self, cr, uid, ids, context=None):
+ if context is None:
+ context = {}
+ if not ids:
+ return []
+ months = ['January','February','March','April','May','June','July','August','September','October','November','December']
+ reads = self.browse(cr, uid, ids, context=context)
+ res = []
+ for record in reads:
+ res.append((record.id,months[int(record.date.split('-')[1])-1]))
+ return res
+
+ def _vehicle_log_month_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
+ res = self.get_month(cr, uid, ids, context=context)
+ return dict(res)
+
_columns = {
'name' : fields.function(_vehicle_log_name_get_fnc, type="char", string='Name', store=True),
@@ -233,6 +248,7 @@ class fleet_vehicle_odometer(osv.Model):
'value' : fields.float('Odometer Value'),
'unit' : fields.selection([('kilometers', 'Kilometers'),('miles','Miles')], 'Odometer Unit', help='Unit of the measurement',required=False),
'vehicle_id' : fields.many2one('fleet.vehicle', 'Vehicle', required=True),
+ 'month' : fields.function(_vehicle_log_month_get_fnc,string="Month", type="char",size=32, store=True)
}
_defaults = {
'date' : time.strftime('%Y-%m-%d')
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index bce8e094200..9de33856623 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -315,15 +315,29 @@
+
+
+ fleet.vehicle.log.fuel.graph
+ fleet.vehicle.log.fuel
+ graph
+
+
+
+
+
+
+
+
+
Vehicles Fuel Logs
fleet.vehicle.log.fuel
form
- tree,form
+ tree,form,graph
@@ -430,11 +444,24 @@
+
+ fleet.vehicle.log.services.graph
+ fleet.vehicle.log.services
+ graph
+
+
+
+
+
+
+
+
+
Vehicles Services Logs
fleet.vehicle.log.services
form
- tree,form
+ tree,form,graph
@@ -469,11 +496,24 @@
+
+ fleet.vehicle.odometer.graph
+ fleet.vehicle.odometer
+ graph
+
+
+
+
+
+
+
+
+
Vehicles Odometer
fleet.vehicle.odometer
form
- tree,form
+ tree,form,graph