!989 pengyu

Merge pull request !989 from 李鹏宇/dev

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="我的考勤"

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>

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"

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="yuthon_hr_employee.group_hr_employee_user"
               sequence="8"/>
     <!-- 招聘管理  -->
     <menuitem id="hr_recruitment_menu_root_board"