diff --git a/addons/stock/models/stock_move_line.py b/addons/stock/models/stock_move_line.py
index 1050d60902e..34fe0157b94 100644
--- a/addons/stock/models/stock_move_line.py
+++ b/addons/stock/models/stock_move_line.py
@@ -42,7 +42,7 @@ class StockMoveLine(models.Model):
     from_loc = fields.Char(compute='_compute_location_description')
     to_loc = fields.Char(compute='_compute_location_description')
     lots_visible = fields.Boolean(compute='_compute_lots_visible')
-    state = fields.Selection(related='move_id.state')
+    state = fields.Selection(related='move_id.state', store=True)
     consume_line_ids = fields.Many2many('stock.move.line', 'stock_move_line_consume_rel', 'consume_line_id', 'produce_line_id', help="Technical link to see who consumed what. ")
     produce_line_ids = fields.Many2many('stock.move.line', 'stock_move_line_consume_rel', 'produce_line_id', 'consume_line_id', help="Technical link to see which line was produced with this. ")
 
diff --git a/addons/stock/views/procurement_views.xml b/addons/stock/views/procurement_views.xml
index eb83e73aec5..c36e2de7a6c 100644
--- a/addons/stock/views/procurement_views.xml
+++ b/addons/stock/views/procurement_views.xml
@@ -92,10 +92,9 @@
         </record>
 
         <!-- Procurements are located in Warehouse menu hierarchy, MRP users should come to Stock application to use it.  -->
-        <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 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="procurement_order_compute_all_menu" name="Schedulers" 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 Scheduler" sequence="5" groups="stock.group_stock_manager"/>
+        <menuitem action="action_procurement_compute" id="menu_procurement_compute" parent="procurement_order_compute_all_menu" sequence="10" groups="base.group_no_one"/>
         <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_menu_views.xml b/addons/stock/views/stock_menu_views.xml
index 02e4506430f..41a1f709455 100644
--- a/addons/stock/views/stock_menu_views.xml
+++ b/addons/stock/views/stock_menu_views.xml
@@ -9,7 +9,7 @@
     <menuitem id="menu_stock_config_settings" name="Configuration" parent="menu_stock_root"
         sequence="100" groups="group_stock_manager"/>
     <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_config_settings" groups="stock.group_stock_manager" sequence="1"/>
-    <menuitem id="menu_packages_config" name="Packages" parent="menu_stock_config_settings" sequence="3"/>
+
 
     <menuitem id="menu_product_in_config_stock" name="Products" parent="stock.menu_stock_config_settings" sequence="4"/>
 
@@ -19,6 +19,8 @@
     <menuitem id="product_uom_menu" name="Units of Measures" parent="menu_stock_config_settings"
         sequence="5" groups="product.group_uom"/>
 
+    <menuitem id="menu_packages_config" name="Packages" parent="menu_stock_config_settings" sequence="6"/>
+
     <menuitem
         action="product.product_category_action_form" id="menu_product_category_config_stock"
         parent="stock.menu_product_in_config_stock" sequence="2"/>
diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index 054198117ba..26262d3592e 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -303,7 +303,7 @@
                                 <group>
                                     <field name="picking_type_code" invisible="1"/>
                                     <field name="move_type" attrs="{'invisible': [('picking_type_code', '=', 'incoming')]}"/>
-                                    <field name="picking_type_id" attrs="{'readonly': [('state', '!=', 'draft')]}" invisible="context.get('default_picking_type_id')"/>
+                                    <field name="picking_type_id" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
                                 </group>
                                 <group>
                                     <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
@@ -391,7 +391,7 @@
             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"/>
+        <menuitem id="all_picking" name="Transfers" parent="stock_picking_menu_product" sequence="5" 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_picking_batch/views/stock_picking_batch_views.xml b/addons/stock_picking_batch/views/stock_picking_batch_views.xml
index cb2a782ce94..9c71aed8401 100644
--- a/addons/stock_picking_batch/views/stock_picking_batch_views.xml
+++ b/addons/stock_picking_batch/views/stock_picking_batch_views.xml
@@ -115,7 +115,7 @@
           </p>
         </field>
     </record>
-    <menuitem action="stock_picking_batch_action" id="stock_picking_batch_menu" parent="stock.menu_stock_warehouse_mgmt" sequence="30"/>
+    <menuitem action="stock_picking_batch_action" id="stock_picking_batch_menu" parent="stock.stock_picking_menu_product" sequence="2"/>
 
     <record id="vpicktree_inherit_stock_picking_batch" model="ir.ui.view">
         <field name="name">stock.picking.tree</field>