[FIX]hr_employee_calendar_planning:incorrect hours_per_day

Always using the topmost hr.employee.calendar for hours per day may lead to unexpected and incorrect behaviour. For example if the date_start and date_end of the topmost calendar are in the future. Then the hours_per_day from the future calendar are taken not from the currently used one. The more specific calendars in regard of date_start and date_end are considered earlier than the less specific ones.

Author: ChristophAbenthungCibex

hr_employee_calendar_planning/__manifest__.py

@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 {
     "name": "Employee Calendar Planning",
-    "version": "16.0.1.1.9",
+    "version": "16.0.1.1.10",
     "category": "Human Resources",
     "website": "https://github.com/OCA/hr",
     "author": "Tecnativa,Odoo Community Association (OCA)",
@@ -11,6 +11,7 @@
     "depends": ["hr"],
     "data": [
         "security/ir.model.access.csv",
+        "data/data.xml",
         "views/hr_employee_views.xml",
         "views/resource_calendar_views.xml",
     ],

hr_employee_calendar_planning/data/data.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo noupdate="1">
+    <record id="ir_cron_create_time_reports" model="ir.cron">
+        <field name="name">Hr Employee: Recompute hours per day</field>
+        <field name="model_id" ref="hr_employee_calendar_planning.model_hr_employee" />
+        <field name="state">code</field>
+        <field name="code">model.cron_recompute_hours_per_day()</field>
+        <field name="interval_type">days</field>
+        <field name="interval_number">1</field>
+        <field name="numbercall">-1</field>
+        <field
+            name="nextcall"
+            eval="datetime.now().replace(hour=1, minute=0, second=0, microsecond=0) + timedelta(days=1)"
+        />
+        <field name="doall" eval="True" />
+        <field name="active" eval="True" />
+    </record>
+</odoo>

hr_employee_calendar_planning/migrations/16.0.1.1.10/post-migration.py

@@ -0,0 +1,6 @@
+from openupgradelib import openupgrade
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    env["hr.employee"].cron_recompute_hours_per_day()

hr_employee_calendar_planning/models/hr_employee.py

@@ -2,6 +2,8 @@
 # Copyright 2022-2023 Tecnativa - Víctor Martínez
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
+from datetime import date
+
 from odoo import _, api, fields, models
 from odoo.exceptions import UserError
 from odoo.tools import config
@@ -58,6 +60,43 @@ def default_get(self, fields):
             ]
         return vals
 
+    def _get_current_hours_per_day(self):
+        """
+        Checks all calendars and uses the most specific first (date_start and date_end are set).
+        If no calendar matches it checks for calendars where no date_end is set.
+        If no calendar matches it checks for calendars where no date_start is set.
+        If no calendar matches it checks for calenders with neither date_start nor date_end.
+        It returns the hours_per_day of the first matching resource calendar.
+        If no calendar matches or no calendar exists -1 is returned.
+        :return: the current valid hours per day
+        """
+        if not self.calendar_ids:
+            return -1
+        today = date.today()
+        relevant_calendars = self.calendar_ids.filtered(
+            lambda x: x.date_start
+            and x.date_end
+            and x.date_start <= today <= x.date_end
+        )
+        if relevant_calendars:
+            return relevant_calendars[0].calendar_id.hours_per_day
+        relevant_calendars = self.calendar_ids.filtered(
+            lambda x: x.date_start and not x.date_end and x.date_start <= today
+        )
+        if relevant_calendars:
+            return relevant_calendars[0].calendar_id.hours_per_day
+        relevant_calendars = self.calendar_ids.filtered(
+            lambda x: not x.date_start and x.date_end and today <= x.date_end
+        )
+        if relevant_calendars:
+            return relevant_calendars[0].calendar_id.hours_per_day
+        relevant_calendars = self.calendar_ids.filtered(
+            lambda x: not x.date_start and not x.date_end
+        )
+        if relevant_calendars:
+            return relevant_calendars[0].calendar_id.hours_per_day
+        return -1
+
     def _regenerate_calendar(self):
         self.ensure_one()
         vals_list = []
