From 587692bb5a8fc51528ca0b8ae45f94db5ab3d592 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 25 Jan 2010 15:43:41 +0530
Subject: [PATCH] [MOD] Modification in menus, set menus in Idea module

bzr revid: vir@tinyerp.com-20100125101341-9trzcq779zh8bbko
---
 addons/idea/idea_view.xml              | 28 +++++++++++++++-----------
 addons/idea/security/idea_security.xml | 14 ++++++-------
 addons/lunch/lunch_view.xml            | 16 +++++++--------
 addons/survey/survey_view.xml          |  8 ++++----
 4 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 64401748e62..fb705f820ca 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    <menuitem name="Tools" id="menu_tools" icon="STOCK_PREFERENCES" />
+    <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" />
         <record model="ir.ui.view" id="view_idea_category_form">
             <field name="name">idea.category.form</field>
             <field name="model">idea.category</field>
@@ -32,8 +32,10 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
     </record>
-    <menuitem name="Configuration" parent="menu_tools" id="menu_config"/>
-    <menuitem name="Ideas" parent="menu_config" id="menu_ideas"/>
+    <menuitem name="Configuration" parent="base.menu_tools"
+         id="base.menu_lunch_survey_root" sequence="6"/>
+<!--    <menuitem name="Configuration" parent="menu_tools" id="menu_config"/>-->
+    <menuitem name="Ideas" parent="base.menu_lunch_survey_root" id="menu_ideas"/>
     <menuitem name="Categories" parent="menu_ideas" id="menu_idea_category" action="action_idea_category"/>
 
     <record model="ir.actions.act_window" id="action_idea_category_tree">
@@ -42,10 +44,10 @@
         <field name="view_type">tree</field>
         <field name="domain">[('parent_id','=',False)]</field>
     </record>
-    <menuitem name="Ideas" parent="menu_tools" id="menu_ideas1"/>
-    <menuitem 
-        name="Ideas by Categories" parent="menu_ideas1" 
-        id="menu_idea_category_tree" 
+    <menuitem name="Ideas" parent="base.menu_tools" id="menu_ideas1" sequence="4"/>
+    <menuitem
+        name="Ideas by Categories" parent="menu_ideas1"
+        id="menu_idea_category_tree"
         action="action_idea_category_tree"/>
 
 
@@ -158,7 +160,7 @@
         <field name="arch" type="xml">
         <tree string="All Ideas">
             <field name="category_id" />
-            <field name="create_date"/> 
+            <field name="create_date"/>
             <field name="user_id" />
             <field name="title"/>
             <field name="vote_avg" />
@@ -168,7 +170,7 @@
         </tree>
         </field>
     </record>
-    
+
     <record model="ir.ui.view" id="view_idea_idea_search">
         <field name="name">idea.idea.search</field>
         <field name="model">idea.idea</field>
@@ -216,7 +218,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="domain">[('state','=','open')]</field>
-        <field name="filter" eval="True"/>        
+        <field name="filter" eval="True"/>
     </record>
 
         <record model="ir.ui.view" id="view_idea_vote_stat_graph">
@@ -262,8 +264,10 @@
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
     </record>
-    <menuitem name="Reporting" parent="menu_ideas1" id="menu_reporting"/>
-    <menuitem name="Vote Statistics" parent="menu_reporting" id="menu_idea_vote_stat" action="action_idea_vote_stat"/>
+	<menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="5"/>
+<!--    <menuitem name="Reporting" parent="menu_ideas1" id="menu_reporting"/>-->
+	<menuitem name="Idea" parent="base.menu_lunch_reporting" id="menu_idea_reporting"/>
+    <menuitem name="Vote Statistics" parent="menu_idea_reporting" id="menu_idea_vote_stat" action="action_idea_vote_stat"/>
 
 
     <record model="ir.actions.act_window" id="action_idea_vote">
diff --git a/addons/idea/security/idea_security.xml b/addons/idea/security/idea_security.xml
index 522560a0bb5..6fd4b290086 100644
--- a/addons/idea/security/idea_security.xml
+++ b/addons/idea/security/idea_security.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <openerp>
 	<data>
