From 4f2dd099c4f1f34b1c7461bb15457a450f16bf71 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Thu, 20 Mar 2025 15:05:08 +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

---
 room/views/room_menus.xml                      |  2 +-
 soong_workflow/views/menuitem.xml              |  2 +-
 yuthon_capital_operation/views/menu.xml        |  2 +-
 .../views/all_attendance_menu.xml              |  4 ++--
 yuthon_issue/views/menus.xml                   |  2 +-
 yuthon_lessee_service/views/all_menu.xml       |  2 +-
 yuthon_official/views/official_menus.xml       |  1 +
 yuthon_performance/views/performacne_menu.xml  |  2 +-
 yuthon_property/views/menuitem.xml             |  2 +-
 yuthon_salary/security/yuthon_salary_group.xml | 18 +++++++++---------
 yuthon_will_task/views/yuthon_task_menu.xml    |  2 +-
 yuthon_work_brand/views/hr_menus.xml           |  8 ++++----
 12 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/room/views/room_menus.xml b/room/views/room_menus.xml
index 71d63ce62..81ddd6c51 100644
--- a/room/views/room_menus.xml
+++ b/room/views/room_menus.xml
@@ -5,7 +5,7 @@
         name="Meeting Rooms"
         web_icon="room,static/description/icon.png"
         action="room.room_booking_action"
-        sequence="6"/>
+        sequence="20"/>
 
     <menuitem
         id="room_booking_menu"
diff --git a/soong_workflow/views/menuitem.xml b/soong_workflow/views/menuitem.xml
index c97e03656..00ae8b396 100644
--- a/soong_workflow/views/menuitem.xml
+++ b/soong_workflow/views/menuitem.xml
@@ -5,7 +5,7 @@
         <menuitem id="menu_soong_workflow_root"
                   name="Workflow"
                   web_icon="soong_workflow,static/description/icon.png"
-                  sequence="2"/>
+                  sequence="15"/>
         <menuitem id="menu_workflow_approval_request_new"
                   name="新建流程"
                   parent="menu_soong_workflow_root"
diff --git a/yuthon_capital_operation/views/menu.xml b/yuthon_capital_operation/views/menu.xml
index ef55a7cd0..f3a3a606c 100644
--- a/yuthon_capital_operation/views/menu.xml
+++ b/yuthon_capital_operation/views/menu.xml
@@ -3,7 +3,7 @@
     <menuitem id="capital_operation_root_board"
               name="资本运营"
               web_icon="yuthon_capital_operation,static/description/icon.png"
-              sequence="10"/>
+              sequence="90"/>
     <menuitem id="capital_operation_menu"
               name="资本运营"
               parent="capital_operation_root_board"
diff --git a/yuthon_hr_attendance/views/all_attendance_menu.xml b/yuthon_hr_attendance/views/all_attendance_menu.xml
index 49a1fa23c..cc19217f5 100644
--- a/yuthon_hr_attendance/views/all_attendance_menu.xml
+++ b/yuthon_hr_attendance/views/all_attendance_menu.xml
@@ -5,7 +5,7 @@
               name="考勤管理"
               web_icon="yuthon_hr_attendance,static/description/attendance.png"
               groups="group_he_attendance_manager"
-              sequence="7"/>
+              sequence="30"/>
     <menuitem id="menu_hr_attendance_month_board"
               name="月度考勤"
               parent="hr_attendance_root_board"
@@ -146,7 +146,7 @@
     <menuitem id="yuthon_attendance_planning_board"
               name="计划排班"
               web_icon="yuthon_work_brand,static/description/planning.png"
-              sequence="9"/>
+              sequence="45"/>
     <!--保安部-->
     <menuitem id="menu_hr_attendance_security_record_board"
               name="保安部计划"
diff --git a/yuthon_issue/views/menus.xml b/yuthon_issue/views/menus.xml
index 4fdc91d06..480b94524 100644
--- a/yuthon_issue/views/menus.xml
+++ b/yuthon_issue/views/menus.xml
@@ -3,7 +3,7 @@
     <menuitem id="tianhe_issue_library_menu_root"
               name="议题管理"
               web_icon="yuthon_issue,static/description/icon.png"
-              sequence="1"/>
+              sequence="25"/>
 
     <menuitem id="yuthon_library_my_menu"
               name="我的议题"
diff --git a/yuthon_lessee_service/views/all_menu.xml b/yuthon_lessee_service/views/all_menu.xml
index a7336100d..12412d868 100644
--- a/yuthon_lessee_service/views/all_menu.xml
+++ b/yuthon_lessee_service/views/all_menu.xml
@@ -8,7 +8,7 @@
               parent="yuthon_property.yuthon_customer_service_menu"
               name="通知公告"
               action="yuthon_lessee_service.yuthon_lessee_notice_action"
-              sequence="1"/>
+              sequence="5"/>
     <menuitem id="yuthon_lessee_document_investigation"
               parent="yuthon_property.yuthon_customer_service_menu"
               name="资料调查"
diff --git a/yuthon_official/views/official_menus.xml b/yuthon_official/views/official_menus.xml
index d7b485c58..7e21a6baa 100644
--- a/yuthon_official/views/official_menus.xml
+++ b/yuthon_official/views/official_menus.xml
@@ -5,6 +5,7 @@
             name="公文管理"
             web_icon="yuthon_official,static/description/icon.png"
             groups="module_yuthon_official_user"
