From 45df0ccd104b4f2d8034ac04400a524fa5de5b90 Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Tue, 3 Dec 2024 18:39:59 +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

---
 .../views/inherit_planning_role_views.xml     |  14 +-
 .../inherit_planning_slot_template_views.xml  |  14 +-
 yuthon_work_brand/views/attendance_menu.xml   | 141 +++++++-----------
 3 files changed, 59 insertions(+), 110 deletions(-)

diff --git a/yuthon_hr_attendance/views/inherit_planning_role_views.xml b/yuthon_hr_attendance/views/inherit_planning_role_views.xml
index 0d7770ef8..e599df41a 100644
--- a/yuthon_hr_attendance/views/inherit_planning_role_views.xml
+++ b/yuthon_hr_attendance/views/inherit_planning_role_views.xml
@@ -22,18 +22,6 @@
         <field name="name">班次名称</field>
         <field name="res_model">planning.role</field>
         <field name="view_mode">tree</field>
-        <field name="domain">[('department_id.name', '=', '运行班')]</field>
-    </record>
-    <record id="action_planning_role_form3" model="ir.actions.act_window">
-        <field name="name">班次名称</field>
-        <field name="res_model">planning.role</field>
-        <field name="view_mode">tree</field>
-        <field name="domain">[('department_id.name', '=', '高压班')]</field>
-    </record>
-    <record id="action_planning_role_form4" model="ir.actions.act_window">
-        <field name="name">班次名称</field>
-        <field name="res_model">planning.role</field>
-        <field name="view_mode">tree</field>
-        <field name="domain">[('department_id.name', '=', '综合班')]</field>
+        <field name="domain">[('department_id.name', '=', '工程部')]</field>
     </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_hr_attendance/views/inherit_planning_slot_template_views.xml b/yuthon_hr_attendance/views/inherit_planning_slot_template_views.xml
index 9b5503f40..0f8c42c10 100644
--- a/yuthon_hr_attendance/views/inherit_planning_slot_template_views.xml
+++ b/yuthon_hr_attendance/views/inherit_planning_slot_template_views.xml
@@ -29,18 +29,6 @@
         <field name="name">班次模板</field>
         <field name="res_model">planning.slot.template</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('department_id.name', '=', '运行班')]</field>
-    </record>
-    <record id="action_planning_slot_template_form3" model="ir.actions.act_window">
-        <field name="name">班次模板</field>
-        <field name="res_model">planning.slot.template</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('department_id.name', '=', '高压班')]</field>
-    </record>
-    <record id="action_planning_slot_template_form4" model="ir.actions.act_window">
-        <field name="name">班次模板</field>
-        <field name="res_model">planning.slot.template</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('department_id.name', '=', '综合班')]</field>
+        <field name="domain">[('department_id.name', '=', '工程部')]</field>
     </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_work_brand/views/attendance_menu.xml b/yuthon_work_brand/views/attendance_menu.xml
index 47439556a..d6219aa1a 100644
--- a/yuthon_work_brand/views/attendance_menu.xml
+++ b/yuthon_work_brand/views/attendance_menu.xml
@@ -23,26 +23,26 @@
               name="保安部计划"
               parent="hr_attendance_root_board"
               sequence="5"/>
-    <menuitem id="menu_hr_plan_sources_board1"
-              name="排班计划"
-              parent="menu_hr_attendance_security_record_board"
-              action="yuthon_hr_attendance.action_planning_slot_form1"
-              sequence="1"/>
     <menuitem id="menu_hr_plan_sources_arrange_board1"
               name="排班安排"
               parent="menu_hr_attendance_security_record_board"
               action="yuthon_hr_attendance.yuthon_shift_planning_view_action"
+              sequence="1"/>
+    <menuitem id="menu_hr_plan_sources_board1"
+              name="排班计划"
+              parent="menu_hr_attendance_security_record_board"
+              action="yuthon_hr_attendance.action_planning_slot_form1"
               sequence="3"/>
     <menuitem id="menu_hr_attendance_security_record"
               name="考勤记录"
               parent="menu_hr_attendance_security_record_board"
               action="yuthon_hr_attendance.hr_attendance_action2"
               sequence="8"/>
