Skip to content

Commit

Permalink
Merge PR #115 into 16.0
Browse files Browse the repository at this point in the history
Signed-off-by pedrobaeza
  • Loading branch information
OCA-git-bot committed Jul 1, 2024
2 parents 5d469dc + 1dd8fd9 commit 43f9f88
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions hr_holidays_public/models/hr_leave.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,16 @@ def action_validate(self):
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."""
if self.holiday_status_id.exclude_public_holidays or not self.holiday_status_id:
self = self.with_context(
employee_id=self.employee_id.id, exclude_public_holidays=True
)
return super(HrLeave, self).action_validate()
for leave in self:
if (
leave.holiday_status_id.exclude_public_holidays
or not leave.holiday_status_id
):
leave = leave.with_context(
employee_id=leave.employee_id.id, exclude_public_holidays=True
)
super(HrLeave, leave).action_validate()
return True

def _get_number_of_days(self, date_from, date_to, employee_id):
if self.holiday_status_id.exclude_public_holidays or not self.holiday_status_id:
Expand Down

0 comments on commit 43f9f88

Please sign in to comment.