19.0 vanilla

This commit is contained in:
Ernad Husremovic 2026-03-09 09:31:00 +01:00
parent a1137a1456
commit e1d89e11e3
2789 changed files with 1093187 additions and 605897 deletions

View file

@ -2,9 +2,10 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from . import employee
from . import res_users
from . import fleet_vehicle_assignation_log
from . import fleet_vehicle
from . import fleet_vehicle_log_contract
from . import fleet_vehicle_log_services
from . import fleet_vehicle_odometer
from . import ir_attachment
from . import mail_activity_plan_template

View file

@ -1,11 +1,11 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from odoo import _, api, fields, models
from odoo.fields import Domain
from odoo.exceptions import ValidationError
class Employee(models.Model):
class HrEmployee(models.Model):
_inherit = 'hr.employee'
employee_cars_count = fields.Integer(compute="_compute_employee_cars_count", string="Cars", groups="fleet.fleet_group_manager")
@ -13,6 +13,7 @@ class Employee(models.Model):
'fleet.vehicle', 'driver_employee_id', string='Vehicles (private)',
groups="fleet.fleet_group_manager,hr.group_hr_user",
)
license_plate = fields.Char(compute="_compute_license_plate", search="_search_license_plate", groups="hr.group_hr_user")
mobility_card = fields.Char(groups="fleet.fleet_group_user")
def action_open_employee_cars(self):
@ -21,23 +22,36 @@ class Employee(models.Model):
return {
"type": "ir.actions.act_window",
"res_model": "fleet.vehicle.assignation.log",
"views": [[self.env.ref("hr_fleet.fleet_vehicle_assignation_log_employee_view_list").id, "tree"], [False, "form"]],
"domain": [("driver_employee_id", "in", self.ids)],
"context": dict(self._context, default_driver_id=self.user_id.partner_id.id, default_driver_employee_id=self.id),
"name": _("History Employee Cars"),
"views": [[self.env.ref("hr_fleet.fleet_vehicle_assignation_log_employee_view_list").id, "list"], [False, "form"]],
"domain": [("driver_employee_id", "in", self.ids), ("driver_id", "in", self.work_contact_id.ids)],
"context": dict(self.env.context, default_driver_id=self.user_id.partner_id.id, default_driver_employee_id=self.id),
"name": self.env._("Cars History"),
}
@api.depends('private_car_plate', 'car_ids.license_plate')
def _compute_license_plate(self):
for employee in self:
if employee.private_car_plate and employee.car_ids.license_plate:
employee.license_plate = ' '.join(employee.car_ids.filtered('license_plate').mapped('license_plate') + [employee.private_car_plate])
else:
employee.license_plate = ' '.join(employee.car_ids.filtered('license_plate').mapped('license_plate')) or employee.private_car_plate
def _search_license_plate(self, operator, value):
if operator in Domain.NEGATIVE_OPERATORS:
return NotImplemented
return ['|', ('car_ids.license_plate', operator, value), ('private_car_plate', operator, value)]
def _compute_employee_cars_count(self):
rg = self.env['fleet.vehicle.assignation.log']._read_group([
('driver_employee_id', 'in', self.ids),
], ['driver_employee_id'], ['driver_employee_id'])
cars_count = {r['driver_employee_id'][0]: r['driver_employee_id_count'] for r in rg}
('driver_employee_id', 'in', self.ids), ('driver_id', 'in', self.work_contact_id.ids),
], ['driver_employee_id'], ['__count'])
cars_count = {driver_employee.id: count for driver_employee, count in rg}
for employee in self:
employee.employee_cars_count = cars_count.get(employee.id, 0)
@api.constrains('address_home_id')
def _check_address_home_id(self):
no_address = self.filtered(lambda r: not r.address_home_id)
@api.constrains('work_contact_id')
def _check_work_contact_id(self):
no_address = self.filtered(lambda r: not r.work_contact_id)
car_ids = self.env['fleet.vehicle'].sudo().search([
('driver_employee_id', 'in', no_address.ids),
])
@ -45,24 +59,37 @@ class Employee(models.Model):
if car_ids:
raise ValidationError(_('Cannot remove address from employees with linked cars.'))
def write(self, vals):
# Update car partner when it is changed on the employee
old_work_contact_id_mapping = {e.id: e.work_contact_id.id for e in self}
res = super().write(vals)
#Update car partner when it is changed on the employee
if 'address_home_id' in vals:
# Update car partner when it is changed on the employee needs to be done after because of _sync_user
if 'work_contact_id' in vals:
for employee in self:
if vals['work_contact_id'] != old_work_contact_id_mapping[employee.id]:
car_ids = self.env['fleet.vehicle'].sudo().search([
'|',
('driver_employee_id', '=', employee.id),
('future_driver_employee_id', '=', employee.id),
])
if car_ids:
car_ids.filtered(lambda c: c.driver_employee_id.id == employee.id).write({
'driver_id': vals['work_contact_id'],
})
car_ids.filtered(lambda c: c.future_driver_employee_id.id == employee.id).write({
'future_driver_id': vals['work_contact_id'],
})
if 'mobility_card' in vals:
car_ids = self.env['fleet.vehicle'].sudo().search([
('driver_employee_id', 'in', self.ids),
('driver_id', 'in', self.mapped('address_home_id').ids),
])
if car_ids:
car_ids.write({'driver_id': vals['address_home_id']})
if 'mobility_card' in vals:
#NOTE: keeping it as a search on driver_id but we might be able to use driver_employee_id in the future
vehicles = self.env['fleet.vehicle'].search([('driver_id', 'in', (self.user_id.partner_id | self.sudo().address_home_id).ids)])
vehicles._compute_mobility_card()
car_ids._compute_mobility_card()
return res
class EmployeePublic(models.Model):
class HrEmployeePublic(models.Model):
_inherit = 'hr.employee.public'
mobility_card = fields.Char(readonly=True)