-    <menuitem id="menu_hr_attendance_security_process_record"
-              name="流程"
-              parent="menu_hr_attendance_security_record_board"
-              action="yuthon_hr_attendance.hr_attendance_action2"
-              sequence="15"/>
+<!--    <menuitem id="menu_hr_attendance_security_process_record"-->
+<!--              name="流程"-->
+<!--              parent="menu_hr_attendance_security_record_board"-->
+<!--              action="yuthon_hr_attendance.hr_attendance_action2"-->
+<!--              sequence="15"/>-->
     <menuitem id="menu_hr_attendance_planning_setting"
               name="配置"
               parent="menu_hr_attendance_security_record_board"
@@ -62,34 +62,10 @@
               parent="hr_attendance_root_board"
               action="yuthon_hr_attendance.hr_attendance_action3"
               sequence="7"/>
-    <menuitem id="menu_hr_attendance_engineering_run_board"
-              name="运行班"
-              parent="menu_hr_attendance_engineering_record_board"
-              sequence="1"/>
-    <menuitem id="menu_hr_plan_sources_board2"
-              name="排班计划"
-              parent="menu_hr_attendance_engineering_run_board"
-              action="yuthon_hr_attendance.action_planning_slot_form2"
-              sequence="1"/>
-    <menuitem id="menu_hr_attendance_security_run_record"
-              name="排班安排"
-              parent="menu_hr_attendance_engineering_run_board"
-              action="yuthon_hr_attendance.action_yuthon_run_planning"
-              sequence="3"/>
-    <menuitem id="menu_hr_attendance_security_record1"
-              name="考勤记录"
-              parent="menu_hr_attendance_engineering_run_board"
-              action="yuthon_hr_attendance.hr_attendance_action3"
-              sequence="5"/>
-    <menuitem id="menu_hr_attendance_security_process_record1"
-              name="流程"
-              parent="menu_hr_attendance_engineering_run_board"
-              action="yuthon_hr_attendance.hr_attendance_action2"
-              sequence="7"/>
     <menuitem id="menu_hr_attendance_planning_setting1"
               name="配置"
-              parent="menu_hr_attendance_engineering_run_board"
-              sequence="9"/>
+              parent="menu_hr_attendance_engineering_record_board"
+              sequence="99"/>
     <menuitem id="menu_hr_attendance_planning_board1"
               name="班次名称"
               parent="menu_hr_attendance_planning_setting1"
@@ -100,82 +76,79 @@
               parent="menu_hr_attendance_planning_setting1"
               action="yuthon_hr_attendance.action_planning_slot_template_form2"
               sequence="3"/>
+
+    <menuitem id="menu_hr_attendance_engineering_run_board"
+              name="运行班"
+              parent="menu_hr_attendance_engineering_record_board"
+              sequence="1"/>
+    <menuitem id="menu_hr_attendance_security_run_record"
+              name="排班安排"
+              parent="menu_hr_attendance_engineering_run_board"
+              action="yuthon_hr_attendance.action_yuthon_run_planning"
+              sequence="1"/>
+    <menuitem id="menu_hr_plan_sources_board2"
+              name="排班计划"
+              parent="menu_hr_attendance_engineering_run_board"
+              action="yuthon_hr_attendance.action_planning_slot_form2"
+              sequence="3"/>
+    <menuitem id="menu_hr_attendance_security_record1"
+              name="考勤记录"
+              parent="menu_hr_attendance_engineering_run_board"
+              action="yuthon_hr_attendance.hr_attendance_action3"
+              sequence="5"/>
+<!--    <menuitem id="menu_hr_attendance_security_process_record1"-->
+<!--              name="流程"-->
+<!--              parent="menu_hr_attendance_engineering_run_board"-->
+<!--              action="yuthon_hr_attendance.hr_attendance_action2"-->
+<!--              sequence="7"/>-->
     <menuitem id="menu_hr_attendance_engineering_hv_board"
               name="高压班"
               parent="menu_hr_attendance_engineering_record_board"
               sequence="3"/>
-    <menuitem id="menu_hr_plan_sources_board3"
-              name="排班计划"
-              parent="menu_hr_attendance_engineering_hv_board"
-              action="yuthon_hr_attendance.action_planning_slot_form3"
-              sequence="1"/>
     <menuitem id="menu_hr_attendance_hv_board"
               name="排班安排"
               parent="menu_hr_attendance_engineering_hv_board"
               action="yuthon_hr_attendance.action_yuthon_hv_planning"
