diff --git a/addons/stock/models/stock_quant.py b/addons/stock/models/stock_quant.py
index 3fabb249ba2..a47cd57c5eb 100644
--- a/addons/stock/models/stock_quant.py
+++ b/addons/stock/models/stock_quant.py
@@ -307,19 +307,6 @@ class StockQuant(models.Model):
         # for some reason if multi-record, env.context doesn't pass to wizards...
         ctx = dict(self.env.context or {})
         ctx['default_quant_ids'] = self.ids
-        quants_not_entered = self.filtered(lambda quant: not quant.inventory_quantity_set)
-        if quants_not_entered:
-            view = self.env.ref('stock.inventory_warning_apply_view', False)
-            return {
-                'name': _('Quantities Not Entered'),
-                'type': 'ir.actions.act_window',
-                'view_mode': 'form',
-                'views': [(view.id, 'form')],
-                'view_id': view.id,
-                'res_model': 'stock.inventory.warning',
-                'target': 'new',
-                'context': ctx,
-            }
         quants_outdated = self.filtered(lambda quant: quant.is_outdated)
         if quants_outdated:
             ctx['default_quant_to_fix_ids'] = quants_outdated.ids
diff --git a/addons/stock/views/stock_quant_views.xml b/addons/stock/views/stock_quant_views.xml
index 06068db9c70..4fc648942c5 100644
--- a/addons/stock/views/stock_quant_views.xml
+++ b/addons/stock/views/stock_quant_views.xml
@@ -343,7 +343,6 @@
             <tree default_order="location_id, inventory_date, product_id, package_id, lot_id, owner_id" decoration-warning='is_outdated' editable="bottom" create="1" edit="1" import="1" js_class="singleton_list" sample="1">
                 <header>
                     <button name="stock.action_stock_inventory_adjustement_name" groups="stock.group_stock_manager" type="action" string="Apply"/>
-                    <button name="action_set_inventory_quantity" type="object" string="Set"/>
                     <button name="action_reset" type="object" string="Clear"/>
                     <button name="stock.action_stock_request_count" groups="stock.group_stock_manager" type="action" string="Request a Count"/>
                 </header>
@@ -376,6 +375,18 @@
         </field>
     </record>
 
+    <record model="ir.actions.server" id="action_view_set_quants_tree">
+        <field name="name">Set</field>
+        <field name="model_id" ref="model_stock_quant"/>
+        <field name="binding_model_id" ref="stock.model_stock_quant"/>
+        <field name="binding_view_types">list</field>
+        <field name="state">code</field>
+        <field name="groups_id" eval="[(4, ref('stock.group_stock_user'))]"/>
+        <field name="code">
+            action = records.action_set_inventory_quantity()
+        </field>
+    </record>
+
     <record model="ir.actions.server" id="action_view_inventory_tree"> <!-- Menu + python -->
         <field name="name">Inventory</field>
         <field name="model_id" ref="model_stock_quant"/>
diff --git a/addons/stock/wizard/stock_inventory_adjustment_name.py b/addons/stock/wizard/stock_inventory_adjustment_name.py
index 80a67ee0d09..92c1695930d 100644
--- a/addons/stock/wizard/stock_inventory_adjustment_name.py
+++ b/addons/stock/wizard/stock_inventory_adjustment_name.py
@@ -6,13 +6,21 @@ from odoo import fields, models, _
 
 class StockInventoryAdjustmentName(models.TransientModel):
     _name = 'stock.inventory.adjustment.name'
-    _description = 'Inventory Adjustment Name'
+    _description = 'Inventory Adjustment Reference / Reason'
+
+    def default_get(self, fields_list):
+        res = super().default_get(fields_list)
+        if self.env.context.get('default_quant_ids'):
+            quants = self.env['stock.quant'].browse(self.env.context['default_quant_ids'])
+            res['show_info'] = any(not quant.inventory_quantity_set for quant in quants)
+        return res
 
     def _default_inventory_adjustment_name(self):
         return _("Inventory Adjustment") + " - " + fields.Date.to_string(fields.Date.today())
 
     quant_ids = fields.Many2many('stock.quant')
     inventory_adjustment_name = fields.Char(default=_default_inventory_adjustment_name)
+    show_info = fields.Boolean('Show warning')
 
     def action_apply(self):
         return self.quant_ids.with_context(
diff --git a/addons/stock/wizard/stock_inventory_adjustment_name.xml b/addons/stock/wizard/stock_inventory_adjustment_name.xml
index 3450b7d3969..a841b876d34 100644
--- a/addons/stock/wizard/stock_inventory_adjustment_name.xml
+++ b/addons/stock/wizard/stock_inventory_adjustment_name.xml
@@ -7,8 +7,12 @@
         <field name="arch" type="xml">
             <form>
                 <div>
+                    <div attrs="{'invisible': [('show_info', '=', False)]}">
+                        Some selected lines don't have any quantities set, they will be ignored.
+                    </div>
                     <group>
-                        <field name="inventory_adjustment_name" string="Inventory Reference"/>
+                        <field name="inventory_adjustment_name" string="Inventory Reference / Reason"/>
+                        <field name="show_info" invisible="1"/>
                     </group>
                 </div>
                 <footer>
@@ -19,7 +23,7 @@
         </field>
     </record>
     <record id="action_stock_inventory_adjustement_name" model="ir.actions.act_window">
-        <field name="name">Name Inventory Adjustement</field>
+        <field name="name">Inventory Adjustment Reference / Reason</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">stock.inventory.adjustment.name</field>
         <field name="view_mode">form</field>
diff --git a/addons/stock/wizard/stock_inventory_warning.py b/addons/stock/wizard/stock_inventory_warning.py
index c27f0adb2f1..cf111b4424f 100644
--- a/addons/stock/wizard/stock_inventory_warning.py
+++ b/addons/stock/wizard/stock_inventory_warning.py
@@ -10,9 +10,6 @@ class StockInventoryWarning(models.TransientModel):
 
     quant_ids = fields.Many2many('stock.quant')
 
-    def action_apply(self):
-        return self.quant_ids.filtered(lambda q: q.inventory_quantity_set).action_apply_inventory()
-
     def action_reset(self):
         return self.quant_ids.action_set_inventory_quantity_to_zero()
 
diff --git a/addons/stock/wizard/stock_inventory_warning.xml b/addons/stock/wizard/stock_inventory_warning.xml
index 0d4d37ccb4b..76c8a0e9d67 100644
--- a/addons/stock/wizard/stock_inventory_warning.xml
+++ b/addons/stock/wizard/stock_inventory_warning.xml
@@ -33,21 +33,4 @@
             </form>
         </field>
     </record>
-
-    <record id="inventory_warning_apply_view" model="ir.ui.view">
-        <field name="name">inventory.apply.warning.view</field>
-        <field name="model">stock.inventory.warning</field>
-        <field name="mode">primary</field>
-        <field name="arch" type="xml">
-            <form>
-                <div>
-                    Some selected lines don't have any quantities set, they will be ignored.
-                </div>
-                <footer>
-                    <button name="action_apply" string="Continue" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button name="cancel_button" string="Discard" class="btn-secondary" special="cancel" data-hotkey="z"/>
-                </footer>
-            </form>
-        </field>
-    </record>
 </odoo>