Merge pull request !7978 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2026-01-14 12:24:00 +00:00
committed by Gitee
@@ -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
})