+              sequence="1"/>
+    <menuitem id="menu_hr_plan_sources_board3"
+              name="排班计划"
+              parent="menu_hr_attendance_engineering_hv_board"
+              action="yuthon_hr_attendance.action_planning_slot_form3"
               sequence="5"/>
     <menuitem id="menu_hr_attendance_security_record2"
               name="考勤记录"
               parent="menu_hr_attendance_engineering_hv_board"
               action="yuthon_hr_attendance.hr_attendance_action4"
               sequence="7"/>
-    <menuitem id="menu_hr_attendance_security_process_record2"
-              name="流程"
-              parent="menu_hr_attendance_engineering_hv_board"
-              action="yuthon_hr_attendance.hr_attendance_action3"
-              sequence="9"/>
-    <menuitem id="menu_hr_attendance_planning_setting2"
-              name="配置"
-              parent="menu_hr_attendance_engineering_hv_board"
-              sequence="15"/>
-    <menuitem id="menu_hr_attendance_planning_board2"
-              name="班次名称"
-              parent="menu_hr_attendance_planning_setting2"
-              action="yuthon_hr_attendance.action_planning_role_form3"
-              sequence="1"/>
-    <menuitem id="menu_hr_attendance_slot_template_role2"
-              name="班次模板"
-              parent="menu_hr_attendance_planning_setting2"
-              action="yuthon_hr_attendance.action_planning_slot_template_form3"
-              sequence="3"/>
+<!--    <menuitem id="menu_hr_attendance_security_process_record2"-->
+<!--              name="流程"-->
+<!--              parent="menu_hr_attendance_engineering_hv_board"-->
+<!--              action="yuthon_hr_attendance.hr_attendance_action3"-->
+<!--              sequence="9"/>-->
     <menuitem id="menu_hr_attendance_engineering_integrated_board"
               name="综合班"
               parent="menu_hr_attendance_engineering_record_board"
               sequence="5"/>
-    <menuitem id="menu_hr_plan_sources_board4"
-              name="排班计划"
-              parent="menu_hr_attendance_engineering_integrated_board"
-              action="yuthon_hr_attendance.action_planning_slot_form4"
-              sequence="1"/>
     <menuitem id="menu_hr_attendance_overall_record"
               name="排班安排"
               parent="menu_hr_attendance_engineering_integrated_board"
               action="yuthon_hr_attendance.action_yuthon_overall_planning"
+              sequence="1"/>
+    <menuitem id="menu_hr_plan_sources_board4"
+              name="排班计划"
+              parent="menu_hr_attendance_engineering_integrated_board"
+              action="yuthon_hr_attendance.action_planning_slot_form4"
               sequence="3"/>
     <menuitem id="menu_hr_attendance_security_record3"
               name="考勤记录"
               parent="menu_hr_attendance_engineering_integrated_board"
               action="yuthon_hr_attendance.hr_attendance_action5"
               sequence="5"/>
-    <menuitem id="menu_hr_attendance_security_process_record3"
-              name="流程"
-              parent="menu_hr_attendance_engineering_integrated_board"
-              action="yuthon_hr_attendance.hr_attendance_action3"
-              sequence="9"/>
-    <menuitem id="menu_hr_attendance_planning_setting3"
-              name="配置"
-              parent="menu_hr_attendance_engineering_integrated_board"
-              sequence="15"/>
-    <menuitem id="menu_hr_attendance_planning_board3"
-              name="班次名称"
-              parent="menu_hr_attendance_planning_setting3"
-              action="yuthon_hr_attendance.action_planning_role_form4"
-              sequence="1"/>
-    <menuitem id="menu_hr_attendance_slot_template_role3"
-              name="班次模板"
-              parent="menu_hr_attendance_planning_setting3"
-              action="yuthon_hr_attendance.action_planning_slot_template_form4"
-              sequence="3"/>
+<!--    <menuitem id="menu_hr_attendance_security_process_record3"-->
+<!--              name="流程"-->
+<!--              parent="menu_hr_attendance_engineering_integrated_board"-->
+<!--              action="yuthon_hr_attendance.hr_attendance_action3"-->
+<!--              sequence="9"/>-->
     <!--    <menuitem id="menu_hr_plan_employee_board"-->
     <!--              name="按角色分类"-->
     <!--              parent="menu_hr_plan_arrange_board"-->