[REM]Removing of models type, versions and engine. Too much complexity.
bzr revid: dle@openerp.com-20120921143415-6fiuv49wanwhc75v
This commit is contained in:
Denis Ledoux dle@openerp.com
parent
73400dac7b
commit
0582e61140
|
|
@ -9,41 +9,13 @@ class fleet_vehicle_model_type(osv.Model):
|
|||
#comment to delete
|
||||
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','version','year'], context=context)
|
||||
res = []
|
||||
for record in reads:
|
||||
name = ''
|
||||
if record['type']:
|
||||
name = record['type'][1] + " - "
|
||||
if record['brand']:
|
||||
name = name + record['brand'][1]
|
||||
if record['modelname']:
|
||||
name = name+ ' / ' +record['modelname'][1]
|
||||
if record['version']:
|
||||
name = name+ ' / ' +record['version'][1]
|
||||
if record['year']:
|
||||
name = name+ ' / ' +str(record['year'])
|
||||
res.append((record['id'], name))
|
||||
return res
|
||||
|
||||
def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
|
||||
res = self.name_get(cr, uid, ids, context=context)
|
||||
return dict(res)
|
||||
|
||||
_name = 'fleet.vehicle.model'
|
||||
_description = 'Model of a vehicle'
|
||||
|
||||
_columns = {
|
||||
'name' : fields.function(_name_get_fnc, type="char", string='Name'),
|
||||
'name' : fields.char('Brand Name',size=32, required=True),
|
||||
'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'),
|
||||
'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),
|
||||
'vendors': fields.many2many('res.partner','fleet_vehicle_model_vendors','model_id', 'partner_id',string='Vendors',required=False),
|
||||
}
|
||||
|
||||
class fleet_vehicle_model_brand(osv.Model):
|
||||
|
|
@ -53,28 +25,6 @@ class fleet_vehicle_model_brand(osv.Model):
|
|||
'name' : fields.char('Brand Name',size=32, required=True),
|
||||
}
|
||||
|
||||
class fleet_vehicle_model_name(osv.Model):
|
||||
_name = 'fleet.vehicle.model.name'
|
||||
_description = 'Name model of the vehicle'
|
||||
_columns = {
|
||||
'name' : fields.char('Name',size=32, required=True),
|
||||
}
|
||||
|
||||
class fleet_vehicle_model_version(osv.Model):
|
||||
_name = 'fleet.vehicle.model.version'
|
||||
_description = 'version model of the vehicle'
|
||||
_columns = {
|
||||
'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):
|
||||
_name = 'fleet.vehicle'
|
||||
_description = 'Fleet Vehicle'
|
||||
|
|
@ -90,15 +40,16 @@ class fleet_vehicle(osv.Model):
|
|||
'color' : fields.char('Color',size=32, help='Color of the vehicle'),
|
||||
'status' : fields.char('Status',size=32, help='Status of the vehicle (in repair, active, ...)'),
|
||||
'location' : fields.char('Location',size=32, help='Location of the vehicle (garage, ...)'),
|
||||
'doors' : fields.integer('Number of doors', help='Number of doors of the vehicle'),
|
||||
|
||||
'next_repair_km' : fields.integer('Next Repair Km'),
|
||||
|
||||
'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),
|
||||
'horses' : fields.integer('Horses',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'),
|
||||
|
||||
}
|
||||
|
||||
def on_change_model(self, cr, uid, ids, model_id, context=None):
|
||||
|
|
|
|||
|
|
@ -9,22 +9,17 @@
|
|||
<sheet>
|
||||
<group col="2">
|
||||
<group>
|
||||
<field name="type" />
|
||||
<field name="brand" />
|
||||
<field name="name" />
|
||||
|
||||
</group>
|
||||
<group>
|
||||
<field name="modelname" />
|
||||
<field name="year" />
|
||||
<field name="brand" />
|
||||
</group>
|
||||
</group>
|
||||
<notebook>
|
||||
<page string="versions">
|
||||
<field name="version" />
|
||||
</page>
|
||||
<page string="Vendors">
|
||||
<field name="partner_id" />
|
||||
<field name="vendors" />
|
||||
</page>
|
||||
|
||||
</notebook>
|
||||
</sheet>
|
||||
</form>
|
||||
|
|
@ -35,12 +30,9 @@
|
|||
<field name="model">fleet.vehicle.model</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Models" version="7.0">
|
||||
<field name="type" />
|
||||
<field name="name" />
|
||||
<field name="brand" />
|
||||
<field name="modelname" />
|
||||
<field name="version" />
|
||||
<field name="year" />
|
||||
<field name="partner_id" />
|
||||
<field name="vendors" />
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
|
@ -51,25 +43,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
|
||||
<record model='ir.ui.view' id='fleet_vehicle_type_tree'>
|
||||
<field name="name">fleet.vehicle.type.tree</field>
|
||||
<field name="model">fleet.vehicle.type</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Type" version="7.0" editable="bottom">
|
||||
<field name="name" />
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model='ir.actions.act_window' id='fleet_vehicle_type_act'>
|
||||
<field name="name">Type of Vehicle</field>
|
||||
<field name="res_model">fleet.vehicle.type</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
|
||||
|
||||
|
||||
<record model='ir.ui.view' id='fleet_vehicle_model_brand_tree'>
|
||||
<field name="name">fleet.vehicle.model.brand.tree</field>
|
||||
<field name="model">fleet.vehicle.model.brand</field>
|
||||
|
|
@ -87,82 +61,11 @@
|
|||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
|
||||
<record model='ir.ui.view' id='fleet_vehicle_model_name_tree'>
|
||||
<field name="name">fleet.vehicle.model.name.tree</field>
|
||||
<field name="model">fleet.vehicle.model.name</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Model Name" version="7.0" editable="bottom">
|
||||
<field name="name" />
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model='ir.actions.act_window' id='fleet_vehicle_model_name_act'>
|
||||
<field name="name">Model name of Vehicle</field>
|
||||
<field name="res_model">fleet.vehicle.model.name</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
|
||||
<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 version" version="7.0">
|
||||
<field name="name" />
|
||||
<field name="model_version_id" />
|
||||
<field name="transmission" />
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<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>
|
||||
|
||||
<menuitem name="Fleet Management" id="menu_root" />
|
||||
<menuitem name="Vehicles" parent="menu_root" id="fleet_vehicles" />
|
||||
<menuitem name="Configuration" parent="menu_root" id="fleet_configuration" />
|
||||
<menuitem action="fleet_vehicle_model_act" parent="fleet_configuration" id="fleet_vehicle_model_menu" />
|
||||
<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_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>
|
||||
|
|
@ -176,9 +79,10 @@
|
|||
<field name="vin_sn" />
|
||||
<field name="model_id" />
|
||||
<field name="acquisition_date" />
|
||||
<field name="acquisition_price" />
|
||||
</group>
|
||||
<group>
|
||||
<field name="acquisition_price" />
|
||||
<field name="doors" />
|
||||
<field name="color" />
|
||||
<field name="location" />
|
||||
<field name="status" />
|
||||
|
|
@ -199,6 +103,20 @@
|
|||
</tree>
|
||||
</field>
|
||||
</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>
|
||||
|
|
|
|||
Loading…
Reference in New Issue