Skip to content

[FIX]hr_holidays_ux: Correct recursive function #57

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

Closed
jcadhoc wants to merge 1 commit into from
Closed

[FIX]hr_holidays_ux: Correct recursive function #57

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
18 changes: 10 additions & 8 deletions hr_holidays_ux/models/hr_leave.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,14 +264,16 @@ def _get_next_states_by_state(self):
def _check_approval_update(self, state, raise_if_not_possible=True):
"""Override to handle pre-validate state transitions."""
# For transitions from pre-validate state
if self.state == "pre-validate" and state == "validate":
# Allow transition from pre-validate to validate
is_officer = self.env.user.has_group("hr_holidays.group_hr_holidays_user")
is_time_off_manager = self.employee_id.leave_manager_id == self.env.user

if is_officer or is_time_off_manager:
return True

for leave in self:
if ((leave.state == "pre-validate" or leave.state == "validate") and state == "confirm") or (
leave.state == "confirm" and state == "validate"
):
# Allow transition from pre-validate to validate
is_officer = self.env.user.has_group("hr_holidays.group_hr_holidays_user")
is_time_off_manager = leave.employee_id.leave_manager_id == self.env.user

if is_officer or is_time_off_manager:
return True
if raise_if_not_possible:
from odoo.exceptions import UserError

Expand Down