diff --git a/stock_barcodes/README.rst b/stock_barcodes/README.rst
index dd43f46374ca..6a7e1a650783 100644
--- a/stock_barcodes/README.rst
+++ b/stock_barcodes/README.rst
@@ -7,7 +7,7 @@ Stock Barcodes
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:9d6c1f593b8fd9742b10d5eb279604dc97496ef1505c5673b29182fba1846342
+   !! source digest: sha256:f6453112d1afcb3f171e5f468a06e4927c98ed93493c10c8af4e4aef077de7fd
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
diff --git a/stock_barcodes/__manifest__.py b/stock_barcodes/__manifest__.py
index 72f813effd2a..86d74c0cd427 100644
--- a/stock_barcodes/__manifest__.py
+++ b/stock_barcodes/__manifest__.py
@@ -27,14 +27,12 @@
     ],
     "assets": {
         "web.assets_backend": [
-            "/stock_barcodes/static/src/utils/barcodes_models_utils.esm.js",
-            "/stock_barcodes/static/src/views/kanban_renderer.esm.js",
-            "/stock_barcodes/static/src/views/views.esm.js",
-            "/stock_barcodes/static/src/views/form_view.esm.js",
-            "/stock_barcodes/static/src/views/view_compiler.esm.js",
-            "/stock_barcodes/static/src/widgets/boolean_toggle.esm.js",
-            "/stock_barcodes/static/src/widgets/numeric_step.esm.js",
-            "/stock_barcodes/static/src/widgets/view_button.esm.js",
+            "/stock_barcodes/static/src/**/*.esm.js",
+            (
+                "after",
+                "/web_widget_numeric_step/static/src/numeric_step.xml",
+                "/stock_barcodes/static/src/widgets/numeric_step.xml",
+            ),
             "/stock_barcodes/static/src/widgets/view_button.xml",
             "/stock_barcodes/static/src/css/stock.scss",
         ],
diff --git a/stock_barcodes/data/stock_barcodes_option.xml b/stock_barcodes/data/stock_barcodes_option.xml
index bb9245ea55ee..1a999cdb767a 100644
--- a/stock_barcodes/data/stock_barcodes_option.xml
+++ b/stock_barcodes/data/stock_barcodes_option.xml
@@ -445,7 +445,6 @@
         <field name="name">Inventory options</field>
         <field name="code">INV</field>
         <field name="barcode_guided_mode" />
-        <field name="show_scan_log">False</field>
     </record>
     <record
         id="stock_barcodes_option_location_id_inventory"
diff --git a/stock_barcodes/i18n/es.po b/stock_barcodes/i18n/es.po
index 6fef90e92947..910fcb9d1ab5 100644
--- a/stock_barcodes/i18n/es.po
+++ b/stock_barcodes/i18n/es.po
@@ -1216,7 +1216,7 @@ msgstr "Aceptar"
 #. module: stock_barcodes
 #: model_terms:ir.ui.view,arch_db:stock_barcodes.view_stock_barcodes_read_picking_form
 msgid "Open"
-msgstr "Abierto"
+msgstr "Abrir"
 
 #. module: stock_barcodes
 #: model:ir.model.fields.selection,name:stock_barcodes.selection__stock_barcodes_option_group__source_pending_moves__move_lines
@@ -1249,7 +1249,7 @@ msgstr "Grupo de opciones para el interfaz de códigos de barras"
 #. module: stock_barcodes
 #: model:ir.model.fields.selection,name:stock_barcodes.selection__stock_barcodes_option_group__location_field_to_sort__location_id
 msgid "Origin Location"
-msgstr ""
+msgstr "Ubicación de origen"
 
 #. module: stock_barcodes
 #: model:ir.model.fields,help:stock_barcodes.field_stock_barcodes_option_group__source_pending_moves
diff --git a/stock_barcodes/models/__init__.py b/stock_barcodes/models/__init__.py
index 38b0f8d03c46..ff0a0135c92c 100644
--- a/stock_barcodes/models/__init__.py
+++ b/stock_barcodes/models/__init__.py
@@ -1,6 +1,5 @@
 from . import stock_barcodes_action
 from . import stock_barcodes_option
-from . import stock_barcodes_read_log
 from . import stock_move_line
 from . import stock_picking
 from . import stock_picking_type
diff --git a/stock_barcodes/models/stock_barcodes_option.py b/stock_barcodes/models/stock_barcodes_option.py
index c78fe5bdcc30..d89bbb28bf9d 100644
--- a/stock_barcodes/models/stock_barcodes_option.py
+++ b/stock_barcodes/models/stock_barcodes_option.py
@@ -39,9 +39,6 @@ class StockBarcodesOptionGroup(models.Model):
         default="move_line_ids",
         help="Origin of the data to generate the movements to process",
     )
-    show_scan_log = fields.Boolean(
-        string="Show scan log", help="Displays a log of the scans processed"
-    )
     ignore_filled_fields = fields.Boolean(
         string="Ignore filled fields",
     )
@@ -103,10 +100,6 @@ class StockBarcodesOptionGroup(models.Model):
             ("location_dest_id", "Destination Location"),
         ]
     )
-    scan_product_one_by_one = fields.Boolean(
-        help="Will set the product quantity to one and complete the line",
-        string="Scan product one by one"
-    )
 
     def get_option_value(self, field_name, attribute):
         option = self.option_ids.filtered(lambda op: op.field_name == field_name)[:1]
diff --git a/stock_barcodes/models/stock_barcodes_read_log.py b/stock_barcodes/models/stock_barcodes_read_log.py
deleted file mode 100644
index 448ec58c4c22..000000000000
--- a/stock_barcodes/models/stock_barcodes_read_log.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2019 Sergio Teruel <sergio.teruel@tecnativa.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from odoo import fields, models
-
-
-class StockBarcodesReadLog(models.Model):
-    _name = "stock.barcodes.read.log"
-    _description = "Log barcode scanner"
-    _order = "id DESC"
-
-    name = fields.Char(string="Barcode Scanned")
-    res_model_id = fields.Many2one(comodel_name="ir.model", index=True)
-    res_id = fields.Integer(index=True)
-    product_id = fields.Many2one(comodel_name="product.product", index=True)
-    lot_id = fields.Many2one(comodel_name="stock.lot", string="Lot scanned")
-    location_id = fields.Many2one(comodel_name="stock.location")
-    packaging_id = fields.Many2one(comodel_name="product.packaging")
-    packaging_qty = fields.Float(string="Package Qty", digits="Product Unit of Measure")
-    product_qty = fields.Float(string="Quantity", digits="Product Unit of Measure")
-    manual_entry = fields.Boolean(string="Manual entry")
-    picking_id = fields.Many2one(comodel_name="stock.picking", string="Picking")
-    log_line_ids = fields.One2many(
-        comodel_name="stock.barcodes.read.log.line",
-        inverse_name="read_log_id",
-        string="Scanning log details",
-    )
-
-
-class StockBarcodesReadLogLine(models.Model):
-    """
-    The goal of this model is store detail about scanning log, for example,
-    when user read in pickings the product quantity can be distributed in more
-    than one stock move line.
-    This help to know what records have been affected by a scanning read.
-    """
-
-    _name = "stock.barcodes.read.log.line"
-    _description = "Stock barcodes read log lines"
-
-    read_log_id = fields.Many2one(
-        comodel_name="stock.barcodes.read.log",
-        string="Scanning log",
-        ondelete="cascade",
-        readonly=True,
-    )
-    move_line_id = fields.Many2one(
-        comodel_name="stock.move.line", string="Stock move lines", readonly=True
-    )
-    product_qty = fields.Float(
-        string="Quantity scanned", digits="Product Unit of Measure", readonly=True
-    )
diff --git a/stock_barcodes/models/stock_move_line.py b/stock_barcodes/models/stock_move_line.py
index bfbac47ec205..f5c622dddbdb 100644
--- a/stock_barcodes/models/stock_move_line.py
+++ b/stock_barcodes/models/stock_move_line.py
@@ -28,7 +28,7 @@ def _barcodes_process_line_to_unlink(self):
 
     def action_barcode_detailed_operation_unlink(self):
         for sml in self:
-            if sml.product_uom_qty:
+            if sml.reserved_uom_qty:
                 sml._barcodes_process_line_to_unlink()
             else:
                 sml.unlink()