+            sequence="91"
             action="send_receive_messages_management_action"/>
 
     <menuitem
diff --git a/yuthon_performance/views/performacne_menu.xml b/yuthon_performance/views/performacne_menu.xml
index d1d503c0b..356b6cdec 100644
--- a/yuthon_performance/views/performacne_menu.xml
+++ b/yuthon_performance/views/performacne_menu.xml
@@ -4,7 +4,7 @@
     <menuitem id="yuthon_performance_menu_config_root"
               name="绩效考核"
               web_icon="yuthon_performance,static/description/icon.png"
-              sequence="13"/>
+              sequence="93"/>
     <menuitem id="yuthon_index_management_menu"
               parent="yuthon_performance_menu_config_root"
               name="指标库"
diff --git a/yuthon_property/views/menuitem.xml b/yuthon_property/views/menuitem.xml
index c26553cb5..f9354b9e2 100644
--- a/yuthon_property/views/menuitem.xml
+++ b/yuthon_property/views/menuitem.xml
@@ -8,7 +8,7 @@
 
     <!-- 一级标题 -->
     <menuitem id="yuthon_property_menu_root"
-              sequence="4"
+              sequence="85"
               web_icon="yuthon_property,static/description/icon.png"
               groups="group_yuthon_property_user"
               name="物业管理"/>
diff --git a/yuthon_salary/security/yuthon_salary_group.xml b/yuthon_salary/security/yuthon_salary_group.xml
index ea94f7aa8..2f9fc0190 100644
--- a/yuthon_salary/security/yuthon_salary_group.xml
+++ b/yuthon_salary/security/yuthon_salary_group.xml
@@ -60,13 +60,13 @@
         <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>
         <field name="groups" eval="[(4, ref('group_salary_user')), (4, ref('group_salary_admin'))]"/>
     </record>
-<!--    <record id="inherit_hr_payslip_views_rule" model="ir.rule">-->
-<!--        <field name="name">工资单公司过滤</field>-->
-<!--        <field name="model_id" ref="model_hr_payslip"/>-->
-<!--        <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>-->
-<!--        <field name="perm_read" eval="True"/>-->
-<!--        <field name="perm_write" eval="True"/>-->
-<!--        <field name="perm_create" eval="True"/>-->
-<!--        <field name="perm_unlink" eval="True"/>-->
-<!--    </record>-->
+    <record id="inherit_hr_payslip_views_rule" model="ir.rule">
+        <field name="name">工资单公司过滤</field>
+        <field name="model_id" ref="model_hr_payslip"/>
+        <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>
+        <field name="perm_read" eval="True"/>
+        <field name="perm_write" eval="True"/>
+        <field name="perm_create" eval="True"/>
+        <field name="perm_unlink" eval="True"/>
+    </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_will_task/views/yuthon_task_menu.xml b/yuthon_will_task/views/yuthon_task_menu.xml
index b2735cd68..feff2398f 100644
--- a/yuthon_will_task/views/yuthon_task_menu.xml
+++ b/yuthon_will_task/views/yuthon_task_menu.xml
@@ -4,7 +4,7 @@
               name='日程'
               web_icon="yuthon_will_task,static/description/icon.png"
               groups="group_yuthon_will_task_user"
-              sequence='1'/>
+              sequence='10'/>
     <menuitem id='menu_yuthon_will_task_root'
               name='我的日程'
               parent='menu_yuthon_will_task'
diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml
index b031dc5b7..e2f669cc7 100644
--- a/yuthon_work_brand/views/hr_menus.xml
+++ b/yuthon_work_brand/views/hr_menus.xml
@@ -4,7 +4,7 @@
     <menuitem id="human_resources_menu_root_board"
               name="人力资源"
               web_icon="yuthon_work_brand,static/description/hr.png"
-              sequence="8"/>
+              sequence="40"/>
     <!-- 招聘管理  -->
     <menuitem id="hr_recruitment_menu_root_board"
               name="招聘管理"
@@ -278,7 +278,7 @@
     <menuitem id="holiday_manage_menu_root_board"
               name="假期管理"
               web_icon="yuthon_work_brand,static/description/holiday.png"
-              sequence="9"/>
+              sequence="50"/>
     <menuitem id="holiday_overview_menu_board"
               name="概览"
               parent="holiday_manage_menu_root_board"
@@ -328,7 +328,7 @@
               name="薪资管理"
               web_icon="yuthon_work_brand,static/description/salary.png"
               groups="yuthon_salary.group_salary_user,yuthon_salary.group_salary_super_admin"
-              sequence="9"/>
+              sequence="35"/>
 <!--    <menuitem id="human_work_entry_board"-->
 <!--              name="工作分录"-->
 <!--              parent="human_resources_salary_root_board"-->
@@ -420,7 +420,7 @@
     <menuitem id="training_manager_root_board"
               name="培训"
               web_icon="yuthon_work_brand,static/description/training.png"
-              sequence="15"/>
+              sequence="95"/>
     <menuitem id="employee_training_root_board"
               name="培训管理"
               parent="training_manager_root_board"