diff --git a/odex25_hr/attendances/__manifest__.py b/odex25_hr/attendances/__manifest__.py index 72167536d..141af9ea0 100644 --- a/odex25_hr/attendances/__manifest__.py +++ b/odex25_hr/attendances/__manifest__.py @@ -8,7 +8,8 @@ 'website': 'http://exp-sa.com', 'license': 'GPL-3', 'author': 'Expert Co. Ltd.' , - 'depends': ['base', 'hr_attendance', 'report_xlsx','hr_base','exp_payroll_custom','hr_holidays_public'], + 'depends': ['base', 'hr_attendance', 'report_xlsx','hr_base','exp_payroll_custom',], + # hr_holidays_public 'data': [ 'security/attendance_security.xml', 'security/ir.model.access.csv', diff --git a/odex25_hr/exp_hr_appraisal/models/appraisal.py b/odex25_hr/exp_hr_appraisal/models/appraisal.py index a42313acd..03bf9aca2 100644 --- a/odex25_hr/exp_hr_appraisal/models/appraisal.py +++ b/odex25_hr/exp_hr_appraisal/models/appraisal.py @@ -262,6 +262,18 @@ class StandardAppraisalLines(models.Model): accrued_greed = fields.Float() question = fields.Char() great_level = fields.Float() + priority = fields.Selection( + [ + ('0', '1'), + ('1', '2'), + ('2', '3'), + ('3', '4'), + ('4', '5'), + ], + string='Priority', + default='0', + index=True + ) # Relational fields standard_appraisal_employee_line = fields.Many2one('hr.employee.appraisal') # inverse field diff --git a/odex25_hr/exp_hr_appraisal/views/employee_appraisal_view.xml b/odex25_hr/exp_hr_appraisal/views/employee_appraisal_view.xml index 555dbb790..6ea53865a 100644 --- a/odex25_hr/exp_hr_appraisal/views/employee_appraisal_view.xml +++ b/odex25_hr/exp_hr_appraisal/views/employee_appraisal_view.xml @@ -54,6 +54,7 @@ 'invisible': [('parent.employee_protest', '!=', True)], 'column_invisible': [('parent.employee_protest', '!=', True)] }"/> +