From 00c7d28b3901f8c244d29751679daaef0adf734b Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Wed, 15 Nov 2023 14:44:06 +0100 Subject: [PATCH 1/3] [ADD] hr_holidays_overlap --- hr_holidays_overlap/README.rst | 35 ++++++++++ hr_holidays_overlap/__init__.py | 1 + hr_holidays_overlap/__manifest__.py | 22 ++++++ hr_holidays_overlap/data/hr_leave_type.xml | 8 +++ hr_holidays_overlap/models/__init__.py | 2 + hr_holidays_overlap/models/hr_leave.py | 36 ++++++++++ hr_holidays_overlap/models/hr_leave_type.py | 66 ++++++++++++++++++ hr_holidays_overlap/readme/CONFIGURE.md | 5 ++ hr_holidays_overlap/readme/CONTEXT.md | 9 +++ hr_holidays_overlap/readme/CONTRIBUTORS.md | 1 + hr_holidays_overlap/readme/CREDITS.md | 20 ++++++ hr_holidays_overlap/readme/DESCRIPTION.md | 1 + hr_holidays_overlap/readme/USAGE.md | 5 ++ .../static/description/icon.png | Bin 0 -> 9455 bytes hr_holidays_overlap/tests/__init__.py | 1 + .../tests/test_hr_holidays_overlap.py | 65 +++++++++++++++++ hr_holidays_overlap/views/hr_leave_type.xml | 17 +++++ .../odoo/addons/hr_holidays_overlap | 1 + setup/hr_holidays_overlap/setup.py | 6 ++ 19 files changed, 301 insertions(+) create mode 100644 hr_holidays_overlap/README.rst create mode 100644 hr_holidays_overlap/__init__.py create mode 100644 hr_holidays_overlap/__manifest__.py create mode 100644 hr_holidays_overlap/data/hr_leave_type.xml create mode 100644 hr_holidays_overlap/models/__init__.py create mode 100644 hr_holidays_overlap/models/hr_leave.py create mode 100644 hr_holidays_overlap/models/hr_leave_type.py create mode 100644 hr_holidays_overlap/readme/CONFIGURE.md create mode 100644 hr_holidays_overlap/readme/CONTEXT.md create mode 100644 hr_holidays_overlap/readme/CONTRIBUTORS.md create mode 100644 hr_holidays_overlap/readme/CREDITS.md create mode 100644 hr_holidays_overlap/readme/DESCRIPTION.md create mode 100644 hr_holidays_overlap/readme/USAGE.md create mode 100644 hr_holidays_overlap/static/description/icon.png create mode 100644 hr_holidays_overlap/tests/__init__.py create mode 100644 hr_holidays_overlap/tests/test_hr_holidays_overlap.py create mode 100644 hr_holidays_overlap/views/hr_leave_type.xml create mode 120000 setup/hr_holidays_overlap/odoo/addons/hr_holidays_overlap create mode 100644 setup/hr_holidays_overlap/setup.py diff --git a/hr_holidays_overlap/README.rst b/hr_holidays_overlap/README.rst new file mode 100644 index 00000000..38929e87 --- /dev/null +++ b/hr_holidays_overlap/README.rst @@ -0,0 +1,35 @@ +**This file is going to be generated by oca-gen-addon-readme.** + +*Manual changes will be overwritten.* + +Please provide content in the ``readme`` directory: + +* **DESCRIPTION.rst** (required) +* INSTALL.rst (optional) +* CONFIGURE.rst (optional) +* **USAGE.rst** (optional, highly recommended) +* DEVELOP.rst (optional) +* ROADMAP.rst (optional) +* HISTORY.rst (optional, recommended) +* **CONTRIBUTORS.rst** (optional, highly recommended) +* CREDITS.rst (optional) + +Content of this README will also be drawn from the addon manifest, +from keys such as name, authors, maintainers, development_status, +and license. + +A good, one sentence summary in the manifest is also highly recommended. + + +Automatic changelog generation +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +`HISTORY.rst` can be auto generated using `towncrier `_. + +Just put towncrier compatible changelog fragments into `readme/newsfragments` +and the changelog file will be automatically generated and updated when a new fragment is added. + +Please refer to `towncrier` documentation to know more. + +NOTE: the changelog will be automatically generated when using `/ocabot merge $option`. +If you need to run it manually, refer to `OCA/maintainer-tools README `_. diff --git a/hr_holidays_overlap/__init__.py b/hr_holidays_overlap/__init__.py new file mode 100644 index 00000000..0650744f --- /dev/null +++ b/hr_holidays_overlap/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/hr_holidays_overlap/__manifest__.py b/hr_holidays_overlap/__manifest__.py new file mode 100644 index 00000000..9acc9fa4 --- /dev/null +++ b/hr_holidays_overlap/__manifest__.py @@ -0,0 +1,22 @@ +# Copyright 2023 Hunki Enterprises BV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0) + +{ + "name": "Overlapping leaves", + "summary": "Allows to configure holidays that overlap with others", + "version": "15.0.1.0.0", + "development_status": "Beta", + "category": "Human Resources/Time Off", + "website": "https://github.com/OCA/hr-holidays", + "author": "Hunki Enterprises BV, Odoo Community Association (OCA)", + "maintainers": ["hbrunn"], + "license": "AGPL-3", + "depends": [ + "hr_holidays", + ], + "data": [ + "data/hr_leave_type.xml", + "views/hr_leave_type.xml", + ], + "demo": [], +} diff --git a/hr_holidays_overlap/data/hr_leave_type.xml b/hr_holidays_overlap/data/hr_leave_type.xml new file mode 100644 index 00000000..2dab29e9 --- /dev/null +++ b/hr_holidays_overlap/data/hr_leave_type.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/hr_holidays_overlap/models/__init__.py b/hr_holidays_overlap/models/__init__.py new file mode 100644 index 00000000..775298ac --- /dev/null +++ b/hr_holidays_overlap/models/__init__.py @@ -0,0 +1,2 @@ +from . import hr_leave +from . import hr_leave_type diff --git a/hr_holidays_overlap/models/hr_leave.py b/hr_holidays_overlap/models/hr_leave.py new file mode 100644 index 00000000..726d6791 --- /dev/null +++ b/hr_holidays_overlap/models/hr_leave.py @@ -0,0 +1,36 @@ +# Copyright 2023 Hunki Enterprises BV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0) + + +from odoo import api, models + +exclude_sentinel = object() + + +class HrLeave(models.Model): + _inherit = "hr.leave" + + @api.constrains("date_from", "date_to", "employee_id") + def _check_date(self): + """Allow overlapping if the holiday type allows it""" + return super( + HrLeave, + self.with_context(hr_holidays_overlap_exclude=exclude_sentinel).filtered( + lambda x: not x.holiday_status_id.can_overlap + ), + )._check_date() + + @api.model + def search_count(self, args): + """Inject condition to exclude leaves whose type allows overlaps if asked so""" + if self.env.context.get("hr_holidays_overlap_exclude") == exclude_sentinel: + args += [("holiday_status_id.can_overlap", "=", False)] + return super().search_count(args) + + def _get_leaves_on_public_holiday(self): + """Don't count leaves with a type that allows overlap""" + return ( + super() + ._get_leaves_on_public_holiday() + .filtered(lambda x: not x.holiday_status_id.can_overlap) + ) diff --git a/hr_holidays_overlap/models/hr_leave_type.py b/hr_holidays_overlap/models/hr_leave_type.py new file mode 100644 index 00000000..c598b8ad --- /dev/null +++ b/hr_holidays_overlap/models/hr_leave_type.py @@ -0,0 +1,66 @@ +# Copyright 2023 Hunki Enterprises BV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0) + + +from odoo import fields, models + + +class HrLeaveType(models.Model): + _inherit = "hr.leave.type" + + can_overlap = fields.Boolean("Allow overlap with other leaves") + + def _get_employees_days_per_allocation(self, employee_ids, date=None): + """Remove overlapping days""" + HrLeave = self.env["hr.leave"] + + result = super()._get_employees_days_per_allocation(employee_ids, date=date) + + if not date: + date = fields.Date.to_date( + self.env.context.get("default_date_from") + ) or fields.Date.context_today(self) + + for employee_id in employee_ids: + for possible_overlap in HrLeave.search( + [ + ("employee_id", "=", employee_id), + ("state", "not in", ("draft", "refuse")), + ("holiday_status_id.can_overlap", "=", True), + ] + ): + for overlap in HrLeave.search( + [ + ("employee_id", "=", employee_id), + ("state", "not in", ("draft", "refuse")), + ("id", "not in", possible_overlap.ids), + ("date_from", "<", possible_overlap.date_to), + ("date_to", ">", possible_overlap.date_from), + ("holiday_status_id", "in", self.ids), + ] + ): + allocation_dict = result[employee_id][overlap.holiday_status_id] + number_of_days = overlap.employee_id._get_work_days_data_batch( + possible_overlap.date_from + if possible_overlap.date_from >= overlap.date_from + else overlap.date_from, + possible_overlap.date_to + if possible_overlap.date_to <= overlap.date_to + else overlap.date_to, + compute_leaves=False, + )[employee_id]["days"] + for allocation, allocation_days in allocation_dict.items(): + if ( + allocation + and allocation.date_to + and ( + allocation.date_to < date or allocation.date_from > date + ) + ): + continue + allocation_days["virtual_remaining_leaves"] += number_of_days + allocation_days["virtual_leaves_taken"] -= number_of_days + allocation_days["remaining_leaves"] += number_of_days + allocation_days["leaves_taken"] -= number_of_days + break + return result diff --git a/hr_holidays_overlap/readme/CONFIGURE.md b/hr_holidays_overlap/readme/CONFIGURE.md new file mode 100644 index 00000000..75873627 --- /dev/null +++ b/hr_holidays_overlap/readme/CONFIGURE.md @@ -0,0 +1,5 @@ +To configure this module, you need to: + +1. Go to _Time Off / Configuration / Time Off Types_ +2. Open a type you want to allow to overlap with other types +3. Check the box _Allow overlap with other leaves_ diff --git a/hr_holidays_overlap/readme/CONTEXT.md b/hr_holidays_overlap/readme/CONTEXT.md new file mode 100644 index 00000000..5945be9a --- /dev/null +++ b/hr_holidays_overlap/readme/CONTEXT.md @@ -0,0 +1,9 @@ +This module was developed because standard Odoo does not allow overlapping leaves. + +For legislations where being sick during vacation counts as sick day and not a vacation +day, you'd have to cancel the original vacation, and recreate sick leaves / vacation +leaves as necessary. + +With this module, you can simply allow overlapping for sick leaves, and add the sick +leave on top of the vacation leave. This will also deduct the sick days taken from the +vacation days taken. diff --git a/hr_holidays_overlap/readme/CONTRIBUTORS.md b/hr_holidays_overlap/readme/CONTRIBUTORS.md new file mode 100644 index 00000000..7cd1dd7b --- /dev/null +++ b/hr_holidays_overlap/readme/CONTRIBUTORS.md @@ -0,0 +1 @@ +- Holger Brunn (https://hunki-enterprises.com) diff --git a/hr_holidays_overlap/readme/CREDITS.md b/hr_holidays_overlap/readme/CREDITS.md new file mode 100644 index 00000000..3d0442e3 --- /dev/null +++ b/hr_holidays_overlap/readme/CREDITS.md @@ -0,0 +1,20 @@ + + +The development of this module has been financially supported by: + +- Company 1 name +- Company 2 name diff --git a/hr_holidays_overlap/readme/DESCRIPTION.md b/hr_holidays_overlap/readme/DESCRIPTION.md new file mode 100644 index 00000000..642d7d80 --- /dev/null +++ b/hr_holidays_overlap/readme/DESCRIPTION.md @@ -0,0 +1 @@ +This module makes it possible to have overlapping leaves. diff --git a/hr_holidays_overlap/readme/USAGE.md b/hr_holidays_overlap/readme/USAGE.md new file mode 100644 index 00000000..6ec67b02 --- /dev/null +++ b/hr_holidays_overlap/readme/USAGE.md @@ -0,0 +1,5 @@ +To use this module, you need to: + +1. Go to the Time Off app +2. Create and approve a paid leave +3. Note that you can create a sick leave for the same employee in the same interval diff --git a/hr_holidays_overlap/static/description/icon.png b/hr_holidays_overlap/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/hr_holidays_overlap/tests/__init__.py b/hr_holidays_overlap/tests/__init__.py new file mode 100644 index 00000000..78f5dd93 --- /dev/null +++ b/hr_holidays_overlap/tests/__init__.py @@ -0,0 +1 @@ +from . import test_hr_holidays_overlap diff --git a/hr_holidays_overlap/tests/test_hr_holidays_overlap.py b/hr_holidays_overlap/tests/test_hr_holidays_overlap.py new file mode 100644 index 00000000..cd750f08 --- /dev/null +++ b/hr_holidays_overlap/tests/test_hr_holidays_overlap.py @@ -0,0 +1,65 @@ +# Copyright 2023 Hunki Enterprises BV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0) + + +from datetime import timedelta + +from odoo.exceptions import ValidationError +from odoo.tests.common import TransactionCase + + +class TestHrHolidaysOverlap(TransactionCase): + def setUp(self): + super().setUp() + # add our leave after the existing demo sick leave to avoid + # unintended overlaps + demo_sick_leave = self.env.ref("hr_holidays.hr_holidays_cl_qdp") + self.paid_leave = demo_sick_leave.copy( + default={ + "name": "Paid leave", + "state": "confirm", + "holiday_status_id": self.env.ref("hr_holidays.holiday_status_cl").id, + # those two are needed to circumvent hr.leave#copy_data's check + "date_from": demo_sick_leave.date_to, + "date_to": demo_sick_leave.date_to + timedelta(days=2), + } + ) + self.paid_leave.action_approve() + self.paid_leave.action_validate() + + def test_overlap(self): + """Test that sick leaves may overlap paid leaves and deducts amounts""" + sick_leave = self.paid_leave.copy( + default={ + "name": "Sick leave", + "state": "confirm", + "holiday_status_id": self.env.ref("hr_holidays.holiday_status_sl").id, + "date_from": self.paid_leave.date_from, + "date_to": self.paid_leave.date_from + timedelta(days=1), + } + ) + sick_leave.action_validate() + paid_leave = self.paid_leave.with_context( + employee_id=self.paid_leave.employee_id.id + ) + # allocation is 20, with 2 days of paid leave it was 18, adding the sick day makes it 19 + self.assertEqual( + paid_leave.holiday_status_id.remaining_leaves, + 19, + ) + + def test_no_overlap(self): + """Test that we still don't allow overlapping for types not configured accordingly""" + with self.assertRaisesRegex( + ValidationError, "You can not set 2 time off that overlaps" + ): + self.paid_leave.copy( + default={ + "state": "confirm", + "holiday_status_id": self.env.ref( + "hr_holidays.holiday_status_unpaid" + ).id, + "date_from": self.paid_leave.date_from, + "date_to": self.paid_leave.date_to, + } + ) diff --git a/hr_holidays_overlap/views/hr_leave_type.xml b/hr_holidays_overlap/views/hr_leave_type.xml new file mode 100644 index 00000000..a55c4ee5 --- /dev/null +++ b/hr_holidays_overlap/views/hr_leave_type.xml @@ -0,0 +1,17 @@ + + + + + hr.leave.type + + + + + + + + diff --git a/setup/hr_holidays_overlap/odoo/addons/hr_holidays_overlap b/setup/hr_holidays_overlap/odoo/addons/hr_holidays_overlap new file mode 120000 index 00000000..73ffc431 --- /dev/null +++ b/setup/hr_holidays_overlap/odoo/addons/hr_holidays_overlap @@ -0,0 +1 @@ +../../../../hr_holidays_overlap \ No newline at end of file diff --git a/setup/hr_holidays_overlap/setup.py b/setup/hr_holidays_overlap/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/hr_holidays_overlap/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From b20af31e9765adfb80a9c2efb84ea449cbc51ff6 Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Wed, 22 Nov 2023 18:12:51 +0100 Subject: [PATCH 2/3] fixup! [ADD] hr_holidays_overlap --- hr_holidays_overlap/models/hr_leave_type.py | 28 ++++++++++++----- .../tests/test_hr_holidays_overlap.py | 31 ++++++++++++++++++- 2 files changed, 50 insertions(+), 9 deletions(-) diff --git a/hr_holidays_overlap/models/hr_leave_type.py b/hr_holidays_overlap/models/hr_leave_type.py index c598b8ad..7a23ed13 100644 --- a/hr_holidays_overlap/models/hr_leave_type.py +++ b/hr_holidays_overlap/models/hr_leave_type.py @@ -25,17 +25,17 @@ def _get_employees_days_per_allocation(self, employee_ids, date=None): for possible_overlap in HrLeave.search( [ ("employee_id", "=", employee_id), - ("state", "not in", ("draft", "refuse")), + ("state", "=", "validate"), ("holiday_status_id.can_overlap", "=", True), ] ): for overlap in HrLeave.search( [ ("employee_id", "=", employee_id), - ("state", "not in", ("draft", "refuse")), + ("state", "in", ("confirm", "validate1", "validate")), ("id", "not in", possible_overlap.ids), - ("date_from", "<", possible_overlap.date_to), - ("date_to", ">", possible_overlap.date_from), + ("date_from", "<=", possible_overlap.date_to), + ("date_to", ">=", possible_overlap.date_from), ("holiday_status_id", "in", self.ids), ] ): @@ -51,8 +51,9 @@ def _get_employees_days_per_allocation(self, employee_ids, date=None): )[employee_id]["days"] for allocation, allocation_days in allocation_dict.items(): if ( - allocation - and allocation.date_to + not allocation + or isinstance(allocation, str) + or allocation.date_to and ( allocation.date_to < date or allocation.date_from > date ) @@ -60,7 +61,18 @@ def _get_employees_days_per_allocation(self, employee_ids, date=None): continue allocation_days["virtual_remaining_leaves"] += number_of_days allocation_days["virtual_leaves_taken"] -= number_of_days - allocation_days["remaining_leaves"] += number_of_days - allocation_days["leaves_taken"] -= number_of_days + if possible_overlap.state == "validate": + allocation_days["remaining_leaves"] += number_of_days + allocation_days["leaves_taken"] -= number_of_days break + if "error" in allocation_dict: + allocation_dict["error"][ + "virtual_remaining_leaves" + ] += number_of_days + allocation_dict[False][ + "virtual_remaining_leaves" + ] += number_of_days + if not allocation_dict["error"]["virtual_remaining_leaves"]: + del allocation_dict["error"] + del allocation_dict[False] return result diff --git a/hr_holidays_overlap/tests/test_hr_holidays_overlap.py b/hr_holidays_overlap/tests/test_hr_holidays_overlap.py index cd750f08..c2303741 100644 --- a/hr_holidays_overlap/tests/test_hr_holidays_overlap.py +++ b/hr_holidays_overlap/tests/test_hr_holidays_overlap.py @@ -19,7 +19,7 @@ def setUp(self): "name": "Paid leave", "state": "confirm", "holiday_status_id": self.env.ref("hr_holidays.holiday_status_cl").id, - # those two are needed to circumvent hr.leave#copy_data's check + # those two are needed to bypass hr.leave#copy_data's check "date_from": demo_sick_leave.date_to, "date_to": demo_sick_leave.date_to + timedelta(days=2), } @@ -47,6 +47,35 @@ def test_overlap(self): paid_leave.holiday_status_id.remaining_leaves, 19, ) + # be sure we can use all 19 days for leave + new_leave = self.paid_leave.copy( + default={ + "name": "Paid leave", + "state": "confirm", + "holiday_status_id": self.env.ref("hr_holidays.holiday_status_cl").id, + "date_from": self.paid_leave.date_to, + "date_to": self.paid_leave.date_to + timedelta(days=27), + } + ) + new_leave.action_validate() + self.assertEqual(new_leave.number_of_days, 19) + self.assertEqual(new_leave.holiday_status_id.virtual_remaining_leaves, 0) + + with self.assertRaisesRegex( + ValidationError, + "The number of remaining time off is not sufficient for this time off type.", + ): + self.paid_leave.copy( + default={ + "name": "Paid leave", + "state": "confirm", + "holiday_status_id": self.env.ref( + "hr_holidays.holiday_status_cl" + ).id, + "date_from": new_leave.date_from, + "date_to": new_leave.date_to + timedelta(days=1), + } + ) def test_no_overlap(self): """Test that we still don't allow overlapping for types not configured accordingly""" From 19e4b489160f14aad3c6768b3e69fd9e6a182728 Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Mon, 29 Jan 2024 18:30:49 +0100 Subject: [PATCH 3/3] fixup! [ADD] hr_holidays_overlap --- hr_holidays_overlap/models/hr_leave_type.py | 64 ++++++++++++--------- 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/hr_holidays_overlap/models/hr_leave_type.py b/hr_holidays_overlap/models/hr_leave_type.py index 7a23ed13..bd8351da 100644 --- a/hr_holidays_overlap/models/hr_leave_type.py +++ b/hr_holidays_overlap/models/hr_leave_type.py @@ -12,8 +12,6 @@ class HrLeaveType(models.Model): def _get_employees_days_per_allocation(self, employee_ids, date=None): """Remove overlapping days""" - HrLeave = self.env["hr.leave"] - result = super()._get_employees_days_per_allocation(employee_ids, date=date) if not date: @@ -22,33 +20,11 @@ def _get_employees_days_per_allocation(self, employee_ids, date=None): ) or fields.Date.context_today(self) for employee_id in employee_ids: - for possible_overlap in HrLeave.search( - [ - ("employee_id", "=", employee_id), - ("state", "=", "validate"), - ("holiday_status_id.can_overlap", "=", True), - ] - ): - for overlap in HrLeave.search( - [ - ("employee_id", "=", employee_id), - ("state", "in", ("confirm", "validate1", "validate")), - ("id", "not in", possible_overlap.ids), - ("date_from", "<=", possible_overlap.date_to), - ("date_to", ">=", possible_overlap.date_from), - ("holiday_status_id", "in", self.ids), - ] + for this in result[employee_id]: + allocation_dict = result[employee_id][this] + for possible_overlap, _overlap, number_of_days in self._get_overlap( + employee_id ): - allocation_dict = result[employee_id][overlap.holiday_status_id] - number_of_days = overlap.employee_id._get_work_days_data_batch( - possible_overlap.date_from - if possible_overlap.date_from >= overlap.date_from - else overlap.date_from, - possible_overlap.date_to - if possible_overlap.date_to <= overlap.date_to - else overlap.date_to, - compute_leaves=False, - )[employee_id]["days"] for allocation, allocation_days in allocation_dict.items(): if ( not allocation @@ -76,3 +52,35 @@ def _get_employees_days_per_allocation(self, employee_ids, date=None): del allocation_dict["error"] del allocation_dict[False] return result + + def _get_overlap(self, employee_id): + """Return overlapping leaves and the working time of the overlap""" + HrLeave = self.env["hr.leave"] + + for possible_overlap in HrLeave.search( + [ + ("employee_id", "=", employee_id), + ("state", "=", "validate"), + ("holiday_status_id.can_overlap", "=", True), + ] + ): + for overlap in HrLeave.search( + [ + ("employee_id", "=", employee_id), + ("state", "in", ("confirm", "validate1", "validate")), + ("id", "not in", possible_overlap.ids), + ("date_from", "<=", possible_overlap.date_to), + ("date_to", ">=", possible_overlap.date_from), + ("holiday_status_id", "in", self.ids), + ] + ): + number_of_days = overlap.employee_id._get_work_days_data_batch( + possible_overlap.date_from + if possible_overlap.date_from >= overlap.date_from + else overlap.date_from, + possible_overlap.date_to + if possible_overlap.date_to <= overlap.date_to + else overlap.date_to, + compute_leaves=False, + )[employee_id]["days"] + yield possible_overlap, overlap, number_of_days