[MIG] stock_barcodes: continue migration

chienandalu · chienandalu · commit 11c42f596ee2 · 2024-05-15T12:15:21.000+02:00
- Drop scan read logs feature, which use was deprecated already in the
  previous versions.
- Pass bootstrap migration scripts.
- Fix views issues.
- Other code fixes.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/stock_barcodes/wizard/stock_barcodes_read_picking.py b/stock_barcodes/wizard/stock_barcodes_read_picking.py
diff --git a/stock_barcodes/wizard/stock_barcodes_read_picking_views.xml b/stock_barcodes/wizard/stock_barcodes_read_picking_views.xml
diff --git a/stock_barcodes/wizard/stock_barcodes_read_todo.py b/stock_barcodes/wizard/stock_barcodes_read_todo.py
diff --git a/stock_barcodes/wizard/stock_barcodes_read_todo_view.xml b/stock_barcodes/wizard/stock_barcodes_read_todo_view.xml
diff --git a/stock_barcodes/wizard/stock_barcodes_read_views.xml b/stock_barcodes/wizard/stock_barcodes_read_views.xml

Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,6 @@ class StockBarcodesOptionGroup(models.Model):`
`39`	`39`	`default="move_line_ids",`
`40`	`40`	`help="Origin of the data to generate the movements to process",`
`41`	`41`	`)`
`42`		`- show_scan_log = fields.Boolean(`
`43`		`- string="Show scan log", help="Displays a log of the scans processed"`
`44`		`- )`
`45`	`42`	`ignore_filled_fields = fields.Boolean(`
`46`	`43`	`string="Ignore filled fields",`
`47`	`44`	`)`
`@@ -103,10 +100,6 @@ class StockBarcodesOptionGroup(models.Model):`
`103`	`100`	`("location_dest_id", "Destination Location"),`
`104`	`101`	`]`
`105`	`102`	`)`
`106`		`- scan_product_one_by_one = fields.Boolean(`
`107`		`- help="Will set the product quantity to one and complete the line",`
`108`		`- string="Scan product one by one"`
`109`		`- )`
`110`	`103`
`111`	`104`	`def get_option_value(self, field_name, attribute):`
`112`	`105`	`option = self.option_ids.filtered(lambda op: op.field_name == field_name)[:1]`