diff --git a/hr_payroll_timesheet/__init__.py b/hr_payroll_timesheet/__init__.py index 73e9c28d..dc1ae41b 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-14' " + "SET code = 'TS_OT-PRE-INSTALL-15' " "WHERE code = 'TS_OT';" ) diff --git a/hr_payroll_timesheet/__manifest__.py b/hr_payroll_timesheet/__manifest__.py index ccd1c658..95c40294 100755 --- a/hr_payroll_timesheet/__manifest__.py +++ b/hr_payroll_timesheet/__manifest__.py @@ -3,7 +3,7 @@ { 'name': 'Timesheets on Payslips', 'description': 'Get Timesheet hours onto Employee Payslips.', - 'version': '14.0.1.0.0', + 'version': '15.0.1.0.0', 'website': 'https://hibou.io/', 'author': 'Hibou Corp. ', 'license': 'OPL-1', 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 deleted file mode 100644 index b4d0ae4a..00000000 --- a/hr_payroll_timesheet/migrations/14.0.0.0.1/pre-migration.py +++ /dev/null @@ -1,19 +0,0 @@ -# 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_payroll_timesheet/tests/test_payslip_timesheet.py b/hr_payroll_timesheet/tests/test_payslip_timesheet.py index 19287258..c1c348b5 100644 --- a/hr_payroll_timesheet/tests/test_payslip_timesheet.py +++ b/hr_payroll_timesheet/tests/test_payslip_timesheet.py @@ -156,7 +156,7 @@ class TestPayslipTimesheet(common.TestPayslip): }) self.payslip.state = 'draft' - self.payslip._onchange_employee() + self.payslip.action_refresh_from_work_entries() timesheet_line = self.payslip.worked_days_line_ids.filtered(lambda l: l.code == 'TS') timesheet_overtime_line = self.payslip.worked_days_line_ids.filtered(lambda l: l.code == 'TS_OT') self.assertTrue(timesheet_line)