diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-11-25 10:37:41 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-11-25 10:37:41 +0100 |
| commit | 000c38816d613e6183dbaf5deafdae8968bc6a17 (patch) | |
| tree | 73c78e82b6a5f21c771dfca7e576209f801d9d92 /addons/fleet/fleet.py | |
| parent | bba9e86c416e76725a4130eff6f4df1d694efdf2 (diff) | |
| parent | 18961cfdf5bb9003253c1269d775ef549b999c9f (diff) | |
[MERGE] [IMP] Addons: updated some field labels to avoid duplicates to ease
the import / export process
Aso includes
- project: deprecated priority field: use sequence instead
- base_calendar: calendar.event: deprecated organizer field: use organize_id instead
bzr revid: tde@openerp.com-20131125093741-hx9hpj85xqfalvqw
Diffstat (limited to 'addons/fleet/fleet.py')
| -rw-r--r-- | addons/fleet/fleet.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 483f989fcde..854bd043869 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -160,8 +160,8 @@ class fleet_vehicle_model(osv.Model): 'brand_id': fields.many2one('fleet.vehicle.model.brand', 'Model Brand', required=True, help='Brand 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"), - 'image_medium': fields.related('brand_id', 'image_medium', type="binary", string="Logo"), - 'image_small': fields.related('brand_id', 'image_small', type="binary", string="Logo"), + 'image_medium': fields.related('brand_id', 'image_medium', type="binary", string="Logo (medium)"), + 'image_small': fields.related('brand_id', 'image_small', type="binary", string="Logo (small)"), } @@ -354,8 +354,8 @@ class fleet_vehicle(osv.Model): 'power': fields.integer('Power', help='Power in kW of the vehicle'), 'co2': fields.float('CO2 Emissions', help='CO2 emissions of the vehicle'), 'image': fields.related('model_id', 'image', type="binary", string="Logo"), - 'image_medium': fields.related('model_id', 'image_medium', type="binary", string="Logo"), - 'image_small': fields.related('model_id', 'image_small', type="binary", string="Logo"), + 'image_medium': fields.related('model_id', 'image_medium', type="binary", string="Logo (medium)"), + 'image_small': fields.related('model_id', 'image_small', type="binary", string="Logo (small)"), 'contract_renewal_due_soon': fields.function(_get_contract_reminder_fnc, fnct_search=_search_contract_renewal_due_soon, type="boolean", string='Has Contracts to renew', multi='contract_info'), 'contract_renewal_overdue': fields.function(_get_contract_reminder_fnc, fnct_search=_search_get_overdue_contract_reminder, type="boolean", string='Has Contracts Overdued', multi='contract_info'), 'contract_renewal_name': fields.function(_get_contract_reminder_fnc, type="text", string='Name of contract to renew soon', multi='contract_info'), |