From 693fa51ca54261eba182ba60ccdced8a29e814aa Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Mon, 1 Oct 2012 14:36:52 +0200
Subject: [PATCH] [FIX]Odometer graph + operator to max operator. + replace
 month field by date field for graphs

bzr revid: dle@openerp.com-20121001123652-bxpvk199pz0mow58
---
 addons/fleet/fleet.py       | 20 ++------------------
 addons/fleet/fleet_view.xml | 12 +++++-------
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index e4c0c87ecd0..f593ae08ea5 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -297,31 +297,15 @@ class fleet_vehicle_odometer(osv.Model):
     def _vehicle_log_name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
         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),
 
         'date' : fields.date('Execution Date'),
-        'value' : fields.float('Odometer Value'),
+        'value' : fields.float('Odometer Value',group_operator="max"),
         'unit': fields.related('vehicle_id','odometer_unit',type="char",string="Unit",store=False, readonly=True),
         '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 cc041827643..b2af0f5479a 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -287,7 +287,6 @@
         <menuitem name="Vehicles" parent="menu_root" id="fleet_vehicles" />
         <menuitem action="fleet_vehicle_act" parent="fleet_vehicles" id="fleet_vehicle_menu" />
 
-
         <record model='ir.ui.view' id='fleet_vehicle_log_insurance_form'>
             <field name="name">fleet.vehicle.log_insurance.form</field>
             <field name="model">fleet.vehicle.log.insurance</field>
@@ -386,9 +385,9 @@
            <field name="type">graph</field>
            <field name="arch" type="xml">
                 <graph string="Odometer value per month">
-                    <field name="month" />
+                    <field name="date" />
                     <field name="vehicle_id" group="True" /> 
-                    <field name="value" operator="+"/>
+                    <field name="value" />
                 </graph>
             </field>
         </record>
@@ -453,7 +452,6 @@
                     <field name="unit" />         
                     <field name="inv_ref" />
                     <field name="vendor_id" />
-                    <field name="month" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -463,8 +461,8 @@
            <field name="model">fleet.vehicle.log.fuel</field>
            <field name="type">graph</field>
            <field name="arch" type="xml">
-                <graph string="Odometer value per month">
-                    <field name="month" />
+                <graph string="Total Fuel amount per month">
+                    <field name="date" />
                     <field name="vehicle_id" group="True" /> 
                     <field name="amount" operator="+"/>
                 </graph>
@@ -540,7 +538,7 @@
            <field name="type">graph</field>
            <field name="arch" type="xml">
                 <graph string="Services total amount per month">
-                    <field name="month" />
+                    <field name="date" />
                     <field name="vehicle_id" group="True" /> 
                     <field name="amount" operator="+"/>
                 </graph>