Skip to content

Commit

Permalink
Merge pull request #2866 from ForgeFlow/14.0-MIG-hr_holidays
Browse files Browse the repository at this point in the history 
[14.0][MIG] hr_holidays
  • Loading branch information
@pedrobaeza
pedrobaeza authored Dec 11, 2021
2 parents fe1330a + f307754 commit 071826b
Show file tree
Hide file tree
Showing 5 changed files with 170 additions and 8 deletions.
2 changes: 1 addition & 1 deletion docsource/modules130-140.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ Module coverage 13.0 -> 14.0
+--------------------------------------------+-------------------------------------------------+
|hr_gamification | |
+--------------------------------------------+-------------------------------------------------+
|hr_holidays | |
|hr_holidays | Done |
+--------------------------------------------+-------------------------------------------------+
|hr_holidays_attendance | |
+--------------------------------------------+-------------------------------------------------+
Expand Down
14 changes: 7 additions & 7 deletions openupgrade_scripts/scripts/hr_holidays/14.0.1.5/noupdate_changes.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8'?>
<odoo>
<record id="holiday_status_cl" model="hr.leave.type">
<!-- <record id="holiday_status_cl" model="hr.leave.type">
<field name="allocation_notif_subtype_id" ref="mt_leave_allocation"/>
<field name="leave_notif_subtype_id" ref="mt_leave"/>
<field name="allocation_validation_type">both</field>
Expand All @@ -18,10 +18,10 @@
<field name="leave_notif_subtype_id" ref="mt_leave_unpaid"/>
<field name="allocation_validation_type">both</field>
<field name="leave_validation_type">both</field>
</record>
<record id="hr_holidays_status_rule_multi_company" model="ir.rule">
</record> -->
<!-- <record id="hr_holidays_status_rule_multi_company" model="ir.rule">
<field name="global"/>
</record>
</record> -->
<record id="hr_leave_allocation_rule_employee" model="ir.rule">
<field name="domain_force">[
'|',
Expand Down Expand Up @@ -57,9 +57,9 @@
]</field>
<field name="name">Allocations: holiday user : create/write</field>
</record>
<record id="hr_leave_rule_multicompany" model="ir.rule">
<field name="global"/>
</record>
<!--<record id="hr_leave_rule_multicompany" model="ir.rule">
<field name="global"/>
</record>-->
<record id="hr_leave_rule_user_read" model="ir.rule">
<field name="perm_create" eval="True"/>
<field name="perm_unlink" eval="True"/>
Expand Down
9 changes: 9 additions & 0 deletions openupgrade_scripts/scripts/hr_holidays/14.0.1.5/post-migration.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Copyright (C) 2021 Open Source Integrators
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
from openupgradelib import openupgrade


@openupgrade.migrate()
def migrate(env, version):
# Load noupdate changes
openupgrade.load_data(env.cr, "hr_holidays", "14.0.1.5/noupdate_changes.xml")
44 changes: 44 additions & 0 deletions openupgrade_scripts/scripts/hr_holidays/14.0.1.5/pre-migration.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Copyright (C) 2021 Open Source Integrators
# Copyright 2021 ForgeFlow S.L. <https://www.forgeflow.com>
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
from openupgradelib import openupgrade

_column_copies = {
"hr_leave_type": [("validation_type", "allocation_validation_type", "varchar")]
}

_field_renames = [
("hr.leave.type", "hr_leave_type", "validation_type", "leave_validation_type"),
]


@openupgrade.migrate()
def migrate(env, version):
openupgrade.copy_columns(env.cr, _column_copies)
openupgrade.rename_fields(env, _field_renames)
openupgrade.set_xml_ids_noupdate_value(
env,
"hr_holidays",
[
"hr_holidays_status_rule_multi_company",
"hr_leave_allocation_rule_employee",
"hr_leave_allocation_rule_employee_update",
"hr_leave_allocation_rule_manager",
"hr_leave_allocation_rule_multicompany",
"hr_leave_allocation_rule_officer_read",
"hr_leave_allocation_rule_officer_update",
"hr_leave_report_calendar_rule_multi_company",
"hr_leave_rule_employee",
"hr_leave_rule_employee_unlink",
"hr_leave_rule_employee_update",
"hr_leave_rule_manager",
"hr_leave_rule_multicompany",
"hr_leave_rule_officer_update",
"hr_leave_rule_responsible_read",
"hr_leave_rule_responsible_update",
"hr_leave_rule_user_read",
"resource_leaves_base_user",
"resource_leaves_holidays_user",
],
True,
)
109 changes: 109 additions & 0 deletions openupgrade_scripts/scripts/hr_holidays/14.0.1.5/upgrade_analysis_work.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
---Models in module 'hr_holidays'---
---Fields in module 'hr_holidays'---
hr_holidays / hr.employee / hr_icon_display (False) : NEW selection_keys: ['presence_absent', 'presence_absent_active', 'presence_holiday_absent', 'presence_holiday_present', 'presence_present', 'presence_to_define', 'presence_undetermined'], mode: modify
hr_holidays / hr.leave / private_name (char) : NEW
hr_holidays / hr.leave.allocation / private_name (char) : NEW
# NOTHING TO DO: new features

