From 0657d0bfc17edb8aac7caf7bb5f81151f9e4a6cb Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 2 Jul 2012 23:08:02 +0200
Subject: [PATCH] [IMP] improve technical menu, hide reporting for portal users

bzr revid: al@openerp.com-20120702210802-ua1586mm4klalrvl
---
 openerp/addons/base/base_menu.xml                   | 11 +++++------
 openerp/addons/base/ir/ir.xml                       |  2 +-
 openerp/addons/base/ir/ir_config_parameter_view.xml |  3 +--
 openerp/addons/base/ir/workflow/workflow_view.xml   |  4 ++--
 openerp/addons/base/res/ir_property_view.xml        |  1 -
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml
index 4af0bb38105..90c7dd348e6 100644
--- a/openerp/addons/base/base_menu.xml
+++ b/openerp/addons/base/base_menu.xml
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem id="menu_reporting" name="Reporting" sequence="90"/>
+        <menuitem id="menu_reporting" name="Reporting" sequence="90" groups="base.group_user"/>
             <menuitem id="menu_reporting_dashboard" name="Dashboards" parent="menu_reporting" sequence="0"/>
             <menuitem id="menu_reporting_config" name="Configuration" parent="menu_reporting" sequence="100" groups="base.group_system"/>
-        <menuitem id="menu_administration" name="Settings" sequence="100" icon="terp-administration"/>
+        <menuitem id="menu_administration" name="Settings" sequence="100"/>
             <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_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="base.group_no_one"/>
-                <menuitem id="menu_translation_export" name="Import / Export" groups="base.group_no_one" parent="menu_translation" sequence="3"/>
-            <menuitem id="menu_custom" name="Technical" parent="menu_administration" sequence="110" groups="base.group_no_one"/> 
+                <menuitem id="menu_translation_export" name="Import / Export" parent="menu_translation" sequence="3" groups="base.group_no_one"/>
+            <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="menu_security" name="Security" parent="menu_custom" sequence="25"/>
+                <menuitem id="menu_ir_property" name="Parameters" parent="menu_custom" sequence="24"/>
                 <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"/>
-
     </data>
 </openerp>
diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 392bb60c53e..88843b207f9 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -328,7 +328,7 @@
             <field name="view_id" ref="action_view_tree"/>
             <field name="search_view_id" ref="action_view_search"/>
         </record>
-        <menuitem id="next_id_6" name="Actions" parent="base.next_id_4" sequence="1"/>
+        <menuitem id="next_id_6" name="Actions" parent="base.menu_custom" sequence="2"/>
         <menuitem action="ir_sequence_actions" id="menu_ir_sequence_actions" parent="next_id_6"/>
         <menuitem action="act_values_form_action" id="menu_values_form_action" parent="next_id_6"/>
         <menuitem action="act_values_form_defaults" id="menu_values_form_defaults" parent="next_id_6"/>
diff --git a/openerp/addons/base/ir/ir_config_parameter_view.xml b/openerp/addons/base/ir/ir_config_parameter_view.xml
index 3df9b80551c..6b1c6c4f86e 100644
--- a/openerp/addons/base/ir/ir_config_parameter_view.xml
+++ b/openerp/addons/base/ir/ir_config_parameter_view.xml
@@ -40,7 +40,6 @@
         </record>
 
         <act_window name="System Parameters" res_model="ir.config_parameter" id="ir_config_list_action"/>
-        <menuitem name="System Parameters" id="ir_config_menu"
-                  parent="base.next_id_4" action="ir_config_list_action" groups="base.group_no_one"/>
+        <menuitem id="ir_config_menu" name="System Parameters" parent="menu_ir_property" action="ir_config_list_action"/>
     </data>
 </openerp>
diff --git a/openerp/addons/base/ir/workflow/workflow_view.xml b/openerp/addons/base/ir/workflow/workflow_view.xml
index bda98b7c8c0..89809d327ae 100644
--- a/openerp/addons/base/ir/workflow/workflow_view.xml
+++ b/openerp/addons/base/ir/workflow/workflow_view.xml
@@ -317,7 +317,7 @@
       <field name="context">{'search_default_active':1}</field>
       <field name="search_view_id" ref="view_workflow_instance_search"/>
     </record>
-    <menuitem action="action_workflow_instance_form" id="menu_workflow_instance" parent="base.menu_low_workflow"/>
+    <menuitem action="action_workflow_instance_form" id="menu_workflow_instance" parent="base.menu_workflow_root"/>
 
     <!--
         ================================
@@ -383,7 +383,7 @@
       <field name="context">{'search_default_active':1}</field>
       <field name="search_view_id" ref="view_workflow_workitem_search"/>
     </record>
-    <menuitem action="action_workflow_workitem_form" id="menu_workflow_workitem" parent="base.menu_low_workflow"/>
+    <menuitem action="action_workflow_workitem_form" id="menu_workflow_workitem" parent="base.menu_workflow_root"/>
 
   </data>
 </openerp>
diff --git a/openerp/addons/base/res/ir_property_view.xml b/openerp/addons/base/res/ir_property_view.xml
index 9717cea1fef..8ca8e98bb32 100644
--- a/openerp/addons/base/res/ir_property_view.xml
+++ b/openerp/addons/base/res/ir_property_view.xml
@@ -66,7 +66,6 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="ir_property_view_tree"/>
         </record>
-        <menuitem id="menu_ir_property" name="Parameters" parent="menu_custom" groups="base.group_no_one" sequence="24"/>
         <menuitem id="menu_ir_property_form_all" parent="menu_ir_property" action="ir_property_form"/>
     </data>
 </openerp>