summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorMartin Trigaux <mat@odoo.com>2014-11-13 16:02:11 +0100
committerMartin Trigaux <mat@odoo.com>2014-11-13 16:05:54 +0100
commite826e84af5eeca402c6cb60bc53fa20d1de67ded (patch)
tree843fffa40078027b6a0b917a8cf049c928b8cb58 /addons
parente038fec696ea7029b2f66da36fdbf337c23a18d1 (diff)
[FIX] fleet: avoid function field computation order issues
The name of a vehicle is function field. The field odometer on a vehicle has a a setter that creates an odometer. The name of an odometer is a function field that uses the name of the vehicle. If a vehicle is created with a value in odometer field, the odometer is created before the name is computed so the concatanation would fail. Fixes #3468
Diffstat (limited to 'addons')
-rw-r--r--addons/fleet/fleet.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index 3683e79aba8..69900a68b85 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -426,8 +426,10 @@ class fleet_vehicle_odometer(osv.Model):
res = {}
for record in self.browse(cr, uid, ids, context=context):
name = record.vehicle_id.name
- if record.date:
- name = name+ ' / '+ str(record.date)
+ if not name:
+ name = record.date
+ elif record.date:
+ name += ' / '+ record.date
res[record.id] = name
return res