From f3f1699be70d6e62f29b27201e54ead2cad31862 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 19 Apr 2012 01:26:50 +0200
Subject: [PATCH 1/2] [IMP] settings menu reorg

bzr revid: al@openerp.com-20120418232650-amyi9cs68nqa5xhj
---
 openerp/addons/base/base_menu.xml             | 47 +++++++------------
 openerp/addons/base/base_update.xml           | 13 +----
 openerp/addons/base/ir/ir.xml                 | 35 +++++++-------
 .../publisher_warranty_view.xml               | 14 ++----
 openerp/addons/base/res/ir_property_view.xml  |  4 +-
 5 files changed, 38 insertions(+), 75 deletions(-)

diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml
index d8cde2700ba..9711228ce6e 100644
--- a/openerp/addons/base/base_menu.xml
+++ b/openerp/addons/base/base_menu.xml
@@ -1,36 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-administration" id="menu_administration"
-                  name="Settings" sequence="50"
-                  web_icon="data/administration.png"
-                  web_icon_hover="data/administration-hover.png"/>
-
-        <menuitem icon="terp-administration" id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/>
-        <menuitem id="menu_custom" name="Customization"
-            parent="base.menu_administration" sequence="6"
-            groups="base.group_extended"/>
-        <menuitem id="next_id_4" name="Low Level Objects"
-            parent="base.menu_custom" sequence="30"/>
-        <menuitem id="menu_low_workflow" name="Workflows" parent="base.next_id_4"/>
-        <menuitem id="menu_custom_action" name="Actions" parent="base.menu_custom" groups="base.group_extended" sequence="20"/>
-        <menuitem id="menu_config" name="Configuration" parent="base.menu_administration" sequence="1"/>
-        <menuitem id="menu_translation" name="Translations" parent="base.menu_administration" sequence="6"/>
-        <menuitem id="menu_translation_app" name="Application Terms" parent="base.menu_translation" sequence="4" groups="base.group_extended"/>
-        <menuitem id="menu_translation_export" name="Import / Export"
-            groups="base.group_extended" parent="base.menu_translation" sequence="3"/>
-        <menuitem id="menu_users" name="Users" parent="base.menu_administration" sequence="4"/>
-        <menuitem id="menu_security" name="Security" parent="base.menu_administration" sequence="5"
-            groups="base.group_extended"/>
-        <menuitem id="menu_management" name="Modules" parent="base.menu_administration" sequence="0"/>
-        <menuitem id="reporting_menu"
-            parent="base.menu_custom" name="Reporting" sequence="30"
-             />
-
-        <menuitem id="base.menu_reporting" name="Reporting" sequence="45"/>
-        <menuitem id="base.menu_reporting_dashboard" name="Dashboards" sequence="0" parent="base.menu_reporting" groups="base.group_extended"/>
-        <menuitem id="menu_audit" name="Audit" parent="base.menu_reporting" sequence="50" groups="base.group_system"/>
-        <menuitem id="base.menu_reporting_config" name="Configuration" parent="base.menu_reporting" sequence="100" groups="base.group_system"/>
-
+        <menuitem id="menu_reporting" name="Reporting" sequence="90"/>
+            <menuitem id="menu_reporting_dashboard" name="Dashboards" parent="menu_reporting" sequence="0" groups="group_extended"/>
+            <menuitem id="menu_reporting_config" name="Configuration" parent="menu_reporting" sequence="100" groups="group_system"/>
+        <menuitem id="menu_administration" name="Settings" sequence="100" icon="terp-administration"/>
+            <menuitem id="menu_management" name="Modules" parent="menu_administration" sequence="0"/>
+            <menuitem id="menu_config" name="Configuration" parent="menu_administration" sequence="1"/>
+                <menuitem id="menu_custom" name="Technical" parent="menu_config" sequence="8" groups="group_extended"/>
+                    <menuitem id="next_id_2" name="User Interface" parent="menu_custom" groups="base.group_extended"/>
+                    <menuitem id="menu_security" name="Security" parent="menu_custom" sequence="25"/>
+                    <menuitem id="next_id_4" name="Low Level Objects" parent="menu_custom" sequence="30"/>
+                        <menuitem id="menu_low_workflow" name="Workflows" parent="next_id_4"/>
+            <menuitem id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/>
+            <menuitem id="menu_users" name="Users" parent="menu_administration" sequence="4"/>
+            <menuitem id="menu_translation" name="Translations" parent="menu_administration" sequence="7"/>
+                <menuitem id="menu_translation_app" name="Application Terms" parent="menu_translation" sequence="4" groups="group_extended"/>
+                <menuitem id="menu_translation_export" name="Import / Export" groups="group_extended" parent="menu_translation" sequence="3"/>
     </data>
 </openerp>
diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index 8a46c985dad..597fa824a59 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -1,18 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <!--
-    ======================
-    Languages
-    ======================
-    -->
-        <menuitem id="next_id_2" name="User Interface" parent="base.menu_custom" groups="base.group_extended"/>
-
-        <!--
-    ======================
-    Groups
-    ======================
-    -->
+        <!-- res.groups -->
         <record id="view_groups_form" model="ir.ui.view">
             <field name="name">res.groups.form</field>
             <field name="model">res.groups</field>
diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index e66182bae39..4907eae09e5 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -893,7 +893,7 @@
             <field name="res_model">ir.ui.view.custom</field>
             <field name="help">Customized views are used when users reorganize the content of their dashboard views (via web client)</field>
         </record>
-        <menuitem action="action_ui_view_custom" id="menu_action_ui_view_custom" parent="base.next_id_4"/>
+        <menuitem id="menu_action_ui_view_custom" action="action_ui_view_custom" parent="base.next_id_2"/>
 
 
         <!-- Attachment -->
@@ -1479,11 +1479,8 @@
         </record>
         <menuitem action="grant_menu_access" id="menu_grant_menu_access" parent="base.next_id_2" sequence="1"/>
 
-        <!--
-    =============================================================
-    Cron Jobs
-    =============================================================
-    -->
+        <!-- ir.cron -->
+
         <record id="ir_cron_view_tree" model="ir.ui.view">
             <field name="name">ir.cron.tree</field>
             <field name="model">ir.cron</field>
@@ -1574,9 +1571,10 @@
             <field name="view_id" ref="ir_cron_view_tree"/>
         </record>
 
-        <menuitem id="next_id_10" name="Scheduler" parent="base.menu_config"  groups="base.group_extended" sequence="23"/>
-        <menuitem action="ir_cron_act" id="menu_ir_cron_act" parent="next_id_10"/>
+        <menuitem id="menu_ir_cron" name="Scheduler" parent="menu_custom"  groups="base.group_extended" sequence="23"/>
+        <menuitem id="menu_ir_cron_act" action="ir_cron_act" parent="menu_ir_cron"/>
 
+        <!-- ir.model.access -->
 
         <record id="ir_access_view_tree" model="ir.ui.view">
             <field name="name">ir.model.access.tree</field>
@@ -1878,6 +1876,8 @@
         </record>
         <menuitem action="action_server_action" id="menu_server_action" parent="base.next_id_6"/>
 
+        <!-- ir.actions.todo -->
+
         <record id="ir_actions_todo_tree" model="ir.ui.view">
             <field name="model">ir.actions.todo</field>
             <field name="name">Config Wizard Steps</field>
@@ -1950,13 +1950,8 @@
             <field name="view_type">form</field>
             <field name="help">The configuration wizards are used to help you configure a new instance of OpenERP. They are launched during the installation of new modules, but you can choose to restart some wizards manually from this menu.</field>
         </record>
-        <menuitem id="next_id_11" name="Configuration Wizards" parent="base.menu_config" sequence="20"
-            groups="base.group_extended"/>
-
-        <menuitem action="act_ir_actions_todo_form" id="menu_ir_actions_todo_form"
-                parent="next_id_11" sequence="20"/>
-
-
+        <menuitem id="menu_ir_actions_todo" name="Configuration Wizards" parent="menu_custom" sequence="20" groups="base.group_extended"/> 
+        <menuitem id="menu_ir_actions_todo_form" action="act_ir_actions_todo_form" parent="menu_ir_actions_todo"/>
 
         <record model="ir.cron" id="cronjob_osv_memory_autovacuum">
             <field name='name'>AutoVacuum osv_memory objects</field>
@@ -1969,7 +1964,9 @@
             <field name="function">power_on</field>
             <field name="args">()</field>
         </record>
-        
+
+        <!-- ir.actions.todo category -->
+
         <record id="ir_actions_todo_category_form" model="ir.ui.view">
             <field name="name">ir.actions.todo.category.form</field>
             <field name="model">ir.actions.todo.category</field>
@@ -1982,7 +1979,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="ir_actions_todo_category_tree" model="ir.ui.view">
             <field name="name">ir.actions.todo.category.tree</field>
             <field name="model">ir.actions.todo.category</field>
@@ -1998,12 +1995,12 @@
         <record id="category_sales_management_config" model="ir.actions.todo.category">
             <field name="name">Sales Management</field>
             <field name="sequence">5</field>
