diff --git a/hr_payroll_attendance/__init__.py b/hr_payroll_attendance/__init__.py index a366a01b..d3b52674 100755 --- a/hr_payroll_attendance/__init__.py +++ b/hr_payroll_attendance/__init__.py @@ -10,6 +10,6 @@ def attn_payroll_pre_init_hook(cr): from installing. """ cr.execute("UPDATE hr_work_entry_type " - "SET code = 'ATTN_OT-PRE-INSTALL' " + "SET code = 'ATTN_OT-PRE-INSTALL-14' " "WHERE code = 'ATTN_OT';" ) diff --git a/hr_payroll_timesheet/__init__.py b/hr_payroll_timesheet/__init__.py index 90502662..73e9c28d 100644 --- a/hr_payroll_timesheet/__init__.py +++ b/hr_payroll_timesheet/__init__.py @@ -10,6 +10,6 @@ def ts_payroll_pre_init_hook(cr): from installing. """ cr.execute("UPDATE hr_work_entry_type " - "SET code = 'TS_OT-PRE-INSTALL' " + "SET code = 'TS_OT-PRE-INSTALL-14' " "WHERE code = 'TS_OT';" ) diff --git a/hr_payroll_timesheet/migrations/14.0.0.0.1/pre-migration.py b/hr_payroll_timesheet/migrations/14.0.0.0.1/pre-migration.py new file mode 100644 index 00000000..b4d0ae4a --- /dev/null +++ b/hr_payroll_timesheet/migrations/14.0.0.0.1/pre-migration.py @@ -0,0 +1,19 @@ +# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details. + +import odoo + + +def migrate(cr, version): + """ + In 13.0, we had our own work type: + hr_payroll_timesheet.work_input_timesheet + + This was moved to `hr_timesheet_work_entry` + We will unlink the XML ref so that the record will be kept. + """ + env = odoo.api.Environment(cr, odoo.SUPERUSER_ID, {}) + xml_refs = env['ir.model.data'].search([ + ('module', '=', 'hr_payroll_timesheet'), + ('name', '=', 'work_input_timesheet'), + ]) + xml_refs.unlink() diff --git a/hr_timesheet_work_entry/__init__.py b/hr_timesheet_work_entry/__init__.py index 6e8e0aba..e58c8b0b 100644 --- a/hr_timesheet_work_entry/__init__.py +++ b/hr_timesheet_work_entry/__init__.py @@ -10,6 +10,6 @@ def ts_work_type_pre_init_hook(cr): from installing. """ cr.execute("UPDATE hr_work_entry_type " - "SET code = 'TS-PRE-INSTALL' " + "SET code = 'TS-PRE-INSTALL-14' " "WHERE code = 'TS';" )