diff --git a/stock_barcodes/security/ir.model.access.csv b/stock_barcodes/security/ir.model.access.csv
index bbc062a9b51a..2a3bbdc9cea4 100644
--- a/stock_barcodes/security/ir.model.access.csv
+++ b/stock_barcodes/security/ir.model.access.csv
@@ -1,6 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_stock_barcodes_read_log,access_stock_barcodes_read_log,model_stock_barcodes_read_log,base.group_user,1,1,1,1
-access_stock_barcodes_read_log_line,access_stock_barcodes_read_log_line,model_stock_barcodes_read_log_line,base.group_user,1,1,1,1
 access_wiz_stock_barcodes_read_picking,access_wiz_stock_barcodes_read_picking,model_wiz_stock_barcodes_read_picking,base.group_user,1,1,1,1
 access_wiz_candidate_picking,access_wiz_candidate_picking,model_wiz_candidate_picking,base.group_user,1,1,1,1
 access_wiz_stock_barcodes_new_lot,access_wiz_stock_barcodes_new_lot,model_wiz_stock_barcodes_new_lot,base.group_user,1,1,1,1
diff --git a/stock_barcodes/static/description/index.html b/stock_barcodes/static/description/index.html
index 2bccf2232031..2bcbbb040bac 100644
--- a/stock_barcodes/static/description/index.html
+++ b/stock_barcodes/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Stock Barcodes</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:9d6c1f593b8fd9742b10d5eb279604dc97496ef1505c5673b29182fba1846342
+!! source digest: sha256:f6453112d1afcb3f171e5f468a06e4927c98ed93493c10c8af4e4aef077de7fd
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/stock-logistics-barcode/tree/16.0/stock_barcodes"><img alt="OCA/stock-logistics-barcode" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--barcode-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/stock-logistics-barcode-16-0/stock-logistics-barcode-16-0-stock_barcodes"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/stock-logistics-barcode&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module provides a barcode reader interface for stock module.</p>
diff --git a/stock_barcodes/static/src/css/stock.scss b/stock_barcodes/static/src/css/stock.scss
index c564609add5c..f0d0e7f5fb8d 100644
--- a/stock_barcodes/static/src/css/stock.scss
+++ b/stock_barcodes/static/src/css/stock.scss
@@ -32,12 +32,17 @@
         border: 0 !important;
     }
 
