[18.0][OU-ADD] hr_holidays #5023

BhaveshHeliconia · 2025-05-13T06:30:04Z

Depends on

[18.0][OU-ADD] hr #5006

legalsylvain · 2025-05-13T06:38:45Z

/ocabot migration hr_holidays

remi-filament

Hi @BhaveshHeliconia thank you for this PR, there is still some work to do IMO

remi-filament · 2025-06-10T10:32:49Z

openupgrade_scripts/scripts/hr_holidays/18.0.1.6/upgrade_analysis_work.txt

+DEL ir.ui.view: hr_holidays.hr_departure_wizard_view_form
+DEL ir.ui.view: hr_holidays.hr_leave_report_search_view
+NEW mail.activity.type: hr_holidays.mail_act_leave_allocation_second_approval (noupdate)
+DEL mail.message.subtype: hr_holidays.mt_leave_home_working (noupdate)


This one you need to delete manually since it is noupdate.

remi-filament · 2025-06-10T10:40:48Z

openupgrade_scripts/scripts/hr_holidays/18.0.1.6/upgrade_analysis_work.txt

+hr_holidays  / hr.employee              / current_leave_state (selection): selection_keys is now '['cancel', 'confirm', 'refuse', 'validate', 'validate1']' ('['cancel', 'confirm', 'draft', 'refuse', 'validate', 'validate1']')
+hr_holidays  / hr.employee              / hr_icon_display (False)       : selection_keys is now '['presence_absent', 'presence_archive', 'presence_holiday_absent', 'presence_holiday_present', 'presence_out_of_working_hour', 'presence_present', 'presence_undetermined']' ('['presence_absent', 'presence_absent_active', 'presence_holiday_absent', 'presence_holiday_present', 'presence_present', 'presence_to_define', 'presence_undetermined']')


You may want to precise that these 2 are Nothing to do since they are computed non stored fields

remi-filament · 2025-06-10T11:54:05Z

openupgrade_scripts/scripts/hr_holidays/18.0.1.6/upgrade_analysis_work.txt

+hr_holidays  / hr.employee              / hr_icon_display (False)       : selection_keys is now '['presence_absent', 'presence_archive', 'presence_holiday_absent', 'presence_holiday_present', 'presence_out_of_working_hour', 'presence_present', 'presence_undetermined']' ('['presence_absent', 'presence_absent_active', 'presence_holiday_absent', 'presence_holiday_present', 'presence_present', 'presence_to_define', 'presence_undetermined']')
+hr_holidays  / hr.leave                 / active (boolean)              : DEL
+hr_holidays  / hr.leave                 / category_id (many2one)        : DEL relation: hr.employee.category
+hr_holidays  / hr.leave                 / employee_id (many2one)        : now required


You need to set an employee in case you had leaves without employee.
It should be decided what should be done of this hr_leaves which were not assigned to an employee but either to category of employees, department, company since these are not supported anymore. Should these be deleted ?

remi-filament · 2025-06-10T11:58:11Z

openupgrade_scripts/scripts/hr_holidays/18.0.1.6/upgrade_analysis_work.txt

+hr_holidays  / hr.leave                 / holiday_type (selection)      : DEL required, selection_keys: ['category', 'company', 'department', 'employee']
+hr_holidays  / hr.leave                 / linked_request_ids (one2many) : DEL relation: hr.leave
+hr_holidays  / hr.leave                 / mode_company_id (many2one)    : DEL relation: res.company
+hr_holidays  / hr.leave                 / multi_employee (boolean)      : DEL
+hr_holidays  / hr.leave                 / parent_id (many2one)          : DEL relation: hr.leave
+hr_holidays  / hr.leave                 / report_note (text)            : DEL


These should be handled together with above comment about what should be done with multi employee hr_leave which are not allowed anymore

remi-filament · 2025-06-10T11:59:46Z

openupgrade_scripts/scripts/hr_holidays/18.0.1.6/upgrade_analysis_work.txt

+hr_holidays  / hr.leave.allocation      / actual_lastcall (date)        : NEW
+hr_holidays  / hr.leave.allocation      / carried_over_days_expiration_date (date): NEW
+hr_holidays  / hr.leave.allocation      / category_id (many2one)        : DEL relation: hr.employee.category
+hr_holidays  / hr.leave.allocation      / employee_id (many2one)        : now required


The same as above for hr.leave applies to hr.leave.allocation where multi-employee allocations are not allowed anymore

remi-filament · 2025-06-10T12:01:45Z

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

+    openupgrade.logged_query(
+        env.cr,
+        """
+        UPDATE hr_leave SET request_hour_to = request_hour_to_float
+        WHERE request_hour_to_float IS NOT NULL;
+        UPDATE hr_leave SET request_hour_from = request_hour_from_float
+        WHERE request_hour_from_float IS NOT NULL;
+
+        """,
+    )


This should be done in pre-migration

remi-filament · 2025-06-10T12:02:21Z

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

+    openupgrade.logged_query(
+        env.cr,
+        """
+            ALTER TABLE hr_leave DROP COLUMN request_hour_to_float;
+            ALTER TABLE hr_leave DROP COLUMN request_hour_from_float;
+
+            """,
+    )


This will be handled by ORM during upgrade

remi-filament · 2025-06-10T12:03:06Z

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

