From 431e70000937a5d94a4869aef86c84e8043cacb4 Mon Sep 17 00:00:00 2001
From: Victor Feyens <vfe@odoo.com>
Date: Mon, 6 Mar 2023 10:15:47 +0000
Subject: [PATCH] [IMP] website_sale: clean menus definition

Part-of: odoo/odoo#114456
---
 addons/website_sale/__manifest__.py           |  3 +
 .../website_sale/views/sale_order_views.xml   | 72 --------------
 .../views/website_pages_views.xml             |  6 --
 .../website_sale/views/website_sale_menus.xml | 94 +++++++++++++++++++
 4 files changed, 97 insertions(+), 78 deletions(-)
 create mode 100644 addons/website_sale/views/website_sale_menus.xml

diff --git a/addons/website_sale/__manifest__.py b/addons/website_sale/__manifest__.py
index b4bc489ed2f..614824285ac 100644
--- a/addons/website_sale/__manifest__.py
+++ b/addons/website_sale/__manifest__.py
@@ -12,11 +12,13 @@
     'data': [
         'security/ir.model.access.csv',
         'security/website_sale.xml',
+
         'data/data.xml',
         'data/mail_template_data.xml',
         'data/product_snippet_template_data.xml',
         'data/digest_data.xml',
         'data/ir_cron_data.xml',
+
         'views/product_attribute_views.xml',
         'views/product_tag_views.xml',
         'views/product_views.xml',
@@ -35,6 +37,7 @@
         'views/product_product_add.xml',
         'views/website_views.xml',
         'views/website_pages_views.xml',
+        'views/website_sale_menus.xml',
     ],
     'demo': [
         'data/demo.xml',
diff --git a/addons/website_sale/views/sale_order_views.xml b/addons/website_sale/views/sale_order_views.xml
index d6cccc0b22c..641ce0e7056 100644
--- a/addons/website_sale/views/sale_order_views.xml
+++ b/addons/website_sale/views/sale_order_views.xml
@@ -186,78 +186,6 @@
         </field>
     </record>
 
-    <!-- Main website sale menu items -->
-    <menuitem id="menu_ecommerce" name="eCommerce"
-        parent="website.menu_website_configuration" sequence="20"
-        groups="sales_team.group_sale_salesman"/>
-    <menuitem id="menu_orders" name="Orders"
-        parent="menu_ecommerce" sequence="2"
-        groups="sales_team.group_sale_salesman"/>
-    <menuitem id="menu_catalog" name="Products"
-        parent="menu_ecommerce" sequence="3"
-        groups="sales_team.group_sale_salesman"/>
-
-    <menuitem id="menu_ecommerce_settings" name="eCommerce" sequence="50"
-        parent="website.menu_website_global_configuration"/>
-
-    <!-- Orders sub-menus -->
-    <menuitem id="menu_orders_orders" name="Orders"
-        action="action_orders_ecommerce"
-        parent="menu_orders" sequence="1"/>
-    <menuitem id="menu_orders_unpaid_orders" name="Unpaid Orders"
-        action="action_view_unpaid_quotation_tree"
-        parent="menu_orders" sequence="2"/>
-    <menuitem id="menu_orders_abandoned_orders" name="Abandoned Carts"
-        action="action_view_abandoned_tree"
-        parent="menu_orders" sequence="3"/>
-    <menuitem id="menu_orders_customers" name="Customers"
-        action="base.action_partner_customer_form"
-        parent="menu_orders" sequence="4"/>
-
-
-    <!-- Catalog sub-menus -->
-    <menuitem id="menu_catalog_products" name="Products"
-        action="product_template_action_website"
-        parent="menu_catalog" sequence="1"/>
-    <menuitem id="menu_catalog_pricelists" name="Pricelists"
-        action="product.product_pricelist_action2"
-        parent="menu_catalog" groups="product.group_product_pricelist" sequence="3"/>
-    <menuitem id="menu_catalog_categories"
-        action="product_public_category_action"
-        parent="menu_catalog" sequence="4"/>
-    <menuitem id="menu_product_attribute_action"
-        action="product.attribute_action"
-        parent="menu_catalog"  groups="product.group_product_variant" sequence="5"/>
-    <menuitem id="product_catalog_product_tags"
-              name="Product Tags"
-              action="product_public_tags_action"
-              parent="menu_catalog"
-              groups="base.group_no_one"
-    />
-
-    <!-- Reporting sub-menus -->
-    <menuitem id="menu_report_sales" name="Online Sales"
-        action="sale_report_action_dashboard"
-        parent="website.menu_reporting" sequence="30"
-        groups="sales_team.group_sale_manager"/>
-
-    <!-- Configuration sub-menus -->
-    <menuitem id="menu_ecommerce_payment_providers"
-        action="payment.action_payment_provider"
-        parent="menu_ecommerce_settings" name="Payment Providers"/>
-    <menuitem id="menu_ecommerce_payment_tokens"
-        action="payment.action_payment_token"
-        groups="base.group_no_one"
-        parent="menu_ecommerce_settings"/>
-    <menuitem id="menu_ecommerce_payment_methods"
-        action="payment.action_payment_method"
-        groups="base.group_no_one"
-        parent="menu_ecommerce_settings"/>
-    <menuitem id="menu_ecommerce_payment_transactions"
-        action="payment.action_payment_transaction"
-        groups="base.group_no_one"
-        parent="menu_ecommerce_settings"/>
-
     <record id="sale_order_view_form" model="ir.ui.view">
         <field name="name">sale.order.form</field>
         <field name="model">sale.order</field>
diff --git a/addons/website_sale/views/website_pages_views.xml b/addons/website_sale/views/website_pages_views.xml
index 9352e4beda8..1e860aa299a 100644
--- a/addons/website_sale/views/website_pages_views.xml
+++ b/addons/website_sale/views/website_pages_views.xml
@@ -84,10 +84,4 @@
     <field name="context">{'create_action': 'website_sale.product_product_action_add'}</field>
 </record>
 
-<menuitem id="menu_product_pages"
-    parent="website.menu_content"
-    sequence="30"
-    name="Products"
-    action="action_product_pages_list"/>
-
 </odoo>
diff --git a/addons/website_sale/views/website_sale_menus.xml b/addons/website_sale/views/website_sale_menus.xml
new file mode 100644
index 00000000000..926f5d5de58
--- /dev/null
+++ b/addons/website_sale/views/website_sale_menus.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+
+    <menuitem id="menu_ecommerce"
+        name="eCommerce"
+        parent="website.menu_website_configuration"
+        groups="sales_team.group_sale_salesman"
+        sequence="20">
+
+        <menuitem id="menu_orders"
+            name="Orders"
+            sequence="2">
+
+            <menuitem id="menu_orders_orders"
+                name="Orders"
+                action="action_orders_ecommerce"
+                sequence="1"/>
+            <menuitem id="menu_orders_unpaid_orders"
+                name="Unpaid Orders"
+                action="action_view_unpaid_quotation_tree"
+                sequence="2"/>
+            <menuitem id="menu_orders_abandoned_orders"
+                name="Abandoned Carts"
+                action="action_view_abandoned_tree"
+                sequence="3"/>
+            <menuitem id="menu_orders_customers"
+                name="Customers"
+                action="base.action_partner_customer_form"
+                sequence="4"/>
+
+        </menuitem>
+
+        <menuitem id="menu_catalog"
+            name="Products"
+            sequence="3">
+
+            <menuitem id="menu_catalog_products"
+                name="Products"
+                action="product_template_action_website"
+                sequence="1"/>
+            <menuitem id="menu_catalog_pricelists"
+                name="Pricelists"
+                action="product.product_pricelist_action2"
+                groups="product.group_product_pricelist"
+                sequence="3"/>
+            <menuitem id="menu_catalog_categories"
+                action="product_public_category_action"
+                sequence="4"/>
+            <menuitem id="menu_product_attribute_action"
+                action="product.attribute_action"
+                groups="product.group_product_variant"
+                sequence="5"/>
+            <menuitem id="product_catalog_product_tags"
+                name="Product Tags"
+                action="product_public_tags_action"
+                groups="base.group_no_one"/>
+
+        </menuitem>
+    </menuitem>
+
+    <menuitem id="menu_ecommerce_settings"
+        name="eCommerce"
+        parent="website.menu_website_global_configuration"
+        sequence="50">
+
+        <menuitem id="menu_ecommerce_payment_providers"
+            name="Payment Providers"
+            action="payment.action_payment_provider"/>
+        <menuitem id="menu_ecommerce_payment_tokens"
+            action="payment.action_payment_token"
+            groups="base.group_no_one"/>
+        <menuitem id="menu_ecommerce_payment_methods"
+            action="payment.action_payment_method"
+            groups="base.group_no_one"/>
+        <menuitem id="menu_ecommerce_payment_transactions"
+            action="payment.action_payment_transaction"
+            groups="base.group_no_one"/>
+
+    </menuitem>
+
+    <!-- Reporting sub-menus -->
+    <menuitem id="menu_report_sales" name="Online Sales"
+        action="sale_report_action_dashboard"
+        parent="website.menu_reporting"
+        groups="sales_team.group_sale_manager"
+        sequence="30"/>
+
+    <menuitem id="menu_product_pages"
+        name="Products"
+        action="action_product_pages_list"
+        parent="website.menu_content"
+        sequence="30"/>
+
+</odoo>