-		<record id="idea.menu_config" model="ir.ui.menu">
-			<field name="groups_id" eval="[(6,0,[ref('base.group_system')])]"/>
-		</record>
-
-		<record id="idea.menu_reporting" model="ir.ui.menu">
-			<field name="groups_id" eval="[(6,0,[ref('base.group_system')])]"/>
-		</record>
+<!--		<record id="idea.menu_config" model="ir.ui.menu">-->
+<!--			<field name="groups_id" eval="[(6,0,[ref('base.group_system')])]"/>-->
+<!--		</record>-->
+<!---->
+<!--		<record id="idea.menu_reporting" model="ir.ui.menu">-->
+<!--			<field name="groups_id" eval="[(6,0,[ref('base.group_system')])]"/>-->
+<!--		</record>-->
 	</data>
 </openerp>
 
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index fa6bf02c4dd..61844e099cb 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -6,16 +6,16 @@
         <menuitem name="Lunch Order" parent="menu_tools" id="menu_lunch" sequence="1"/>
         <menuitem name="Reporting" parent="menu_tools" id="menu_lunch_reporting" sequence="4"/>
         <menuitem name="Lunch Orders" parent="menu_lunch_reporting" id="menu_lunch_reporting_order" sequence="1"/>
-        <menuitem name="Configuration" parent="menu_tools" id="menu_lunch_category_root" sequence="5"/>-->
+        <menuitem name="Configuration" parent="menu_tools" id="menu_lunch_category_root" sequence="5"/>
        <menuitem name="Tools" id="menu_tools" icon="STOCK_PREFERENCES"/>-->
 
         <menuitem name="Lunch Order" parent="base.menu_tools" id="menu_lunch" sequence="1"/>
-        <menuitem name="Reporting" parent="base.menu_tools" id="menu_lunch_reporting" sequence="4"/>
-        <menuitem name="Lunch Orders" parent="menu_lunch_reporting" id="menu_lunch_reporting_order" sequence="1"/>
-        <menuitem name="Configuration" parent="base.menu_tools" id="base.menu_lunch_survey_root" sequence="5"/>
+        <menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="5"/>
+        <menuitem name="Lunch Orders" parent="base.menu_lunch_reporting" id="menu_lunch_reporting_order" sequence="1"/>
+        <menuitem name="Configuration" parent="base.menu_tools" id="base.menu_lunch_survey_root" sequence="6"/>
 
 
-       <menuitem name="Lunch" parent="base.menu_lunch_survey_root" id="menu_lunch_category_root_configuration" sequence="5"/>
+       <menuitem name="Lunch" parent="base.menu_lunch_survey_root" id="menu_lunch_category_root_configuration" sequence="1"/>
         <record model="ir.ui.view" id="view_lunch_order_form">
             <field name="name">Order</field>
             <field name="model">lunch.order</field>
@@ -54,11 +54,11 @@
 
 
         <record model="ir.actions.act_window" id="action_lunch_order_form">
-                <field name="name">Orders</field>
+                <field name="name">Lunch Orders</field>
                 <field name="res_model">lunch.order</field>
-                <field name="view_mode">form,tree</field>
+                <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name="Order" parent="menu_lunch" id="menu_lunch_order_form" action="action_lunch_order_form"/>
+        <menuitem name="Lunch Order" parent="menu_lunch" id="menu_lunch_order_form" action="action_lunch_order_form"/>
 
 <!--        <record model="ir.actions.act_window" id="action_lunch_order_day_form">-->
 <!--                <field name="name"> Order of the day</field>-->
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index c69e75c895d..40d8b695136 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -7,14 +7,14 @@
             groups="group_survey_manager,group_survey_user"/>-->
     <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools"/>
 	<menuitem name="Survey" id="main_menu_survey"
-            icon="terp-crm" sequence="1"
-            groups="group_survey_manager,group_survey_user" parent="base.menu_tools"/>
+            icon="terp-crm" sequence="3"
+            groups="group_survey_manager,group_survey_user" parent="base.menu_tools" />
 <!--        <menuitem name="Configuration" id="menu_survey_config"
             parent="main_menu_survey" groups="group_survey_manager"/>-->
 	<menuitem name="Configuration" parent="base.menu_tools"
-         id="base.menu_lunch_survey_root" groups="group_survey_manager" sequence="5"/>
+         id="base.menu_lunch_survey_root" groups="group_survey_manager" sequence="6"/>
     <menuitem name="survey" id="menu_survey_config"
-        parent="base.menu_lunch_survey_root" groups="group_survey_manager"/>
+        parent="base.menu_lunch_survey_root" groups="group_survey_manager" sequence="2"/>
         <!--
             Survey
         -->