-        </record>         
+        </record>
 
         <record id="category_tools_customization_config" model="ir.actions.todo.category">
             <field name="name">Tools / Customization</field>
             <field name="sequence">5</field>
-        </record>         
+        </record>
 
         <!-- ir.mail.server -->
         <record model="ir.ui.view" id="ir_mail_server_form">
diff --git a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
index 8c40d0a1c6b..4b15ff8f8c0 100644
--- a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
+++ b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <menuitem id="menu_publisher_warranty" name="OpenERP Entreprise" parent="base.menu_administration" sequence="5"/>
 
         <record id="publisher_warranty_contract_tree_view" model="ir.ui.view">
             <field name="name">publisher_warranty.contract.tree</field>
@@ -81,12 +82,7 @@
             <field name="view_mode">tree,form,calendar</field>
             <field name="search_view_id" ref="publisher_warranty_contract_search_view"/>
         </record>
-
-        <menuitem name="Publisher Warranty" id="publisher_warranty"
-            parent="base.menu_administration"/>
-
-        <menuitem action="action_publisher_warranty_contract_form" id="menu_publisher_warranty_contract"
-            parent="publisher_warranty" sequence="2"/>
+        <menuitem id="menu_publisher_warranty_contract" parent="menu_publisher_warranty" action="action_publisher_warranty_contract_form" sequence="2"/>
 
 
         <record id="publisher_warranty_contract_add_wizard" model="ir.ui.view">
@@ -139,11 +135,7 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-
-        <menuitem
-            action="action_publisher_warranty_contract_add_wizard"
-            id="menu_publisher_warranty_contract_add"
-            parent="publisher_warranty" sequence="1"/>
+        <menuitem id="menu_publisher_warranty_contract_add" action="action_publisher_warranty_contract_add_wizard" parent="menu_publisher_warranty" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/openerp/addons/base/res/ir_property_view.xml b/openerp/addons/base/res/ir_property_view.xml
index d0292576199..87835cafffc 100644
--- a/openerp/addons/base/res/ir_property_view.xml
+++ b/openerp/addons/base/res/ir_property_view.xml
@@ -75,7 +75,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="ir_property_view_tree"/>
         </record>
-        <menuitem id="next_id_15" name="Parameters" parent="base.menu_config" groups="base.group_extended" sequence="24"/>
-        <menuitem action="ir_property_form" id="menu_ir_property_form_all" parent="base.next_id_15"/>
+        <menuitem id="menu_ir_property" name="Parameters" parent="menu_custom" groups="group_extended" sequence="24"/>
+        <menuitem id="menu_ir_property_form_all" parent="menu_ir_property" action="ir_property_form"/>
     </data>
 </openerp>

From 76361a7acb8c3880c4075be75e5db7f0320fc2b9 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 19 Apr 2012 01:33:11 +0200
Subject: [PATCH 2/2] [IMP] settings menu reorg fix email

bzr revid: al@openerp.com-20120418233311-sj7ti2uy50ke5e9y
---
 openerp/addons/base/base_menu.xml | 1 +
 openerp/addons/base/ir/ir.xml     | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml
index 9711228ce6e..efc6844d383 100644
--- a/openerp/addons/base/base_menu.xml
+++ b/openerp/addons/base/base_menu.xml
@@ -9,6 +9,7 @@
             <menuitem id="menu_config" name="Configuration" parent="menu_administration" sequence="1"/>
                 <menuitem id="menu_custom" name="Technical" parent="menu_config" sequence="8" groups="group_extended"/>
                     <menuitem id="next_id_2" name="User Interface" parent="menu_custom" groups="base.group_extended"/>
+                    <menuitem id="menu_email" name="Email" parent="menu_custom" sequence="1"/>
                     <menuitem id="menu_security" name="Security" parent="menu_custom" sequence="25"/>
                     <menuitem id="next_id_4" name="Low Level Objects" parent="menu_custom" sequence="30"/>
                         <menuitem id="menu_low_workflow" name="Workflows" parent="next_id_4"/>
diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 4907eae09e5..bf970a9b4d1 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -2067,8 +2067,6 @@
             <field name="view_id" ref="ir_mail_server_list" />
             <field name="search_view_id" ref="view_ir_mail_server_search"/>
         </record>
-
-        <menuitem id="menu_email" name="Email" parent="base.menu_config" sequence="22"/>
         <menuitem id="menu_mail_servers" parent="menu_email" action="action_ir_mail_server_list" sequence="15" groups="base.group_no_one"/>
 
     </data>