@@ -115,11 +154,11 @@ def _regenerate_calendar(self):
             )
         else:
             self.resource_calendar_id.attendance_ids = vals_list
-        # Set the hours per day to the last (top date end) calendar line to apply
+        # Set the hours per day to the value of the current resource calendar
+        current_hours_per_day = self._get_current_hours_per_day()
+        if current_hours_per_day >= 0:
+            self.resource_id.calendar_id.hours_per_day = current_hours_per_day
         if self.calendar_ids:
-            self.resource_id.calendar_id.hours_per_day = self.calendar_ids[
-                0
-            ].calendar_id.hours_per_day
             # set global leaves
             self.copy_global_leaves()
 
@@ -162,6 +201,13 @@ def copy_global_leaves(self):
         to_unlink.unlink()
         return self.env["resource.calendar.leaves"].create(new_vals).ids
 
+    def cron_recompute_hours_per_day(self):
+        employees = self.search([])
+        for employee in employees:
+            current_hours_per_day = employee._get_current_hours_per_day()
+            if current_hours_per_day >= 0:
+                employee.resource_id.calendar_id.hours_per_day = current_hours_per_day
+
     def regenerate_calendar(self):
         for item in self:
             item._regenerate_calendar()

hr_employee_calendar_planning/tests/test_hr_employee_calendar_planning.py

@@ -2,6 +2,8 @@
 # Copyright 2021-2023 Tecnativa - Víctor Martínez
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
+from datetime import date, timedelta
+
 from odoo import exceptions, fields
 from odoo.tests import common, new_test_user
 
@@ -454,3 +456,68 @@ def test_create_employee_multi(self):
             ]
         )
         self.assertEqual(len(employees), 2)
+
+    def test_get_current_hours_per_day(self):
+        employee_calendar1 = self.env["hr.employee.calendar"].create(
+            {
+                "date_start": date.today() - timedelta(days=2),
+                "date_end": date.today() + timedelta(days=2),
+                "employee_id": self.employee.id,
+                "calendar_id": self.calendar1.id,
+            }
+        )
+        self.assertEqual(
+            self.employee.resource_calendar_id.hours_per_day,
+            self.calendar1.hours_per_day,
+        )
+        self.calendar2.attendance_ids[
+            -1
+        ].unlink()  # Make hours_per_day different for calendar 1 and 2
+        employee_calendar2 = self.env["hr.employee.calendar"].create(
+            {
+                "date_start": date.today() + timedelta(days=3),
+                "date_end": date.today() + timedelta(days=5),
+                "employee_id": self.employee.id,
+                "calendar_id": self.calendar2.id,
+            }
+        )
+        self.assertEqual(
+            self.employee.resource_calendar_id.hours_per_day,
+            self.calendar1.hours_per_day,
+        )
+        employee_calendar1.write(
+            {
+                "date_start": employee_calendar1.date_start + timedelta(days=5),
+                "date_end": employee_calendar1.date_start + timedelta(days=7),
+            }
+        )
+        employee_calendar2.write(
+            {
+                "date_start": date.today() - timedelta(days=2),
+                "date_end": None,
+            }
+        )
+        self.assertEqual(
+            self.employee.resource_calendar_id.hours_per_day,
+            self.calendar2.hours_per_day,
+        )
+        employee_calendar1.write(
+            {
+                "date_start": None,
+                "date_end": None,
+            }
+        )
+        self.assertEqual(
+            self.employee.resource_calendar_id.hours_per_day,
+            self.calendar2.hours_per_day,
+        )
+        employee_calendar2.write(
+            {
+                "date_start": date.today() + timedelta(days=2),
+                "date_end": None,
+            }
+        )
+        self.assertEqual(
+            self.employee.resource_calendar_id.hours_per_day,
+            self.calendar1.hours_per_day,
+        )