From 03ca585bb5d575c1e1191461cf86865f073a53b9 Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Fri, 22 Nov 2024 20:15:13 +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
---
soong_workflow/models/soong_user_role.py | 10 +---------
yuthon_hr_employee/models/yuthon_hr_department.py | 9 ---------
2 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/soong_workflow/models/soong_user_role.py b/soong_workflow/models/soong_user_role.py
index b2b8929b0..9b3afb05e 100644
--- a/soong_workflow/models/soong_user_role.py
+++ b/soong_workflow/models/soong_user_role.py
@@ -36,12 +36,4 @@ class YuthonUserRole(models.Model):
break
department = department.parent_id
else:
- record.yuthon_company = 'thtz'
-
- @api.depends('name')
- def _compute_display_name(self):
- for record in self:
- if record.department_id:
- record.display_name = f"{record.department_id.name}-{record.name}"
- else:
- record.display_name = record.name
\ No newline at end of file
+ record.yuthon_company = 'thtz'
\ No newline at end of file
diff --git a/yuthon_hr_employee/models/yuthon_hr_department.py b/yuthon_hr_employee/models/yuthon_hr_department.py
index d304ee1fa..b712f99ba 100644
--- a/yuthon_hr_employee/models/yuthon_hr_department.py
+++ b/yuthon_hr_employee/models/yuthon_hr_department.py
@@ -38,12 +38,3 @@ class YuthonHrDepartment(models.Model):
#
# cycle_code(self, self.department_code)
- @api.depends('name', 'parent_id')
- def _compute_display_name(self):
- for record in self:
- if record.parent_id:
- record.display_name = f"{record.name}({record.parent_id.name})"
- else:
- record.display_name = record.name
-
-
From edaff38d8840b29005a97f3ec1dc80403640cb25 Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Fri, 22 Nov 2024 20:19: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
---
yuthon_hr_employee/views/inherit_hr_job_views.xml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/yuthon_hr_employee/views/inherit_hr_job_views.xml b/yuthon_hr_employee/views/inherit_hr_job_views.xml
index 9c99a483c..43e196b65 100644
--- a/yuthon_hr_employee/views/inherit_hr_job_views.xml
+++ b/yuthon_hr_employee/views/inherit_hr_job_views.xml
@@ -20,9 +20,6 @@
1
-
-
-