diff --git a/hr_payroll_attendance/__init__.py b/hr_payroll_attendance/__init__.py index 4e3ff034..a366a01b 100755 --- a/hr_payroll_attendance/__init__.py +++ b/hr_payroll_attendance/__init__.py @@ -3,16 +3,12 @@ from . import models def attn_payroll_pre_init_hook(cr): """ - This module installs a Work Entry Type with code "ATTN" + This module installs a Work Entry Type with code "ATTN_OT" If you have undergone a migration (either for this module - or even your own Payslip Work Entry lines with code "ATTN") + or even your own Payslip Work Entry lines with code "ATTN_OT") then the uniqueness constraint will prevent this module from installing. """ - cr.execute("UPDATE hr_work_entry_type " - "SET code = 'ATTN-PRE-INSTALL' " - "WHERE code = 'ATTN';" - ) cr.execute("UPDATE hr_work_entry_type " "SET code = 'ATTN_OT-PRE-INSTALL' " "WHERE code = 'ATTN_OT';" diff --git a/hr_payroll_attendance/__manifest__.py b/hr_payroll_attendance/__manifest__.py index 3a1be326..bb68d371 100755 --- a/hr_payroll_attendance/__manifest__.py +++ b/hr_payroll_attendance/__manifest__.py @@ -15,6 +15,7 @@ 'depends': [ 'hr_payroll', 'hr_attendance', + 'hr_attendance_work_entry', 'hr_payroll_overtime', ], 'pre_init_hook': 'attn_payroll_pre_init_hook', diff --git a/hr_payroll_attendance/data/hr_payroll_attendance_data.xml b/hr_payroll_attendance/data/hr_payroll_attendance_data.xml index 6023dd08..c4efdc82 100644 --- a/hr_payroll_attendance/data/hr_payroll_attendance_data.xml +++ b/hr_payroll_attendance/data/hr_payroll_attendance_data.xml @@ -6,16 +6,10 @@ Attendance Overtime ATTN_OT - - Attendance - ATTN + + - - - Work Calendar - -