From 680209c9a9c2636e561760883986a437560ab203 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Tue, 26 Aug 2025 15:25:57 +0800
Subject: [PATCH 1/2] =?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_onboard_approval.py          | 18 ++++++++++++++++++
 .../views/yuthon_onboard_approval_views.xml    |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py
index 4cc40d4c8..8522474a4 100644
--- a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py
+++ b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py
@@ -153,6 +153,8 @@ class YuthonOnboardApproval(models.Model):
                                                       'identification_id':login_id.id_card,
                                                       'mobile_phone': login_id.phone,
                                                       'marital': marital,
+                                                      'entry_date': self.onboard_time,
+                                                      'work_phone': login_id.phone,
                                                       'work_email': login_id.email,
                                                       'job_id': self.job_id.id,
                                                       'department_id': self.department_id1.id
@@ -161,12 +163,28 @@ class YuthonOnboardApproval(models.Model):
             salary = self.salary
         else:
             salary = self.salary_level
+        contract_type_dict = {
+            'labor': '劳务协议',
+            'internship': '实习协议',
+            'part_time': '兼职协议',
+            'consultant': '顾问',
+            'outsourcing': '外包',
+        }
+        if self.employment_form == 'informal':
+            contract_type_id = self.env['hr.contract.type'].search([('name', '=', contract_type_dict.get(self.contract_type))], limit=1)
+            if not contract_type_id:
+                contract_type_id = self.env['hr.contract.type'].create({
+                    'name': contract_type_dict.get(self.contract_type),
+                    })
+        else:
+            contract_type_id = self.env['hr.contract.type'].search([('name', '=', '正式合同（一签）')], limit=1)
         self.env['hr.contract'].create({
             'wage': salary,
             'job_id': self.job_id.id,
             'department_id': self.department_id1.id,
             'employee_id': employee_id.id,
             'date_start': self.duration_employment,
+            'contract_type_id': contract_type_id.id,
             'structure_type_id': self.structure_type_id.id,
             'is_annual_salary': self.is_annual_salary,
             'date_end': self.duration_employment_end,
diff --git a/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
index 26695045d..04511f553 100644
--- a/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
@@ -17,7 +17,7 @@
         <field name="arch" type="xml">
             <form create="0">
                 <header>
-<!--                    <button name="put_contract" type="object" class="oe_highlight" string="创建合同"/>-->
+                    <button name="put_contract" type="object" class="oe_highlight" string="创建合同"/>
                     <button name="button_office_supply" type="object" class="oe_highlight" string="办公用品" invisible="not is_office"/>
                 </header>
                 <sheet>

From b639d53036080e28a5fe9c1537bdb4f69d577024 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Tue, 26 Aug 2025 15:26:24 +0800
Subject: [PATCH 2/2] =?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

---
 .../views/yuthon_onboard_approval_views.xml                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
index 04511f553..26695045d 100644
--- a/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
@@ -17,7 +17,7 @@
         <field name="arch" type="xml">
             <form create="0">
                 <header>
-                    <button name="put_contract" type="object" class="oe_highlight" string="创建合同"/>
+<!--                    <button name="put_contract" type="object" class="oe_highlight" string="创建合同"/>-->
                     <button name="button_office_supply" type="object" class="oe_highlight" string="办公用品" invisible="not is_office"/>
                 </header>
                 <sheet>