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 @@
Services Costs by Month
fleet.vehicle.log.services
-
-
-
+
form
tree
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 @@
+
+
+ 513
+
+ 2012-10-15
+
+ 124
+
+ Maintenance
+
+
+
+
+ 412
+
+ 2012-10-08
+
+ 20984
+
+ Maintenance
+
+
+
+
+ 275
+
+ 2012-09-25
+
+ 241
+
+ Maintenance
+
+
+
+
+ 302
+
+ 2012-09-15
+
+ 22513
+
+ Maintenance
+
+
0
@@ -771,7 +815,7 @@
0
400
- weekly
+ monthly
2012-01-01
@@ -809,7 +853,7 @@
0
400
- daily
+ monthly
2012-01-01
@@ -847,7 +891,7 @@
0
400
- yearly
+ monthly
2012-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)