diff --git a/yuthon_hr_attendance/models/card_approval.py b/yuthon_hr_attendance/models/card_approval.py index 0d7295ff2..6ed19b68f 100644 --- a/yuthon_hr_attendance/models/card_approval.py +++ b/yuthon_hr_attendance/models/card_approval.py @@ -40,6 +40,12 @@ class CardApprovals(models.Model): rep.replacement_time = 'all' if rep.attendance_id.is_early_card and rep.attendance_id.is_no_card: rep.replacement_time = 'all' + if rep.attendance_id.is_no_card and not rep.attendance_id.check_out: + rep.replacement_time = 'quitting' + if rep.attendance_id.is_no_card and not rep.attendance_id.check_in: + rep.replacement_time = 'work' + if rep.attendance_id.is_no_card and not rep.attendance_id.check_in and not rep.attendance_id.check_out: + rep.replacement_time = 'all' @api.depends('users_id', 'attendance_id') def _compute_name(self): @@ -92,6 +98,3 @@ class CardApprovals(models.Model): elif self.related_issues_id: raise UserError("已经创建了相关的上会记录,不能取消勾选") - - - diff --git a/yuthon_hr_attendance/views/hr_attendance_views.xml b/yuthon_hr_attendance/views/hr_attendance_views.xml index 5243ce549..e4519a3f6 100644 --- a/yuthon_hr_attendance/views/hr_attendance_views.xml +++ b/yuthon_hr_attendance/views/hr_attendance_views.xml @@ -36,7 +36,7 @@ - + diff --git a/yuthon_property/data/data_yuthon_resource_mgmt_config.xml b/yuthon_property/data/data_yuthon_resource_mgmt_config.xml index 6c8def2e6..1b013b99d 100644 --- a/yuthon_property/data/data_yuthon_resource_mgmt_config.xml +++ b/yuthon_property/data/data_yuthon_resource_mgmt_config.xml @@ -69,7 +69,7 @@ 代管 - 自营 + 自有 diff --git a/yuthon_property/views/menuitem.xml b/yuthon_property/views/menuitem.xml index 4bc61ae49..f327cd9b2 100644 --- a/yuthon_property/views/menuitem.xml +++ b/yuthon_property/views/menuitem.xml @@ -336,8 +336,8 @@ - + +