+    // In Odoo 16 the flat input styling lacks proper usability
     .o_field_widget {
-        margin-bottom: 0 !important;
+        margin-bottom: 3 !important;
+        .o_input {
+            border-radius: 3px;
+            border-width: 1px;
+            background-color: white;
+        }
     }
 
     .o_kanban_record {
-        padding: 0.3em;
         flex-basis: 100%;
 
         .btn-full-width {
diff --git a/stock_barcodes/static/src/widgets/numeric_step.xml b/stock_barcodes/static/src/widgets/numeric_step.xml
index 0c13f3eb2a8f..c17eeb694f1e 100644
--- a/stock_barcodes/static/src/widgets/numeric_step.xml
+++ b/stock_barcodes/static/src/widgets/numeric_step.xml
@@ -6,7 +6,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 <template>
     <t
         t-name="barcode_web_widget_numeric_step"
-        t-inherit="barcode_web_widget_numeric_step"
+        t-inherit="web_widget_numeric_step.web_widget_numeric_step"
         t-inherit-mode="extension"
         owl="1"
     >
diff --git a/stock_barcodes/tests/common.py b/stock_barcodes/tests/common.py
index f9e2fcd5c735..dc2a517c00c0 100644
--- a/stock_barcodes/tests/common.py
+++ b/stock_barcodes/tests/common.py
@@ -109,7 +109,6 @@ def _create_barcode_option_group(cls):
         return cls.env["stock.barcodes.option.group"].create(
             {
                 "name": "option group for tests",
-                "show_scan_log": True,
                 "create_lot": True,
                 "option_ids": [
                     (
diff --git a/stock_barcodes/tests/test_stock_barcodes.py b/stock_barcodes/tests/test_stock_barcodes.py
index 74031ac05190..97dda779c6f2 100644
--- a/stock_barcodes/tests/test_stock_barcodes.py
+++ b/stock_barcodes/tests/test_stock_barcodes.py
@@ -68,9 +68,6 @@ def test_wizard_scan_not_found(self):
             "84118xxx22568 (Barcode not found with this screen values)",
         )
 
-    def test_wizard_remove_last_scan(self):
-        self.assertTrue(self.wiz_scan.action_undo_last_scan())
-
     def test_wiz_clean_lot(self):
         self.wiz_scan.location_id = self.location_1.id
         self.wiz_scan.action_show_step()
diff --git a/stock_barcodes/tests/test_stock_barcodes_picking.py b/stock_barcodes/tests/test_stock_barcodes_picking.py
index 6ed005fc0762..c93930b06d3a 100644
--- a/stock_barcodes/tests/test_stock_barcodes_picking.py
+++ b/stock_barcodes/tests/test_stock_barcodes_picking.py
@@ -17,8 +17,6 @@ def setUpClass(cls):
         cls.barcode_option_group_out = cls._create_barcode_option_group_outgoing()
         cls.barcode_option_group_in = cls._create_barcode_option_group_incoming()
 
-        cls.barcode_option_group_out.show_scan_log = True
-        cls.barcode_option_group_in.show_scan_log = True
         cls.barcode_option_group_out.barcode_guided_mode = False
         cls.barcode_option_group_in.barcode_guided_mode = False
         cls.partner_agrolite = cls.env.ref("base.res_partner_2")
@@ -97,7 +95,7 @@ def setUpClass(cls):
                             0,
                             0,
                             {
-                                "name": cls.product_wo_tracking.name,
+                                "name": cls.product_tracking.name,
                                 "product_id": cls.product_tracking.id,
                                 "product_uom_qty": 3,
                                 "product_uom": cls.product_tracking.uom_id.id,
@@ -109,7 +107,7 @@ def setUpClass(cls):
                             0,
                             0,
                             {
-                                "name": cls.product_wo_tracking.name,
+                                "name": cls.product_tracking.name,
                                 "product_id": cls.product_tracking.id,
                                 "product_uom_qty": 5,
                                 "product_uom": cls.product_tracking.uom_id.id,
diff --git a/stock_barcodes/views/stock_barcodes_option_view.xml b/stock_barcodes/views/stock_barcodes_option_view.xml
index 6215cfc2708f..c24ff35547e4 100644
--- a/stock_barcodes/views/stock_barcodes_option_view.xml
+++ b/stock_barcodes/views/stock_barcodes_option_view.xml
@@ -31,7 +31,6 @@
                             />
                             <field name="group_key_for_todo_records" />
                             <field name="location_field_to_sort" />
-                            <field name="show_scan_log" />
                             <field name="show_detailed_operations" />
                             <field name="auto_put_in_pack" />
                         </group>
@@ -47,7 +46,6 @@
                             <field name="auto_lot" />
                             <field name="create_lot" />
                             <field name="use_location_dest_putaway" />
-                            <field name="scan_product_one_by_one" />
                         </group>
                     </group>
                     <separator string="Steps to scan" />
diff --git a/stock_barcodes/views/stock_picking_views.xml b/stock_barcodes/views/stock_picking_views.xml
index 05ac256a8c75..246d86d32b96 100644
--- a/stock_barcodes/views/stock_picking_views.xml
+++ b/stock_barcodes/views/stock_picking_views.xml
@@ -46,10 +46,10 @@
                 <field name="default_location_dest_id" invisible="1" />
             </field>
             <xpath expr="//div[hasclass('o_kanban_primary_left')]" position="inside">
-                <field name="barcode_option_group_id" invisible="1"/>
+                <field name="barcode_option_group_id" invisible="1" />
                 <div
                     class="mt8"
-                    t-if="['incoming', 'outgoing', 'internal'].indexOf(record.code.raw_value) > -1"
+                    t-if="['incoming', 'outgoing', 'internal'].indexOf(record.code.raw_value) &gt; -1"
                     attrs="{'invisible': [('barcode_option_group_id', '=', False)]}"
                 >
                     <button
@@ -66,7 +66,7 @@
             </xpath>
             <xpath expr="//div[hasclass('o_kanban_primary_right')]" position="inside">
                 <div
-                    class="mt8 float-right"
+                    class="float-end mt8"
                     t-if="record.default_location_src_id.raw_value and record.default_location_dest_id.raw_value"
                 >
                     <button
diff --git a/stock_barcodes/wizard/stock_barcodes_read.py b/stock_barcodes/wizard/stock_barcodes_read.py
index 852a9607f20f..350427b9d33d 100644
--- a/stock_barcodes/wizard/stock_barcodes_read.py
+++ b/stock_barcodes/wizard/stock_barcodes_read.py
@@ -45,11 +45,6 @@ class WizStockBarcodesRead(models.AbstractModel):
     confirmed_moves = fields.Boolean(
         string="Confirmed moves", related="option_group_id.confirmed_moves"
     )
-    # Computed field for display all scanning logs from res_model and res_id
-    # when change product_id
-    scan_log_ids = fields.Many2many(
-        comodel_name="stock.barcodes.read.log", compute="_compute_scan_log_ids"
-    )
     message_type = fields.Selection(
         [
             ("info", "Barcode read with additional info"),
@@ -73,7 +68,6 @@ class WizStockBarcodesRead(models.AbstractModel):
     step = fields.Integer()
     is_manual_qty = fields.Boolean(compute="_compute_is_manual_qty")
     is_manual_confirm = fields.Boolean(compute="_compute_is_manual_qty")
-    show_scan_log = fields.Boolean(compute="_compute_is_manual_qty")
     # Technical field to allow use in attrs
     display_menu = fields.Boolean()
     qty_available = fields.Float(compute="_compute_qty_available")
@@ -110,7 +104,6 @@ def _compute_is_manual_qty(self):
             rec.is_manual_qty = rec.option_group_id.is_manual_qty
             rec.is_manual_confirm = rec.option_group_id.is_manual_confirm
             rec.auto_lot = rec.option_group_id.auto_lot
-            rec.show_scan_log = rec.option_group_id.show_scan_log
 
     @api.depends("option_group_id")
     def _compute_auto_lot(self):
@@ -208,11 +201,6 @@ def process_barcode_product_id(self):
                 )
                 return False
             self.action_product_scaned_post(product)
-
-            if self.option_group_id.scan_product_one_by_one:
-                self.action_done()
-                return True
-
             if (
                 self.option_group_id.fill_fields_from_lot
                 and self.location_id
@@ -558,9 +546,6 @@ def action_done(self):
             return False
         if not self.check_done_conditions():
             return False
-        if not self.env.context.get("_stock_barcodes_skip_read_log"):
-            _logger.info("Add scanned log barcode:{}".format(self.barcode))
-            self._add_read_log()
         self.process_lot_before_done()
         return True
 
@@ -653,35 +638,11 @@ def _prepare_scan_log_values(self, log_detail=False):
             "res_id": self.res_id,
         }
 
-    def _add_read_log(self, log_detail=False):
-        if self.product_qty and not self.env.context.get("force_create_move", False):
-            vals = self._prepare_scan_log_values(log_detail)
-            self.env["stock.barcodes.read.log"].create(vals)
-
-    @api.depends("product_id", "lot_id")
-    def _compute_scan_log_ids(self):
-        if self.option_group_id.show_scan_log:
-            logs = self.env["stock.barcodes.read.log"].search(
-                [
-                    ("res_model_id", "=", self.res_model_id.id),
-                    ("res_id", "=", self.res_id),
-                    # ("location_id", "=", self.location_id.id),
-                    # ("product_id", "=", self.product_id.id),
-                ],
-                limit=10,
-            )
-            self.scan_log_ids = logs
-        else:
-            self.scan_log_ids = False
-
     # TODO: To remove when stock_move_location uses action_clean_values
     def reset_qty(self):
         self.product_qty = 0
         self.packaging_qty = 0
 
-    def action_undo_last_scan(self):
-        return True
-
     def open_actions(self):
         self.display_menu = True
 
@@ -749,9 +710,6 @@ def onchange_package_id(self):
     def action_confirm(self):
         if not self.check_option_required():
             return False
-        record = self.browse(self.ids)
-        record.write(self._convert_to_write(self._cache))
-        self = record
         res = self.action_done()
         self.invalidate_recordset()
         self.play_sounds(res)
@@ -811,7 +769,7 @@ def _prepare_lot_vals(self):
         }
 
     def _create_new_lot(self):
-        StockProductionLot = self.env["stock.production.lot"]
+        StockProductionLot = self.env["stock.lot"]
         lot_domain = [
             ("name", "=", self.lot_name),
             ("product_id", "=", self.product_id.id),
diff --git a/stock_barcodes/wizard/stock_barcodes_read_inventory.py b/stock_barcodes/wizard/stock_barcodes_read_inventory.py
index e474796ff554..5c6ea7b2da52 100644
--- a/stock_barcodes/wizard/stock_barcodes_read_inventory.py
+++ b/stock_barcodes/wizard/stock_barcodes_read_inventory.py
@@ -98,10 +98,7 @@ def _serial_tracking_message_fail(self):
         )
 
     def action_done(self):
-        result = super(
-            WizStockBarcodesReadInventory,
-            self.with_context(_stock_barcodes_skip_read_log=True),
-        ).action_done()
+        result = super().action_done()
         if result:
             result = self._add_inventory_quant()
             if result:
diff --git a/stock_barcodes/wizard/stock_barcodes_read_inventory_views.xml b/stock_barcodes/wizard/stock_barcodes_read_inventory_views.xml
index 2d2b242d525f..73317526bb3b 100644
--- a/stock_barcodes/wizard/stock_barcodes_read_inventory_views.xml
+++ b/stock_barcodes/wizard/stock_barcodes_read_inventory_views.xml
@@ -11,7 +11,7 @@
                 <field name="inventory_product_qty" invisible="1" />
             </field>
             <!-- hide result package from inventory -->
-            <div name="quant_package" position="replace">
+            <group name="quant_package" position="replace">
                 <div class="mt4">
                     <strong class="d-none d-sm-block">Package</strong>
                     <span
@@ -27,7 +27,7 @@
                         class="h5"
                     />
                 </div>
-            </div>
+            </group>
             <field name="location_id" position="attributes">
                 <attribute
                     name="domain"
@@ -104,7 +104,7 @@
                                             </div>
                                             <div class="col-2">
                                                 <span
-                                                    class="float-right text-end font-weight-bold"
+                                                    class="float-end text-end fw-bold"
                                                 >
                                                     <field name="inventory_quantity" />
                                                 </span>
diff --git a/stock_barcodes/wizard/stock_barcodes_read_picking.py b/stock_barcodes/wizard/stock_barcodes_read_picking.py
index e9bbbf82b664..faa31e7eec59 100644
--- a/stock_barcodes/wizard/stock_barcodes_read_picking.py
+++ b/stock_barcodes/wizard/stock_barcodes_read_picking.py
@@ -267,11 +267,7 @@ def update_fields_after_determine_todo(self, move_line):
         self.picking_product_qty = move_line.qty_done
 
     def action_done(self):
-        # Skip read log creation to be able to pass log_detail when available.
-        res = super(
-            WizStockBarcodesReadPicking,
-            self.with_context(_stock_barcodes_skip_read_log=True),
-        ).action_done()
+        res = super().action_done()
         if res:
             move_dic = self._process_stock_move_line()
             if move_dic:
@@ -284,13 +280,7 @@ def action_done(self):
                     self.determine_todo_action()
                 else:
                     self.action_show_step()
-            # Now we can add read log with details.
-            _logger.info("Add scanned log barcode:{}".format(self.barcode))
-            self._add_read_log(log_detail=move_dic)
             return move_dic
-        # Add read log normally.
-        _logger.info("Add scanned log barcode:{}".format(self.barcode))
-        self._add_read_log()
         return res
 
     def action_manual_entry(self):
@@ -735,14 +725,6 @@ def remove_scanning_log(self, scanning_log):
             )
             log.unlink()
 
-    def action_undo_last_scan(self):
-        res = super().action_undo_last_scan()
-        log_scan = first(
-            self.scan_log_ids.filtered(lambda x: x.create_uid == self.env.user)
-        )
-        self.remove_scanning_log(log_scan)
-        return res
-
     def get_lot_by_removal_strategy(self):
         quants = first(
             self.env["stock.quant"]._gather(self.product_id, self.location_id)
diff --git a/stock_barcodes/wizard/stock_barcodes_read_picking_views.xml b/stock_barcodes/wizard/stock_barcodes_read_picking_views.xml
index bcd7e8250266..31c07feef7f7 100644
--- a/stock_barcodes/wizard/stock_barcodes_read_picking_views.xml
+++ b/stock_barcodes/wizard/stock_barcodes_read_picking_views.xml
@@ -13,7 +13,7 @@
                     attrs="{'invisible': [('candidate_picking_ids', '=', [])]}"
                     nolabel="1"
                     force_save="1"
-                    options='{"always_reload": True}'
+                    options="{&quot;always_reload&quot;: True}"
                 >
                     <kanban>
                         <field name="name" />
@@ -83,7 +83,7 @@
                                             t-if="!widget.isHtmlEmpty(record.note.raw_value)"
                                         >
                                             <div
-                                                class="text-danger font-italic font-weight-bold text-center"
+                                                class="fw-bold text-center text-danger fst-italic"
                                             >
                                                 <t
                                                     t-out="record.note.value"
@@ -96,7 +96,7 @@
                                                 <button
                                                     name="action_open_picking"
                                                     type="object"
-                                                    class="btn btn-secondary float-left"
+                                                    class="float-start btn btn-secondary border"
                                                     context="{'wiz_barcode_id': parent.id, 'picking_id': picking_id}"
                                                     data-hotkey="'shift+o'"
                                                 >Open</button>
@@ -106,7 +106,7 @@
                                                 <button
                                                     name="action_validate_picking"
                                                     type="object"
-                                                    t-att-class="'btn float-right' + (record.is_pending.raw_value == false ? ' btn-primary' : ' btn-secondary')"
+                                                    t-att-class="'btn float-end' + (record.is_pending.raw_value == false ? ' btn-primary' : ' btn-secondary border')"
                                                     attrs="{'invisible': [('state', 'not in', ['draft', 'assigned', 'confirmed'])]}"
                                                     confirm="Are you sure to validate the picking ?"
                                                     context="{'wiz_barcode_id': parent.id, 'picking_id': picking_id}"
@@ -135,12 +135,12 @@
                     name="domain"
                 >[('id', 'child_of', picking_location_id), '|', ('company_id', '=', False), ('company_id', '=', company_id), ('usage', '!=', 'view')]</attribute>
             </field>
-            <div name="location" position="attributes">
+            <group name="location" position="attributes">
                 <attribute
                     name="attrs"
                 >{'readonly': [('manual_entry', '=', False)], 'invisible': [('picking_type_code', '=', 'incoming')]}</attribute>
-            </div>
-            <div name="location" position="after">
+            </group>
+            <group name="location" position="after">
                 <div attrs="{'invisible': [('picking_type_code', '=', 'outgoing')]}">
                     <strong class=" d-none d-sm-block">Dest. Location</strong>
                     <span
@@ -158,201 +158,212 @@
                         domain="[('id', 'child_of', picking_location_dest_id), '|', ('company_id', '=', False), ('company_id', '=', company_id), ('usage', '!=', 'view')]"
                     />
                 </div>
-            </div>
+            </group>
             <group name="scan_fields" position="after">
-                <notebook
+                <group
                     string="Pending moves"
                     attrs="{'invisible': [('pending_move_ids', '=', [])]}"
+                    col="2"
                 >
-                    <page string="Pending moves">
-                        <field
-                            name="pending_move_ids"
-                            options="{'no_open': True, 'always_reload': True}"
-                            nolabel="1"
-                            force_save="1"
-                            mode="tree,kanban"
-                        >
-                            <tree>
-                                <field name="state" invisible="1" />
-                                <field name="product_id" />
-                                <field name="product_uom_qty" />
-                                <field name="line_ids" invisible="1" />
-                                <field
-                                    name="lot_id"
-                                    groups="stock.group_production_lot"
-                                    optional="hide"
-                                />
-                                <field
-                                    name="package_id"
-                                    groups="stock.group_tracking_lot"
-                                    optional="hide"
-                                />
-                                <field name="qty_done" />
-                                <button
-                                    name="fill_from_pending_line"
-                                    type="object"
-                                    class="btn"
-                                    icon="fa-upload"
-                                    title="Fill from pending line"
-                                    context="{'wiz_barcode_id': parent.id}"
-                                />
-                            </tree>
-                            <kanban class="o_kanban_mobile">
-                                <field name="state" />
-                                <field name="product_id" />
-                                <field name="product_uom_qty" />
-                                <field name="qty_done" />
-                                <templates>
-                                    <t t-name="kanban-box">
-                                        <div t-attf-class="oe_kanban_card">
-                                            <div class="row">
-                                                <div class="col-6">
-                                                    <strong>
-                                                        <span>
-                                                            <field name="product_id" />
-                                                        </span>
-                                                    </strong>
-                                                </div>
-                                                <div class="col-2">
-                                                    <span
-                                                        class="float-right text-end text-muted"
-                                                    >
-                                                        <field name="product_uom_qty" />
-                                                    </span>
-                                                </div>
-                                                <div class="col-2">
-                                                    <span
-                                                        class="float-right text-end"
-                                                        t-att-class="qty_done >= product_uom_qty ? 'text-success' : ''"
-                                                    >
-                                                        <field name="qty_done" />
+                    <field
+                        name="pending_move_ids"
+                        options="{'no_open': True, 'always_reload': True}"
+                        nolabel="1"
+                        colspan="2"
+                        force_save="1"
+                        mode="tree,kanban"
+                    >
+                        <tree>
+                            <field name="state" invisible="1" />
+                            <field name="product_id" />
+                            <field name="product_uom_qty" />
+                            <field name="line_ids" invisible="1" />
+                            <field
+                                name="lot_id"
+                                groups="stock.group_production_lot"
+                                optional="hide"
+                            />
+                            <field
+                                name="package_id"
+                                groups="stock.group_tracking_lot"
+                                optional="hide"
+                            />
+                            <field name="qty_done" />
+                            <button
+                                name="fill_from_pending_line"
+                                title="Fill from pending line"
+                                type="object"
+                                class="btn"
+                                icon="fa-upload"
+                                context="{'wiz_barcode_id': parent.id}"
+                            />
+                        </tree>
+                        <kanban class="o_kanban_mobile">
+                            <field name="state" />
+                            <field name="product_id" />
+                            <field name="product_uom_qty" />
+                            <field name="qty_done" />
+                            <templates>
+                                <t t-name="kanban-box">
+                                    <div t-attf-class="oe_kanban_card">
+                                        <div class="row">
+                                            <div class="col-6">
+                                                <strong>
+                                                    <span>
+                                                        <field name="product_id" />
                                                     </span>
-                                                </div>
-                                                <div class="col-2 text-end">
-                                                    <button
-                                                        name="fill_from_pending_line"
-                                                        type="object"
-                                                        icon="fa-upload"
+                                                </strong>
+                                            </div>
+                                            <div class="col-2">
+                                                <span
+                                                    class="pull-right text-end text-muted"
+                                                >
+                                                    <field name="product_uom_qty" />
+                                                </span>
+                                            </div>
+                                            <div class="col-2">
+                                                <span
+                                                    class="pull-right text-end"
+                                                    t-att-class="qty_done &gt;= product_uom_qty ? 'text-success' : ''"
+                                                >
+                                                    <field name="qty_done" />
+                                                </span>
+                                            </div>
+                                            <div class="text-end col-2">
+                                                <button
+                                                    name="fill_from_pending_line"
+                                                    type="object"
+                                                    class="btn"
+                                                    context="{'wiz_barcode_id': parent.id}"
+                                                >
+                                                    <i
+                                                        class="fa fa-upload"
                                                         title="Fill from pencil"
-                                                        class="btn"
-                                                        context="{'wiz_barcode_id': parent.id}"
+                                                        style="font-size:1.5em"
                                                     />
-                                                </div>
+                                                </button>
                                             </div>
                                         </div>
-                                    </t>
-                                </templates>
-                            </kanban>
-                        </field>
-                    </page>
-                </notebook>
-                <notebook>
-                    <page string="Detailed operations">
-                        <field
-                            name="move_line_ids"
-                            options="{'no_open': True, 'always_reload': True}"
-                            nolabel="1"
-                            force_save="1"
-                            mode="tree,kanban"
-                        >
-                            <tree>
-                                <field name="picking_code" invisible="1" />
-                                <field name="product_id" options="{'no_open': True}" />
-                                <field
-                                    name="location_id"
-                                    options="{'no_open': True}"
-                                    groups="stock.group_stock_multi_locations"
-                                    attrs="{'invisible': [('picking_code', '=', 'incoming')]}"
-                                    optional="show"
-                                />
-                                <field
-                                    name="location_dest_id"
-                                    options="{'no_open': True}"
-                                    groups="stock.group_stock_multi_locations"
-                                    attrs="{'invisible': [('picking_code', '=', 'outgoing')]}"
-                                    optional="show"
-                                />
-                                <field
-                                    name="lot_id"
-                                    groups="stock.group_production_lot"
-                                    options="{'no_open': True}"
-                                    optional="show"
-                                />
-                                <field
-                                    name="result_package_id"
-                                    groups="stock.group_tracking_lot"
-                                    options="{'no_open': True}"
-                                    optional="show"
-                                />
-                                <field name="qty_done" />
-                                <field
-                                    name="product_uom_id"
-                                    groups="uom.group_uom"
-                                    options="{'no_open': True}"
-                                />
-                                <button
-                                    name="action_barcode_detailed_operation_unlink"
-                                    type="object"
-                                    class="btn"
-                                    icon="fa-trash"
-                                    title="Remove detailed operation"
-                                    context="{'wiz_barcode_id': parent.id}"
-                                />
-                            </tree>
-                            <kanban class="o_kanban_mobile">
-                                <field name="product_id" />
-                                <field name="qty_done" />
-                                <field name="product_uom_id" />
-                                <templates>
-                                    <t t-name="kanban-box">
-                                        <div t-attf-class="oe_kanban_card">
-                                            <div class="row">
-                                                <div class="col-7">
-                                                    <strong>
-                                                        <span>
-                                                            <field name="product_id" />
-                                                        </span>
-                                                    </strong>
-                                                </div>
-                                                <div class="col-2">
-                                                    <span
-                                                        class="float-right text-end font-weight-bold"
-                                                    >
-                                                        <field name="qty_done" />
+                                    </div>
+                                </t>
+                            </templates>
+                        </kanban>
+                    </field>
+                </group>
+                <group
+                    string="Detailed operations"
+                    col="2"
+                    attrs="{'invisible': ['|', ('move_line_ids', '=', []), ('show_detailed_operations', '=', False)]}"
+                >
+                    <field
+                        name="move_line_ids"
+                        options="{'no_open': True, 'always_reload': True}"
+                        nolabel="1"
+                        colspan="2"
+                        force_save="1"
+                        mode="tree,kanban"
+                    >
+                        <tree>
+                            <field name="picking_code" invisible="1" />
+                            <field name="product_id" options="{'no_open': True}" />
+                            <field
+                                name="location_id"
+                                options="{'no_open': True}"
+                                groups="stock.group_stock_multi_locations"
+                                attrs="{'invisible': [('picking_code', '=', 'incoming')]}"
+                                optional="show"
+                            />
+                            <field
+                                name="location_dest_id"
+                                options="{'no_open': True}"
+                                groups="stock.group_stock_multi_locations"
+                                attrs="{'invisible': [('picking_code', '=', 'outgoing')]}"
+                                optional="show"
+                            />
+                            <field
+                                name="lot_id"
+                                groups="stock.group_production_lot"
+                                options="{'no_open': True}"
+                                optional="show"
+                            />
+                            <field
+                                name="result_package_id"
+                                groups="stock.group_tracking_lot"
+                                options="{'no_open': True}"
+                                optional="show"
+                            />
+                            <field name="qty_done" />
+                            <field
+                                name="product_uom_id"
+                                groups="uom.group_uom"
+                                options="{'no_open': True}"
+                            />
+                            <button
+                                name="action_barcode_detailed_operation_unlink"
+                                title="Remove detailed operation"
+                                type="object"
+                                class="btn"
+                                icon="fa-trash"
+                                context="{'wiz_barcode_id': parent.id}"
+                            />
+                        </tree>
+                        <kanban class="o_kanban_mobile">
+                            <field name="product_id" />
+                            <field name="qty_done" />
+                            <field name="product_uom_id" />
+                            <templates>
+                                <t t-name="kanban-box">
+                                    <div t-attf-class="oe_kanban_card">
+                                        <div class="row">
+                                            <div class="col-7">
+                                                <strong>
+                                                    <span>
+                                                        <field name="product_id" />
                                                     </span>
-                                                </div>
-                                                <div class="col-3 text-end">
-                                                    <button
-                                                        name="action_barcode_detailed_operation_unlink"
-                                                        type="object"
-                                                        icon="fa-trash"
+                                                </strong>
+                                            </div>
+                                            <div class="col-2">
+                                                <span
+                                                    class="fw-bold text-end pull-right"
+                                                >
+                                                    <field name="qty_done" />
+                                                </span>
+                                            </div>
+                                            <div class="text-end col-3">
+                                                <button
+                                                    name="action_barcode_detailed_operation_unlink"
+                                                    type="object"
+                                                    class="btn mt0"
+                                                    context="{'wiz_barcode_id': parent.id}"
+                                                >
+                                                    <i
+                                                        class="fa fa-trash"
                                                         title="Remove"
-                                                        class="btn mt0"
-                                                        context="{'wiz_barcode_id': parent.id}"
+                                                        style="font-size:1.5em"
                                                     />
-                                                </div>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="row">
+                                            <div class="col-4">
+                                                Lot: <field name="lot_id" />
                                             </div>
-                                            <div class="row">
+                                            <t
+                                                t-if="record.result_package_id.raw_value"
+                                            >
                                                 <div class="col-4">
-                                                    Lot: <field name="lot_id" />
+                                                    Package: <field
+                                                        name="result_package_id"
+                                                    />
                                                 </div>
-                                                <t
-                                                    t-if="record.result_package_id.raw_value"
-                                                >
-                                                    <div class="col-4">
-                                                        Package: <field
-                                                            name="result_package_id"
-                                                        />
-                                                    </div>
-                                                </t>
-                                            </div>
+                                            </t>
                                         </div>
-                                    </t>
-                                </templates>
-                            </kanban>
-                        </field>
-                    </page>
-                </notebook>
+                                    </div>
+                                </t>
+                            </templates>
+                        </kanban>
+                    </field>
+                </group>
             </group>
             <xpath expr="//button[@id='btn_create_lot']" position="after">
                 <field name="display_assign_serial" invisible="1" />
diff --git a/stock_barcodes/wizard/stock_barcodes_read_todo.py b/stock_barcodes/wizard/stock_barcodes_read_todo.py
index 003354b9d7a5..e1ebe4bb942e 100644
--- a/stock_barcodes/wizard/stock_barcodes_read_todo.py
+++ b/stock_barcodes/wizard/stock_barcodes_read_todo.py
@@ -93,7 +93,7 @@ def _prepare_fill_record_values(self, wiz_barcode, line, position):
             )
             vals.update(
                 {
-                    "product_uom_qty": line.move_id.product_uom_qty,
+                    "product_uom_qty": line.reserved_uom_qty,
                     "location_id": line.location_id.id,
                     "location_dest_id": line.location_dest_id.id,
                     "lot_id": line.lot_id.id,
@@ -111,7 +111,7 @@ def _prepare_fill_record_values(self, wiz_barcode, line, position):
         else:
             vals.update(
                 {
-                    "product_uom_qty": line.move_id.product_uom_qty,
+                    "product_uom_qty": line.product_uom_qty,
                     "location_id": (line.move_line_ids[:1] or line).location_id.id,
                     "location_dest_id": (
                         line.move_line_ids[:1] or line
@@ -127,16 +127,17 @@ def _prepare_fill_record_values(self, wiz_barcode, line, position):
         return vals
 
     def _update_fill_record_values(self, wiz_barcode, line, vals):
-        vals["product_uom_qty"] += line.product_uom_qty
         if wiz_barcode.option_group_id.source_pending_moves == "move_line_ids":
+            vals["product_uom_qty"] += line.reserved_uom_qty
             vals["product_qty_reserved"] += line.reserved_qty
             vals["line_ids"][0][2].append(line.id)
             vals["stock_move_ids"][0][2].append(line.move_id.id)
         else:
+            vals["product_uom_qty"] += line.product_uom_qty
             vals["product_qty_reserved"] += (
                 line.move_line_ids
-                and sum(line.move_line_ids.mapped("product_qty"))
-                or line.reserved_uom_qty
+                and sum(line.move_line_ids.mapped("reserved_qty"))
+                or line.product_uom_qty
             )
             vals["line_ids"][0][2].extend(line.move_line_ids.ids)
             vals["stock_move_ids"][0][2].extend(line.ids)
diff --git a/stock_barcodes/wizard/stock_barcodes_read_todo_view.xml b/stock_barcodes/wizard/stock_barcodes_read_todo_view.xml
index f053dde90ef1..18f025f2a0f4 100644
--- a/stock_barcodes/wizard/stock_barcodes_read_todo_view.xml
+++ b/stock_barcodes/wizard/stock_barcodes_read_todo_view.xml
@@ -41,7 +41,7 @@
                                         <span
                                             attrs="{'invisible': [('picking_code', '!=', 'internal')]}"
                                         >
-                                            <field name="location_name" /> \u21E8 <field
+                                            <field name="location_name" /> ⇨ <field
                                                 name="location_dest_name"
                                             />
                                         </span>
@@ -94,7 +94,7 @@
                             <div class="row">
                                 <div class="col-12">
                                     <span>
-                                        <span class="font-weight-bold">
+                                        <span class="fw-bold">
                                             <t t-esc="record.qty_done.value" />
                                         </span> / <t
                                             t-esc="record.product_uom_qty.value"
@@ -109,7 +109,7 @@
                                         type="object"
                                         icon="fa-step-backward"
                                         title="Previous"
-                                        class="btn btn-primary float-left btn-sm"
+                                        class="btn-sm float-start btn btn-primary"
                                         context="{'wiz_barcode_id': parent.id}"
                                         data-hotkey="1"
                                     />
@@ -120,7 +120,7 @@
                                         type="object"
                                         icon="fa-trash"
                                         title="Clean"
-                                        class="btn btn-warning float-right btn-sm"
+                                        class="btn-sm btn float-end btn-warning"
                                         context="{'wiz_barcode_id': parent.id}"
                                         data-hotkey="2"
                                     />
@@ -129,13 +129,22 @@
                                     <button
                                         name="action_todo_next"
                                         type="object"
-                                        class="btn btn-danger float-right btn-sm"
+                                        class="btn-sm float-end btn-danger btn"
+                                        context="{'wiz_barcode_id': parent.id}"
+                                        data-hotkey="3"
+                                        attrs="{'invisible': [('qty_done', '=', 0.0)]} "
+                                    >Ignore rest
+                                    </button>
+                                    <!-- Ask for confirmation when we've got done quantities to avoid squashing quantities -->
+                                    <button
+                                        name="action_todo_next"
+                                        type="object"
+                                        class="btn-sm float-end btn-danger btn"
                                         context="{'wiz_barcode_id': parent.id}"
                                         data-hotkey="3"
                                         attrs="{'invisible': [('qty_done', '!=', 0.0)]} "
                                         confirm="You have not set any quantity to this operation and it will be removed from pending moves. Are you sure?"
-                                    >
-                                    Ignore rest
+                                    >Ignore rest
                                     </button>
                                 </div>
                                 <div class="col-3">
@@ -144,7 +153,7 @@
                                         type="object"
                                         icon="fa-step-forward"
                                         title="Next"
-                                        class="btn btn-primary float-right btn-sm"
+                                        class="btn-sm float-end btn btn-primary"
                                         context="{'wiz_barcode_id': parent.id}"
                                         data-hotkey="4"
                                     />
diff --git a/stock_barcodes/wizard/stock_barcodes_read_views.xml b/stock_barcodes/wizard/stock_barcodes_read_views.xml
index 35adc076f05e..7d32fc1b99d9 100644
--- a/stock_barcodes/wizard/stock_barcodes_read_views.xml
+++ b/stock_barcodes/wizard/stock_barcodes_read_views.xml
@@ -41,7 +41,7 @@
                                             <button
                                                 name="open_action"
                                                 type="object"
-                                                class="btn-full-width float-right btn"
+                                                class="float-end btn-full-width btn"
                                                 style="width:100%"
                                                 data-hotkey="hotkey"
                                             >
@@ -93,7 +93,7 @@
                                 <field name="message" />
                                 <button
                                     name="action_clean_message"
-                                    class="fa fa-window-close float-right"
+                                    class="float-end fa-window-close fa"
                                     type="object"
                                     title="Clean message"
                                 />
@@ -104,7 +104,6 @@
                         <field name="step" invisible="1" force_save="1" />
                         <field name="is_manual_qty" invisible="1" />
                         <field name="is_manual_confirm" invisible="1" />
-                        <field name="show_scan_log" invisible="1" />
                         <field name="auto_lot" invisible="1" />
                         <field name="product_tracking" invisible="1" force_save="1" />
                         <field name="guided_product_id" invisible="1" force_save="1" />
@@ -125,191 +124,208 @@
                         <field name="keep_result_package" invisible="1" />
                         <field name="create_lot" invisible="1" />
                         <field name="lot_id" invisible="1" />
-                        <field name="product_packaging_ids" invisible="1" />
                         <field
                             name="_barcode_scanned"
                             widget="barcode_handler"
                             invisible="0"
                         />
                         <group name="scan_fields" class="bg-light">
-                            <div name="location">
-                                <strong
-                                    class=" d-none d-sm-block"
-                                >Source Location</strong>
-                                <span
-                                    class="fa fa-map-marker d-sm-none oe_span_small_icon"
-                                    title="Source Location"
-                                />
-                                <field
-                                    name="location_id"
-                                    options="{'no_create': True}"
-                                    attrs="{'readonly': [('manual_entry', '=', False)]}"
-                                    force_save="1"
-                                    nolabel="1"
-                                    style="width:85%"
-                                    class="h5"
-                                />
-                            </div>
-                            <div name="quant_package" groups="stock.group_tracking_lot">
-                                <strong
-                                    class="d-none d-sm-block"
-                                >Source Package -> Result Package</strong>
-                                <span
-                                    class="fa fa-cubes d-sm-none oe_span_small_icon"
-                                    title="Source Package to Result Package"
-                                />
-                                <field
-                                    name="package_id"
-                                    options="{'no_create': True}"
-                                    attrs="{'readonly': [('manual_entry', '=', False)]}"
-                                    force_save="1"
-                                    style="width:35%"
-                                    class="h5"
-                                />
-                                <span
-                                    attrs="{'invisible': [('result_package_id', '=', False)]}"
-                                >-></span>
-                                <field
-                                    name="result_package_id"
-                                    options="{'no_create': True}"
-                                    attrs="{'readonly': [('manual_entry', '=', False)]}"
-                                    force_save="1"
-                                    style="width:35%"
-                                    class="h5"
-                                />
-                                <button
-                                    class="btn btn-warning btn-sm oe_kanban_action_button float-right mr4"
-                                    name="action_clean_package"
-                                    type="object"
-                                    icon="fa-trash fa-1x"
-                                    attrs="{'invisible': [('package_id', '=', False), ('result_package_id', '=', False)]}"
-                                    title="Clean package info"
-                                />
-                                <button
-                                    id="btn_create_package"
-                                    class="btn btn-secondary ml2 btn-sm oe_kanban_action_button float-right mr4"
-                                    type="object"
-                                    name="action_create_package"
-                                    icon="fa-plus fa-1x"
-                                    title="Create new package"
-                                />
-                                <!-- Double button to display open or closed padlock -->
-                                <button
-                                    id="btn_keep_result_package_lock"
-                                    class="btn btn-danger ml2 btn-sm oe_kanban_action_button float-right mr4"
-                                    type="object"
-                                    name="action_keep_result_package"
-                                    title="If locked keep result package"
-                                    icon="fa-lock"
-                                    attrs="{'invisible': [('keep_result_package', '=', False)]}"
-                                />
-                                <button
-                                    id="btn_keep_result_package_unlock"
-                                    class="btn btn-secondary ml2 btn-sm oe_kanban_action_button float-right mr4 "
-                                    type="object"
-                                    name="action_keep_result_package"
-                                    title="If locked keep result package"
-                                    icon="fa-unlock"
-                                    attrs="{'invisible': [('keep_result_package', '=', True)]}"
-                                />
-                                <!-- End padlock -->
-                            </div>
-                            <div>
-                                <strong class="d-none d-sm-block">Product</strong>
-                                <span
-                                    class="fa fa-th-list d-sm-none oe_span_small_icon"
-                                    title="Product"
-                                />
-                                <field
-                                    name="product_id"
-                                    options="{'no_create': True}"
-                                    attrs="{'readonly': [('manual_entry', '=', False)]}"
-                                    force_save="1"
-                                    style="width:85%"
-                                    class="h5"
-                                />
-                                <button
-                                    class="btn btn-warning btn-sm float-right mr4 oe_kanban_action_button"
-                                    name="action_clean_product"
-                                    type="object"
-                                    icon="fa-trash fa-1x"
-                                    title="Clean product"
-                                    attrs="{'invisible': [('product_id', '=', False)]}"
-                                />
-                            </div>
-                            <div
+                            <group name="location">
+                                <div class="mt4">
+                                    <strong
+                                        class=" d-none d-sm-block"
+                                    >Source Location</strong>
+                                    <span
+                                        class="fa fa-map-marker d-sm-none oe_span_small_icon"
+                                        title="Source Location"
+                                    />
+                                    <field
+                                        name="location_id"
+                                        options="{'no_create': True}"
+                                        attrs="{'readonly': [('manual_entry', '=', False)]}"
+                                        force_save="1"
+                                        nolabel="1"
+                                        style="width:85%"
+                                        class="h5"
+                                    />
+                                </div>
+                            </group>
+                            <group
+                                name="quant_package"
+                                groups="stock.group_tracking_lot"
+                                col="2"
+                            >
+                                <div class="mt4" colspan="2">
+                                    <strong
+                                        class="d-none d-sm-block"
+                                    >Source Package -&gt; Result Package</strong>
+                                    <span
+                                        class="fa fa-cubes d-sm-none oe_span_small_icon"
+                                        title="Source Package to Result Package"
+                                    />
+                                    <field
+                                        name="package_id"
+                                        options="{'no_create': True}"
+                                        attrs="{'readonly': [('manual_entry', '=', False)]}"
+                                        force_save="1"
+                                        class="h5 oe_inline"
+                                        style="width: 35% !important"
+                                    />
+                                    <span
+                                        attrs="{'invisible': [('result_package_id', '=', False)]}"
+                                    >-&gt;</span>
+                                    <field
+                                        name="result_package_id"
+                                        options="{'no_create': True}"
+                                        attrs="{'readonly': [('manual_entry', '=', False)]}"
+                                        force_save="1"
+                                        class="h5 oe_inline ms-1"
+                                        style="width: 35% !important"
+                                    />
+                                    <button
+                                        class="btn-sm float-end btn-warning oe_kanban_action_button btn mr4"
+                                        name="action_clean_package"
+                                        type="object"
+                                        icon="fa-trash fa-1x"
+                                        attrs="{'invisible': [('package_id', '=', False), ('result_package_id', '=', False)]}"
+                                        title="Clean package info"
+                                    />
+                                    <button
+                                        id="btn_create_package"
+                                        class="ml2 btn-sm float-end oe_kanban_action_button btn btn-secondary mr4"
+                                        type="object"
+                                        name="action_create_package"
+                                        icon="fa-plus fa-1x"
+                                        title="Create new package"
+                                    />
+                                    <!-- Double button to display open or closed padlock -->
+                                    <button
+                                        id="btn_keep_result_package_lock"
+                                        class="ml2 btn-sm float-end btn-danger oe_kanban_action_button btn mr4"
+                                        type="object"
+                                        name="action_keep_result_package"
+                                        title="If locked keep result package"
+                                        icon="fa-lock"
+                                        attrs="{'invisible': [('keep_result_package', '=', False)]}"
+                                    />
+                                    <button
+                                        id="btn_keep_result_package_unlock"
+                                        class="ml2 btn-sm float-end oe_kanban_action_button btn btn-secondary mr4"
+                                        type="object"
+                                        name="action_keep_result_package"
+                                        title="If locked keep result package"
+                                        icon="fa-unlock"
+                                        attrs="{'invisible': [('keep_result_package', '=', True)]}"
+                                    />
+                                    <!-- End padlock -->
+                                </div>
+                            </group>
+                            <group col="2">
+                                <div class="mt4" colspan="2">
+                                    <strong class="d-none d-sm-block">Product</strong>
+                                    <span
+                                        class="fa fa-th-list d-sm-none oe_span_small_icon"
+                                        title="Product"
+                                    />
+                                    <field
+                                        name="product_id"
+                                        options="{'no_create': True}"
+                                        attrs="{'readonly': [('manual_entry', '=', False)]}"
+                                        force_save="1"
+                                        style="width:85%"
+                                        class="h5"
+                                    />
+                                    <button
+                                        class="btn-sm float-end btn-warning oe_kanban_action_button btn mr4"
+                                        name="action_clean_product"
+                                        type="object"
+                                        icon="fa-trash fa-1x"
+                                        title="Clean product"
+                                        attrs="{'invisible': [('product_id', '=', False)]}"
+                                    />
+                                </div>
+                            </group>
+                            <group
                                 groups="stock.group_production_lot"
+                                col="2"
                                 attrs="{'invisible': [('product_tracking', 'in', [False, 'none'])]}"
                             >
-                                <strong class="d-none d-sm-block">Lot S/N</strong>
-                                <span
-                                    class="fa fa-tags d-sm-none oe_span_small_icon"
-                                    title="Lot S/N"
-                                />
-                                <field
-                                    name="lot_name"
-                                    attrs="{'invisible': [('create_lot', '=', False)]}"
-                                    style="width:60%"
-                                    class="h5"
-                                />
-                                <field
-                                    name="lot_id"
-                                    options="{'no_create': True}"
-                                    domain="[('product_id', '=', product_id)]"
-                                    context="{'default_product_id': product_id}"
-                                    attrs="{'readonly': [('manual_entry', '=', False)], 'invisible': [('create_lot', '!=', False)]}"
-                                    force_save="1"
-                                    style="width:60%"
-                                    class="h5"
-                                />
-                                <button
-                                    class="btn btn-warning btn-sm float-right mr4 oe_kanban_action_button"
-                                    name="action_clean_lot"
-                                    type="object"
-                                    icon="fa-trash fa-1x"
-                                    attrs="{'invisible': [('lot_id', '=', False), ('lot_name', '=', False)]}"
-                                    title="Clean lot"
-                                    data-hotkey="G"
-                                />
-                                <button
-                                    id="btn_create_lot"
-                                    class="btn btn-secondary ml2 btn-sm oe_kanban_action_button float-right mr4"
-                                    type="action"
-                                    name="%(action_stock_barcodes_new_lot)d"
-                                    icon="fa-plus fa-1x"
-                                    title="Create lot"
-                                    context="{'default_product_id': product_id}"
-                                    attrs="{'invisible': [('create_lot', '=', False)]}"
-                                    help="Create new lot"
-                                />
-                            </div>
-                            <div
+                                <div class="mt4" colspan="2">
+                                    <strong class="d-none d-sm-block">Lot S/N</strong>
+                                    <span
+                                        class="fa fa-tags d-sm-none oe_span_small_icon"
+                                        title="Lot S/N"
+                                    />
+                                    <field
+                                        name="lot_name"
+                                        attrs="{'invisible': [('create_lot', '=', False)]}"
+                                        style="width:60%"
+                                        class="h5"
+                                    />
+                                    <field
+                                        name="lot_id"
+                                        options="{'no_create': True}"
+                                        domain="[('product_id', '=', product_id)]"
+                                        context="{'default_product_id': product_id}"
+                                        attrs="{'readonly': [('manual_entry', '=', False)], 'invisible': [('create_lot', '!=', False)]}"
+                                        force_save="1"
+                                        style="width:60%"
+                                        class="h5"
+                                    />
+                                    <button
+                                        class="btn-sm float-end btn-warning oe_kanban_action_button btn mr4"
+                                        name="action_clean_lot"
+                                        type="object"
+                                        icon="fa-trash fa-1x"
+                                        attrs="{'invisible': [('lot_id', '=', False), ('lot_name', '=', False)]}"
+                                        title="Clean lot"
+                                        data-hotkey="G"
+                                    />
+                                    <button
+                                        id="btn_create_lot"
+                                        class="ml2 btn-sm float-end oe_kanban_action_button btn btn-secondary mr4"
+                                        type="action"
+                                        name="%(action_stock_barcodes_new_lot)d"
+                                        icon="fa-plus fa-1x"
+                                        title="Create lot"
+                                        context="{'default_product_id': product_id}"
+                                        attrs="{'invisible': [('create_lot', '=', False)]}"
+                                        help="Create new lot"
+                                    />
+                                </div>
+                            </group>
+                            <group
                                 name="option_qty_info"
                                 attrs="{'invisible': ['|', ('product_id', '=', False),'|', ('is_manual_qty', '=', True), ('manual_entry', '=', True)]}"
-                                col="1"
+                                col="2"
                             >
-                                <strong class="d-none d-sm-block">Total Qty</strong>
-                                <span
-                                    class="fa fa-hashtag d-sm-none oe_span_small_icon"
-                                    title="Total Quantity"
-                                />
-                                <field
-                                    name="product_qty"
-                                    attrs="{'readonly': [('manual_entry', '=', False)]}"
-                                    force_save="1"
-                                    style="width:85%"
-                                    class="h5"
-                                />
-                            </div>
-
+                                <div class="mt4" colspan="2">
+                                    <strong class="d-none d-sm-block">Total Qty</strong>
+                                    <span
+                                        class="fa fa-hashtag d-sm-none oe_span_small_icon"
+                                        title="Total Quantity"
+                                    />
+                                    <field
+                                        name="product_qty"
+                                        attrs="{'readonly': [('manual_entry', '=', False)]}"
+                                        force_save="1"
+                                        style="width:85%"
+                                        class="h5"
+                                    />
+                                </div>
+                            </group>
                             <group
                                 name="option_qty"
                                 attrs="{'invisible': ['|', ('product_id', '=', False),'&amp;', ('is_manual_qty', '=', False), ('manual_entry', '=', False)]}"
                                 col="1"
                             >
-                                <div class="row mt8" name="option_qty_header">
+                                <div
+                                    class="row mt8"
+                                    name="option_qty_header"
+                                    colspan="1"
+                                >
                                     <div
-                                        class="col text-center pr-0"
+                                        class="text-center col"
                                         name="total_qty_header"
                                     >
                                         <div
@@ -317,31 +333,21 @@
                                         >
                                             <span>(<field
                                                     name="total_product_qty_done"
+                                                    class="oe_inline"
                                                     readonly="1"
                                                 /> / <field
                                                     name="total_product_uom_qty"
+                                                    class="oe_inline"
                                                     readonly="1"
                                                 />) <field
                                                     name="product_uom_id"
+                                                    class="oe_inline"
                                                     options="{'no_open': True}"
                                                     readonly="1"
                                                 /></span>
                                         </div>
                                     </div>
                                 </div>
-                                <div
-                                    class="col text-center"
-                                    groups="product.group_stock_packaging"
-                                >
-                                    <field
-                                        name="packaging_qty"
-                                        force_save="1"
-                                        nolabel="1"
-                                        widget="numeric_step"
-                                        options="{'auto_select': True}"
-                                        attrs="{'invisible': [('product_packaging_ids', '=', [])]}"
-                                    />
-                                </div>
                                 <div class="col text-center" name="total_qty_field">
                                     <field
                                         name="product_qty"
@@ -353,79 +359,6 @@
                                 </div>
                             </group>
                         </group>
-                        <group
-                            name="scan_log"
-                            string="Current product scanning log"
-                            attrs="{'invisible': [('show_scan_log', '=', False)]}"
-                        >
-                                <group>
-                                    <button
-                                    name="action_undo_last_scan"
-                                    type="object"
-                                    string="Remove last yours"
-                                    icon="fa-trash"
-                                />
-                                </group>
-                                <field
-                                name="scan_log_ids"
-                                options="{'no_open': True}"
-                                nolabel="1"
-                                mode="tree,kanban"
-                            >
-                                    <tree>
-                                        <field name="create_date" />
-                                        <field name="create_uid" />
-                                        <field name="name" />
-                                        <field name="location_id" />
-                                        <field name="product_id" />
-                                        <field name="product_qty" />
-                                        <field name="lot_id" />
-                                    </tree>
-                                    <kanban class="o_kanban_mobile">
-                                        <field name="create_date" />
-                                        <field name="create_uid" />
-                                        <field name="product_qty" />
-                                        <templates>
-                                            <t t-name="kanban-box">
-                                                <div t-attf-class="oe_kanban_card">
-                                                    <div class="row">
-                                                        <div class="col">
-                                                            <strong>
-                                                                <span>
-                                                                    <t
-                                                                    t-esc="record.create_date.value"
-                                                                />
-                                                                </span>
-                                                                <span>
-                                                                    <t
-                                                                    t-esc="record.create_uid.value"
-                                                                />
-                                                                </span>
-                                                            </strong>
-                                                        </div>
-                                                        <div class="col">
-                                                            <strong>
-                                                                <span
-                                                                class="float-right text-end"
-                                                            >
-                                                                    <t
-                                                                    t-esc="record.product_qty.value"
-                                                                />
-                                                                </span>
-                                                            </strong>
-                                                        </div>
-                                                    </div>
-                                                    <row>
-                                                        <div class="col">
-                                                            <field name="product_id" />
-                                                        </div>
-                                                    </row>
-                                                </div>
-                                            </t>
-                                        </templates>
-                                    </kanban>
-                                </field>
-                            </group>
                     </div>
                     <div class="oe_stock_barcodes_bottombar d-flex">
                         <field name="display_menu" invisible="1" />
@@ -437,7 +370,7 @@
                             <a
                                 role="button"
                                 class="btn btn-secondary dropdown-toggle d-lg-none"
-                                data-toggle="dropdown"
+                                data-bs-toggle="dropdown"
                                 aria-haspopup="true"
                                 aria-expanded="false"
                                 title="Options"
@@ -445,7 +378,7 @@
                               <i class="fa fa-cogs" />
                             </a>
                             <div
-                                class="dropdown-menu pl-2 pr-2 d-lg-flex-no-dropdown"
+                                class="d-lg-flex-no-dropdown ps-2 dropdown-menu"
                                 role="menu"
                                 style="min-width: 200px"
                             >
@@ -462,14 +395,14 @@
                             </div>
                         </div>
                         <div
-                            class="d-flex pl-1 pr-1 d-lg-none"
+                            class="d-flex d-lg-none ps-1"
                             style="width: 75px;flex-wrap: wrap;"
                             title="Manual entry"
                             attrs="{'invisible': [('display_menu', '=', True)]}"
                         >
                             <i
                                 name="manual_entry"
-                                class="fa fa-hand-paper-o text-info mr-1"
+                                class="fa-hand-paper-o fa text-info me-1"
                                 attrs="{'invisible': [('manual_entry', '=', False)]}"
                             />
                         </div>
@@ -528,6 +461,40 @@
             </form>
         </field>
     </record>
+    <record id="view_stock_barcodes_read_packaging_form" model="ir.ui.view">
+        <field name="name">stock.barcodes.read.packaging.form</field>
+        <field name="model">wiz.stock.barcodes.read</field>
+        <field name="inherit_id" ref="stock_barcodes.view_stock_barcodes_read_form" />
+        <field name="arch" type="xml">
+            <div name="total_qty_header" position="before">
+                <div
+                    class="col text-center pr-0"
+                    groups="product.group_stock_packaging"
+                >
+                    <field name="product_packaging_ids" invisible="1" />
+                    <field
+                        name="packaging_id"
+                        options="{'no_open': True, 'no_create': True}"
+                        domain="[('product_id', '=', product_id)]"
+                        force_save="1"
+                        placeholder="Packaging"
+                        attrs="{'invisible': [('product_packaging_ids', '=', [])]}"
+                    />
+                </div>
+            </div>
+            <div name="total_qty_field" position="before">
+                <div class="col text-center" groups="product.group_stock_packaging">
+                    <field
+                        name="packaging_qty"
+                        force_save="1"
+                        widget="numeric_step"
+                        options="{'auto_select': True}"
+                        attrs="{'invisible': [('product_packaging_ids', '=', [])]}"
+                    />
+                </div>
+            </div>
+        </field>
+    </record>
     <!--
      Open wizard in current target option to avoid that the wizard is
      closed after any button click,