diff --git a/addons/stock/models/stock_move_line.py b/addons/stock/models/stock_move_line.py
index 387e262601b..94022f89352 100644
--- a/addons/stock/models/stock_move_line.py
+++ b/addons/stock/models/stock_move_line.py
@@ -62,6 +62,8 @@ class StockMoveLine(models.Model):
         compute="_compute_location_id", store=True, readonly=False, precompute=True,
     )
     location_dest_id = fields.Many2one('stock.location', 'To', domain="[('usage', '!=', 'view')]", check_company=True, required=True, compute="_compute_location_id", store=True, readonly=False, precompute=True)
+    location_usage = fields.Selection(string="Source Location Type", related='location_id.usage')
+    location_dest_usage = fields.Selection(string="Destination Location Type", related='location_dest_id.usage')
     lots_visible = fields.Boolean(compute='_compute_lots_visible')
     picking_partner_id = fields.Many2one(related='picking_id.partner_id', readonly=True)
     picking_code = fields.Selection(related='picking_id.picking_type_id.code', readonly=True)
diff --git a/addons/stock/models/stock_quant.py b/addons/stock/models/stock_quant.py
index 4cce7c2cb88..0ed014aff80 100644
--- a/addons/stock/models/stock_quant.py
+++ b/addons/stock/models/stock_quant.py
@@ -331,7 +331,6 @@ class StockQuant(models.Model):
         self.ensure_one()
         action = self.env["ir.actions.actions"]._for_xml_id("stock.stock_move_line_action")
         action['domain'] = [
-            ('product_id', '=', self.product_id.id),
             '|',
                 ('location_id', '=', self.location_id.id),
                 ('location_dest_id', '=', self.location_id.id),
@@ -340,6 +339,8 @@ class StockQuant(models.Model):
                 ('package_id', '=', self.package_id.id),
                 ('result_package_id', '=', self.package_id.id),
         ]
+        action['context'] = literal_eval(action.get('context'))
+        action['context']['search_default_product_id'] = self.product_id.id
         return action
 
     def action_view_orderpoints(self):
