Merge PR #149 into 16.0

Signed-off-by pedrobaeza

hr_holidays_natural_period_public/README.rst

@@ -0,0 +1,93 @@
+==============================
+Holidays Natural Period Public
+==============================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:a6309313893a7739105b60c835b3de3c9c63cd15e1b32e18f5d90b0f78bcbffc
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :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/16.0/hr_holidays_natural_period_public
+    :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-16-0/hr-holidays-16-0-hr_holidays_natural_period_public
+    :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=16.0
+    :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
+This is a glue module between `HR Holidays Public` and `HR Holidays Natural
+Period` modules.
+
+It allows the user to decide whether public holidays should be excluded from
+leave days computation or not, when the requested leave type uses natural days
+as the request unit.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Usage
+=====
+
+To choose whether you want to exclude public holidays from leave days
+computation, you can access the settings of the leave type and check or uncheck
+the box "Exclude public holidays". Also make sure that the "Request Unit" is
+set to "Natural Day".
+
+To access the settings of the leave type, you must navigate to `Time Off -->
+Configurations --> Time Off Types` and select the desired leave type.
+
+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_public%0Aversion:%2016.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* ForgeFlow
+
+Contributors
+~~~~~~~~~~~~
+
+* `ForgeFlow <https://forgeflow.com>`_:
+    * Laura Cazorla <[email protected]>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+This module is part of the `OCA/hr-holidays <https://github.com/OCA/hr-holidays/tree/16.0/hr_holidays_natural_period_public>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

hr_holidays_natural_period_public/__init__.py

@@ -0,0 +1,4 @@
+# Copyright 2024 ForgeFlow S.L. (https://www.forgeflow.com)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models

hr_holidays_natural_period_public/__manifest__.py

@@ -0,0 +1,17 @@
+# Copyright 2024 ForgeFlow S.L. (https://www.forgeflow.com)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Holidays Natural Period Public",
+    "summary": "Allow excluding public holidays for natural days holidays",
+    "version": "16.0.1.0.0",
+    "license": "AGPL-3",
+    "category": "Human Resources",
+    "author": "ForgeFlow, Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/hr-holidays",
+    "depends": ["hr_holidays_public", "hr_holidays_natural_period"],
+    "data": ["views/hr_leave_views.xml"],
+    "demo": ["demo/hr_leave_type_data.xml"],
+    "installable": True,
+    "application": False,
+}

hr_holidays_natural_period_public/demo/hr_leave_type_data.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo noupdate="1">
+    <record
+        id="hr_holidays_natural_period.hr_leave_type_natural_day_test"
+        model="hr.leave.type"
+    >
+        <field name="exclude_public_holidays">False</field>
+    </record>
+</odoo>

hr_holidays_natural_period_public/models/__init__.py

@@ -0,0 +1,4 @@
+# Copyright 2024 ForgeFlow S.L. (https://www.forgeflow.com)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import resource_calendar

hr_holidays_natural_period_public/models/resource_calendar.py

@@ -0,0 +1,20 @@
+# Copyright 2024 ForgeFlow S.L. (https://www.forgeflow.com)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import models
+
+
+class ResourceCalendar(models.Model):
+    _inherit = "resource.calendar"
+
+    def _attendance_intervals_batch(
+        self, start_dt, end_dt, resources=None, domain=None, tz=None
+    ):
+        result = super()._attendance_intervals_batch(
+            start_dt, end_dt, resources=resources, domain=domain, tz=tz
+        )
+        if self.env.context.get("exclude_public_holidays") and resources:
+            return self._attendance_intervals_batch_exclude_public_holidays(
+                start_dt, end_dt, result, resources, tz
+            )
+        return result

hr_holidays_natural_period_public/readme/CONTRIBUTORS.rst

@@ -0,0 +1,2 @@
+* `ForgeFlow <https://forgeflow.com>`_:
+    * Laura Cazorla <[email protected]>

hr_holidays_natural_period_public/readme/DESCRIPTION.rst

@@ -0,0 +1,6 @@
+This is a glue module between `HR Holidays Public` and `HR Holidays Natural
+Period` modules.
+
+It allows the user to decide whether public holidays should be excluded from
+leave days computation or not, when the requested leave type uses natural days
+as the request unit.

hr_holidays_natural_period_public/readme/USAGE.rst

@@ -0,0 +1,7 @@
+To choose whether you want to exclude public holidays from leave days
+computation, you can access the settings of the leave type and check or uncheck
+the box "Exclude public holidays". Also make sure that the "Request Unit" is
+set to "Natural Day".
+
+To access the settings of the leave type, you must navigate to `Time Off -->
+Configurations --> Time Off Types` and select the desired leave type.