From 4ff1c333d90f12318a7348d8d686f754e1552a0c Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 28 Jun 2014 17:32:01 +0200
Subject: [PATCH] [IMP] menuitems cleanups

Remove Tools
Move cron, action rules and subscription to Automation
Move and rename ir_property models to Parameters
---
 addons/base_action_rule/base_action_rule_view.xml |  5 +----
 addons/multi_company/res_company_view.xml         |  9 ++-------
 addons/subscription/subscription_view.xml         | 14 ++++----------
 openerp/addons/base/base_menu.xml                 |  2 ++
 openerp/addons/base/ir/ir_cron_view.xml           |  2 +-
 openerp/addons/base/ir/ir_logging_view.xml        |  2 +-
 openerp/addons/base/ir/ir_model_view.xml          |  1 -
 openerp/addons/base/res/ir_property_view.xml      |  2 +-
 openerp/addons/base/res/res_company_view.xml      |  6 ++----
 9 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index 8ed9b2d7b4b..2087d51a0d7 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem id="base.menu_base_action_rule_admin" name="Automated Actions"
-            parent="base.menu_custom" />
-
         <!-- Action Rule Form View -->
         <record id="view_base_action_rule_form" model="ir.ui.view">
             <field name="name">base.action.rule.form</field>
@@ -114,7 +111,7 @@
         </record>
 
         <menuitem id="menu_base_action_rule_form"
-            parent="base.menu_base_action_rule_admin" action="base_action_rule_act" sequence="1"/>
+            parent="base.menu_automation" action="base_action_rule_act" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/addons/multi_company/res_company_view.xml b/addons/multi_company/res_company_view.xml
index d69eb6e533d..c7df582a632 100644
--- a/addons/multi_company/res_company_view.xml
+++ b/addons/multi_company/res_company_view.xml
@@ -56,21 +56,16 @@
         </record>
 
         <record id="action_inventory_form" model="ir.actions.act_window">
-            <field name="name">Default Company per Object</field>
+            <field name="name">Company Defaults</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">multi_company.default</field>
             <field name="view_type">form</field>
             <field name="search_view_id" ref="view_inventory_search"/>
         </record>
 
-        <menuitem id="menu_custom_multicompany"
-            name="Multi-Companies"
-            parent="base.menu_custom"
-            sequence="50"/>
-
         <menuitem id="base.menu_action_inventory_form" 
             action="action_inventory_form"
-            parent="menu_custom_multicompany"/>
+            parent="base.menu_ir_property"/>
     </data>
 </openerp>
 
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 593eefb65a2..7ee225805bb 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <!-- Top menu item -->
-        <menuitem name="Tools" id="base.menu_tools" sequence="120" groups="base.group_tool_user"/>
-        <menuitem id="next_id_45" name="Recurring Events" parent="base.menu_tools" sequence="4"/>
 
         <!-- Subscription Views -->
         <record id="view_subscription_form" model="ir.ui.view">
@@ -85,7 +82,7 @@
         </record>
 
         <record id="action_subscription_form" model="ir.actions.act_window">
-            <field name="name">Subscriptions</field>
+            <field name="name">Recurring Documents</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">subscription.subscription</field>
             <field name="view_type">form</field>
@@ -93,7 +90,7 @@
             <field name="context">{'search_default_User':1}</field>
             <field name="search_view_id" ref="view_subscription_filter"/>
         </record>
-        <menuitem action="action_subscription_form" id="menu_action_subscription_form" parent="subscription.next_id_45"/>
+        <menuitem action="action_subscription_form" id="menu_action_subscription_form" parent="base.menu_automation"/>
 
         <record id="subscription_subscription_history_tree" model="ir.ui.view">
             <field name="name">subscription.subscription.history.tree</field>
@@ -181,17 +178,14 @@
         </record>
 
         <record id="action_document_form" model="ir.actions.act_window">
-            <field name="name">Document Types</field>
+            <field name="name">Recurring Types</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">subscription.document</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="document_tree"/>
             <field name="search_view_id" ref="view_subscription_document_filter"/>
         </record>
-        <menuitem name="Configuration" parent="base.menu_tools"
-              id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager"/>
-        <menuitem id="config_recuuring_event" name="Recurring Events" parent="base.menu_lunch_survey_root" sequence="4"/>
-        <menuitem action="action_document_form" id="menu_action_document_form" parent="config_recuuring_event"/>
+        <menuitem id="menu_action_document_form" action="action_document_form" parent="base.menu_automation"/>
 
     </data>
 </openerp>
diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml
index 19f1e8465e2..d9cd0c4e8bf 100644
--- a/openerp/addons/base/base_menu.xml
+++ b/openerp/addons/base/base_menu.xml
@@ -25,6 +25,8 @@
             <menuitem id="menu_custom" name="Technical" parent="menu_administration" sequence="110" groups="base.group_no_one"/>
                 <menuitem id="next_id_2" name="User Interface" parent="menu_custom"/>
                 <menuitem id="menu_email" name="Email" parent="menu_custom" sequence="1"/>
+                <menuitem id="next_id_9" name="Database Structure" parent="base.menu_custom"/>
+                <menuitem id="menu_automation" name="Automation" parent="base.menu_custom"/>
                 <menuitem id="menu_security" name="Security" parent="menu_custom" sequence="25"/>
                 <menuitem id="menu_ir_property" name="Parameters" parent="menu_custom" sequence="24"/>
 
diff --git a/openerp/addons/base/ir/ir_cron_view.xml b/openerp/addons/base/ir/ir_cron_view.xml
index 9d54931a8ce..f65b374f677 100644
--- a/openerp/addons/base/ir/ir_cron_view.xml
+++ b/openerp/addons/base/ir/ir_cron_view.xml
@@ -86,7 +86,7 @@
             <field name="context">{'active_test': False}</field>
             <field name="view_id" ref="ir_cron_view_tree"/>
         </record>
-        <menuitem id="menu_ir_cron_act" action="ir_cron_act" parent="base.next_id_6"/>
+        <menuitem id="menu_ir_cron_act" action="ir_cron_act" parent="base.menu_automation"/>
 
     </data>
 </openerp>
diff --git a/openerp/addons/base/ir/ir_logging_view.xml b/openerp/addons/base/ir/ir_logging_view.xml
index 1c2f3d84b86..6ecd6fa437b 100644
--- a/openerp/addons/base/ir/ir_logging_view.xml
+++ b/openerp/addons/base/ir/ir_logging_view.xml
@@ -61,6 +61,6 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="ir_logging_search_view" />
         </record>
-        <menuitem parent="base.menu_custom" id="ir_logging_all_menu" action="ir_logging_all_act" />
+        <menuitem parent="base.next_id_9" id="ir_logging_all_menu" action="ir_logging_all_act" />
     </data>
 </openerp>
diff --git a/openerp/addons/base/ir/ir_model_view.xml b/openerp/addons/base/ir/ir_model_view.xml
index 0d2f49e0c7b..bdd5868ce03 100644
--- a/openerp/addons/base/ir/ir_model_view.xml
+++ b/openerp/addons/base/ir/ir_model_view.xml
@@ -145,7 +145,6 @@
             <field name="context">{'manual':True}</field>
             <field name="view_id" ref="view_model_tree"/>
         </record>
-        <menuitem id="next_id_9" name="Database Structure" parent="base.menu_custom" groups="base.group_no_one"/>
         <menuitem action="action_model_model" id="ir_model_model_menu" parent="next_id_9"/>
 
         <!-- ir model fields -->
diff --git a/openerp/addons/base/res/ir_property_view.xml b/openerp/addons/base/res/ir_property_view.xml
index 37fb1b742aa..97afe1aafda 100644
--- a/openerp/addons/base/res/ir_property_view.xml
+++ b/openerp/addons/base/res/ir_property_view.xml
@@ -57,7 +57,7 @@
             </field>
         </record>
         <record id="ir_property_form" model="ir.actions.act_window">
-            <field name="name">Configuration Parameters</field>
+            <field name="name">Company Properties</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">ir.property</field>
             <field name="view_type">form</field>
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 214166a14d9..f1fb225d951 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -4,8 +4,6 @@
         <menuitem id="menu_res_company_global" parent="base.menu_administration" name="Companies" sequence="2"
             groups="base.group_no_one"/>
 
-        <menuitem id="menu_custom_multicompany" parent="base.menu_custom" name="Multi-Companies" sequence="50"/>
-
         <report id="preview_report" model="res.company" name="preview.report" multi="True" rml="base/report/preview_report.rml" string="Preview Report"/>
         <record id="bank_account_update" model="ir.actions.act_window">
             <field name="name">Company Bank Accounts</field>
@@ -207,13 +205,13 @@
             </field>
         </record>
         <record id="action_inventory_form" model="ir.actions.act_window">
-            <field name="name">Default Company per Object</field>
+            <field name="name">Company Defaults</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">multi_company.default</field>
             <field name="view_type">form</field>
             <field name="search_view_id" ref="view_inventory_search"/>
         </record>
-        <menuitem id="menu_action_inventory_form"  parent="menu_custom_multicompany" action="action_inventory_form"/>
+        <menuitem id="menu_action_inventory_form"  parent="base.menu_ir_property" action="action_inventory_form"/>
 
     </data>
 </openerp>