From 1ce7a9eca5c1508e6157cfe6cd4062c4e6c650e2 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:29 +0100
Subject: [PATCH] Follow common rule to organize menu entries

issue10118
review347611002
---
 configuration.xml |  6 ++++++
 recurrence.xml    |  4 +++-
 service.xml       |  7 +++++--
 subscription.xml  | 15 +++++++++++----
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/configuration.xml b/configuration.xml
index e0bf63a80a..627b56c3ce 100644
--- a/configuration.xml
+++ b/configuration.xml
@@ -3,6 +3,12 @@
 this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data>
+        <menuitem
+            name="Subscription"
+            parent="product.menu_configuration"
+            sequence="50"
+            id="menu_configuration"/>
+
         <record model="ir.sequence.type" id="sequence_type_subscription">
             <field name="name">Subscription</field>
             <field name="code">sale.subscription</field>
diff --git a/recurrence.xml b/recurrence.xml
index 54d6b6a5e0..338b4a6bbc 100644
--- a/recurrence.xml
+++ b/recurrence.xml
@@ -31,8 +31,10 @@ this repository contains the full copyright notices and license terms. -->
             <field name="view" ref="recurrence_rule_set_view_form"/>
             <field name="act_window" ref="act_recurrence_rule_set_form"/>
         </record>
-        <menuitem parent="product.menu_configuration"
+        <menuitem
+            parent="menu_configuration"
             action="act_recurrence_rule_set_form"
+            sequence="10"
             id="menu_recurrence_rule_set_form"/>
 
         <record model="ir.model.access" id="access_recurrence_rule_set">
diff --git a/service.xml b/service.xml
index 9f12cafd8d..62d4bd1f63 100644
--- a/service.xml
+++ b/service.xml
@@ -29,8 +29,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="view" ref="service_view_form"/>
             <field name="act_window" ref="act_service_form"/>
         </record>
-        <menuitem parent="product.menu_main_product" sequence="20"
-            action="act_service_form" id="menu_service_form"/>
+        <menuitem
+            parent="product.menu_main_product"
+            action="act_service_form"
+            sequence="20"
+            id="menu_service_form"/>
 
         <record model="ir.model.access" id="access_service">
             <field name="model"
diff --git a/subscription.xml b/subscription.xml
index 4a9360bc76..a6958f2b67 100644
--- a/subscription.xml
+++ b/subscription.xml
@@ -67,8 +67,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="domain"></field>
             <field name="act_window" ref="act_subscription_form"/>
         </record>
-        <menuitem parent="sale.menu_sale" action="act_subscription_form"
-            id="menu_subscription_form" sequence="20"/>
+        <menuitem
+            parent="sale.menu_sale"
+            action="act_subscription_form"
+            sequence="20"
+            id="menu_subscription_form"/>
         <record model="ir.ui.menu-res.group"
             id="menu_subscription_form_group_sale">
             <field name="menu" ref="menu_subscription_form"/>
@@ -295,8 +298,10 @@ this repository contains the full copyright notices and license terms. -->
             <field name="group" ref="sale.group_sale"/>
         </record>
 
-        <menuitem parent="menu_subscription_form" sequence="10"
+        <menuitem
+            parent="sale.menu_sale"
             action="act_line_consumption_create"
+            sequence="90"
             id="menu_line_consumption_create"/>
 
         <record model="ir.ui.view"
@@ -322,8 +327,10 @@ this repository contains the full copyright notices and license terms. -->
             <field name="group" ref="sale.group_sale"/>
         </record>
 
-        <menuitem parent="menu_subscription_form" sequence="20"
+        <menuitem
+            parent="sale.menu_sale"
             action="act_create_invoice"
+            sequence="90"
             id="menu_create_invoice"/>
 
         <record model="ir.ui.view" id="create_invoice_start_view_form">