From 5cf167abc61ee85d21302f21c631c4baa6ca92ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Theys?= <seb@odoo.com>
Date: Fri, 3 Aug 2018 10:55:24 +0200
Subject: [PATCH] [IMP] sale: reorder menuitems in xml to match their sequence

The items were hardly readable in the xml because they were in a random order. They are now logically sorted by parent relation and sequence.

Unnecessary groups were also removed (child groups when parents already had more restrictive groups).

PR: #26345
Task: none
---
 addons/sale/views/sale_views.xml | 44 +++++++++++++++-----------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml
index 4fdbab32bc0..3e955ba02e6 100644
--- a/addons/sale/views/sale_views.xml
+++ b/addons/sale/views/sale_views.xml
@@ -2,7 +2,6 @@
 <odoo>
 
         <!-- Top menu item -->
-
         <menuitem id="sale_menu_root"
             name="Sales"
             web_icon="sale,static/description/icon.png"
@@ -14,29 +13,17 @@
             parent="sale_menu_root"
             sequence="2"/>
 
+        <menuitem id="report_sales_team"
+            name="Sales Teams"
+            parent="sale_order_menu"
+            action="sales_team.crm_team_salesteams_act"
+            sequence="3"/>
+
         <menuitem id="res_partner_menu"
             parent="sale_order_menu"
             action="base.action_partner_form"
             sequence="4" groups="sales_team.group_sale_salesman"/>
 
-        <menuitem id="menu_sale_config"
-            name="Configuration"
-            parent="sale_menu_root"
-            sequence="6"
-            groups="sales_team.group_sale_manager"/>
-
-        <menuitem id= "menu_sales_config"
-            parent= "menu_sale_config"
-            sequence= "3"
-            name= "Sales Orders"
-            groups= "sales_team.group_sale_manager,account.group_account_manager,account.group_account_user"/>
-
-        <menuitem id="sales_team_config"
-            name="Sales Teams"
-            parent="sale.menu_sale_config"
-            action="sales_team.sales_team_config_action"
-            sequence="2"/>
-
         <menuitem id="menu_sale_report"
             name="Reporting"
             parent="sale_menu_root"
@@ -49,11 +36,22 @@
             parent="menu_sale_report"
             sequence="1"/>
 
-        <menuitem id="report_sales_team"
+        <menuitem id="menu_sale_config"
+            name="Configuration"
+            parent="sale_menu_root"
+            sequence="6"
+            groups="sales_team.group_sale_manager"/>
+
+        <menuitem id="sales_team_config"
             name="Sales Teams"
-            parent="sale_order_menu"
-            action="sales_team.crm_team_salesteams_act"
-            sequence="3"/>
+            parent="sale.menu_sale_config"
+            action="sales_team.sales_team_config_action"
+            sequence="2"/>
+
+        <menuitem id="menu_sales_config"
+            parent="menu_sale_config"
+            sequence="3"
+            name="Sales Orders"/>
 
         <record id="product_template_action" model="ir.actions.act_window">
             <field name="name">Products</field>