Merge PR #187 into 16.0

Signed-off-by pedrobaeza
OCA · Oct 29, 2024 · b213e4e · b213e4e
2 parents 4bd6d75 + 70bb0e8
commit b213e4e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/hr_attendance_report_theoretical_time/reports/hr_attendance_theoretical_time_report.py b/hr_attendance_report_theoretical_time/reports/hr_attendance_theoretical_time_report.py
@@ -20,6 +20,7 @@ class HrAttendanceTheoreticalTimeReport(models.Model):
     employee_id = fields.Many2one(
         comodel_name="hr.employee", string="Employee", readonly=True
     )
+    company_id = fields.Many2one(related="employee_id.company_id")
     department_id = fields.Many2one(
         comodel_name="hr.department",
         string="Department",

diff --git a/...ttendance_report_theoretical_time/reports/hr_attendance_theoretical_time_report_views.xml b/...ttendance_report_theoretical_time/reports/hr_attendance_theoretical_time_report_views.xml
@@ -33,6 +33,12 @@
                     string="My Attendances"
                     domain="[('employee_id.user_id.id', '=', uid)]"
                 />
+                <separator />
+                <filter
+                    name="active_employees"
+                    string="Active employees"
+                    domain="[('employee_id.active', '=', True)]"
+                />
             </search>
         </field>
     </record>

diff --git a/...dance_report_theoretical_time/security/hr_attendance_report_theoretical_time_security.xml b/...dance_report_theoretical_time/security/hr_attendance_report_theoretical_time_security.xml
@@ -2,6 +2,11 @@
 <!-- Copyright 2018 Tecnativa - Pedro M. Baeza
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo noupdate="1">
+    <record id="rule_multi_company_theoretical_vs_worked_report" model="ir.rule">
+        <field name="name">Theoretical vs worked hours multi-company</field>
+        <field name="model_id" ref="model_hr_attendance_theoretical_time_report" />
+        <field name="domain_force">[('company_id', 'in', company_ids)]</field>
+    </record>
     <record model="ir.rule" id="rule_theoretical_vs_worked_report_own">
         <field name="name">Theoretical vs worked hours: Own attendances</field>
         <field name="model_id" ref="model_hr_attendance_theoretical_time_report" />