From 582ff6ee3ff8d49fb30d33e687936666f452cbee Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Thu, 4 Oct 2012 16:32:53 +0200
Subject: [PATCH] [ADD]Data.xml data files and Refueling service type, default
value of fuel log
bzr revid: dle@openerp.com-20121004143253-dhh44g6gwtb9gfdw
---
addons/fleet/__openerp__.py | 1 +
addons/fleet/demo.xml | 7 ++++++-
addons/fleet/fleet.py | 6 +++++-
addons/fleet/fleet_view.xml | 25 ++++++++++++++++++++++++-
4 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py
index 44a04f6..db9be6b 100644
--- a/addons/fleet/__openerp__.py
+++ b/addons/fleet/__openerp__.py
@@ -24,6 +24,7 @@ Add insurance and services reminder that will help you by sending you a mail whe
],
'data' : [
'fleet_view.xml',
+ 'data.xml',
],
'update_xml' : ['security/ir.model.access.csv'],
'demo': ['demo.xml'],
diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml
index 0ef71e1..553c7e5 100644
--- a/addons/fleet/demo.xml
+++ b/addons/fleet/demo.xml
@@ -2199,7 +2199,12 @@ gg==
Small risks
contract
-
+
+
+
+ Refueling
+ service
+
diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index 1feea5d..b998b54 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -5,6 +5,7 @@ import tools
import datetime
from osv.orm import except_orm
from tools.translate import _
+from import_base.mapper import *
############################
############################
#Vehicle.cost class
@@ -550,6 +551,9 @@ class fleet_vehicle_log_fuel(osv.Model):
self.write(cr, uid, id, {'odometer_id': ''})
return False
+ def _get_default_service_type(self, cr, uid, context):
+ model, model_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'fleet', 'type_service_refueling')
+ return model_id
_name = 'fleet.vehicle.log.fuel'
@@ -569,7 +573,7 @@ class fleet_vehicle_log_fuel(osv.Model):
_defaults = {
'purchaser_id': lambda self, cr, uid, ctx: uid,
'date' : time.strftime('%Y-%m-%d'),
-
+ 'cost_type': _get_default_service_type,
}
############################
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index b2d1ce3..e718ee8 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -665,7 +665,7 @@
fleet.service.type.tree
fleet.service.type
-
+
@@ -680,6 +680,29 @@
+
+
+
+ fleet.vehicle.cost.tree
+ fleet.vehicle.cost
+
+
+
+
+
+
+
+
+
+
+
+ Vehicle Costs
+ fleet.vehicle.cost
+ form
+ tree,form
+
+
+