From c9686df1d05c8d46867a9328521ef13bb67821e1 Mon Sep 17 00:00:00 2001
From: Dhawal Limbuwala <dli@odoo.com>
Date: Mon, 17 Apr 2017 16:45:33 +0530
Subject: [PATCH] [IMP] base: Reorganise General Settings

Purpose
=======

Clean the menu on Settings as some the items are really advanced

Specification
=============

- Keep Menu : Dashboard - Users & Company - Translations - General Settings

- Google drive is already on General Settings - no need to repeat Remove

- and add to debug menu + : Postal Printings - Database anonymization
---
 addons/anonymization/views/anonymization_views.xml |  3 ++-
 addons/base_setup/views/res_config_views.xml       |  2 +-
 addons/google_drive/views/google_drive_views.xml   | 10 ----------
 odoo/addons/base/base_menu.xml                     |  4 ++--
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/addons/anonymization/views/anonymization_views.xml b/addons/anonymization/views/anonymization_views.xml
index df81688365a..457aa30e573 100644
--- a/addons/anonymization/views/anonymization_views.xml
+++ b/addons/anonymization/views/anonymization_views.xml
@@ -99,7 +99,8 @@
     <menuitem id="menu_administration_anonymization"
               name="Database anonymization"
               parent="base.menu_administration"
-              sequence="30" />
+              sequence="30"
+              groups="base.group_no_one" />
 
     <menuitem id="menu_administration_anonymization_history"
               name="Anonymization History"
diff --git a/addons/base_setup/views/res_config_views.xml b/addons/base_setup/views/res_config_views.xml
index 69b90a983cb..86dac4a307b 100644
--- a/addons/base_setup/views/res_config_views.xml
+++ b/addons/base_setup/views/res_config_views.xml
@@ -198,7 +198,7 @@
             id="menu_config"
             name="General Settings"
             parent="base.menu_administration"
-            sequence="1"
+            sequence="2"
             action="action_general_configuration"
             groups="base.group_system"/>
 
diff --git a/addons/google_drive/views/google_drive_views.xml b/addons/google_drive/views/google_drive_views.xml
index bc0ff8f23e5..4e282533ec2 100644
--- a/addons/google_drive/views/google_drive_views.xml
+++ b/addons/google_drive/views/google_drive_views.xml
@@ -68,14 +68,4 @@
             </field>
         </record>
 
-        <menuitem
-            id='menu_google_drive_config'
-            name='Google Drive'
-            parent='base.menu_administration' />
-
-        <menuitem
-            id='menu_google_drive_model_config'
-            parent='menu_google_drive_config'
-            action='action_google_drive_users_config' />
-
 </odoo>
diff --git a/odoo/addons/base/base_menu.xml b/odoo/addons/base/base_menu.xml
index 89f3fd15118..4b57bf79288 100644
--- a/odoo/addons/base/base_menu.xml
+++ b/odoo/addons/base/base_menu.xml
@@ -13,8 +13,8 @@
           groups="base.group_erp_manager"/>
           <menuitem id="menu_management" name="Apps" sequence="310" web_icon="base,static/description/modules.png" groups="base.group_system"/>
           <menuitem id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/>
-          <menuitem id="menu_users" name="Users" parent="menu_administration" sequence="0"/>
-          <menuitem id="menu_translation" name="Translations" parent="menu_administration" sequence="7"/>
+          <menuitem id="menu_users" name="Users &amp; Companies" parent="menu_administration" sequence="0"/>
+          <menuitem id="menu_translation" name="Translations" parent="menu_administration" sequence="1"/>
               <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" parent="menu_translation" sequence="3" groups="base.group_no_one"/>