From ba1adaef65362ab45e38be1adc6ff746438fcca6 Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Tue, 23 Oct 2012 16:31:08 +0200
Subject: [PATCH] [ADD]Demo values and optimize date comparaison for generation
 of contracts costs

bzr revid: dle@openerp.com-20121023143108-3gq57w6l0fzmdv01
---
 addons/fleet/board_fleet_view.xml |  4 +--
 addons/fleet/demo.xml             | 50 +++++++++++++++++++++++++++++--
 addons/fleet/fleet.py             |  6 ++--
 3 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/addons/fleet/board_fleet_view.xml b/addons/fleet/board_fleet_view.xml
index 09a670b5d13..3ef597733bb 100644
--- a/addons/fleet/board_fleet_view.xml
+++ b/addons/fleet/board_fleet_view.xml
@@ -28,9 +28,7 @@
     <record model="ir.actions.act_window" id="action_fleet_vehicle_log_services_graph">
       <field name="name">Services Costs by Month</field>
       <field name="res_model">fleet.vehicle.log.services</field>
-      <field name="view_id" ref="fleet_vehicle_log_services_graph">
-
-      </field>
+      <field name="view_id" ref="fleet_vehicle_log_services_graph" />
       <field name="view_type">form</field>
       <field name="view_mode">tree</field>
     </record>
diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml
index 5db21ef9298..359ad8a3b48 100644
--- a/addons/fleet/demo.xml
+++ b/addons/fleet/demo.xml
@@ -729,6 +729,50 @@
         <field name="parent_id" ref="log_service_2_fleet_vehicle_cost" />
       </record>
 
+      <record id="log_service_3" model="fleet.vehicle.log.services" >
+        <field name="vehicle_id" ref="vehicle_1" />
+        <field name="amount">513</field>
+        <field name="cost_type" ref="type_service_service_8"/>
+        <field name="date">2012-10-15</field>
+        <field name="purchaser_id" ref="base.res_partner_address_18" />
+        <field name="inv_ref">124</field>
+        <field name="vendor_id" ref="base.res_partner_13" />
+        <field name="notes">Maintenance</field>
+      </record>
+
+      <record id="log_service_4" model="fleet.vehicle.log.services" >
+        <field name="vehicle_id" ref="vehicle_3" />
+        <field name="amount">412</field>
+        <field name="cost_type" ref="type_service_service_8"/>
+        <field name="date">2012-10-08</field>
+        <field name="purchaser_id" ref="base.res_partner_address_18" />
+        <field name="inv_ref">20984</field>
+        <field name="vendor_id" ref="base.res_partner_13" />
+        <field name="notes">Maintenance</field>
+      </record>
+
+      <record id="log_service_5" model="fleet.vehicle.log.services" >
+        <field name="vehicle_id" ref="vehicle_4" />
+        <field name="amount">275</field>
+        <field name="cost_type" ref="type_service_service_8"/>
+        <field name="date">2012-09-25</field>
+        <field name="purchaser_id" ref="base.res_partner_address_18" />
+        <field name="inv_ref">241</field>
+        <field name="vendor_id" ref="base.res_partner_13" />
+        <field name="notes">Maintenance</field>
+      </record>
+
+      <record id="log_service_6" model="fleet.vehicle.log.services" >
+        <field name="vehicle_id" ref="vehicle_5" />
+        <field name="amount">302</field>
+        <field name="cost_type" ref="type_service_service_8"/>
+        <field name="date">2012-09-15</field>
+        <field name="purchaser_id" ref="base.res_partner_address_18" />
+        <field name="inv_ref">22513</field>
+        <field name="vendor_id" ref="base.res_partner_13" />
+        <field name="notes">Maintenance</field>
+      </record>
+
       <record id="log_contract_1" model="fleet.vehicle.log.contract" >
         <field name="vehicle_id" ref="vehicle_2" />
         <field name="amount">0</field>
@@ -771,7 +815,7 @@
         <field name="vehicle_id" ref="vehicle_1" />
         <field name="amount">0</field>
         <field name="cost_generated">400</field>
-        <field name="cost_frequency">weekly</field>
+        <field name="cost_frequency">monthly</field>
         <field name="cost_type" ref="type_service_56"/>
         <field name="date">2012-01-01</field>
         <field name="start_date" eval="time.strftime('%Y-01-01')" />
@@ -809,7 +853,7 @@
         <field name="vehicle_id" ref="vehicle_3" />
         <field name="amount">0</field>
         <field name="cost_generated">400</field>
-        <field name="cost_frequency">daily</field>
+        <field name="cost_frequency">monthly</field>
         <field name="cost_type" ref="type_service_56"/>
         <field name="date">2012-01-01</field>
         <field name="start_date" eval="time.strftime('%Y-01-01')" />
@@ -847,7 +891,7 @@
         <field name="vehicle_id" ref="vehicle_4" />
         <field name="amount">0</field>
         <field name="cost_generated">400</field>
-        <field name="cost_frequency">yearly</field>
+        <field name="cost_frequency">monthly</field>
         <field name="cost_type" ref="type_service_56"/>
         <field name="date">2012-01-01</field>
         <field name="start_date" eval="time.strftime('%Y-01-01')" />
diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index d2d59adef1e..a85b1dd8ad8 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -851,8 +851,8 @@ class fleet_vehicle_log_contract(osv.Model):
 
     def run_scheduler(self,cr,uid,context=None):
 
-        d = datetime.datetime.now()
-        #d = datetime.date(2001, 01, 01)
+        #d = datetime.datetime.now()
+        d = datetime.date(2012, 8, 01)
 
         frequencies = []
         if d.day == 1 and d.month == 1:
@@ -867,7 +867,7 @@ class fleet_vehicle_log_contract(osv.Model):
         for i in range(frequencies_size-1):
             frequencies.insert(0,'|')
 
-        condition = ['&','&','&',('state','=','open',),('start_date','<=',d),('expiration_date','>=',d)]
+        condition = ['&','&','&',('state','=','open',),('start_date','<=',d.strftime('%Y-%m-%d')),('expiration_date','>=',d.strftime('%Y-%m-%d'))]
         condition.extend(frequencies)
 
         print str(condition)