[IMP] Make term changed to version, and change of relationship between version and its model
bzr revid: dle@openerp.com-20120921131602-5rtzewizms4c353j
This commit is contained in:
Denis Ledoux dle@openerp.com
parent
80b84053d9
commit
73400dac7b
|
|
@ -12,7 +12,7 @@ class fleet_vehicle_model(osv.Model):
|
|||
def name_get(self, cr, uid, ids, context=None):
|
||||
if not ids:
|
||||
return []
|
||||
reads = self.read(cr, uid, ids, ['type','brand','modelname','make','year'], context=context)
|
||||
reads = self.read(cr, uid, ids, ['type','brand','modelname','version','year'], context=context)
|
||||
res = []
|
||||
for record in reads:
|
||||
name = ''
|
||||
|
|
@ -22,8 +22,8 @@ class fleet_vehicle_model(osv.Model):
|
|||
name = name + record['brand'][1]
|
||||
if record['modelname']:
|
||||
name = name+ ' / ' +record['modelname'][1]
|
||||
if record['make']:
|
||||
name = name+ ' / ' +record['make'][1]
|
||||
if record['version']:
|
||||
name = name+ ' / ' +record['version'][1]
|
||||
if record['year']:
|
||||
name = name+ ' / ' +str(record['year'])
|
||||
res.append((record['id'], name))
|
||||
|
|
@ -41,16 +41,9 @@ class fleet_vehicle_model(osv.Model):
|
|||
'brand' : fields.many2one('fleet.vehicle.model.brand', 'Model brand', required=True, help='Brand of the vehicle'),
|
||||
'type' : fields.many2one('fleet.vehicle.type', 'Vehicle Type', required=True, help='Type of vehicle (car, bike, ...)'),
|
||||
'modelname' : fields.many2one('fleet.vehicle.model.name', 'Model name', required=False, help='Model name of the vehicle'),
|
||||
'make' : fields.many2one('fleet.vehicle.model.make', 'Model make', required=False, help='Make of the vehicle'),
|
||||
'version' : fields.one2many('fleet.vehicle.model.version', 'model_version_id', 'Versions'),
|
||||
'year' : fields.integer('Year', required=False, help='Year of fabrication of the vehicle'),
|
||||
'partner_id': fields.many2many('res.partner','fleet_vehicle_model_vendors','model_id', 'partner_id',string='Vendors',required=False),
|
||||
|
||||
'transmission' : fields.selection([('manual', 'Manual'),('automatic','Automatic')], 'Transmission', help='Transmission Used by the vehicle',required=False),
|
||||
'fuel_type' : fields.selection([('gasoline', 'Gasoline'),('diesel','Diesel'),('electric','Electric'),('hybrid','Hybrid')], 'Fuel Type', help='Fuel Used by the vehicle',required=False),
|
||||
'horsepower' : fields.integer('Horsepower',required=False),
|
||||
'horsepower_tax': fields.float('Horsepower Taxation'),
|
||||
'power' : fields.integer('Power (kW)',required=False,help='Power in kW of the vehicle'),
|
||||
'co2' : fields.float('CO2 Emissions',required=False,help='CO2 emissions of the vehicle'),
|
||||
}
|
||||
|
||||
class fleet_vehicle_model_brand(osv.Model):
|
||||
|
|
@ -67,12 +60,19 @@ class fleet_vehicle_model_name(osv.Model):
|
|||
'name' : fields.char('Name',size=32, required=True),
|
||||
}
|
||||
|
||||
class fleet_vehicle_model_make(osv.Model):
|
||||
_name = 'fleet.vehicle.model.make'
|
||||
_description = 'Make model of the vehicle'
|
||||
class fleet_vehicle_model_version(osv.Model):
|
||||
_name = 'fleet.vehicle.model.version'
|
||||
_description = 'version model of the vehicle'
|
||||
_columns = {
|
||||
'name' : fields.char('Make',size=32, required=True),
|
||||
'country_id': fields.many2one('res.country', 'Country', required=False),
|
||||
'name' : fields.char('name',size=32, required=True),
|
||||
'model_version_id' : fields.many2one('fleet.vehicle.model', 'Associated model', required=True, help='Model name of the vehicle associated to this version'),
|
||||
|
||||
'transmission' : fields.selection([('manual', 'Manual'),('automatic','Automatic')], 'Transmission', help='Transmission Used by the vehicle',required=False),
|
||||
'fuel_type' : fields.selection([('gasoline', 'Gasoline'),('diesel','Diesel'),('electric','Electric'),('hybrid','Hybrid')], 'Fuel Type', help='Fuel Used by the vehicle',required=False),
|
||||
'horsepower' : fields.integer('Horsepower',required=False),
|
||||
'horsepower_tax': fields.float('Horsepower Taxation'),
|
||||
'power' : fields.integer('Power (kW)',required=False,help='Power in kW of the vehicle'),
|
||||
'co2' : fields.float('CO2 Emissions',required=False,help='CO2 emissions of the vehicle'),
|
||||
}
|
||||
|
||||
class fleet_vehicle(osv.Model):
|
||||
|
|
|
|||
|
|
@ -13,29 +13,18 @@
|
|||
<field name="brand" />
|
||||
</group>
|
||||
<group>
|
||||
<field name="modelname" />
|
||||
<field name="make" />
|
||||
<field name="modelname" />
|
||||
<field name="year" />
|
||||
</group>
|
||||
</group>
|
||||
<notebook>
|
||||
<page string="versions">
|
||||
<field name="version" />
|
||||
</page>
|
||||
<page string="Vendors">
|
||||
<field name="partner_id" />
|
||||
</page>
|
||||
<page string="Engine">
|
||||
<group col="2">
|
||||
<group>
|
||||
<field name="transmission" />
|
||||
<field name="fuel_type" />
|
||||
<field name="co2" />
|
||||
</group>
|
||||
<group>
|
||||
<field name="horsepower" />
|
||||
<field name="horsepower_tax" />
|
||||
<field name="power" />
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
|
||||
</notebook>
|
||||
</sheet>
|
||||
</form>
|
||||
|
|
@ -49,7 +38,7 @@
|
|||
<field name="type" />
|
||||
<field name="brand" />
|
||||
<field name="modelname" />
|
||||
<field name="make" />
|
||||
<field name="version" />
|
||||
<field name="year" />
|
||||
<field name="partner_id" />
|
||||
</tree>
|
||||
|
|
@ -115,19 +104,53 @@
|
|||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
|
||||
<record model='ir.ui.view' id='fleet_vehicle_model_make_tree'>
|
||||
<field name="name">fleet.vehicle.model.make.tree</field>
|
||||
<field name="model">fleet.vehicle.model.make</field>
|
||||
<record model='ir.ui.view' id='fleet_vehicle_model_version_tree'>
|
||||
<field name="name">fleet.vehicle.model.version.tree</field>
|
||||
<field name="model">fleet.vehicle.model.version</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Model Make" version="7.0" editable="bottom">
|
||||
<tree string="Model version" version="7.0">
|
||||
<field name="name" />
|
||||
<field name="model_version_id" />
|
||||
<field name="transmission" />
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model='ir.actions.act_window' id='fleet_vehicle_model_make_act'>
|
||||
<field name="name">Model make of Vehicle</field>
|
||||
<field name="res_model">fleet.vehicle.model.make</field>
|
||||
<record model='ir.ui.view' id='fleet_vehicle_model_version_form'>
|
||||
<field name="name">fleet.vehicle.model.version.form</field>
|
||||
<field name="model">fleet.vehicle.model.version</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Model" version="7.0">
|
||||
<sheet>
|
||||
<group>
|
||||
<field name="name" />
|
||||
<field name="model_version_id" />
|
||||
</group>
|
||||
<notebook>
|
||||
<page string="Engine">
|
||||
<group col="2">
|
||||
<group>
|
||||
<field name="transmission" />
|
||||
<field name="fuel_type" />
|
||||
<field name="co2" />
|
||||
</group>
|
||||
<group>
|
||||
<field name="horsepower" />
|
||||
<field name="horsepower_tax" />
|
||||
<field name="power" />
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
<record model='ir.actions.act_window' id='fleet_vehicle_model_version_act'>
|
||||
<field name="name">Model version of Vehicle</field>
|
||||
<field name="res_model">fleet.vehicle.model.version</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
|
|
@ -139,7 +162,7 @@
|
|||
<menuitem action="fleet_vehicle_type_act" parent="fleet_configuration" id="fleet_vehicle_type_menu" />
|
||||
<menuitem action="fleet_vehicle_model_brand_act" parent="fleet_configuration" id="fleet_vehicle_model_brand_menu" />
|
||||
<menuitem action="fleet_vehicle_model_name_act" parent="fleet_configuration" id="fleet_vehicle_model_name_menu" />
|
||||
<menuitem action="fleet_vehicle_model_make_act" parent="fleet_configuration" id="fleet_vehicle_model_make_menu" />
|
||||
<menuitem action="fleet_vehicle_model_version_act" parent="fleet_configuration" id="fleet_vehicle_model_version_menu" />
|
||||
|
||||
<record model='ir.ui.view' id='fleet_vehicle_form'>
|
||||
<field name="name">fleet.vehicle.form</field>
|
||||
|
|
|
|||
Loading…
Reference in New Issue