[MIG] hr_holidays_natural_period: Migration to 19.0

cristina-hidalgo-tecnativa · cristina-hidalgo-tecnativa · commit 32268a814bbb · 2026-03-04T12:07:51.000+01:00
diff --git a/hr_holidays_natural_period/README.rst b/hr_holidays_natural_period/README.rst
@@ -11,7 +11,7 @@ Holidays natural period
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:103684da3f328a5df8849cf8b46061fa08a672c79f654f56ad91b475a13855ff
+   !! source digest: sha256:d0c51197864f4aec9990179577b0bf2ee358dd0521d047fd699fd02ba8196bf9
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -21,13 +21,13 @@ Holidays natural period
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fhr--holidays-lightgray.png?logo=github
-    :target: https://github.com/OCA/hr-holidays/tree/18.0/hr_holidays_natural_period
+    :target: https://github.com/OCA/hr-holidays/tree/19.0/hr_holidays_natural_period
     :alt: OCA/hr-holidays
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/hr-holidays-18-0/hr-holidays-18-0-hr_holidays_natural_period
+    :target: https://translation.odoo-community.org/projects/hr-holidays-19-0/hr-holidays-19-0-hr_holidays_natural_period
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/hr-holidays&target_branch=18.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/hr-holidays&target_branch=19.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -60,7 +60,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/hr-holidays/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/hr-holidays/issues/new?body=module:%20hr_holidays_natural_period%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/hr-holidays/issues/new?body=module:%20hr_holidays_natural_period%0Aversion:%2019.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -110,6 +110,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-victoralmau| 
 