View file

@ -1,9 +1,9 @@
# -*- coding:utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from odoo import _, api, fields, models
from odoo.exceptions import ValidationError
class FleetVehicle(models.Model):
_inherit = 'fleet.vehicle'
@ -13,6 +13,7 @@ class FleetVehicle(models.Model):
compute='_compute_driver_employee_id', store=True,
domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]",
tracking=True,
index='btree_not_null',
)
driver_employee_name = fields.Char(related="driver_employee_id.name")
future_driver_employee_id = fields.Many2one(
@ -24,30 +25,38 @@ class FleetVehicle(models.Model):
@api.depends('driver_id')
def _compute_driver_employee_id(self):
employees_by_partner_id_and_company_id = self.env['hr.employee']._read_group(
domain=[('work_contact_id', 'in', self.driver_id.ids)],
groupby=['work_contact_id', 'company_id'],
aggregates=['id:recordset']
)
employees_by_partner_id_and_company_id = {
(partner, company): employee for partner, company, employee in employees_by_partner_id_and_company_id
}
for vehicle in self:
if vehicle.driver_id:
vehicle.driver_employee_id = self.env['hr.employee'].search([
('address_home_id', '=', vehicle.driver_id.id),
], limit=1)
else:
vehicle.driver_employee_id = False
employees = employees_by_partner_id_and_company_id.get((vehicle.driver_id, vehicle.company_id))
vehicle.driver_employee_id = employees[0] if employees else False
@api.depends('future_driver_id')
def _compute_future_driver_employee_id(self):
employees_by_partner_id_and_company_id = self.env['hr.employee']._read_group(
domain=[('work_contact_id', 'in', self.future_driver_id.ids)],
groupby=['work_contact_id', 'company_id'],
aggregates=['id:recordset']
)
employees_by_partner_id_and_company_id = {
(partner, company): employee for partner, company, employee in employees_by_partner_id_and_company_id
}
for vehicle in self:
if vehicle.future_driver_id:
vehicle.future_driver_employee_id = self.env['hr.employee'].search([
('address_home_id', '=', vehicle.future_driver_id.id),
], limit=1)
else:
vehicle.future_driver_employee_id = False
employees = employees_by_partner_id_and_company_id.get((vehicle.future_driver_id, vehicle.company_id))
vehicle.future_driver_employee_id = employees[0] if employees else False
@api.depends('driver_id')
def _compute_mobility_card(self):
for vehicle in self:
employee = self.env['hr.employee']
if vehicle.driver_id:
employee = employee.search([('address_home_id', '=', vehicle.driver_id.id)], limit=1)
employee = employee.search([('work_contact_id', '=', vehicle.driver_id.id)], limit=1)
if not employee:
employee = employee.search([('user_id.partner_id', '=', vehicle.driver_id.id)], limit=1)
vehicle.mobility_card = employee.mobility_card
@ -57,7 +66,7 @@ class FleetVehicle(models.Model):
partner = False
if vals['driver_employee_id']:
employee = self.env['hr.employee'].sudo().browse(vals['driver_employee_id'])
partner = employee.address_home_id.id
partner = employee.work_contact_id.id
vals['driver_id'] = partner
elif 'driver_id' in vals:
# Reverse the process if we can find a single employee
@ -65,7 +74,7 @@ class FleetVehicle(models.Model):
if vals['driver_id']:
# Limit to 2, we only care about the first one if he is the only one
employee_ids = self.env['hr.employee'].sudo().search([
('address_home_id', '=', vals['driver_id'])
('work_contact_id', '=', vals['driver_id'])
], limit=2)
if len(employee_ids) == 1:
employee = employee_ids[0].id
@ -76,7 +85,7 @@ class FleetVehicle(models.Model):
partner = False
if vals['future_driver_employee_id']:
employee = self.env['hr.employee'].sudo().browse(vals['future_driver_employee_id'])
partner = employee.address_home_id.id
partner = employee.work_contact_id.id
vals['future_driver_id'] = partner
elif 'future_driver_id' in vals:
# Reverse the process if we can find a single employee
@ -84,7 +93,7 @@ class FleetVehicle(models.Model):
if vals['future_driver_id']:
# Limit to 2, we only care about the first one if he is the only one
employee_ids = self.env['hr.employee'].sudo().search([
('address_home_id', '=', vals['future_driver_id'])
('work_contact_id', '=', vals['future_driver_id'])
], limit=2)
if len(employee_ids) == 1:
employee = employee_ids[0].id
@ -120,5 +129,5 @@ class FleetVehicle(models.Model):
def open_assignation_logs(self):
action = super().open_assignation_logs()
action['views'] = [[self.env.ref('hr_fleet.fleet_vehicle_assignation_log_view_list').id, 'tree']]
action['views'] = [[self.env.ref('hr_fleet.fleet_vehicle_assignation_log_view_list').id, 'list']]
return action

View file

@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from odoo import api, fields, models
@ -12,17 +11,23 @@ class FleetVehicleAssignationLog(models.Model):
@api.depends('driver_id')
def _compute_driver_employee_id(self):
employees = self.env['hr.employee'].search([('address_home_id', 'in', self.driver_id.ids)])
employees_by_partner_id_and_company_id = self.env['hr.employee']._read_group(
domain=[('work_contact_id', 'in', self.driver_id.ids)],
groupby=['work_contact_id', 'company_id'],
aggregates=['id:recordset']
)
employees_by_partner_id_and_company_id = {
(partner, company): employee for partner, company, employee in employees_by_partner_id_and_company_id
}
for log in self:
employee = employees.filtered(lambda e: e.address_home_id.id == log.driver_id.id)
log.driver_employee_id = employee and employee[0] or False
employees = employees_by_partner_id_and_company_id.get((log.driver_id, log.vehicle_id.company_id))
log.driver_employee_id = employees[0] if employees else False
def _compute_attachment_number(self):
attachment_data = self.env['ir.attachment']._read_group([
('res_model', '=', 'fleet.vehicle.assignation.log'),
('res_id', 'in', self.ids)], ['res_id'], ['res_id'])
attachment = dict((data['res_id'], data['res_id_count']) for data in attachment_data)
('res_id', 'in', self.ids)], ['res_id'], ['__count'])
attachment = dict(attachment_data)
for doc in self:
doc.attachment_number = attachment.get(doc.id, 0)

