From 39a1b7cf2b3f10ad2005069a7e959afe1422a58d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <pengyuthon@user.noreply.gitee.com>
Date: Sat, 28 Dec 2024 21:52:20 +0800
Subject: [PATCH] =?UTF-8?q?ljm=20=E4=BF=AE=E6=94=B9=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/description/attendance.png         | Bin 0 -> 2424 bytes
 .../views/all_attendance_menu.xml             |   3 ++-
 .../security/yuthon_notice_group.xml          |  18 +++++++++++-------
 yuthon_notice/views/yuthon_notice_views.xml   |  16 +++++++---------
 yuthon_work_brand/views/hr_menus.xml          |   1 -
 5 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 yuthon_hr_attendance/static/description/attendance.png

diff --git a/yuthon_hr_attendance/static/description/attendance.png b/yuthon_hr_attendance/static/description/attendance.png
new file mode 100644
index 0000000000000000000000000000000000000000..b339450fdf12be0c105e0d90e03796d73687dedc
GIT binary patch
literal 2424
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
Zp&0v{escK5M*J%UaIEZ@1(wIKe*!WS3vK`a

literal 0
HcmV?d00001

diff --git a/yuthon_hr_attendance/views/all_attendance_menu.xml b/yuthon_hr_attendance/views/all_attendance_menu.xml
index 4f7ba7a31..e409b4575 100644
--- a/yuthon_hr_attendance/views/all_attendance_menu.xml
+++ b/yuthon_hr_attendance/views/all_attendance_menu.xml
@@ -3,7 +3,8 @@
     <!--  出勤  -->
     <menuitem id="hr_attendance_root_board"
               name="考勤管理"
-              web_icon="yuthon_work_brand,static/description/attendance.png"
+              web_icon="yuthon_hr_attendance,static/description/attendance.png"
+              groups="group_he_attendance_user"
               sequence="7"/>
     <menuitem id="menu_hr_attendance_my_record_board"
               name="我的考勤"
diff --git a/yuthon_notice/security/yuthon_notice_group.xml b/yuthon_notice/security/yuthon_notice_group.xml
index 769f896dc..3837b8211 100644
--- a/yuthon_notice/security/yuthon_notice_group.xml
+++ b/yuthon_notice/security/yuthon_notice_group.xml
@@ -1,32 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-     <record id="module_category_yuthon_notice" model="ir.module.category">
-        <field name="name">通知权限</field>
+    <record id="module_category_yuthon_notice" model="ir.module.category">
+        <field name="name">通知公告组</field>
+    </record>
+
+    <record id="module_category_yuthon_notice_user" model="res.groups">
+        <field name="name">用户</field>
+        <field name="category_id" ref="module_category_yuthon_notice"/>
     </record>
 
-    <!-- 天河投资通知群组 -->
     <record id="group_tz_notice_topic" model="res.groups">
         <field name="name">天河投资通知权限</field>
         <field name="category_id" ref="module_category_yuthon_notice"/>
+        <field name="implied_ids" eval="[(4, ref('module_category_yuthon_notice_user'))]"/>
     </record>
 
-    <!-- 天河粮储通知群组 -->
     <record id="group_lc_notice_topic" model="res.groups">
         <field name="name">天河粮储通知权限</field>
         <field name="category_id" ref="module_category_yuthon_notice"/>
+        <field name="implied_ids" eval="[(4, ref('module_category_yuthon_notice_user'))]"/>
     </record>
 
-    <!--天河物管通知群组 -->
     <record id="group_wg_notice_topic" model="res.groups">
         <field name="name">天河物管通知权限</field>
         <field name="category_id" ref="module_category_yuthon_notice"/>
+        <field name="implied_ids" eval="[(4, ref('module_category_yuthon_notice_user'))]"/>
     </record>
 
-    <!-- 通知管理员群组 -->
     <record id="group_notice_admin" model="res.groups">
         <field name="name">通知管理员</field>
         <field name="category_id" ref="module_category_yuthon_notice"/>
-        <field name="implied_ids" eval="[(4, ref('group_tz_notice_topic')),
+        <field name="implied_ids" eval="[(4, ref('module_category_yuthon_notice_user')),(4, ref('group_tz_notice_topic')),
         (4, ref('group_lc_notice_topic')), (4, ref('group_wg_notice_topic'))]"/>
         <field name="users" eval="[(4, ref('base.user_admin'))]"/>
     </record>
diff --git a/yuthon_notice/views/yuthon_notice_views.xml b/yuthon_notice/views/yuthon_notice_views.xml
index eab9517b6..046ba2a71 100644
--- a/yuthon_notice/views/yuthon_notice_views.xml
+++ b/yuthon_notice/views/yuthon_notice_views.xml
@@ -179,6 +179,7 @@
             id="yuthon_notice_menu_config_root"
             name="通知公告"
             web_icon="yuthon_notice,static/description/icon.png"
+            groups="module_category_yuthon_notice_user"
             sequence="1"/>
 
     <menuitem
@@ -186,36 +187,33 @@
             parent="yuthon_notice_menu_config_root"
             name="我的通知公告"
             action="approval_notice_action2"
+            groups="module_category_yuthon_notice_user"
             sequence="2"/>
-    <menuitem
-            id="yuthon_notice_menu"
-            parent="yuthon_notice_menu_config_root"
-            name="管理"
-            sequence="5"/>
+
     <menuitem
             id="yuthon_notice_menu1"
-            parent="yuthon_notice_menu"
+            parent="yuthon_notice_menu_config_root"
             name="全部"
             action="approval_notice_action"
             groups="yuthon_notice.group_notice_admin"
             sequence="1"/>
     <menuitem
             id="yuthon_notice_menu2"
-            parent="yuthon_notice_menu"
+            parent="yuthon_notice_menu_config_root"
             name="领导日程(集团本部)"
             action="approval_notice_action3"
             groups="yuthon_notice.group_tz_notice_topic"
             sequence="3"/>
     <menuitem
             id="yuthon_notice_menu3"
-            parent="yuthon_notice_menu"
+            parent="yuthon_notice_menu_config_root"
             name="领导日程(粮储公司)"
             action="approval_notice_action4"
             groups="yuthon_notice.group_lc_notice_topic"
             sequence="5"/>
     <menuitem
             id="yuthon_notice_menu4"
-            parent="yuthon_notice_menu"
+            parent="yuthon_notice_menu_config_root"
             name="领导日程(物管公司)"
             action="approval_notice_action5"
             groups="yuthon_notice.group_wg_notice_topic"
diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml
index d29f3fa95..e34812772 100644
--- a/yuthon_work_brand/views/hr_menus.xml
+++ b/yuthon_work_brand/views/hr_menus.xml
@@ -4,7 +4,6 @@
     <menuitem id="human_resources_menu_root_board"
               name="人力资源"
               web_icon="yuthon_work_brand,static/description/hr.png"
-              groups="hr.group_hr_user"
               sequence="8"/>
     <!-- 招聘管理  -->
     <menuitem id="hr_recruitment_menu_root_board"