hr_holidays / hr.leave / message_has_sms_error (boolean): module is now 'sms' ('hr_holidays')
hr_holidays / hr.leave / website_message_ids (one2many): module is now 'portal' ('hr_holidays')
hr_holidays / hr.leave.allocation / message_has_sms_error (boolean): module is now 'sms' ('hr_holidays')
hr_holidays / hr.leave.allocation / website_message_ids (one2many): module is now 'portal' ('hr_holidays')
# NOTHING TO DO: handled by ORM

hr_holidays / hr.employee / leave_manager_id (many2one) : now a function
hr_holidays / hr.leave / category_id (many2one) : now a function
hr_holidays / hr.leave / date_from (datetime) : now a function
hr_holidays / hr.leave / date_to (datetime) : now a function
hr_holidays / hr.leave / department_id (many2one) : now a function
hr_holidays / hr.leave / duration_display (char) : is now stored
hr_holidays / hr.leave / employee_id (many2one) : now a function
hr_holidays / hr.leave / holiday_status_id (many2one) : now a function
hr_holidays / hr.leave / manager_id (many2one) : now a function
hr_holidays / hr.leave / mode_company_id (many2one) : now a function
hr_holidays / hr.leave / name (char) : not stored anymore
hr_holidays / hr.leave / name (char) : now a function
hr_holidays / hr.leave / number_of_days (float) : now a function
hr_holidays / hr.leave / request_unit_custom (boolean) : now a function
hr_holidays / hr.leave / request_unit_half (boolean) : now a function
hr_holidays / hr.leave / request_unit_hours (boolean) : now a function
hr_holidays / hr.leave / state (selection) : now a function
hr_holidays / hr.leave.allocation / category_id (many2one) : now a function
hr_holidays / hr.leave.allocation / date_to (datetime) : now a function
hr_holidays / hr.leave.allocation / department_id (many2one) : now a function
hr_holidays / hr.leave.allocation / employee_id (many2one) : now a function
hr_holidays / hr.leave.allocation / holiday_status_id (many2one) : now a function
hr_holidays / hr.leave.allocation / interval_number (integer) : now a function
hr_holidays / hr.leave.allocation / interval_unit (selection) : now a function
hr_holidays / hr.leave.allocation / manager_id (many2one) : now a function
hr_holidays / hr.leave.allocation / mode_company_id (many2one) : now a function
hr_holidays / hr.leave.allocation / name (char) : not stored anymore
hr_holidays / hr.leave.allocation / name (char) : now a function
hr_holidays / hr.leave.allocation / number_of_days (float) : now a function
hr_holidays / hr.leave.allocation / number_per_interval (float) : now a function
hr_holidays / hr.leave.allocation / unit_per_interval (selection) : now a function
# NOTHING TO DO

hr_holidays / hr.leave.allocation / interval_unit (selection) : selection_keys is now '['days', 'months', 'weeks', 'years']' ('['months', 'weeks', 'years']')
# NOTHING TO DO: added 'days' option

hr_holidays / hr.leave.type / allocation_validation_type (selection): NEW selection_keys: ['both', 'hr', 'manager'], hasdefault
hr_holidays / hr.leave.type / leave_validation_type (selection): NEW selection_keys: ['both', 'hr', 'manager', 'no_validation'], hasdefault
hr_holidays / hr.leave.type / validation_type (selection) : DEL selection_keys: ['both', 'hr', 'manager', 'no_validation']
# DONE: pre-migration: renamed field

---XML records in module 'hr_holidays'---
DEL ir.actions.act_window: hr_holidays.hr_leave_action_all
DEL ir.actions.act_window: hr_holidays.hr_leave_action_payroll
NEW ir.actions.act_window.view: hr_holidays.action_view_activity_manager_approve
NEW ir.actions.act_window.view: hr_holidays.action_view_calendar_manager_approve
NEW ir.model.access: hr_holidays.access_hr_holidays_summary_employee
NEW ir.rule: hr_holidays.hr_leav_allocation_rule_employee_unlink (noupdate)
# NOTHING TO DO

