From 9536e7b0ebfbc2eb065d7b24754e9924a58e90f0 Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Thu, 19 Dec 2024 19:29:30 +0800
Subject: [PATCH] =?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  | 2 +-
 yuthon_holiday/models/inherit_hr_leave.py | 2 +-
 yuthon_work_brand/views/hr_menus.xml      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/soong_workflow/models/soong_user_role.py b/soong_workflow/models/soong_user_role.py
index a58677230..c4b73c0c1 100644
--- a/soong_workflow/models/soong_user_role.py
+++ b/soong_workflow/models/soong_user_role.py
@@ -21,7 +21,7 @@ class YuthonUserRole(models.Model):
     personnel = fields.Text(string="在岗人员", compute='_compute_personnel')
     employee_ids = fields.One2many('hr.employee', 'user_role_id')
     number_people = fields.Integer(string="在岗人数", compute='_compute_number_people')
-    child_ids = fields.One2many('soong.user.role', 'parent_id', string='子集角色', index=True)
+    child_ids = fields.One2many('soong.user.role', 'parent_id', string='下级角色', index=True)
     yuthon_company = fields.Selection([('thtz', '天河投资集团'), ('thwg', '天河物管'),
                                            ('thlc', '天河粮储'), ('thtjbb', '天河投资本部')], string="所属公司", compute='compute_company')
     pinyin_name = fields.Char(string="拼音名称", compute='_compute_pinyin', index=True, store=True)
diff --git a/yuthon_holiday/models/inherit_hr_leave.py b/yuthon_holiday/models/inherit_hr_leave.py
index 018a9be37..9badd12d8 100644
--- a/yuthon_holiday/models/inherit_hr_leave.py
+++ b/yuthon_holiday/models/inherit_hr_leave.py
@@ -131,7 +131,7 @@ class HolidaysRequestBatch(models.Model):
     details = fields.Text(string="假期流程说明", compute='_compute_details')
     days = fields.Float(string='天数')
     hours = fields.Float(string='小时')
-    text = fields.Html(string='申请事由')
+    text = fields.Text(string='申请事由')
     is_day = fields.Boolean(string='按天请假')
     is_hour = fields.Boolean(string='按小时请假')
     leave_ids = fields.One2many(string='按天请假详情', comodel_name='hr.leave', inverse_name='batch_id', domain=[('leave_type_request_unit', '=', 'day')])
diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml
index 71528d000..b64ead976 100644
--- a/yuthon_work_brand/views/hr_menus.xml
+++ b/yuthon_work_brand/views/hr_menus.xml
@@ -134,8 +134,8 @@
               sequence="10"/>
     <menuitem id="hr_set_process_menu_root_board"
               name="流程"
-              parent="hr_employee_menu_root_board"
-              sequence="11"/>
+              parent="hr_menu_root_board"
+              sequence="5"/>
     <menuitem id="hr_menu_regularization_approval_root_board"
               name="转正申请表"
               parent="hr_set_process_menu_root_board"