diff --git a/addons/hr_fleet/models/__init__.py b/addons/hr_fleet/models/__init__.py index 9dcef252c7f..bc9700e0568 100644 --- a/addons/hr_fleet/models/__init__.py +++ b/addons/hr_fleet/models/__init__.py @@ -6,4 +6,6 @@ from . import res_users from . import fleet_vehicle_assignation_log from . import fleet_category from . import fleet_vehicle -from . import fleet_vehicle_cost +from . import fleet_vehicle_log_contract +from . import fleet_vehicle_log_services +from . import fleet_vehicle_odometer diff --git a/addons/hr_fleet/models/fleet_vehicle.py b/addons/hr_fleet/models/fleet_vehicle.py index 09e84d65aae..e9884fd35fd 100644 --- a/addons/hr_fleet/models/fleet_vehicle.py +++ b/addons/hr_fleet/models/fleet_vehicle.py @@ -165,11 +165,3 @@ class FleetVehicle(models.Model): partners_to_unsubscribe.append(employee.user_id.partner_id.id) vehicle.message_unsubscribe(partner_ids=partners_to_unsubscribe) return super().write(vals) - -class FleetVehicleOdometer(models.Model): - _inherit = 'fleet.vehicle.odometer' - - driver_employee_id = fields.Many2one( - related='vehicle_id.driver_employee_id', string='Current Driver (Employee)', - readonly=True, - ) diff --git a/addons/hr_fleet/models/fleet_vehicle_log_contract.py b/addons/hr_fleet/models/fleet_vehicle_log_contract.py new file mode 100644 index 00000000000..6b947cbc3ff --- /dev/null +++ b/addons/hr_fleet/models/fleet_vehicle_log_contract.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import fields, models + +class FleetVehicleLogContract(models.Model): + _inherit = 'fleet.vehicle.log.contract' + + purchaser_employee_id = fields.Many2one( + related='vehicle_id.driver_employee_id', + string='Current Driver (Employee)', + ) + fleet_is_internal = fields.Boolean(related='vehicle_id.fleet_is_internal') diff --git a/addons/hr_fleet/models/fleet_vehicle_cost.py b/addons/hr_fleet/models/fleet_vehicle_log_services.py similarity index 76% rename from addons/hr_fleet/models/fleet_vehicle_cost.py rename to addons/hr_fleet/models/fleet_vehicle_log_services.py index 669360da822..6a79d809b08 100644 --- a/addons/hr_fleet/models/fleet_vehicle_cost.py +++ b/addons/hr_fleet/models/fleet_vehicle_log_services.py @@ -3,15 +3,6 @@ from odoo import api, fields, models -class FleetVehicleLogContract(models.Model): - _inherit = 'fleet.vehicle.log.contract' - - purchaser_employee_id = fields.Many2one( - related='vehicle_id.driver_employee_id', - string='Current Driver (Employee)', - ) - fleet_is_internal = fields.Boolean(related='vehicle_id.fleet_is_internal') - class FleetVehicleLogServices(models.Model): _inherit = 'fleet.vehicle.log.services' diff --git a/addons/hr_fleet/models/fleet_vehicle_odometer.py b/addons/hr_fleet/models/fleet_vehicle_odometer.py new file mode 100644 index 00000000000..41dbee7dbea --- /dev/null +++ b/addons/hr_fleet/models/fleet_vehicle_odometer.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import fields, models + + +class FleetVehicleOdometer(models.Model): + _inherit = 'fleet.vehicle.odometer' + + driver_employee_id = fields.Many2one( + related='vehicle_id.driver_employee_id', string='Current Driver (Employee)', + readonly=True, + )