diff --git a/addons/hr_fleet/controllers/main.py b/addons/hr_fleet/controllers/main.py index a943fdac284..175139e04da 100644 --- a/addons/hr_fleet/controllers/main.py +++ b/addons/hr_fleet/controllers/main.py @@ -4,15 +4,15 @@ import base64 import io -from odoo import _ -from odoo.http import request, route, Controller - from PyPDF2 import PdfFileReader, PdfFileWriter from reportlab.pdfgen import canvas +from odoo import _ +from odoo.http import request, route, Controller + + class HrFleet(Controller): - @route(["/fleet/print_claim_report/"], type='http', auth='user') def get_claim_report_user(self, employee_id, **post): if not request.env.user.has_group('fleet.fleet_group_manager'): diff --git a/addons/hr_fleet/models/employee.py b/addons/hr_fleet/models/employee.py index dc0d6c214d1..1e80a6569f1 100644 --- a/addons/hr_fleet/models/employee.py +++ b/addons/hr_fleet/models/employee.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. - from odoo import fields, models + class Employee(models.Model): _inherit = 'hr.employee' @@ -26,7 +26,7 @@ class Employee(models.Model): driver_ids = (self.mapped('user_id.partner_id') | self.sudo().mapped('address_home_id')).ids fleet_data = self.env['fleet.vehicle.assignation.log'].read_group( domain=[('driver_id', 'in', driver_ids)], fields=['driver_id'], groupby=['driver_id']) - mapped_data = dict([(m['driver_id'][0], m['driver_id_count']) for m in fleet_data]) + mapped_data = {m['driver_id'][0]: m['driver_id_count'] for m in fleet_data} for employee in self: drivers = employee.user_id.partner_id | employee.sudo().address_home_id employee.employee_cars_count = sum(mapped_data.get(pid, 0) for pid in drivers.ids) diff --git a/addons/hr_fleet/views/employee_views.xml b/addons/hr_fleet/views/employee_views.xml index 010775dce22..7f9b7fc87a1 100644 --- a/addons/hr_fleet/views/employee_views.xml +++ b/addons/hr_fleet/views/employee_views.xml @@ -36,7 +36,7 @@