[MIG] hr_leave_date_to_custom_hour: migration to 18.0

Author: quirino95

hr_leave_date_to_custom_hour/__manifest__.py

@@ -4,7 +4,7 @@
 {
     "name": "Date to for custom hours",
     "summary": "Display Date to when custom hours is selected.",
-    "version": "16.0.1.0.0",
+    "version": "18.0.1.0.0",
     "license": "AGPL-3",
     "author": "PyTech, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/hr-holidays",

hr_leave_date_to_custom_hour/models/hr_leave.py

@@ -15,11 +15,15 @@ class HRLeave(models.Model):
         "custom_hours_request_date_to",
     )
     def _compute_date_from_to(self):
-        return super()._compute_date_from_to()
-
-    def _get_attendances(self, employee, request_date_from, request_date_to):
-        if len(self) == 1 and self.request_unit_hours:
-            self.request_date_to = request_date_to = (
-                self.custom_hours_request_date_to or self.request_date_to
+        res = super()._compute_date_from_to()
+        if (
+            len(self) == 1
+            and self.request_unit_hours
+            and self.custom_hours_request_date_to
+        ):
+            self.date_to = self._to_utc(
+                self.custom_hours_request_date_to,
+                self.request_hour_to,
+                self.employee_id or self,
             )
-        return super()._get_attendances(employee, request_date_from, request_date_to)
+        return res

hr_leave_date_to_custom_hour/tests/test_hr_leave.py

@@ -3,7 +3,7 @@
 
 from datetime import datetime, timedelta
 
-from odoo.tests.common import Form
+from odoo.tests import Form
 
 from odoo.addons.hr_holidays.tests.common import TestHrHolidaysCommon
 
@@ -63,4 +63,4 @@ def test_custom_hours_date_to(self):
         leave = self._create_user_leave(user, leave_from, leave_to)
 
         # Assert
-        self.assertEqual(leave.number_of_hours_display, leave_duration_hours)
+        self.assertEqual(leave.number_of_hours, leave_duration_hours)

hr_leave_date_to_custom_hour/views/hr_leave_views.xml

@@ -9,25 +9,21 @@
         <field name="model">hr.leave</field>
         <field name="inherit_id" ref="hr_holidays.hr_leave_view_form" />
         <field name="arch" type="xml">
-            <field name="request_date_from" position="before">
-                <span class="text-muted">From</span>
-            </field>
-            <field name="request_date_from" position="after">
-                <span class="text-muted">To</span>
-                <field
-                    name="custom_hours_request_date_to"
-                    widget="daterange"
-                    options="{
-                        'related_start_date': 'request_date_from',
-                    }"
-                />
-            </field>
-            <field name="request_date_from" position="attributes">
+            <xpath
+                expr="//div[hasclass('o_row')]/field[@name='request_date_from']"
+                position="after"
+            >
+                <field name="custom_hours_request_date_to" invisible="1" />
+            </xpath>
+            <xpath
+                expr="//div[hasclass('o_row')]/field[@name='request_date_from']"
+                position="attributes"
+            >
                 <attribute name="widget">daterange</attribute>
                 <attribute name="options">{
-                    'related_end_date': 'custom_hours_request_date_to',
+                    'end_date_field': 'custom_hours_request_date_to'
                 }</attribute>
-            </field>
+            </xpath>
         </field>
     </record>
 </odoo>