[18.0][OU-ADD] hr_holidays #5260
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openupgrade_scripts/scripts/hr_holidays/18.0.1.6/upgrade_analysis_work.txt
Outdated
Show resolved
Hide resolved
Contributor
Author
|
/ocabot migration hr_holidays |
MiquelRForgeFlow
force-pushed
the
18.0-mig-hr_holidays
branch
from
b23f267 to
968e4f7
Compare
This comment was marked as spam.
This comment was marked as spam.
This comment was marked as spam.
This comment was marked as spam.
Contributor
|
Previous comments looks very much like text generated by artificial stupidity... |
MiquelRForgeFlow
force-pushed
the
18.0-mig-hr_holidays
branch
from
968e4f7 to
d8d41e2
Compare
MiquelRForgeFlow
commented
Aug 1, 2025
| # DONE: pre-migration: officer -> hr, no -> no_validation | ||
|
|
||
| hr_holidays / hr.leave.type / include_public_holidays_in_duration (boolean): NEW hasdefault: default | ||
| # NOTHING TO DO: new feature |
Contributor
Author
There was a problem hiding this comment.
Need to consider whether we should do something due to https://github.com/OCA/hr-holidays/tree/18.0/hr_holidays_public/
Contributor
Author
There was a problem hiding this comment.
In fact, "considering hr_holidays_public" is outside this PR. So, if somebody want to analyze compatibilities, feel free.
MiquelRForgeFlow
force-pushed
the
18.0-mig-hr_holidays
branch
6 times, most recently
from
acb94fb to
a566ec0
Compare
MiquelRForgeFlow
force-pushed
the
18.0-mig-hr_holidays
branch
from
a566ec0 to
c7be1e5
Compare
Comment on lines
+88
to
+181
| def split_employee_leaves(env): | ||
| for table in ["hr_leave", "hr_leave_allocation"]: | ||
| env.cr.execute( | ||
| f""" | ||
| SELECT column_name | ||
| FROM information_schema.columns | ||
| WHERE table_name = '{table}' | ||
| """ | ||
| ) | ||
| columns = ", ".join( | ||
| [x[0] for x in env.cr.fetchall() if x[0] not in ("id", "employee_id")] | ||
| ) | ||
| leave_employees = [] | ||
| # case multi_employee | ||
| env.cr.execute( | ||
| f""" | ||
| SELECT leave.id, 'employee', array_agg(rel.hr_employee_id) as employee_ids | ||
| FROM {table} AS leave | ||
| JOIN hr_employee_{table}_rel rel ON rel.{table}_id = leave.id | ||
| WHERE leave.holiday_type = 'employee' AND leave.multi_employee | ||
| GROUP BY leave.id | ||
| """ | ||
| ) | ||
| leave_employees.extend(env.cr.fetchall()) | ||
| # case company | ||
| env.cr.execute( | ||
| f""" | ||
| 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' | ||
| GROUP BY leave.id | ||
| """ | ||
| ) | ||
| leave_employees.extend(env.cr.fetchall()) | ||
| # case category | ||
| env.cr.execute( | ||
| f""" | ||
| 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 | ||
| WHERE leave.holiday_type = 'category' | ||
| GROUP BY leave.id | ||
| """ | ||
| ) | ||
| leave_employees.extend(env.cr.fetchall()) | ||
| # case department | ||
| env.cr.execute( | ||
| f""" | ||
| 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' | ||
| 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) | ||
| if employee_ids: | ||
| openupgrade.logged_query( | ||
| env.cr, | ||
| f""" | ||
| UPDATE {table} | ||
| SET employee_id = {employees[0].id} | ||
| WHERE id = {table_id} | ||
| """, | ||
| ) | ||
| if holiday_type != "employee": | ||
| openupgrade.logged_query( | ||
| env.cr, | ||
| f""" | ||
| UPDATE {table} | ||
| SET holiday_type = 'employee' | ||
| WHERE id = {table_id} | ||
| """, | ||
| ) | ||
| for employee in employees[1:]: | ||
| openupgrade.logged_query( | ||
| env.cr, | ||
| f""" | ||
| INSERT INTO {table} (employee_id, {columns}) | ||
| SELECT {employee.id}, {columns} | ||
| FROM {table} | ||
| WHERE id = {table_id} | ||
| """, | ||
| ) | ||
| else: | ||
| openupgrade.logged_query( | ||
| env.cr, | ||
| f""" | ||
| DELETE FROM {table} WHERE id = {table_id} | ||
| """, | ||
| ) |
Contributor
There was a problem hiding this comment.
Hi @MiquelRForgeFlow are you sure about that one ?
On my database, everytime I had a leave or allocation concerning multiple employees, individuals leave or allocations were also created for each one of these.
Now running migration on my database, I end up with duplicate leave and allocations (even worse when I had allocation for company, it created allocations for employees which are not anymore under contract for years).
Maybe we should do that only for leave / allocation which are in draft state only ?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Supersedes #5023.