!280 zhou

Merge pull request !280 from 李鹏宇/dev_zhou

room/views/room_menus.xml

@@ -20,4 +20,15 @@
         action="room.room_room_action"
         parent="room.room_menu_root"
         sequence="2"/>
+
+    <menuitem id="room_type_setting_menu"
+              name="配置"
+              parent="room.room_menu_root"
+              sequence="3"/>
+
+    <menuitem id="room_type_setting"
+              name="会议类型配置"
+              action="room.view_room_meeting_type_action"
+              parent="room_type_setting_menu"
+              sequence="1"/>
 </odoo>

yuthon_notice/views/yuthon_confirm_users_views.xml

@@ -35,11 +35,4 @@
         <field name="view_mode">tree</field>
         <field name="search_view_id" ref="yuthon_confirm_users_filter"/>
     </record>
-
-    <menuitem
-            id="yuthon_confirm_users_menu"
-            parent="yuthon_notice_menu_config_root"
-            name="公告确认信息"
-            action="yuthon_confirm_users_action"
-            sequence="9"/>
 </odoo>

yuthon_notice/views/yuthon_notice_views.xml

@@ -175,14 +175,14 @@
     <menuitem
             id="yuthon_notice_my_menu"
             parent="yuthon_notice_menu_config_root"
-            name="我的通知公告"
+            name="通知公告"
             action="approval_notice_action2"
             sequence="2"/>
 
     <menuitem
             id="yuthon_notice_menu"
             parent="yuthon_notice_menu_config_root"
-            name="通知公告管理"
+            name="管理"
             action="approval_notice_action"
             sequence="5"/>
 </odoo>