Skip to content

Commit b14fec1

Browse files
[OU-FIX] hr_holidays: remove if employee is inactive
1 parent 3767346 commit b14fec1

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

openupgrade_scripts/scripts/hr_holidays/18.0.1.6/pre-migration.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ def split_employee_leaves(env):
125125
SELECT leave.id, 'company', array_agg(he.id) as employee_ids
126126
FROM {table} AS leave
127127
JOIN hr_employee he ON he.company_id = leave.mode_company_id
128-
WHERE leave.holiday_type = 'company' and he.active = True
128+
WHERE leave.holiday_type = 'company'
129129
GROUP BY leave.id
130130
"""
131131
)
@@ -137,7 +137,7 @@ def split_employee_leaves(env):
137137
FROM {table} AS leave
138138
JOIN employee_category_rel rel ON rel.category_id = leave.category_id
139139
JOIN hr_employee he ON he.id = rel.employee_id
140-
WHERE leave.holiday_type = 'category' and he.active = True
140+
WHERE leave.holiday_type = 'category'
141141
GROUP BY leave.id
142142
"""
143143
)
@@ -148,13 +148,13 @@ def split_employee_leaves(env):
148148
SELECT leave.id, 'department', array_agg(he.id) as employee_ids
149149
FROM {table} AS leave
150150
JOIN hr_employee he ON he.department_id = leave.department_id
151-
WHERE leave.holiday_type = 'department' and he.active = True
151+
WHERE leave.holiday_type = 'department'
152152
GROUP BY leave.id
153153
"""
154154
)
155155
leave_employees.extend(env.cr.fetchall())
156156
for table_id, holiday_type, employee_ids in leave_employees:
157-
employees = env["hr.employee"].browse(employee_ids)
157+
employees = env["hr.employee"].browse(employee_ids).filtered("active")
158158
if employee_ids:
159159
openupgrade.logged_query(
160160
env.cr,

0 commit comments

Comments
 (0)