diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py index 6c212e1cd..587b5ff88 100644 --- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py +++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py @@ -52,6 +52,7 @@ class YuthonVacationReports(models.Model): exam_leave = fields.Integer(string='考试假', compute='_compute_other_leave', store=True, group_operator=None) right_days = fields.Float(string='转正天数', group_operator=None) internship_days = fields.Float(string='实习天数', group_operator=None) + test_days = fields.Float(string='试用天数', group_operator=None) should_attendance = fields.Integer(string="应到", store=True, group_operator=None) actual_attendance = fields.Integer(string="实到", compute='compute_attendance_fields', store=True,group_operator=None) @@ -62,6 +63,7 @@ class YuthonVacationReports(models.Model): is_work = fields.Integer(string='旷工', compute='compute_attendance_fields', store=True, group_operator=None) is_abnormal = fields.Integer(string="异常", compute='compute_attendance_fields', store=True, group_operator=None) + vacation_state = fields.Selection( selection=[ ('unconfirmed', "未确认"), diff --git a/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml b/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml index b63709a54..fd417f95a 100644 --- a/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml +++ b/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml @@ -66,6 +66,7 @@ + @@ -123,6 +124,18 @@ + + + + + + + + + + + + @@ -181,6 +194,22 @@ + + + + + + + + + + + + +