diff --git a/addons/stock/__manifest__.py b/addons/stock/__manifest__.py
index 41aaa65f4e5..3c3509539db 100644
--- a/addons/stock/__manifest__.py
+++ b/addons/stock/__manifest__.py
@@ -43,14 +43,13 @@
         'wizard/stock_immediate_transfer_views.xml',
         'wizard/stock_backorder_confirmation_views.xml',
 
-        'views/stock_scrap_views.xml',
-
         'views/res_partner_views.xml',
         'views/product_strategy_views.xml',
-        'views/stock_inventory_views.xml',
         'views/stock_incoterms_views.xml',
         'views/stock_production_lot_views.xml',
         'views/stock_picking_views.xml',
+        'views/stock_scrap_views.xml',
+        'views/stock_inventory_views.xml',
         'views/stock_quant_views.xml',
         'views/stock_location_views.xml',
         'views/procurement_views.xml',
diff --git a/addons/stock/views/procurement_views.xml b/addons/stock/views/procurement_views.xml
index 012789e5495..eb83e73aec5 100644
--- a/addons/stock/views/procurement_views.xml
+++ b/addons/stock/views/procurement_views.xml
@@ -92,9 +92,10 @@
         </record>
 
         <!-- Procurements are located in Warehouse menu hierarchy, MRP users should come to Stock application to use it.  -->
-        <menuitem id="menu_stock_sched" name="Schedulers" parent="stock.menu_stock_root" groups="group_stock_manager" sequence="50"/>
+        <menuitem id="menu_stock_sched" name="Scheduler" parent="stock.menu_stock_root" groups="group_stock_manager" sequence="50"/>
         <menuitem action="action_procurement_compute" id="menu_procurement_compute" parent="menu_stock_sched" sequence="2" groups="base.group_no_one"/>
-        <menuitem action="procurement.action_compute_schedulers" id="menu_stock_proc_schedulers" parent="menu_stock_sched" sequence="1" groups="stock.group_stock_manager"/>
+        <menuitem id="procurement_order_compute_all_menu" name="Scheduling" sequence="5" groups="group_stock_manager" parent="menu_stock_warehouse_mgmt"/>
+        <menuitem action="procurement.action_compute_schedulers" id="menu_stock_proc_schedulers" parent="procurement_order_compute_all_menu" name="Run Schedular" sequence="1" groups="stock.group_stock_manager"/>
         <menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_config_settings" sequence="5"/>
         <menuitem action="procurement.procurement_order_action_exceptions" id="menu_stock_procurement_action" parent="stock.menu_warehouse_report" sequence="130" groups="stock.group_stock_manager"/>
 </odoo>
diff --git a/addons/stock/views/stock_inventory_views.xml b/addons/stock/views/stock_inventory_views.xml
index a7a63adaea2..4026cd2e277 100644
--- a/addons/stock/views/stock_inventory_views.xml
+++ b/addons/stock/views/stock_inventory_views.xml
@@ -271,5 +271,5 @@
         <field name="domain">[('inventory_id', '=', active_id)]</field>
     </record>
 
-    <menuitem action="action_inventory_form" id="menu_action_inventory_form" parent="menu_stock_inventory_control" sequence="30"/>
+    <menuitem action="action_inventory_form" id="menu_action_inventory_form" parent="stock_picking_menu_product" sequence="30"/>
 </odoo>
diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index 6e0f20e6358..f0ce80d0243 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -388,7 +388,11 @@
             </field>
         </record>
 
-        <menuitem id="all_picking" name="All Transfers" parent="menu_stock_warehouse_mgmt" sequence="2" action="action_picking_tree_all" groups="stock.group_stock_manager,stock.group_stock_user"/>
+        <menuitem id="stock_picking_menu_product" name="Products"
+            parent="menu_stock_warehouse_mgmt" sequence="1"
+            groups="stock.group_stock_manager,stock.group_stock_user"/>
+
+        <menuitem id="all_picking" name="Transfers" parent="stock_picking_menu_product" sequence="2" action="action_picking_tree_all" groups="stock.group_stock_manager,stock.group_stock_user"/>
 
         <record id="stock_picking_action_picking_type" model="ir.actions.act_window">
             <field name="name">All Transfers</field>
diff --git a/addons/stock/views/stock_scrap_views.xml b/addons/stock/views/stock_scrap_views.xml
index fbd2684d80a..570e24974e4 100644
--- a/addons/stock/views/stock_scrap_views.xml
+++ b/addons/stock/views/stock_scrap_views.xml
@@ -136,7 +136,7 @@
     <menuitem
         id="menu_stock_scrap"
         name="Scrap"
-        parent="menu_stock_inventory_control"
+        parent="stock_picking_menu_product"
         action="action_stock_scrap"
         sequence="99"/>
 
diff --git a/odoo/addons/test_main_flows/static/src/js/tour.js b/odoo/addons/test_main_flows/static/src/js/tour.js
index 71dbbd8e293..f6b3d29012d 100644
--- a/odoo/addons/test_main_flows/static/src/js/tour.js
+++ b/odoo/addons/test_main_flows/static/src/js/tour.js
@@ -407,11 +407,15 @@ tour.register('main_flow_tour', {
 }, {
 // Run the schedulers
     edition: "enterprise",
-    trigger: ".o_menu_sections a:contains('Schedulers')",
-    content: _t("Go to Schedulers"),
+    trigger: ".o_menu_sections a:contains('Operations')",
+    content: _t("Go to Operations"),
     position: "bottom"
 }, {
-    trigger: ".o_menu_sections a:has(span:contains('Run Schedulers')), .oe_secondary_submenu .oe_menu_text:contains('Run Schedulers'):first",
+    trigger: ".o_app[data-menu-xmlid='stock.procurement_order_compute_all_menu'], .oe_menu_toggler[data-menu-xmlid='stock.procurement_order_compute_all_menu']",
+    content: _t("Click on schedulers menu"),
+    position: "bottom"
+}, {
+    trigger: ".o_menu_sections a:has(span:contains('Run Scheduler')), .oe_secondary_submenu .oe_menu_text:contains('Run Scheduler'):first",
     content: _t("Run the schedulers"),
     position: "bottom"
 }, {