diff --git a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml index 989d7bc0a..921a5f9f7 100644 --- a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml +++ b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml @@ -148,7 +148,7 @@ - + 1 diff --git a/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py b/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py index e28ef2aaa..202e478f8 100644 --- a/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py @@ -24,7 +24,7 @@ class YuthonRenewalApproval(models.Model): work_end = fields.Boolean(string="结束") employee_id = fields.Many2one('hr.employee', string="续签员工") - contract_signing_entity = fields.Char(string="合同签约主体") + contract_signing_entity = fields.Many2one('yuthon.party.setting', string="合同签约主体") card = fields.Char(related='employee_id.identification_id', string="身份证号") department1_id = fields.Many2one('hr.department', string="续签部门") user_sex = fields.Selection(related='employee_id.user_sex', string="性别") diff --git a/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml index 3810f02e1..3f1bff0d1 100644 --- a/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml @@ -66,12 +66,12 @@ - +