View file

@ -1,7 +1,8 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from odoo import fields, models
from odoo import fields, models, _
class FleetVehicleLogContract(models.Model):
_inherit = 'fleet.vehicle.log.contract'
@ -10,3 +11,13 @@ class FleetVehicleLogContract(models.Model):
related='vehicle_id.driver_employee_id',
string='Driver (Employee)',
)
def action_open_employee(self):
self.ensure_one()
return {
'name': _('Related Employee'),
'type': 'ir.actions.act_window',
'res_model': 'hr.employee',
'view_mode': 'form',
'res_id': self.purchaser_employee_id.id,
}

View file

@ -3,6 +3,7 @@
from odoo import api, fields, models
class FleetVehicleLogServices(models.Model):
_inherit = 'fleet.vehicle.log.services'
@ -16,7 +17,7 @@ class FleetVehicleLogServices(models.Model):
internals = self.filtered(lambda r: r.purchaser_employee_id)
super(FleetVehicleLogServices, (self - internals))._compute_purchaser_id()
for service in internals:
service.purchaser_id = service.purchaser_employee_id.address_home_id
service.purchaser_id = service.purchaser_employee_id.work_contact_id
@api.depends('vehicle_id')
def _compute_purchaser_employee_id(self):

View file

@ -0,0 +1,14 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from odoo import models
class IrAttachment(models.Model):
_inherit = 'ir.attachment'
def action_preview_attachment(self):
return {
'type': 'ir.actions.act_url',
'url': '/web/content/%s/%s' % (self.id, self.name),
'target': 'new',
}

