From d3bd92511c93ac56f963225b35da31f7cabd84b3 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: Wed, 14 Jan 2026 20:22:42 +0800 Subject: [PATCH] =?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 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py b/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py index a2a11bc88..7d66b216f 100644 --- a/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py @@ -48,12 +48,24 @@ class YuthonRenewalApproval(models.Model): new_version_num = version_num + 1.0 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 + if original_contract.contract_type_id and original_contract.contract_type_id.name: + contract_type_name = original_contract.contract_type_id.nam + if '一签' in contract_type_name: + two_sign_type = self.env['hr.contract.type'].search([('name', 'ilike', '二签')], limit=1) + if two_sign_type: + new_contract_type_id = two_sign_type.id + elif '二签' in contract_type_name: + no_fixed_type = self.env['hr.contract.type'].search([('name', 'ilike', '无固定')], limit=1) + if no_fixed_type: + 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), 'state': 'open', 'job_id': self.job_id.id, 'version': new_version, + 'new_contract_type_id': new_contract_type_id.id, 'structure_type_id': self.payroll_structure_id.type_id.id, 'department_id': self.department1_id.id })