diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 3db8c38db30..c10b7680901 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -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' diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 885c48a602f..50952f8c57e 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -100,26 +100,34 @@ - + - + +
- + - - - - - - + + + + + + + + + + + + + @@ -127,30 +135,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -214,26 +198,6 @@ - - - - - - - - -
- - - - - - - - -
-
-
@@ -283,48 +247,6 @@ - - fleet.vehicle.log.form - fleet.vehicle.log - -
- - - - - - - - - -
-
-
- - - - fleet.vehicle.log.tree - fleet.vehicle.log - - - - - - - - - - - - - Vehicle Logs - fleet.vehicle.log - form - tree,form - - - - fleet.vehicle.log.fuel.form fleet.vehicle.log.fuel @@ -389,53 +311,6 @@ - - fleet.vehicle.log.odometer.form - fleet.vehicle.log.odometer - -
- - - - - - - - - - - - - - - -
-
-
- - - fleet.vehicle.log.odometer.tree - fleet.vehicle.log.odometer - - - - - - - - - - - - - Vehicle Odometer Logs - fleet.vehicle.log.odometer - form - tree,form - - - - fleet.vehicle.log.services.form fleet.vehicle.log.services