From fcb5a0ed6695b7abd65062f4ece02ff96cdedc43 Mon Sep 17 00:00:00 2001 From: William Braeckman Date: Tue, 15 Feb 2022 13:49:37 +0000 Subject: [PATCH] [FIX] hr_attendance: fix attendance report This commit contains two fixes. The first fixes the absence of a multi company rule for the attendance report model. The second fixes the wrong widget being used in the pivot view of the attendance report. TaskId-2765671 closes odoo/odoo#84668 Related: odoo/upgrade#3251 Signed-off-by: Kevin Baptiste --- addons/hr_attendance/report/hr_attendance_report.py | 6 +++++- addons/hr_attendance/security/hr_attendance_security.xml | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/addons/hr_attendance/report/hr_attendance_report.py b/addons/hr_attendance/report/hr_attendance_report.py index db0cdbe99f9..f8d885e97cc 100644 --- a/addons/hr_attendance/report/hr_attendance_report.py +++ b/addons/hr_attendance/report/hr_attendance_report.py @@ -1,7 +1,7 @@ # -*- 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, tools class HRAttendanceReport(models.Model): @@ -11,11 +11,14 @@ class HRAttendanceReport(models.Model): department_id = fields.Many2one('hr.department', string="Department", readonly=True) employee_id = fields.Many2one('hr.employee', string="Employee", readonly=True) + company_id = fields.Many2one('res.company', string="Company", readonly=True) check_in = fields.Date("Check In", readonly=True) worked_hours = fields.Float("Hours Worked", readonly=True) overtime_hours = fields.Float("Extra Hours", readonly=True) def init(self): + tools.drop_view_if_exists(self.env.cr, self._table) + self.env.cr.execute(""" CREATE OR REPLACE VIEW %s AS ( ( @@ -23,6 +26,7 @@ class HRAttendanceReport(models.Model): hra.id, hr_employee.department_id, hra.employee_id, + hr_employee.company_id, hra.check_in, hra.worked_hours, coalesce(ot.duration, 0) as overtime_hours diff --git a/addons/hr_attendance/security/hr_attendance_security.xml b/addons/hr_attendance/security/hr_attendance_security.xml index da89fe7c437..44f244502bc 100644 --- a/addons/hr_attendance/security/hr_attendance_security.xml +++ b/addons/hr_attendance/security/hr_attendance_security.xml @@ -108,5 +108,12 @@ + + + + Attendance report multi company rule + + [('company_id', 'in', company_ids)] +