From 498f6f39ba0d24e1ec9b0f25b5a90ad94d01d536 Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Thu, 14 Nov 2024 18:58:44 +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
---
yuthon_sps_approval/data/sps_approval_code_data.xml | 7 -------
1 file changed, 7 deletions(-)
diff --git a/yuthon_sps_approval/data/sps_approval_code_data.xml b/yuthon_sps_approval/data/sps_approval_code_data.xml
index 73e28d5f6..9f8a1ad04 100644
--- a/yuthon_sps_approval/data/sps_approval_code_data.xml
+++ b/yuthon_sps_approval/data/sps_approval_code_data.xml
@@ -7,11 +7,4 @@
3
-
- 办公用品借用编号
- yuthon_office_borrow_code
- BG%(y)s%(month)s%(day)s
- 3
-
-
\ No newline at end of file
From f0dddeff9d503f0ae9be43b13db2372cc57a6177 Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Thu, 14 Nov 2024 18:59:07 +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
---
.../models/yuthon_onboard_approval.py | 7 +++++++
.../views/yuthon_onboard_approval_views.xml | 5 +++++
2 files changed, 12 insertions(+)
diff --git a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py
index 1cd48dbf5..7254046fc 100644
--- a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py
+++ b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py
@@ -19,6 +19,7 @@ class YuthonOnboardApproval(models.Model):
_description = "入职申请表"
_inherit = ['soong.workflow.mixin']
+ name = fields.Char(string="标题")
code = fields.Char(string="编号",
default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_onboard_approval_code'))
employee_id = fields.Many2one('hr.employee', string='姓名')
@@ -75,3 +76,9 @@ class YuthonOnboardApproval(models.Model):
'default_date_end': self.duration_employment_end,
'default_job_lv_id': self.grades_id.id,
}}
+ @api.onchange('employee_id')
+ def _onchange_employee_id(self):
+ for record in self:
+ if record.employee_id:
+ self.name = record.employee_id.name + '的入职合同'
+
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 1c7878c14..31bcfcedd 100644
--- a/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
@@ -20,6 +20,11 @@
+
+
+
+
+