From 55ae39d0bbff995b5b59a78617a24917a6f74257 Mon Sep 17 00:00:00 2001
From: "RCH(Open ERP)" <>
Date: Tue, 19 Jan 2010 15:49:21 +0530
Subject: [PATCH] [IMP] Improvements in survey, lunch and subscription menu

bzr revid: vir@tinyerp.com-20100119101921-vu9wjcfferhyt2yk
---
 addons/lunch/lunch_view.xml               | 20 ++++++++++++++------
 addons/subscription/subscription_view.xml |  6 +++---
 addons/survey/__terp__.py                 |  2 +-
 addons/survey/survey_view.xml             | 15 +++++++++++----
 4 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index a06e0d89b4f..fa6bf02c4dd 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -1,13 +1,21 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-
-        <menuitem name="Tools" id="menu_tools" icon="STOCK_PREFERENCES"/>
+          <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools"/>
+        <!--<menuitem name="Tools" id="menu_tools" icon="STOCK_PREFERENCES"/>
         <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="Lunch" parent="base.menu_lunch_survey_root" id="menu_lunch_category_root_configuration" sequence="5"/>
         <record model="ir.ui.view" id="view_lunch_order_form">
             <field name="name">Order</field>
             <field name="model">lunch.order</field>
@@ -88,7 +96,7 @@
                 <field name="name"> CashBox </field>
                 <field name="res_model">lunch.cashbox</field>
         </record>
-        <menuitem name="CashBox" parent="menu_lunch_category_root" id="menu_lunch_cashbox_form" action="action_lunch_cashbox_form"/>
+        <menuitem name="CashBox" parent="menu_lunch_category_root_configuration" id="menu_lunch_cashbox_form" action="action_lunch_cashbox_form"/>
 
         <record model="ir.ui.view" id="view_lunch_cashmove_form">
             <field name="name">CashMove</field>
@@ -191,8 +199,8 @@
         </record>
 
         <menuitem name="Tools/Lunch/Configuration/Products" id="menu_lunch_product_form" action="action_lunch_product_form"  sequence="1"/>
-        <menuitem name="Products" parent="menu_lunch_category_root" id="menu_lunch_product_form" action="action_lunch_product_form"  sequence="2"/>
-        <menuitem name="Category of product" parent="menu_lunch_category_root" id="menu_lunch_category_form" action="action_lunch_category_form" sequence="1"/>
+        <menuitem name="Products" parent="menu_lunch_category_root_configuration" id="menu_lunch_product_form" action="action_lunch_product_form"  sequence="2"/>
+        <menuitem name="Category of product" parent="menu_lunch_category_root_configuration" id="menu_lunch_category_form" action="action_lunch_category_form" sequence="1"/>
 
 
         <record model="ir.ui.view" id="view_report_lunch_amount_tree">
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 9fa87223cc9..0466d4501cf 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-        <menuitem icon="STOCK_PREFERENCES" id="menu_tools" name="Tools"/>
-        <menuitem id="next_id_45" name="Recurring Events" parent="subscription.menu_tools" sequence="2"/>
+        <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools"/>
+       <!-- <menuitem icon="STOCK_PREFERENCES" id="menu_tools" name="Tools"/>-->
+        <menuitem id="next_id_45" name="Recurring Events" parent="base.menu_tools" sequence="2"/>
 <!--        <menuitem id="menu_subscription_config" name="Configuration" parent="next_id_45"/>-->
         <!--
 	=======================================================
diff --git a/addons/survey/__terp__.py b/addons/survey/__terp__.py
index c38c1f576b3..4ca5b9275a2 100644
--- a/addons/survey/__terp__.py
+++ b/addons/survey/__terp__.py
@@ -32,7 +32,7 @@
     Partners are also sent mails with user name and password for the invitation of the survey
     """,
     'author': 'Tiny',
-    'depends': ['base','subscription'],
+    'depends': ['base'],
     'update_xml': ['survey_report.xml','survey_data.xml','survey_que_wizard.xml','survey_wizard.xml','survey_view.xml','security/ir.model.access.csv'],
     'demo_xml': ['survey_demo.xml'],
     'installable': True,
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 3a2de344c8e..c19ec067860 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
+         <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="subscription.menu_tools"/>-->
         <menuitem name="Survey" id="main_menu_survey"
             icon="terp-crm" sequence="1"
-            groups="group_survey_manager,group_survey_user" parent="subscription.menu_tools"/>
+            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" 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" sequence="5"/>
+            <menuitem name="survey" id="menu_survey_config"
+            parent="base.menu_lunch_survey_root" groups="group_survey_manager"/>
 
         <!--
             Survey