+    openupgrade.logged_query(
+        env.cr,
+        """
+        ALTER TABLE hr_leave ADD COLUMN request_hour_to_float float;
+        ALTER TABLE hr_leave ADD COLUMN request_hour_from_float float;
+        """,
+    )
+    openupgrade.logged_query(
+        env.cr,
+        """
+        UPDATE hr_leave SET request_hour_to_float = request_hour_to::float
+        WHERE request_hour_to IS NOT NULL;
+        UPDATE hr_leave SET request_hour_from_float = request_hour_from::float
+        WHERE request_hour_from IS NOT NULL;
+
+        """,
+    )


Here you should pre-create destination column (request_hour_to / request_hour_from) and copy data inside instead of creating temporary column

remi-filament · 2025-06-10T12:04:44Z

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

+    openupgrade.logged_query(
+        env.cr,
+        """
+        DELETE FROM ir_model_fields_selection
+        WHERE field_id IN (
+            SELECT f.id
+            FROM ir_model_fields f
+            JOIN ir_model m ON f.model_id = m.id
+            WHERE f.name = 'request_hour_to' AND m.model = 'hr.leave'
+        );
+        DELETE FROM ir_model_fields_selection
+        WHERE field_id IN (
+            SELECT f.id
+            FROM ir_model_fields f
+            JOIN ir_model m ON f.model_id = m.id
+            WHERE f.name = 'request_hour_from' AND m.model = 'hr.leave'
+        );
+        """,
+    )
+
+    # Remove the Many2many relation table if it exists
+    openupgrade.logged_query(
+        env.cr,
+        """
+        DROP TABLE IF EXISTS hr_employee_hr_leave_allocation_rel CASCADE
+        """,
+    )
+
+    # Optionally drop the column from the table (not usually required for M2M)
+    openupgrade.logged_query(
+        env.cr,
+        """
+        ALTER TABLE hr_leave_allocation
+        DROP COLUMN IF EXISTS employee_ids
+        """,
+    )


I think that all these steps are unecessary as will be performed by ORM during upgrade

remi-filament · 2025-06-10T12:05:40Z

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

+    openupgrade.logged_query(
+        env.cr,
+        """
+        DELETE FROM ir_rule
+        WHERE id = (
+            SELECT res_id FROM ir_model_data
+            WHERE module = 'hr_holidays'
+            AND name = 'hr_leave_allocation_rule_multicompany'
+        )
+        """,
+    )


Here you better use delete_records_safely_by_xml_id() function from openupgradelib

OCA-git-bot added this to the 18.0 milestone May 13, 2025

OCA-git-bot mentioned this pull request May 13, 2025

Migration to version 18.0 #4519

Open

BhaveshHeliconia force-pushed the 18.0-mig-hr_holidays branch from a0a2990 to 04af498 Compare May 13, 2025 09:04

BhaveshHeliconia mentioned this pull request May 13, 2025

[18.0][OU-ADD] hr_holidays_attendance: Nothing to do #5025

Open

BhaveshHeliconia force-pushed the 18.0-mig-hr_holidays branch 2 times, most recently from 6d153ec to ec1b791 Compare May 14, 2025 10:23

legalsylvain added the Blocked by dependency label May 15, 2025

BhaveshHeliconia force-pushed the 18.0-mig-hr_holidays branch from ec1b791 to 861a206 Compare May 19, 2025 09:32

MiquelRForgeFlow added Dependency OK and removed Blocked by dependency labels May 30, 2025

[OU-ADD] hr_holidays

923762e

BhaveshHeliconia force-pushed the 18.0-mig-hr_holidays branch from 861a206 to 923762e Compare June 3, 2025 02:55

remi-filament suggested changes Jun 10, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

[18.0][OU-ADD] hr_holidays #5023

[18.0][OU-ADD] hr_holidays #5023

Uh oh!

BhaveshHeliconia commented May 13, 2025 •

edited

Loading

Uh oh!

legalsylvain commented May 13, 2025 •

edited

Loading

Uh oh!

remi-filament left a comment

Uh oh!

remi-filament Jun 10, 2025

Uh oh!

remi-filament Jun 10, 2025

Uh oh!

remi-filament Jun 10, 2025

Uh oh!

remi-filament Jun 10, 2025

Uh oh!

remi-filament Jun 10, 2025

Uh oh!

remi-filament Jun 10, 2025

Uh oh!

remi-filament Jun 10, 2025

Uh oh!

remi-filament Jun 10, 2025

Uh oh!

remi-filament Jun 10, 2025

Uh oh!

remi-filament Jun 10, 2025

Uh oh!

Uh oh!

		hr_holidays / hr.employee / current_leave_state (selection): selection_keys is now '['cancel', 'confirm', 'refuse', 'validate', 'validate1']' ('['cancel', 'confirm', 'draft', 'refuse', 'validate', 'validate1']')
		hr_holidays / hr.employee / hr_icon_display (False) : selection_keys is now '['presence_absent', 'presence_archive', 'presence_holiday_absent', 'presence_holiday_present', 'presence_out_of_working_hour', 'presence_present', 'presence_undetermined']' ('['presence_absent', 'presence_absent_active', 'presence_holiday_absent', 'presence_holiday_present', 'presence_present', 'presence_to_define', 'presence_undetermined']')

Uh oh!

[18.0][OU-ADD] hr_holidays #5023

Are you sure you want to change the base?

[18.0][OU-ADD] hr_holidays #5023

Uh oh!

Conversation

BhaveshHeliconia commented May 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

legalsylvain commented May 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

remi-filament left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

BhaveshHeliconia commented May 13, 2025 •

edited

Loading

legalsylvain commented May 13, 2025 •

edited

Loading