From 0f4e8682e775deedc91621e75610e97ce191d9ed Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Fri, 19 Oct 2012 10:24:07 +0200
Subject: [PATCH] [FIX]Prices for fuel and services not editable
bzr revid: dle@openerp.com-20121019082407-4c9t4hxepdihs4tx
---
addons/fleet/fleet.py | 5 +++--
addons/fleet/fleet_view.xml | 8 +++-----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index cfb7464437b..fce4ffab400 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -646,7 +646,7 @@ class fleet_vehicle_log_fuel(osv.Model):
'odometer_id' : fields.many2one('fleet.vehicle.odometer', 'Odometer', required=False, help='Odometer measure of the vehicle at the moment of this log'),
'odometer' : fields.function(_get_odometer,fnct_inv=_set_odometer,type='char',string='Odometer',store=False),
'odometer_unit': fields.related('vehicle_id','odometer_unit',type="char",string="Unit",store=False, readonly=True),
- 'amount': fields.related('cost_id','amount',type="float",string="Amount",store=True, readonly=True),
+ 'cost_amount': fields.related('cost_id','amount',type="float",string="Amount",store=True, readonly=True),
}
_defaults = {
'purchaser_id': lambda self, cr, uid, ctx: uid,
@@ -717,7 +717,7 @@ class fleet_vehicle_log_services(osv.Model):
'odometer_id' : fields.many2one('fleet.vehicle.odometer', 'Odometer', required=False, help='Odometer measure of the vehicle at the moment of this log'),
'odometer' : fields.function(_get_odometer,fnct_inv=_set_odometer,type='char',string='Odometer Value',store=False),
'odometer_unit': fields.related('vehicle_id','odometer_unit',type="char",string="Unit",store=False, readonly=True),
- 'amount': fields.related('cost_id','amount',type="float",string="Amount",store=True, readonly=True),
+ 'cost_amount': fields.related('cost_id','amount',type="float",string="Amount",store=True, readonly=True),
}
_defaults = {
'purchaser_id': lambda self, cr, uid, ctx: uid,
@@ -868,6 +868,7 @@ class fleet_vehicle_log_contract(osv.Model):
'odometer_id' : fields.many2one('fleet.vehicle.odometer', 'Odometer', required=False, help='Odometer measure of the vehicle at the moment of this log'),
'odometer' : fields.function(_get_odometer,fnct_inv=_set_odometer,type='char',string='Odometer Value',store=False,help='Odometer measure of the vehicle at the moment of this log'),
'odometer_unit': fields.related('vehicle_id','odometer_unit',type="char",string="Unit",store=False, readonly=True),
+ 'cost_amount': fields.related('cost_id','amount',type="float",string="Amount",store=True, readonly=True),
}
_defaults = {
'purchaser_id': lambda self, cr, uid, ctx: uid,
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index b6665ab1646..7cfa3bfe12d 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -239,7 +239,7 @@
-
+
@@ -314,9 +314,7 @@
-
-
@@ -615,7 +613,7 @@
-
+
@@ -710,7 +708,7 @@
-
+