[MIG] hr_leave_custom_hour_interval: Migration to 17.0

hr_leave_custom_hour_interval/README.rst

@@ -71,6 +71,7 @@ Contributors
 
    -  Olga Marco
    -  Enric Tobella
+   -  Duy Do Anh [email protected]
 
 Maintainers
 -----------

hr_leave_custom_hour_interval/__manifest__.py

@@ -5,7 +5,7 @@
     "name": "Custom Hour Interval for Holidays",
     "summary": """
         Edit start and end of leaves using time intervals""",
-    "version": "15.0.1.0.0",
+    "version": "17.0.1.0.0",
     "license": "AGPL-3",
     "author": "Creu Blanca,Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/hr-holidays",

hr_leave_custom_hour_interval/models/hr_leave.py

@@ -28,3 +28,20 @@ def _compute_hour_to(self):
     @api.depends("request_time_hour_from", "request_time_hour_to")
     def _compute_date_from_to(self):
         return super()._compute_date_from_to()
+
+    def action_validate(self):
+        """Inject the needed context for excluding public holidays (if applicable) on
+        the actions derived from this validation. This is required for example for
+        `project_timesheet_holidays` for not generating the timesheet on the public
+        holiday. Unfortunately, no regression test can be added, being in a separate
+        module.
+        """
+        for leave in self:
+            if (
+                leave.holiday_status_id.exclude_public_holidays
+                or not leave.holiday_status_id
+            ):
+                leave.with_context(
+                    employee_id=leave.employee_id.id, exclude_public_holidays=True
+                )
+        return super().action_validate()

hr_leave_custom_hour_interval/readme/CONTRIBUTORS.md

@@ -1,3 +1,4 @@
-- Creu Blanca  
+- Creu Blanca
   - Olga Marco
   - Enric Tobella
+  - Duy Do Anh <[email protected]>

hr_leave_custom_hour_interval/static/description/index.html

@@ -417,6 +417,7 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 <li>Creu Blanca<ul>
 <li>Olga Marco</li>
 <li>Enric Tobella</li>
+<li>Duy Do Anh <a class="reference external" href="mailto:duyda&#64;trobz.com">duyda&#64;trobz.com</a></li>
 </ul>
 </li>
 </ul>

hr_leave_custom_hour_interval/views/hr_leave.xml

@@ -9,30 +9,26 @@
         <field name="arch" type="xml">
             <field name="request_hour_from" position="attributes">
                 <attribute name="invisible">1</attribute>
-                <attribute name="attrs">{}</attribute>
             </field>
             <field name="request_hour_from" position="after">
                 <field
                     name="request_time_hour_from"
                     widget="float_time"
-                    attrs="{
-                        'readonly': [('state', '=', 'validate')],
-                        'required': [('request_unit_hours', '=', True)],
-                        'invisible': [('request_unit_hours', '=', False)]}"
+                    readonly="state == 'validate'"
+                    required="request_unit_hours"
+                    invisible="not request_unit_hours"
                 />
             </field>
             <field name="request_hour_to" position="attributes">
                 <attribute name="invisible">1</attribute>
-                <attribute name="attrs">{}</attribute>
             </field>
             <field name="request_hour_to" position="after">
                 <field
                     name="request_time_hour_to"
                     widget="float_time"
-                    attrs="{
-                        'readonly': [('state', '=', 'validate')],
-                        'required': [('request_unit_hours', '=', True)],
-                        'invisible': [('request_unit_hours', '=', False)]}"
+                    readonly="state == 'validate'"
+                    required="request_unit_hours"
+                    invisible="not request_unit_hours"
                 />
             </field>
         </field>