@@ -433,9 +434,9 @@ class StockQuant(models.Model):
             'context': {
                 'search_default_inventory': 1,
                 'search_default_done': 1,
+                'search_default_product_id': self.product_id.id,
             },
             'domain': [
-                ('product_id', '=', self.product_id.id),
                 ('company_id', '=', self.company_id.id),
                 '|',
                     ('location_id', '=', self.location_id.id),
diff --git a/addons/stock/views/stock_move_line_views.xml b/addons/stock/views/stock_move_line_views.xml
index 7094fc1c751..e3ef1618344 100644
--- a/addons/stock/views/stock_move_line_views.xml
+++ b/addons/stock/views/stock_move_line_views.xml
@@ -4,17 +4,23 @@
         <field name="name">stock.move.line.tree</field>
         <field name="model">stock.move.line</field>
         <field name="arch" type="xml">
-            <tree string="Move Lines" create="0" default_order="date">
+            <tree string="Move Lines" create="0" default_order="date desc">
+                <field name="location_usage" invisible="1"/>
+                <field name="location_dest_usage" invisible="1"/>
                 <field name="date"/>
                 <field name="reference" string="Reference"
                        invisible="context.get('no_reference', False)"/>
                 <field name="product_id"/>
-                <field name="lot_id" groups="stock.group_production_lot"/>
-                <field name="location_id" groups="stock.group_stock_multi_locations" />
-                <field name="location_dest_id" groups="stock.group_stock_multi_locations" />
-                <field name="qty_done" string="Quantity Done"/>
-                <field name="product_uom_id" options="{'no_open': True, 'no_create': True}" string="Unit of Measure" groups="uom.group_uom"/>
-                <field name="company_id" groups="base.group_multi_company" force_save="1"/>
+                <field name="lot_id" optional="show" groups="stock.group_production_lot"/>
+                <field name="package_id" optional="hide" groups="stock.group_tracking_lot"/>
+                <field name="result_package_id" optional="hide" groups="stock.group_tracking_lot"/>
+                <field name="location_id"/>
+                <field name="location_dest_id"/>
+                <field name="company_id" optional="hide" groups="base.group_multi_company" force_save="1"/>
+                <field name="qty_done" string="Quantity"
+                    decoration-danger="(location_usage in ('internal','transit')) and (location_dest_usage not in ('internal','transit'))"
+                    decoration-success="(location_usage not in ('internal','transit')) and (location_dest_usage in ('internal','transit'))"/>
+                <field name="product_uom_id" options="{'no_open': True, 'no_create': True}" string="Unit" groups="uom.group_uom"/>
                 <field name="state" widget='badge' optional="show"
                        decoration-danger="state=='cancel'"
                        decoration-info="state== 'assigned'"
@@ -103,12 +109,11 @@
         <field name="model">stock.move.line</field>
         <field name="arch" type="xml">
             <search string="Stock Moves">
+                <field name="location_id" string="Location" filter_domain="['|',('location_id', 'ilike', self),('location_dest_id', 'ilike', self)]" groups="stock.group_stock_multi_locations"/>
+                <field name="product_id"/>
                 <field name="picking_id" string="Transfer"/>
                 <field name="reference" string="Reference"/>
-                <field name="product_id"/>
                 <field name="product_category_name" string="Category"/>
-                <field name="location_id" string="Source Location" groups="stock.group_stock_multi_locations"/>
-                <field name="location_dest_id" string="Destination Location" groups="stock.group_stock_multi_locations"/>
                 <field name="lot_id" string="Lot/Serial Number" groups="stock.group_production_lot"/>
                 <field name="package_id" string="Source Package" groups="stock.group_tracking_lot"/>
                 <field name="result_package_id" string="Destination Package" groups="stock.group_tracking_lot"/>
@@ -146,22 +151,38 @@
         <field name="model">stock.move.line</field>
         <field name="arch" type="xml">
             <kanban class="o_kanban_mobile">
-                <field name="location_id" invisible="1"/>
-                <field name="location_dest_id" invisible="1"/>
                 <templates>
                     <t t-name="kanban-box">
                         <div t-attf-class="oe_kanban_card oe_kanban_global_click">
-                            <strong><field name="product_id"/></strong>
-                            <field name="picking_id"/>
+                            <field name="picking_id" invisible="1"/>
+                            <div class="row">
+                                <div class="col-6">
+                                    <field name="reference"/>
+                                </div>
+                                <div class="col-6 text-end">
+                                    <field name="date"/>
+                                </div>
+                            </div>
+                            <div>
+                                <strong><field name="product_id"/></strong>
+                            </div>
+                            <div groups="stock.group_stock_multi_locations">
+                                <field name="location_id"/>
+                                →
+                                <field name="location_dest_id"/>
+                            </div>
+                            <div groups="stock.group_production_lot" attrs="{'invisible': [('lot_id', '=', False),('lot_name', '=', False)]}">
+                                Lot/SN:
+                                <field name="lot_id" attrs="{'invisible': [('lot_id', '=', False),('lot_name', '!=', False)]}"/>
+                                <field name="lot_name" attrs="{'invisible': ['|',('lot_id', '!=', False),('lot_name', '=', False)]}"/>
+                            </div>
                             <div class="row">
                                 <div class="col-6">
-                                    <field name="lot_id" invisible="not context.get('show_lots_m2o')" groups="stock.group_production_lot" context="{'default_product_id': product_id, 'active_picking_id': picking_id}"/>
-                                    <field name="lot_name" invisible="not context.get('show_lots_text')" groups="stock.group_production_lot"/>
                                     <field name="qty_done" string="Quantity Done"/>
                                     <field name="product_uom_id" string="Unit of Measure" groups="uom.group_uom"/>
                                 </div>
                                 <div class="col-6 text-end">
-                                    <field name="date"/>
+                                    <field name="state" widget="label_selection" options="{'classes': {'draft': 'default', 'cancel': 'danger', 'waiting': 'warning', 'confirmed': 'warning', 'done': 'success'}}"/>
                                 </div>
                             </div>
                         </div>
@@ -177,7 +198,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="view_mode">tree,kanban,pivot,form</field>
             <field name="view_id" ref="view_move_line_tree"/>
-            <field name="context">{'search_default_filter_last_12_months': 1, 'search_default_done': 1, 'create': 0}</field>
+            <field name="context">{'search_default_done': 1, 'create': 0}</field>
             <field name="help" type="html">
                 <p class="o_view_nocontent_empty_folder">
                     There's no product move yet
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 916c9b5c360..02e8b76c357 100644
--- a/addons/stock_picking_batch/views/stock_picking_batch_views.xml
+++ b/addons/stock_picking_batch/views/stock_picking_batch_views.xml
@@ -297,7 +297,7 @@
         <field name="inherit_id" ref="stock.view_move_line_tree"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='state']" position="after">
-                <field name="batch_id" optional="show"/>
+                <field name="batch_id" optional="hide"/>
             </xpath>
         </field>
     </record>