diff --git a/yuthon_hr_attendance/models/hr_attendance.py b/yuthon_hr_attendance/models/hr_attendance.py index f38abf7d5..38e8bcfc4 100644 --- a/yuthon_hr_attendance/models/hr_attendance.py +++ b/yuthon_hr_attendance/models/hr_attendance.py @@ -1259,21 +1259,15 @@ class HrAttendance(models.Model): ] leave_records = self.env['hr.leave'].search(leave_domain) if leave_records: - attendance_domain = [ - ('employee_id', '=', employee.id), - ('current_data', '=', current_date_str), - ] - attendance_recs = self.env['hr.attendance'].search(attendance_domain) for leave in leave_records: if leave.batch_id: main_leave_record = leave.batch_id elif leave.hour_batch_id: main_leave_record = leave.hour_batch_id - workflow = self.env['soong.workflow.record'].search([ ('code', '=', main_leave_record.code) ], limit=1) - attendance_recs.write({ + self.write({ 'workflow_id': workflow.id, 'is_workflow': True, 'is_no_card': False, @@ -1282,6 +1276,12 @@ class HrAttendance(models.Model): 'is_abnormal': False, 'absenteeism_card': False }) + else: + self.write({ + 'workflow_id': False, + 'is_workflow': False, + }) + go_approval_domain = [ ('employee_ids', 'in', employee.id), ('start_date', '<=', current_date_str), @@ -1289,18 +1289,11 @@ class HrAttendance(models.Model): ] go_approval_record = self.env['go.approval'].search(go_approval_domain) if go_approval_record: - attendance_domain = [ - ('employee_id', '=', employee.id), - ('current_data', '=', current_date_str), - ] - attendance_recs = self.env['hr.attendance'].search(attendance_domain) - if not attendance_recs: - return workflow = self.env['soong.workflow.record'].search([ ('code', '=', go_approval_record.code) ], limit=1) if workflow and workflow.approve_state == 'end': - attendance_recs.write({ + self.write({ 'workflow_id': workflow.id, 'is_workflow': True, 'is_no_card': False, diff --git a/yuthon_hr_attendance/models/hr_attendance_wechat.py b/yuthon_hr_attendance/models/hr_attendance_wechat.py index 17a3ea96a..1f8cbeea0 100644 --- a/yuthon_hr_attendance/models/hr_attendance_wechat.py +++ b/yuthon_hr_attendance/models/hr_attendance_wechat.py @@ -76,7 +76,7 @@ class HrAttendance(models.Model): view = self.env.ref("yuthon_wechat.view_hr_attendance_detail_tree") form_view = self.env.ref("yuthon_wechat.view_hr_attendance_detail_form") return { - "name": _("出勤详情"), + "name": _("打卡详情"), "type": "ir.actions.act_window", "view_mode": "tree,form", "res_model": "hr.attendance.detail", diff --git a/yuthon_hr_attendance/views/hr_attendance_detail_wechat_views.xml b/yuthon_hr_attendance/views/hr_attendance_detail_wechat_views.xml index 41d14a9fa..a8bf94c15 100644 --- a/yuthon_hr_attendance/views/hr_attendance_detail_wechat_views.xml +++ b/yuthon_hr_attendance/views/hr_attendance_detail_wechat_views.xml @@ -81,7 +81,7 @@ - 出勤详情 + 打卡详情 hr.attendance.detail tree,form,search