View file

@ -0,0 +1,37 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from odoo import api, fields, models, _
from odoo import exceptions
class MailActivityPlanTemplate(models.Model):
_inherit = 'mail.activity.plan.template'
responsible_type = fields.Selection(
selection_add=[('fleet_manager', "Fleet Manager")],
ondelete={'fleet_manager': 'set default'})
@api.constrains('plan_id', 'responsible_type')
def _check_responsible_hr_fleet(self):
""" Ensure that hr types are used only on employee model """
for template in self.filtered(lambda tpl: tpl.plan_id.res_model != 'hr.employee'):
if template.responsible_type == 'fleet_manager':
raise exceptions.ValidationError(_("Fleet Manager is limited to Employee plans."))
def _determine_responsible(self, on_demand_responsible, employee):
if self.responsible_type == 'fleet_manager' and self.plan_id.res_model == 'hr.employee':
employee_id = self.env['hr.employee'].browse(employee._origin.id)
vehicle = employee_id.car_ids[:1]
error = False
warning = False
if not vehicle:
error = _('Employee %s is not linked to a vehicle.', employee_id.name)
if vehicle and not vehicle.manager_id:
warning = _("The vehicle of employee %(employee)s is not linked to a fleet manager, assigning to you.", employee=employee_id.name)
return {
'responsible': vehicle.manager_id or self.env.user,
'error': error,
'warning': warning
}
return super()._determine_responsible(on_demand_responsible, employee)

View file

@ -1,17 +0,0 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from odoo import models, fields
class User(models.Model):
_inherit = ['res.users']
employee_cars_count = fields.Integer(related='employee_id.employee_cars_count')
@property
def SELF_READABLE_FIELDS(self):
return super().SELF_READABLE_FIELDS + ['employee_cars_count']
def action_open_employee_cars(self):
return self.employee_id.action_open_employee_cars()