Skip to content

Commit

Permalink
[IMP] Change string 'brand' by 'make' in fleet module
Browse files Browse the repository at this point in the history
  • Loading branch information
ypa-odoo committed Jul 16, 2014
1 parent 49bc956 commit 72e0cbf
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions addons/fleet/fleet.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ def on_change_brand(self, cr, uid, ids, model_id, context=None):
_columns = {
'name': fields.function(_model_name_get_fnc, type="char", string='Name', store=True),
'modelname': fields.char('Model name', required=True),
'brand_id': fields.many2one('fleet.vehicle.model.brand', 'Model Brand', required=True, help='Brand of the vehicle'),
'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"),
'image_medium': fields.related('brand_id', 'image_medium', type="binary", string="Logo (medium)"),
Expand All @@ -170,7 +170,7 @@ def _set_image(self, cr, uid, id, name, value, args, context=None):
return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)

_columns = {
'name': fields.char('Brand Name', required=True),
'name': fields.char('Make', required=True),
'image': fields.binary("Logo",
help="This field holds the image used as logo for the brand, limited to 1024x1024px."),
'image_medium': fields.function(_get_image, fnct_inv=_set_image,
Expand Down
12 changes: 6 additions & 6 deletions addons/fleet/fleet_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<search string="Vehicles costs" >
<field name="brand_id" />
<group expand="1" string="Group By">
<filter name="groupby_brand" context="{'group_by' : 'brand_id'}" string="Brand"/>
<filter name="groupby_brand" context="{'group_by' : 'brand_id'}" string="Make"/>
</group>
</search>
</field>
Expand All @@ -78,7 +78,7 @@
<p class="oe_view_nocontent_create">
Click to create a new model.
</p><p>
You can define several models (e.g. A3, A4) for each brand (Audi).
You can define several models (e.g. A3, A4) for each make (Audi).
</p>
</field>
</record>
Expand All @@ -87,7 +87,7 @@
<field name="name">fleet.vehicle.model.brand.tree</field>
<field name="model">fleet.vehicle.model.brand</field>
<field name="arch" type="xml">
<tree string="Model Brand">
<tree string="Model Make">
<field name="name" />
</tree>
</field>
Expand All @@ -97,7 +97,7 @@
<field name="name">fleet.vehicle.model.brand.form</field>
<field name="model">fleet.vehicle.model.brand</field>
<field name="arch" type="xml">
<form string="Model Brand">
<form string="Model Make">
<sheet>
<group>
<div>
Expand Down Expand Up @@ -144,13 +144,13 @@
</record>

<record model='ir.actions.act_window' id='fleet_vehicle_model_brand_act'>
<field name="name">Model brand of Vehicle</field>
<field name="name">Model make of Vehicle</field>
<field name="res_model">fleet.vehicle.model.brand</field>
<field name="view_type">form</field>
<field name="view_mode">kanban,tree,form</field>
<field name="help" type="html">
<p class="oe_view_nocontent_create">
Click to create a new brand.
Click to create a new make.
</p>
</field>
</record>
Expand Down

0 comments on commit 72e0cbf

Please sign in to comment.