NEW ir.model.access: hr_holidays.access_hr_leave_report_calendar [renamed from hr_holidays_calendar module]
DEL ir.model.access: hr_holidays_calendar.access_hr_leave_report_calendar [renamed to hr_holidays module]
# NOTHING TO DO: the prefix is corrected when merging the module

ir.rule: hr_holidays.hr_holidays_status_rule_multi_company (noupdate) (noupdate switched)
ir.rule: hr_holidays.hr_leave_allocation_rule_employee (noupdate) (noupdate switched)
ir.rule: hr_holidays.hr_leave_allocation_rule_employee_update (noupdate) (noupdate switched)
ir.rule: hr_holidays.hr_leave_allocation_rule_manager (noupdate) (noupdate switched)
ir.rule: hr_holidays.hr_leave_allocation_rule_multicompany (noupdate) (noupdate switched)
ir.rule: hr_holidays.hr_leave_allocation_rule_officer_read (noupdate) (noupdate switched)
ir.rule: hr_holidays.hr_leave_allocation_rule_officer_update (noupdate) (noupdate switched)
NEW ir.rule: hr_holidays.hr_leave_report_calendar_rule_multi_company [renamed from hr_holidays_calendar module] (noupdate) (noupdate switched)
DEL ir.rule: hr_holidays_calendar.hr_leave_report_calendar_rule_multi_company [renamed to hr_holidays module]
ir.rule: hr_holidays.hr_leave_rule_employee (noupdate) (noupdate switched)
ir.rule: hr_holidays.hr_leave_rule_employee_unlink (noupdate) (noupdate switched)
ir.rule: hr_holidays.hr_leave_rule_employee_update (noupdate) (noupdate switched)
ir.rule: hr_holidays.hr_leave_rule_manager (noupdate) (noupdate switched)
ir.rule: hr_holidays.hr_leave_rule_multicompany (noupdate) (noupdate switched)
ir.rule: hr_holidays.hr_leave_rule_officer_update (noupdate) (noupdate switched)
ir.rule: hr_holidays.hr_leave_rule_responsible_read (noupdate) (noupdate switched)
ir.rule: hr_holidays.hr_leave_rule_responsible_update (noupdate) (noupdate switched)
ir.rule: hr_holidays.hr_leave_rule_user_read (noupdate) (noupdate switched)
ir.rule: hr_holidays.resource_leaves_base_user (noupdate) (noupdate switched)
ir.rule: hr_holidays.resource_leaves_holidays_user (noupdate) (noupdate switched)
# DONE: pre-migration: switched noupdate

DEL ir.ui.menu: hr_holidays.hr_holidays_menu_manager_all
DEL ir.ui.menu: hr_holidays.hr_holidays_menu_manager_all_allocations
DEL ir.ui.menu: hr_holidays.hr_holidays_menu_manager_approve
DEL ir.ui.menu: hr_holidays.hr_holidays_menu_manager_payroll
DEL ir.ui.menu: hr_holidays.hr_holidays_menu_manager_payroll_to_report
DEL ir.ui.menu: hr_holidays.menu_open_employee_leave
NEW ir.ui.view: hr_holidays.hr_departure_wizard_view_form
NEW ir.ui.view: hr_holidays.hr_kanban_view_public_employees_kanban
NEW ir.ui.view: hr_holidays.hr_leave_allocation_view_search_manager
NEW ir.ui.view: hr_holidays.hr_leave_allocation_view_search_my
NEW ir.ui.view: hr_holidays.hr_leave_report_calendar_view
NEW ir.ui.view: hr_holidays.hr_leave_report_calendar_view_form
NEW ir.ui.view: hr_holidays.hr_leave_view_form_dashboard_new_time_off
NEW ir.ui.view: hr_holidays.hr_leave_view_search_manager
NEW ir.ui.view: hr_holidays.hr_leave_view_search_my
NEW ir.ui.view: hr_holidays.view_employee_tree_inherit_leave
DEL ir.ui.view: hr_holidays.hr_leave_view_form_manager_approve
DEL ir.ui.view: hr_holidays_calendar.hr_leave_report_calendar_view
DEL ir.ui.view: hr_holidays_calendar.hr_leave_report_calendar_view_form
# NOTHING TO DO

0 comments on commit 071826b

Please sign in to comment.