[IMP]Deleting generic logs and inherits from odometer part 3. Final.
bzr revid: dle@openerp.com-20120926151150-c8wp3yeduzte6omx
This commit is contained in:
Denis Ledoux dle@openerp.com
+6
-57
@@ -191,44 +191,6 @@ class fleet_vehicle_odometer(osv.Model):
|
||||
'date' : time.strftime('%Y-%m-%d')
|
||||
}
|
||||
|
||||
class fleet_vehicle_log(osv.Model):
|
||||
_name = 'fleet.vehicle.log'
|
||||
|
||||
def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
|
||||
if context is None:
|
||||
context = {}
|
||||
if not ids:
|
||||
return {}
|
||||
reads = self.browse(cr, uid, ids, context=context)
|
||||
res = []
|
||||
for record in reads:
|
||||
name = record.type
|
||||
if record.employee_id.name:
|
||||
name = name+ ' / '+ record.employee_id.name
|
||||
if record.vehicle_id.name:
|
||||
name = name+ ' / '+ record.vehicle_id.name
|
||||
if record.date_creation:
|
||||
name = name+ ' / '+record.date_creation
|
||||
res.append((record.id, name))
|
||||
|
||||
return dict(res)
|
||||
|
||||
_columns = {
|
||||
'name' : fields.function(_name_get_fnc, type="text", string='Log', store=True),
|
||||
'employee_id' : fields.many2one('hr.employee', 'Employee'),
|
||||
'vehicle_id' : fields.many2one('fleet.vehicle', 'Vehicle', required=True),
|
||||
|
||||
'date_creation' : fields.date('Creation Date'),
|
||||
|
||||
'description' : fields.text('Description'),
|
||||
'type' : fields.char('Type',size=32),
|
||||
}
|
||||
|
||||
_defaults = {
|
||||
#'name' : 'Log',
|
||||
'type' : 'Log',
|
||||
}
|
||||
|
||||
class fleet_vehicle_log_fuel(osv.Model):
|
||||
|
||||
_inherits = {'fleet.vehicle.odometer': 'odometer_id'}
|
||||
@@ -292,7 +254,6 @@ class fleet_vehicle_log_services(osv.Model):
|
||||
'name' : fields.char('Name',size=64),
|
||||
|
||||
'amount' :fields.float('Cost', help="Total cost of the service"),
|
||||
|
||||
'service_ids' :fields.many2many('fleet.service.type','vehicle_service_type_rel','vehicle_service_type_id','service_id','Services completed'),
|
||||
'purchaser_id' : fields.many2one('res.partner', 'Purchaser'),
|
||||
'inv_ref' : fields.char('Invoice Reference', size=64),
|
||||
@@ -306,19 +267,20 @@ class fleet_insurance_type(osv.Model):
|
||||
}
|
||||
|
||||
class fleet_vehicle_log_insurance(osv.Model):
|
||||
_inherit = 'fleet.vehicle.log'
|
||||
_inherits = {'fleet.vehicle.odometer': 'odometer_id'}
|
||||
|
||||
_name = 'fleet.vehicle.log.insurance'
|
||||
_columns = {
|
||||
|
||||
'name' : fields.char('Name',size=64),
|
||||
|
||||
'insurance_type' : fields.many2one('fleet.insurance.type', 'Type', required=False, help='Type of the insurance'),
|
||||
'start_date' : fields.date('Start date', required=False, help='Date when the coverage of the insurance begins'),
|
||||
'expiration_date' : fields.date('Expiration date', required=False, help='Date when the coverage of the insurance expirates'),
|
||||
'price' : fields.float('Price', help="Cost of the insurance for the specified period"),
|
||||
'insurer_id' :fields.many2one('res.partner', 'Insurer', domain="[('supplier','=',True)]"),
|
||||
'description' : fields.text('Description'),
|
||||
'ins_ref' : fields.char('Insurance Reference', size=64),
|
||||
}
|
||||
_defaults = {
|
||||
#'name': 'Insurance log',
|
||||
'type': 'Insurance',}
|
||||
|
||||
class fleet_service_type(osv.Model):
|
||||
_name = 'fleet.service.type'
|
||||
@@ -326,19 +288,6 @@ class fleet_service_type(osv.Model):
|
||||
'name': fields.char('Name', required=True, translate=True),
|
||||
}
|
||||
|
||||
class fleet_vehicle_log_odometer(osv.Model):
|
||||
_inherit = ['fleet.vehicle.log']
|
||||
|
||||
_name = 'fleet.vehicle.log.odometer'
|
||||
_columns = {
|
||||
'value' : fields.float('Value', required=True, help="Meter reading at service, fuel up and others"),
|
||||
'fuel_log' :fields.many2one('fleet.vehicle.log.fuel', 'Fuel log'),
|
||||
'service_log' :fields.many2one('fleet.vehicle.log.services', 'Services log'),
|
||||
}
|
||||
_defaults = {
|
||||
# 'name': 'Odometer Log',
|
||||
'type': 'Odometer'}
|
||||
|
||||
class hr_employee(osv.Model):
|
||||
_inherit = 'hr.employee'
|
||||
|
||||
|
||||
+17
-142
@@ -100,26 +100,34 @@
|
||||
<page string="Insurances">
|
||||
<field name="log_insurances">
|
||||
<tree string="Insurances">
|
||||
<field name="type" />
|
||||
<field name="insurance_type" />
|
||||
<field name="start_date" />
|
||||
<field name="expiration_date" />
|
||||
<field name="insurer_id" />
|
||||
<field name="employee_id" />
|
||||
<field name="price" />
|
||||
<field name="value" />
|
||||
<field name="unit" />
|
||||
</tree>
|
||||
<form string="Insurances" version="7.0">
|
||||
<sheet>
|
||||
<group col="2">
|
||||
<group>
|
||||
<group string="Insurance details">
|
||||
<field name="insurance_type" />
|
||||
<field name="insurer_id" />
|
||||
<field name="employee_id" />
|
||||
<field name="price" />
|
||||
</group>
|
||||
<group>
|
||||
<field name="date_creation" />
|
||||
<field name="start_date" />
|
||||
<field name="expiration_date" />
|
||||
<field name="price" />
|
||||
</group>
|
||||
<group></group>
|
||||
</group>
|
||||
<group col="2">
|
||||
<group string="Odometer details">
|
||||
<field name="value" />
|
||||
<field name="unit" />
|
||||
</group>
|
||||
<group string="Additional details">
|
||||
<field name="date" />
|
||||
<field name="insurer_id" />
|
||||
<field name="ins_ref" />
|
||||
</group>
|
||||
</group>
|
||||
</sheet>
|
||||
@@ -127,30 +135,6 @@
|
||||
</field>
|
||||
</page>
|
||||
<page string="Logs">
|
||||
<group>
|
||||
<field name="log_odometer">
|
||||
<tree string="Odometer Logs">
|
||||
<field name="value" />
|
||||
<field name="date_creation" />
|
||||
<field name="employee_id" />
|
||||
<field name="description" />
|
||||
</tree>
|
||||
<form string="Odometer Logs" version="7.0">
|
||||
<sheet>
|
||||
<group col = "2">
|
||||
<group>
|
||||
<field name="value" />
|
||||
<field name="date_creation" />
|
||||
<field name="employee_id" />
|
||||
</group>
|
||||
<group>
|
||||
<field name="description" />
|
||||
</group>
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</group>
|
||||
<group>
|
||||
<field name="log_services">
|
||||
<tree string="Completed services">
|
||||
@@ -214,26 +198,6 @@
|
||||
</form>
|
||||
</field>
|
||||
</group>
|
||||
<group>
|
||||
<field name="log_ids">
|
||||
<tree string="Other Logs">
|
||||
<field name="type" />
|
||||
<field name="employee_id" />
|
||||
<field name="description" />
|
||||
<field name="date_creation" />
|
||||
</tree>
|
||||
<form string="Other logs" version="7.0">
|
||||
<sheet>
|
||||
<group>
|
||||
<field name="type" />
|
||||
<field name="date_creation" />
|
||||
<field name="employee_id" />
|
||||
<field name="description" />
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Engine">
|
||||
<group col="2">
|
||||
@@ -283,48 +247,6 @@
|
||||
<menuitem name="Vehicles" parent="menu_root" id="fleet_vehicles" />
|
||||
<menuitem action="fleet_vehicle_act" parent="fleet_vehicles" id="fleet_vehicle_menu" />
|
||||
|
||||
<record model='ir.ui.view' id='fleet_vehicle_log_form'>
|
||||
<field name="name">fleet.vehicle.log.form</field>
|
||||
<field name="model">fleet.vehicle.log</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Logs" version="7.0">
|
||||
<sheet>
|
||||
<group>
|
||||
<field name="type" />
|
||||
<field name="date_creation" />
|
||||
<field name="vehicle_id" />
|
||||
<field name="employee_id" />
|
||||
<field name="description" />
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model='ir.ui.view' id='fleet_vehicle_log_tree'>
|
||||
|
||||
<field name="name">fleet.vehicle.log.tree</field>
|
||||
<field name="model">fleet.vehicle.log</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Logs">
|
||||
<field name="type" />
|
||||
<field name="date_creation" />
|
||||
<field name="vehicle_id" />
|
||||
<field name="employee_id" />
|
||||
<field name="description" />
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model='ir.actions.act_window' id='fleet_vehicle_log_act'>
|
||||
<field name="name">Vehicle Logs</field>
|
||||
<field name="res_model">fleet.vehicle.log</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
|
||||
<menuitem action="fleet_vehicle_log_act" parent="fleet_vehicles" id="fleet_vehicle_log_menu" />
|
||||
|
||||
<record model='ir.ui.view' id='fleet_vehicle_log_fuel_form'>
|
||||
<field name="name">fleet.vehicle.log.fuel.form</field>
|
||||
<field name="model">fleet.vehicle.log.fuel</field>
|
||||
@@ -389,53 +311,6 @@
|
||||
|
||||
<menuitem action="fleet_vehicle_log_fuel_act" parent="fleet_vehicles" id="fleet_vehicle_log_fuel_menu" />
|
||||
|
||||
<record model='ir.ui.view' id='fleet_vehicle_log_odometer_form'>
|
||||
<field name="name">fleet.vehicle.log.odometer.form</field>
|
||||
<field name="model">fleet.vehicle.log.odometer</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Fuel Logs" version="7.0">
|
||||
<sheet>
|
||||
<group col = "2">
|
||||
<group>
|
||||
<field name="vehicle_id" />
|
||||
<field name="value" />
|
||||
<field name="date_creation" />
|
||||
</group>
|
||||
<group>
|
||||
<field name="employee_id" />
|
||||
</group>
|
||||
</group>
|
||||
<group>
|
||||
<field name="description" />
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model='ir.ui.view' id='fleet_vehicle_log_odometer_tree'>
|
||||
<field name="name">fleet.vehicle.log.odometer.tree</field>
|
||||
<field name="model">fleet.vehicle.log.odometer</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Fuel Logs">
|
||||
<field name="vehicle_id" />
|
||||
<field name="value" />
|
||||
<field name="date_creation" />
|
||||
<field name="employee_id" />
|
||||
<field name="description" />
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model='ir.actions.act_window' id='fleet_vehicle_log_odometer_act'>
|
||||
<field name="name">Vehicle Odometer Logs</field>
|
||||
<field name="res_model">fleet.vehicle.log.odometer</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
|
||||
<menuitem action="fleet_vehicle_log_odometer_act" parent="fleet_vehicles" id="fleet_vehicle_log_odometer_menu" />
|
||||
|
||||
<record model='ir.ui.view' id='fleet_vehicle_log_services_form'>
|
||||
<field name="name">fleet.vehicle.log.services.form</field>
|
||||
<field name="model">fleet.vehicle.log.services</field>
|
||||
|
||||
Reference in New Issue
Block a user