From 57e2036e430fdff2cf266473018f894c2828ec6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sat, 27 Feb 2021 18:16:28 +0100
Subject: [PATCH] Follow common rule to organize menu entries

issue10118
review347611002
---
 category.xml      | 15 ++++++++++-----
 configuration.xml |  7 +++++--
 product.xml       | 33 ++++++++++++++++++++++++++-------
 uom.xml           | 15 ++++++++++-----
 4 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/category.xml b/category.xml
index 0db0de2c21..f17d27027c 100644
--- a/category.xml
+++ b/category.xml
@@ -45,8 +45,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="act_window" ref="act_category_tree"/>
         </record>
 
-        <menuitem parent="menu_main_product" sequence="2"
-            action="act_category_tree" id="menu_category_tree"/>
+        <menuitem
+            parent="menu_main_product"
+            action="act_category_tree"
+            sequence="20"
+            id="menu_category_tree"/>
 
         <record model="ir.action.act_window" id="act_category_list">
             <field name="name">Categories</field>
@@ -62,9 +65,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="view" ref="category_view_form"/>
             <field name="act_window" ref="act_category_list"/>
         </record>
-        <menuitem parent="menu_category_tree"
-            sequence="10" id="menu_category_list"
-            action="act_category_list"/>
+        <menuitem
+            parent="menu_category_tree"
+            action="act_category_list"
+            sequence="10"
+            id="menu_category_list"/>
 
         <record model="ir.action.act_window" id="act_category_product">
             <field name="name">Add products</field>
diff --git a/configuration.xml b/configuration.xml
index 88ae1e2abe..4cf2ce46d6 100644
--- a/configuration.xml
+++ b/configuration.xml
@@ -20,9 +20,12 @@ this repository contains the full copyright notices and license terms. -->
             <field name="view" ref="product_configuration_view_form"/>
             <field name="act_window" ref="act_product_configuration_form"/>
         </record>
-        <menuitem parent="menu_configuration"
+        <menuitem
+            parent="menu_configuration"
             action="act_product_configuration_form"
-            id="menu_product_configuration" sequence="0" icon="tryton-list"/>
+            sequence="10"
+            id="menu_product_configuration"
+            icon="tryton-list"/>
         <record model="ir.ui.menu-res.group"
             id="menu_product_configuration_group_product_admin">
             <field name="menu" ref="menu_product_configuration"/>
diff --git a/product.xml b/product.xml
index a35d12c66d..ecba6e51b2 100644
--- a/product.xml
+++ b/product.xml
@@ -16,17 +16,29 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">tryton-product</field>
             <field name="path">icons/tryton-product.svg</field>
         </record>
-        <menuitem name="Product" id="menu_main_product" sequence="1"
+        <menuitem
+            name="Product"
+            sequence="30"
+            id="menu_main_product"
             icon="tryton-product"/>
 
-        <menuitem name="Configuration" parent="menu_main_product" id="menu_configuration" sequence="0" icon="tryton-settings"/>
+        <menuitem
+            name="Configuration"
+            parent="menu_main_product"
+            sequence="0"
+            id="menu_configuration"
+            icon="tryton-settings"/>
         <record model="ir.ui.menu-res.group"
             id="menu_product_group_product_admin">
             <field name="menu" ref="menu_configuration"/>
             <field name="group" ref="group_product_admin"/>
         </record>
 
-        <menuitem name="Reporting" parent="menu_main_product" id="menu_reporting" sequence="100"/>
+        <menuitem
+            name="Reporting"
+            parent="menu_main_product"
+            sequence="100"
+            id="menu_reporting"/>
 
         <record model="ir.ui.view" id="template_view_tree">
             <field name="model">product.template</field>
@@ -55,8 +67,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="act_window" ref="act_template_form"/>
         </record>
 
-        <menuitem parent="menu_main_product" sequence="1" id="menu_template"
-            action="act_template_form"/>
+        <menuitem
+            parent="menu_main_product"
+            action="act_template_form"
+            sequence="10"
+            id="menu_template"/>
 
         <record model="ir.action.act_window" id="act_template_by_category">
             <field name="name">Product by Category</field>
@@ -128,8 +143,12 @@ this repository contains the full copyright notices and license terms. -->
             <field name="act_window" ref="act_product_form"/>
         </record>
 
-        <menuitem parent="menu_template" sequence="1" id="menu_product"
-            action="act_product_form" icon="tryton-list"/>
+        <menuitem
+            parent="menu_template"
+            action="act_product_form"
+            sequence="10"
+            id="menu_product"
+            icon="tryton-list"/>
 
         <record model="ir.model.access" id="access_product">
             <field name="model" search="[('model', '=', 'product.product')]"/>
diff --git a/uom.xml b/uom.xml
index d1e5ec125e..00515dfb13 100644
--- a/uom.xml
+++ b/uom.xml
@@ -27,8 +27,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="view" ref="uom_view_form"/>
             <field name="act_window" ref="act_uom_form"/>
         </record>
-        <menuitem name="Units of Measure" parent="menu_main_product"
-            sequence="3" id="menu_uom_form" action="act_uom_form"/>
+        <menuitem
+            parent="menu_configuration"
+            action="act_uom_form"
+            sequence="50"
+            id="menu_uom_form"/>
 
         <record model="ir.ui.view" id="uom_category_view_tree">
             <field name="model">product.uom.category</field>
@@ -56,9 +59,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="view" ref="uom_category_view_form"/>
             <field name="act_window" ref="act_uom_category_form"/>
         </record>
-        <menuitem parent="menu_uom_form" sequence="2"
-            id="menu_uom_category_form"
-            action="act_uom_category_form"/>
+        <menuitem
+            parent="menu_uom_form"
+            action="act_uom_category_form"
+            sequence="20"
+            id="menu_uom_category_form"/>
 
         <record model="product.uom.category" id="uom_cat_unit">
             <field name="name">Units</field>