-This module is part of the `OCA/hr-holidays <https://github.com/OCA/hr-holidays/tree/18.0/hr_holidays_natural_period>`_ project on GitHub.
+This module is part of the `OCA/hr-holidays <https://github.com/OCA/hr-holidays/tree/19.0/hr_holidays_natural_period>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/hr_holidays_natural_period/__manifest__.py b/hr_holidays_natural_period/__manifest__.py
@@ -4,7 +4,7 @@
 {
     "name": "Holidays natural period",
     "summary": "Apply natural days in holidays",
-    "version": "18.0.1.0.5",
+    "version": "19.0.1.0.0",
     "category": "Human Resources",
     "website": "https://github.com/OCA/hr-holidays",
     "author": "Tecnativa, Odoo Community Association (OCA)",
diff --git a/hr_holidays_natural_period/demo/hr_leave_type_data.xml b/hr_holidays_natural_period/demo/hr_leave_type_data.xml
@@ -4,6 +4,6 @@
         <field name="name">Test Time Off (natural day)</field>
         <field name="request_unit">natural_day</field>
         <field name="responsible_ids" eval="[(4, ref('base.user_admin'))]" />
-        <field name="employee_requests">yes</field>
+        <field name="employee_requests">True</field>
     </record>
 </odoo>
diff --git a/hr_holidays_natural_period/models/resource_calendar.py b/hr_holidays_natural_period/models/resource_calendar.py
@@ -10,8 +10,7 @@
 
 from odoo import models
 from odoo.tools.float_utils import float_round
-
-from odoo.addons.resource.models.utils import Intervals
+from odoo.tools.intervals import Intervals
 
 
 class ResourceCalendar(models.Model):
@@ -40,7 +39,6 @@ def _get_attendance_intervals_days_data(self, attendance_intervals):
                 interval_days = interval_hours / 24  # hours on a day
             day_hours[start.date()] += interval_hours
             day_days[start.date()] += interval_days
-
         return {
             # Round the number of days to the closest 16th of a day.
             "days": float_round(
@@ -58,29 +56,26 @@ def _exist_interval_in_date(self, intervals, date):
     def _natural_period_intervals_batch(self, start_dt, end_dt, intervals, resources):
         # Re-define start_dt and end_dt to ensure that we always iterate through the
         # last day.
-        start_dt = datetime.combine(start_dt.date(), time.min)
-        end_time = (
-            time.max
-            if self.env.context.get("old_request_unit") == "natural_day"
-            else time(12, 0, 0)
-        )
-        end_dt = datetime.combine(end_dt.date(), end_time)
+        start_date = start_dt.date()
+        end_date = end_dt.date()
+        old_request_unit = self.env.context.get("old_request_unit")
+        # Fix: if old_request_unit == 'day' and self.env.context.get('natural_period'):
+        # old_request_unit = 'natural_day'
+        if old_request_unit == "day" and self.env.context.get("natural_period"):
+            old_request_unit = "natural_day"
+        end_time = time.max if old_request_unit == "natural_day" else time(12, 0, 0)
         for resource in resources or []:
-            interval_resource = intervals[resource.id]
             tz = timezone(resource.tz)
             attendances = []
-            if len(interval_resource._items) > 0:
-                attendances = interval_resource._items
-            for day in rrule.rrule(rrule.DAILY, dtstart=start_dt, until=end_dt):
-                exist_interval = self._exist_interval_in_date(attendances, day.date())
-                if not exist_interval:
-                    attendances.append(
-                        (
-                            datetime.combine(day.date(), time.min).replace(tzinfo=tz),
-                            datetime.combine(day.date(), end_time).replace(tzinfo=tz),
-                            self.env["resource.calendar.attendance"],
-                        )
+            # For natural days, create intervals for ALL days
+            for day in rrule.rrule(rrule.DAILY, dtstart=start_date, until=end_date):
+                attendances.append(
+                    (
+                        datetime.combine(day.date(), time.min).replace(tzinfo=tz),
+                        datetime.combine(day.date(), end_time).replace(tzinfo=tz),
+                        self.env["resource.calendar.attendance"],
                     )
+                )
             intervals[resource.id] = Intervals(attendances)
         return intervals
 
diff --git a/hr_holidays_natural_period/static/description/index.html b/hr_holidays_natural_period/static/description/index.html
@@ -372,9 +372,9 @@ <h1>Holidays natural period</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:103684da3f328a5df8849cf8b46061fa08a672c79f654f56ad91b475a13855ff
+!! source digest: sha256:d0c51197864f4aec9990179577b0bf2ee358dd0521d047fd699fd02ba8196bf9
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/hr-holidays/tree/18.0/hr_holidays_natural_period"><img alt="OCA/hr-holidays" src="https://img.shields.io/badge/github-OCA%2Fhr--holidays-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/hr-holidays-18-0/hr-holidays-18-0-hr_holidays_natural_period"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/hr-holidays&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/hr-holidays/tree/19.0/hr_holidays_natural_period"><img alt="OCA/hr-holidays" src="https://img.shields.io/badge/github-OCA%2Fhr--holidays-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/hr-holidays-19-0/hr-holidays-19-0-hr_holidays_natural_period"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/hr-holidays&amp;target_branch=19.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module was written to define natural day and natural day (Half Day)
 options in request unit on holidays type.</p>
 <p><strong>Table of contents</strong></p>
@@ -409,7 +409,7 @@ <h2><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h2>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/hr-holidays/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/hr-holidays/issues/new?body=module:%20hr_holidays_natural_period%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/hr-holidays/issues/new?body=module:%20hr_holidays_natural_period%0Aversion:%2019.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -459,7 +459,7 @@ <h3><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h3>
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
 <p><a class="reference external image-reference" href="https://github.com/victoralmau"><img alt="victoralmau" src="https://github.com/victoralmau.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/hr-holidays/tree/18.0/hr_holidays_natural_period">OCA/hr-holidays</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/hr-holidays/tree/19.0/hr_holidays_natural_period">OCA/hr-holidays</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>
diff --git a/hr_holidays_natural_period/tests/test_hr_leave.py b/hr_holidays_natural_period/tests/test_hr_leave.py
@@ -12,11 +12,23 @@ class TestHrLeave(BaseCommon):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
-        cls.leave_type = cls.env.ref(
-            "hr_holidays_natural_period.hr_leave_type_natural_day_test"
+        cls.leave_type = cls.env["hr.leave.type"].create(
+            {
+                "name": "Natural Day Test Leave Type",
+                "request_unit": "natural_day",
+                "requires_allocation": True,
+                "employee_requests": True,
+            }
+        )
+        cls.leave_type_day = cls.env["hr.leave.type"].create(
+            {
+                "name": "Test Day Leave Type",
+                "request_unit": "day",
+                "requires_allocation": True,
+                "employee_requests": True,
+            }
         )
-        cls.leave_type_day = cls.env.ref("hr_holidays.holiday_status_cl")
-        cls.leave_type_day.employee_requests = "yes"
+
         calendar = cls.env.ref("resource.resource_calendar_std")
         calendar = calendar.copy({"name": "Test calendar"})
         calendar.switch_calendar_type()
@@ -58,31 +70,35 @@ def _create_leave_allocation(self, leave_type, days):
         leave_allocation_form.number_of_days_display = days
         return leave_allocation_form.save()
 
-    def _create_hr_leave(self, leave_type, date_from, date_to):
+    def _create_hr_leave(self, leave_type, date_from, date_to=None):
+        if leave_type.request_unit == "natural_day_half_day":
+            return self.env["hr.leave"].create(
+                {
+                    "holiday_status_id": leave_type.id,
+                    "request_date_from": date_from,
+                    "request_date_to": date_to or date_from,
+                    "request_unit_half": True,
+                    "request_date_from_period": "am",
+                    "employee_id": self.employee.id,
+                }
+            )
+
         leave_form = Form(self.env["hr.leave"])
         leave_form.holiday_status_id = leave_type
         leave_form.request_date_from = date_from
-        if leave_type.request_unit == "natural_day_half_day":
-            leave_form.request_unit_half = True
-            leave_form.request_date_from_period = "am"
-        else:
+        if date_to:
             leave_form.request_date_to = date_to
         return leave_form.save()
 
     def _test_hr_leave_natural_day_01(self):
         leave_allocation = self._create_leave_allocation(self.leave_type, 5)
-        leave_allocation.sudo().action_validate()
-        res_leave_type = (
-            self.env["hr.leave.type"]
-            .with_company(self.env.company)
-            .get_allocation_data_request()[0][1]
+        leave_allocation.sudo()._action_validate()
+
+        self.assertEqual(leave_allocation.number_of_days, 5)
+        self.assertEqual(
+            self.leave_type.request_unit in ("natural_day", "natural_day_half_day"),
+            True,
         )
-        self.assertEqual(res_leave_type["remaining_leaves"], 5)
-        self.assertEqual(res_leave_type["virtual_remaining_leaves"], 5)
-        self.assertEqual(res_leave_type["max_leaves"], 5)
-        self.assertEqual(res_leave_type["leaves_taken"], 0)
-        self.assertEqual(res_leave_type["virtual_leaves_taken"], 0)
-        self.assertEqual(res_leave_type["request_unit"], self.leave_type.request_unit)
 
     @users("test-user")
     @mute_logger("odoo.models.unlink")
@@ -96,7 +112,7 @@ def test_hr_leave_natural_day_01(self):
     def test_hr_leave_natural_day_half_day_01(self):
         self.leave_type.request_unit = "natural_day_half_day"
         self._test_hr_leave_natural_day_01()
-        leave = self._create_hr_leave(self.leave_type, "2023-01-02", "2023-01-05")
+        leave = self._create_hr_leave(self.leave_type, "2023-01-02")
         self.assertEqual(leave.number_of_days, 0.5)
 
     def _test_hr_leave_natural_day_02(self):
@@ -125,7 +141,7 @@ def _test_hr_leave_natural_day_02(self):
         )
         self.employee.resource_calendar_id = calendar
         leave_allocation = self._create_leave_allocation(self.leave_type, 9)
-        leave_allocation.sudo().action_validate()
+        leave_allocation.sudo()._action_validate()
 
     @users("test-user")
     @mute_logger("odoo.models.unlink")
@@ -139,24 +155,16 @@ def test_hr_leave_natural_day_02(self):
     def test_hr_leave_natural_day_half_day_02(self):
         self.leave_type.request_unit = "natural_day_half_day"
         self._test_hr_leave_natural_day_02()
-        leave = self._create_hr_leave(self.leave_type, "2023-01-01", "2023-01-09")
+        leave = self._create_hr_leave(self.leave_type, "2023-01-01")
         self.assertEqual(leave.number_of_days, 0.5)
 
     @users("test-user")
     @mute_logger("odoo.models.unlink")
     def test_hr_leave_day(self):
         leave_allocation = self._create_leave_allocation(self.leave_type_day, 5)
-        leave_allocation.sudo().action_validate()
-        res_leave_type = (
-            self.env["hr.leave.type"]
-            .with_company(self.env.company)
-            .get_allocation_data_request()[0][1]
-        )
-        self.assertEqual(res_leave_type["remaining_leaves"], 5)
-        self.assertEqual(res_leave_type["virtual_remaining_leaves"], 5)
-        self.assertEqual(res_leave_type["max_leaves"], 5)
-        self.assertEqual(res_leave_type["leaves_taken"], 0)
-        self.assertEqual(res_leave_type["virtual_leaves_taken"], 0)
-        self.assertEqual(res_leave_type["request_unit"], "day")
+        leave_allocation.sudo()._action_validate()
+
+        self.assertEqual(leave_allocation.number_of_days, 5)
+        self.assertEqual(self.leave_type_day.request_unit, "day")
         leave = self._create_hr_leave(self.leave_type_day, "2023-01-08", "2023-01-15")
         self.assertEqual(leave.number_of_days, 5)
diff --git a/hr_holidays_natural_period/views/hr_leave_views.xml b/hr_holidays_natural_period/views/hr_leave_views.xml
@@ -5,24 +5,22 @@
         <field name="model">hr.leave</field>
         <field name="inherit_id" ref="hr_holidays.hr_leave_view_form" />
         <field name="arch" type="xml">
-            <label for="request_unit_half" position="attributes">
-                <attribute
-                    name="invisible"
-                >leave_type_request_unit in ('day', 'natural_day')</attribute>
-            </label>
             <xpath
-                expr="//label[@for='request_unit_half']/following-sibling::div"
+                expr="//div[hasclass('o_row')]/field[@name='request_date_from_period']"
                 position="attributes"
             >
                 <attribute
                     name="invisible"
-                >leave_type_request_unit in ('day', 'natural_day')</attribute>
+                >leave_type_request_unit in ('day', 'natural_day') or not request_unit_half</attribute>
             </xpath>
-            <field name="request_unit_half" position="attributes">
+            <xpath
+                expr="//div[hasclass('o_row')]/field[@name='request_date_to_period']"
+                position="attributes"
+            >
                 <attribute
                     name="invisible"
-                >leave_type_request_unit in ('day', 'natural_day')</attribute>
-            </field>
+                >leave_type_request_unit in ('day', 'natural_day') or not request_unit_half</attribute>
+            </xpath>
         </field>
     </record>
 </odoo>

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`{`
`5`	`5`	`"name": "Holidays natural period",`
`6`	`6`	`"summary": "Apply natural days in holidays",`
`7`		`- "version": "18.0.1.0.5",`
	`7`	`+ "version": "19.0.1.0.0",`
`8`	`8`	`"category": "Human Resources",`
`9`	`9`	`"website": "https://github.com/OCA/hr-holidays",`
`10`	`10`	`"author": "Tecnativa, Odoo Community Association (OCA)",`