From e903e37bb13f4541c950aa734090d2d0f3305f71 Mon Sep 17 00:00:00 2001 From: Ajay javiya Date: Fri, 21 Nov 2014 17:37:32 +0530 Subject: [PATCH] [IMP] fleet: usability improvements : - simplifed name of vehicle model; the name is now the model name; the old function is used to compute the name_get. - added Suzuki data - parent of a cost is now hidden except for technical group, because it is the same as the vehicle - fixed some vehicule -> vehicle typos --- addons/fleet/fleet.py | 15 ++- addons/fleet/fleet_cars.xml | 4 + addons/fleet/fleet_data.xml | 90 +++++++++--------- addons/fleet/fleet_view.xml | 10 +- .../fleet/static/img/brand_suzuki-image.png | Bin 0 -> 9976 bytes 5 files changed, 61 insertions(+), 58 deletions(-) create mode 100644 addons/fleet/static/img/brand_suzuki-image.png diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 1b2b96ffbfb..ae2da5ea509 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -110,13 +110,13 @@ class fleet_vehicle_state(osv.Model): class fleet_vehicle_model(osv.Model): - def _model_name_get_fnc(self, cr, uid, ids, field_name, arg, context=None): - res = {} + def name_get(self, cr, uid, ids, context=None): + res = [] for record in self.browse(cr, uid, ids, context=context): - name = record.modelname + name = record.name if record.brand_id.name: - name = record.brand_id.name + ' / ' + name - res[record.id] = name + name = record.brand_id.name + '/' + name + res.append((record.id, name)) return res def on_change_brand(self, cr, uid, ids, model_id, context=None): @@ -134,8 +134,7 @@ class fleet_vehicle_model(osv.Model): _order = 'name asc' _columns = { - 'name': fields.function(_model_name_get_fnc, type="char", string='Name', store=True), - 'modelname': fields.char('Model name', required=True), + 'name': fields.char('Model name', required=True), 'brand_id': fields.many2one('fleet.vehicle.model.brand', 'Make', required=True, help='Make of the vehicle'), 'vendors': fields.many2many('res.partner', 'fleet_vehicle_model_vendors', 'model_id', 'partner_id', string='Vendors'), 'image': fields.related('brand_id', 'image', type="binary", string="Logo"), @@ -189,7 +188,7 @@ class fleet_vehicle(osv.Model): def _vehicle_name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None): res = {} for record in self.browse(cr, uid, ids, context=context): - res[record.id] = record.model_id.brand_id.name + '/' + record.model_id.modelname + ' / ' + record.license_plate + res[record.id] = record.model_id.brand_id.name + '/' + record.model_id.name + '/' + record.license_plate return res def return_action_to_open(self, cr, uid, ids, context=None): diff --git a/addons/fleet/fleet_cars.xml b/addons/fleet/fleet_cars.xml index dd3b3f6d51a..1c545fd67df 100644 --- a/addons/fleet/fleet_cars.xml +++ b/addons/fleet/fleet_cars.xml @@ -261,5 +261,9 @@ Willys + + Suzuki + + diff --git a/addons/fleet/fleet_data.xml b/addons/fleet/fleet_data.xml index d0d07ade01e..2336c589cf3 100644 --- a/addons/fleet/fleet_data.xml +++ b/addons/fleet/fleet_data.xml @@ -449,227 +449,227 @@ - Corsa + Corsa - Astra + Astra - Agila + Agila - Combo Tour + Combo Tour - Meriva + Meriva - AstraGTC + AstraGTC - Zafira + Zafira - Zafira Tourer + Zafira Tourer - Insignia + Insignia - Mokka + Mokka - Antara + Antara - Ampera + Ampera - A1 + A1 - A3 + A3 - A4 + A4 - A5 + A5 - A6 + A6 - A7 + A7 - A8 + A8 - Q3 + Q3 - Q5 + Q5 - Q7 + Q7 - TT + TT - Serie 1 + Serie 1 - Serie 3 + Serie 3 - Serie 5 + Serie 5 - Serie 6 + Serie 6 - Serie 7 + Serie 7 - Serie X + Serie X - Serie Z4 + Serie Z4 - Serie M + Serie M - Serie Hybrid + Serie Hybrid - Class A + Class A - Class B + Class B - Class C + Class C - Class CL + Class CL - Class CLS + Class CLS - Class E + Class E - Class M + Class M - Class GL + Class GL - Class GLK + Class GLK - Class R + Class R - Class S + Class S - Class SLK + Class SLK - SLS + SLS diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 350d168294f..ed22f2f922d 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -10,7 +10,7 @@