[IMP]: Re-organized Tools menu structure.

bzr revid: uco@tinyerp.com-20100617134420-52257h3u0w6y7iux

6 files changed, 17 insertions, 13 deletions

diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml
index 8d9a9549664..65973fea9f7 100644
--- a/addons/email_template/email_template_account_view.xml
+++ b/addons/email_template/email_template_account_view.xml
@@ -3,7 +3,8 @@
     <data>
 
         <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="28"/>
-        <menuitem name="Email Template" id="menu_email_template" parent="base.menu_tools"/>
+        <menuitem name="Emails" id="base.menu_emails" parent="base.menu_tools" sequence="5"/>
+        <menuitem name="Email Template" id="menu_email_template" parent="base.menu_emails"/>
 
         <record model="ir.ui.view" id="email_template_account_form">
             <field name="name">email_template.account.form</field>
@@ -95,7 +96,7 @@
             <field name="search_view_id" ref="view_email_template_account_search"/>
         </record>
 
-        <menuitem name="Configuration" id="menu_email_template_configuration" parent="menu_email_template" />
+        <menuitem name="Emails" id="menu_email_template_configuration" parent="base.menu_lunch_survey_root" />
 
         <menuitem name="Email Accounts" id="menu_email_template_account_all" parent="menu_email_template_configuration" action="action_email_template_account_tree_all"/>
 
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index fe1022b9d5c..d24ad041fee 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -44,9 +44,9 @@
     </record>
 
     <menuitem name="Configuration" parent="base.menu_tools"
-         id="base.menu_lunch_survey_root" sequence="6"/>
+         id="base.menu_lunch_survey_root" sequence="20"/>
 
-    <menuitem name="Ideas" parent="base.menu_lunch_survey_root" id="menu_ideas"/>
+    <menuitem name="Ideas" parent="base.menu_lunch_survey_root" id="menu_ideas" sequence="3"/>
 
     <menuitem name="Categories" parent="menu_ideas" id="menu_idea_category" action="action_idea_category" />
 
@@ -356,9 +356,9 @@
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
     </record>
-    <menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="5"/>
+    <menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="6"/>
 
-    <menuitem name="Idea" parent="base.menu_lunch_reporting" id="menu_idea_reporting"/>
+    <menuitem name="Idea" parent="base.menu_lunch_reporting" id="menu_idea_reporting" sequence="3"/>
 
     <menuitem name="Vote Statistics" parent="menu_idea_reporting"
         id="menu_idea_vote_stat" action="action_idea_vote_stat" />
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 7d494a6be06..aec0d877c18 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -6,14 +6,14 @@
               id="menu_lunch" sequence="1" />
 
           <menuitem name="Reporting" parent="base.menu_tools"
-              id="base.menu_lunch_reporting" sequence="5" />
+              id="base.menu_lunch_reporting" sequence="6" />
 
           <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" />
+              id="base.menu_lunch_survey_root" sequence="20" />
 
           <menuitem name="Lunch" parent="base.menu_lunch_survey_root"
               id="menu_lunch_category_root_configuration" sequence="1" />
diff --git a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
index ca4d8efd40c..ea9fba18384 100644
--- a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
+++ b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
@@ -48,7 +48,7 @@
     -->
 
     <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="28"/>
-    <menuitem name="Mailchimps" id="menu_action_mailchimp" parent="base.menu_tools" />
+    <menuitem name="Mailchimps" id="menu_action_mailchimp" parent="base.menu_emails" />
 
     <record model="ir.ui.view" id="view_mailchimp_account_tree">
         <field name="name">mailchimp.account.tree</field>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 2c53f02a447..478bb4a4f67 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28"/>
-        <menuitem id="next_id_45" name="Recurring Events" parent="base.menu_tools" sequence="2"/>
+        <menuitem id="next_id_45" name="Recurring Events" parent="base.menu_tools" sequence="4"/>
 
         <!--
         =======================================================
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 86aa52e6810..e2643b127b7 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -3,12 +3,15 @@
     <data>
 
             <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28"/>
+            <menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools" 
+                        groups="group_survey_manager,group_survey_user" sequence="2"/>
             <menuitem name="Define Surveys" id="menu_define_survey"
                  groups="group_survey_manager"
-                 parent="base.menu_tools" />
-            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="base.menu_tools" groups="group_survey_manager,group_survey_user"/>
+                 parent="menu_surveys" />
+            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="group_survey_manager,group_survey_user"/>
             <menuitem name="Reporting" parent="base.menu_tools"
-                id="menu_reporting" groups="group_survey_manager"/>
+                id="base.menu_lunch_reporting" groups="group_survey_manager" sequence="6"/>
+            <menuitem name="Surveys" id="menu_reporting" parent="base.menu_lunch_reporting" sequence="2"/>
         <!--
             Survey
         -->