diff --git a/yuthon_contract/models/inherit_hr_contract.py b/yuthon_contract/models/inherit_hr_contract.py index bc34f3481..0d979c484 100644 --- a/yuthon_contract/models/inherit_hr_contract.py +++ b/yuthon_contract/models/inherit_hr_contract.py @@ -301,22 +301,13 @@ class HrContract(models.Model): else: # operator == '!=' return [("company_id", "not in", company_ids)] - # @api.onchange('resource_calendar_id') - # def _onchange_resource_calendar_id(self): - # if self.resource_calendar_id: - # self.employee_id.sudo().write({'resource_calendar_id': self.resource_calendar_id.id}) - @api.depends("contract_type_id") def _compute_simplified_name(self): for record in self: - if "(副本)" in (record.name or ""): - core_name = record.name.replace("(副本)", "").strip() - record.name = core_name + "(副本)" + if record.contract_type_id and record.employee_id: + record.name = record.contract_type_id.name + "合同" else: - if record.contract_type_id and record.employee_id: - record.name = record.contract_type_id.name + "合同" - else: - record.name = " " + record.name = " " if record.contract_type_id: if record.contract_type_id.name == "实习协议": record.is_internship = True @@ -326,17 +317,21 @@ class HrContract(models.Model): @api.depends("contract_type_id") def _compute_name(self): for record in self: + has_copy_suffix = "(副本)" in (record.name or "") if record.contract_type_id and record.employee_id: - record.name = ( - record.employee_id.name + record.contract_type_id.name + "合同" - ) + new_name = record.employee_id.name + record.contract_type_id.name + "合同" else: - record.name = " " + new_name = " " + + if has_copy_suffix: + record.name = new_name + "(副本)" + else: + record.name = new_name + if record.contract_type_id: - if record.contract_type_id.name == "实习协议": - record.is_internship = True - else: - record.is_internship = False + record.is_internship = record.contract_type_id.name == "实习协议" + else: + record.is_internship = False def action_hr_contract(self): return {