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 })