Skip to content

[18.0][OU-FIX] hr_holidays: remove if employee is inactive #5398

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

Merged
MiquelRForgeFlow merged 1 commit into from
Oct 8, 2025
Merged

[18.0][OU-FIX] hr_holidays: remove if employee is inactive #5398

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
9 changes: 4 additions & 5 deletions openupgrade_scripts/scripts/hr_holidays/18.0.1.6/pre-migration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def split_employee_leaves(env):
SELECT leave.id, 'company', array_agg(he.id) as employee_ids
FROM {table} AS leave
JOIN hr_employee he ON he.company_id = leave.mode_company_id
WHERE leave.holiday_type = 'company' and he.active = True
WHERE leave.holiday_type = 'company'
GROUP BY leave.id
"""
)
Expand All @@ -136,8 +136,7 @@ def split_employee_leaves(env):
SELECT leave.id, 'category', array_agg(rel.employee_id) as employee_ids
FROM {table} AS leave
JOIN employee_category_rel rel ON rel.category_id = leave.category_id
JOIN hr_employee he ON he.id = rel.employee_id
WHERE leave.holiday_type = 'category' and he.active = True
WHERE leave.holiday_type = 'category'
GROUP BY leave.id
"""
)
Expand All @@ -148,13 +147,13 @@ def split_employee_leaves(env):
SELECT leave.id, 'department', array_agg(he.id) as employee_ids
FROM {table} AS leave
JOIN hr_employee he ON he.department_id = leave.department_id
WHERE leave.holiday_type = 'department' and he.active = True
WHERE leave.holiday_type = 'department'
GROUP BY leave.id
"""
)
leave_employees.extend(env.cr.fetchall())
for table_id, holiday_type, employee_ids in leave_employees:
employees = env["hr.employee"].browse(employee_ids)
employees = env["hr.employee"].browse(employee_ids).filtered("active")
if employee_ids:
openupgrade.logged_query(
env.cr,
Expand Down