From 1319ced2d66b1486f8c05d253c3a7573dab5efa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Fri, 20 Mar 2026 19:18:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../models/yuthon_renewal_approval.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py b/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py index 1fdf64119..d4dd81ee3 100644 --- a/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py @@ -51,7 +51,6 @@ class YuthonRenewalApproval(models.Model): new_version = f"V{new_version_num:.1f}" new_contract_vals = original_contract.copy_data()[0] new_contract_type_id = original_contract.contract_type_id.id - original_contract.state = 'close' if original_contract.contract_type_id and original_contract.contract_type_id.name: contract_type_name = original_contract.contract_type_id.name if '一签' in contract_type_name: @@ -64,11 +63,11 @@ class YuthonRenewalApproval(models.Model): new_contract_type_id = no_fixed_type.id new_contract_vals.update({ 'date_end': self.renewal_date, - # 'date_start': original_contract.date_end + relativedelta(days=1), + 'date_start': original_contract.date_end + relativedelta(days=1), 'state': 'open', 'job_id': self.job_id.id, 'version': new_version, - # 'new_contract_type_id': new_contract_type_id, + 'new_contract_type_id': new_contract_type_id, 'structure_type_id': self.payroll_structure_id.type_id.id, 'department_id': self.department1_id.id }) From 9a8cd05d4f65711d835d5028f1a5d403bebd8fec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Fri, 20 Mar 2026 19:20:35 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_hr_employee_approval/models/yuthon_renewal_approval.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py b/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py index d4dd81ee3..9df7ea7bf 100644 --- a/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py @@ -67,7 +67,7 @@ class YuthonRenewalApproval(models.Model): 'state': 'open', 'job_id': self.job_id.id, 'version': new_version, - 'new_contract_type_id': new_contract_type_id, + # 'new_contract_type_id': new_contract_type_id, 'structure_type_id': self.payroll_structure_id.type_id.id, 'department_id': self.department1_id.id }) From 5dff69e990756368e1abc57eb169fcad00252c98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Fri, 20 Mar 2026 19:32:22 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_hr_attendance/controllers/applet_attendance.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yuthon_hr_attendance/controllers/applet_attendance.py b/yuthon_hr_attendance/controllers/applet_attendance.py index 889422d8f..6e199785e 100644 --- a/yuthon_hr_attendance/controllers/applet_attendance.py +++ b/yuthon_hr_attendance/controllers/applet_attendance.py @@ -178,7 +178,7 @@ class AppletAttendance(Controller): check_in_str = check_in.strftime('%H:%M:%S') if check_in else ' ' check_out_str = check_out.strftime('%H:%M:%S') if check_out else ' ' has_leave_batch_workflow = False - if attendance_id.workflow_id and attendance_id.workflow_id.res_model == 'hr.leave.batch': + if attendance_id.workflow_id and attendance_id.workflow_id.res_model in ['hr.leave.batch', 'go.approval']: has_leave_batch_workflow = True check_in_html = f'

{check_in_str}

' if has_leave_batch_workflow else ( From e0a0364c7f465b254712c58c0b67feb2f24b0a2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Fri, 20 Mar 2026 19:35:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_hr_attendance/controllers/applet_attendance.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yuthon_hr_attendance/controllers/applet_attendance.py b/yuthon_hr_attendance/controllers/applet_attendance.py index 6e199785e..6357fad50 100644 --- a/yuthon_hr_attendance/controllers/applet_attendance.py +++ b/yuthon_hr_attendance/controllers/applet_attendance.py @@ -299,7 +299,7 @@ class AppletAttendance(Controller): check_out_str = check_out.strftime('%H:%M:%S') if check_out else ' ' has_leave_batch_workflow = False if hasattr(attendance_id, 'workflow_id') and attendance_id.workflow_id: - if attendance_id.workflow_id.res_model == 'hr.leave.batch': + if attendance_id.workflow_id.res_model in ['hr.leave.batch', 'go.approval']: has_leave_batch_workflow = True check_in_html = (