Skip to content

[IMP] hr_holidays_leave_repeated: detect dates at limits #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hailangvn wants to merge 1 commit into
base: 17.0-mig-hr_holidays_leave_repeated
Choose a base branch
from
Open

[IMP] hr_holidays_leave_repeated: detect dates at limits #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion hr_holidays_leave_repeated/models/hr_leave.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# Copyright 2024- Le Filament (https://le-filament.com)
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).

from datetime import timedelta
from dateutil.relativedelta import relativedelta
from pytz import timezone, utc

Expand Down Expand Up @@ -89,7 +90,7 @@ def _update_repeated_leave_vals(self, leave, resource_calendar):
from_dt = fields.Datetime.from_string(leave.date_from)
to_dt = fields.Datetime.from_string(leave.date_to)

if (to_dt - from_dt).days > param_dict["days"]:
if to_dt - from_dt > timedelta(days=param_dict["days"]):
raise UserError(param_dict["user_error_msg"])

from_dt, to_dt = self._update_repeated_workday_dates(
Expand Down
4 changes: 2 additions & 2 deletions hr_holidays_leave_repeated/tests/test_holidays_leave_repeated.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,13 +198,13 @@ def test_06_check_dates(self):

def test_07_check_dates(self):
date_start = datetime(2019, 2, 18, 8, 0, 0, 0)
date_end = datetime(2019, 2, 20, 18, 0, 0, 0)
date_end = datetime(2019, 2, 25, 18, 0, 0, 0)
with self.assertRaises(UserError):
self.env["hr.leave"].create(
{
"holiday_status_id": self.status_1.id,
"holiday_type": "employee",
"repeat_every": "workday",
"repeat_every": "week",
"repeat_mode": "times",
"repeat_limit": 5,
"request_date_from": date_start,
Expand Down