odoo-addon-stock-barcodes 15.0.3.1.5.2__py3-none-any.whl → 16.0.1.0.0.18__py3-none-any.whl

odoo/addons/stock_barcodes/tests/test_stock_barcodes_picking.py

@@ -2,11 +2,11 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from odoo.tests.common import tagged
 
-from .test_stock_barcodes import TestStockBarcodes
+from .common import TestCommonStockBarcodes
 
 
 @tagged("post_install", "-at_install")
-class TestStockBarcodesPicking(TestStockBarcodes):
+class TestStockBarcodesPicking(TestCommonStockBarcodes):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
@@ -17,8 +17,6 @@ class TestStockBarcodesPicking(TestStockBarcodes):
         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")
@@ -41,7 +39,7 @@ class TestStockBarcodesPicking(TestStockBarcodes):
                     "location_dest_id": cls.customer_location.id,
                     "partner_id": cls.partner_agrolite.id,
                     "picking_type_id": cls.picking_type_out.id,
-                    "move_lines": [
+                    "move_ids": [
                         (
                             0,
                             0,
@@ -68,7 +66,7 @@ class TestStockBarcodesPicking(TestStockBarcodes):
                     "location_dest_id": cls.stock_location.id,
                     "partner_id": cls.partner_agrolite.id,
                     "picking_type_id": cls.picking_type_in.id,
-                    "move_lines": [
+                    "move_ids": [
                         (
                             0,
                             0,
@@ -215,10 +213,10 @@ class TestStockBarcodesPicking(TestStockBarcodes):
             wiz_barcode_id=self.wiz_scan_picking.id, picking_id=self.picking_out_01.id
         )
         candidate_wiz.with_context(force_create_move=True).action_lock_picking()
-        self.assertEqual(self.picking_out_01.move_lines.quantity_done, 2)
+        self.assertEqual(self.picking_out_01.move_ids.quantity_done, 2)
         self.wiz_scan_picking.product_qty = 2
         self.wiz_scan_picking.with_context(force_create_move=True).action_confirm()
-        self.assertEqual(self.picking_out_01.move_lines.quantity_done, 4)
+        self.assertEqual(self.picking_out_01.move_ids.quantity_done, 4)
 
         # Picking out 3 is in confirmed state, so until confirmed moves has
         # not been activated candidate pickings is 2
@@ -286,6 +284,7 @@ class TestStockBarcodesPicking(TestStockBarcodes):
 
         # Continue test with a outgoing wizard
         self.wiz_scan_picking_out.option_group_id.auto_lot = True
+        self.wiz_scan_picking_out.auto_lot = True
         self.action_barcode_scanned(self.wiz_scan_picking_out, "8433281006850")
         self.assertEqual(self.wiz_scan_picking_out.lot_id, self.lot_1)
 
@@ -294,6 +293,7 @@ class TestStockBarcodesPicking(TestStockBarcodes):
         self.product_tracking.categ_id.removal_strategy_id = self.env.ref(
             "stock.removal_lifo"
         )
+        self.wiz_scan_picking_out.action_clean_values()
         self.action_barcode_scanned(self.wiz_scan_picking_out, "8433281006850")
         self.assertEqual(self.wiz_scan_picking_out.lot_id, lot_3)
 

odoo/addons/stock_barcodes/views/stock_barcodes_option_view.xml

@@ -31,9 +31,9 @@
                             />
                             <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" />
+                            <field name="display_read_quant" />
                         </group>
                         <group>
                             <field name="ignore_filled_fields" />

odoo/addons/stock_barcodes/views/stock_picking_views.xml

@@ -28,7 +28,6 @@
                 <button
                     name="action_barcode_scan"
                     class="btn btn-secondary"
-                    icon="fa-barcode"
                     type="object"
                     help="Start barcode interface"
                     states="assigned"
@@ -47,9 +46,11 @@
                 <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" />
                 <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
                         name="action_barcode_scan"
@@ -65,7 +66,7 @@
             </xpath>
             <xpath expr="//div[hasclass('o_kanban_primary_right')]" position="inside">
                 <div
-                    class="mt8 pull-right"
+                    class="float-end mt8"
                     t-if="record.default_location_src_id.raw_value and record.default_location_dest_id.raw_value"
                 >
                     <button

odoo/addons/stock_barcodes/wizard/stock_barcodes_read.py

@@ -23,7 +23,7 @@ class WizStockBarcodesRead(models.AbstractModel):
     )
     product_uom_id = fields.Many2one(comodel_name="uom.uom")
     product_tracking = fields.Selection(related="product_id.tracking", readonly=True)
-    lot_id = fields.Many2one(comodel_name="stock.production.lot")
+    lot_id = fields.Many2one(comodel_name="stock.lot")
     lot_name = fields.Char(
         "Lot/Serial Number Name",
         compute="_compute_lot_name",
@@ -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"),
@@ -64,7 +59,7 @@ class WizStockBarcodesRead(models.AbstractModel):
     guided_product_id = fields.Many2one(comodel_name="product.product")
     guided_location_id = fields.Many2one(comodel_name="stock.location")
     guided_location_dest_id = fields.Many2one(comodel_name="stock.location")
-    guided_lot_id = fields.Many2one(comodel_name="stock.production.lot")
+    guided_lot_id = fields.Many2one(comodel_name="stock.lot")
     action_ids = fields.Many2many(
         comodel_name="stock.barcodes.action", compute="_compute_action_ids"
     )
@@ -73,10 +68,8 @@ 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")
     auto_lot = fields.Boolean(
         string="Get lots automatically",
         help="If checked the lot will be set automatically with the same "
@@ -110,7 +103,6 @@ class WizStockBarcodesRead(models.AbstractModel):
             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):
@@ -122,24 +114,6 @@ class WizStockBarcodesRead(models.AbstractModel):
         for rec in self:
             rec.create_lot = rec.option_group_id.create_lot
 
-    @api.depends("location_id", "product_id", "lot_id")
-    def _compute_qty_available(self):
-        if not self.product_id or self.location_id.usage != "internal":
-            self.qty_available = 0.0
-            return
-        domain_quant = [
-            ("product_id", "=", self.product_id.id),
-            ("location_id", "=", self.location_id.id),
-        ]
-        if self.lot_id:
-            domain_quant.append(("lot_id", "=", self.lot_id.id))
-        # if self.package_id:
-        #     domain_quant.append(('package_id', '=', self.package_id.id))
-        groups = self.env["stock.quant"].read_group(
-            domain_quant, ["quantity"], [], orderby="id"
-        )
-        self.qty_available = groups[0]["quantity"]
-
     @api.depends("product_id")
     def _compute_display_assign_serial(self):
         for rec in self:
@@ -234,7 +208,7 @@ class WizStockBarcodesRead(models.AbstractModel):
             lot_domain = [("name", "=", self.barcode)]
             if self.product_id:
                 lot_domain.append(("product_id", "=", self.product_id.id))
-            lot = self.env["stock.production.lot"].search(lot_domain)
+            lot = self.env["stock.lot"].search(lot_domain)
             if len(lot) == 1:
                 if self.option_group_id.fill_fields_from_lot:
                     quant_domain = [
@@ -258,6 +232,8 @@ class WizStockBarcodesRead(models.AbstractModel):
                             "more_match",
                             _("No stock available for this lot with screen values"),
                         )
+                        self.lot_id = False
+                        self.lot_name = False
                         return False
                     if quants:
                         self.set_info_from_quants(quants)
@@ -371,12 +347,14 @@ class WizStockBarcodesRead(models.AbstractModel):
     def process_barcode_packaging_id(self):
         domain = self._barcode_domain(self.barcode)
         if self.env.user.has_group("product.group_stock_packaging"):
+            domain.append(("product_id", "!=", False))
             packaging = self.env["product.packaging"].search(domain)
             if packaging:
                 if len(packaging) > 1:
                     self._set_messagge_info(
                         "more_match", _("More than one package found")
                     )
+                    self.packaging_id = False
                     return False
                 self.action_packaging_scaned_post(packaging)
                 return True
@@ -399,14 +377,15 @@ class WizStockBarcodesRead(models.AbstractModel):
             option_func = getattr(self, "process_barcode_%s" % option.field_name, False)
             if option_func:
                 res = option_func()
-                if option.required:
-                    self.play_sounds(res)
                 if res:
                     barcode_found = True
+                    self.play_sounds(barcode_found)
                     break
                 elif self.message_type != "success":
+                    self.play_sounds(False)
                     return False
         if not barcode_found:
+            self.play_sounds(barcode_found)
             if self.option_group_id.ignore_filled_fields:
                 self._set_messagge_info(
                     "info", _("Barcode not found or field already filled")
@@ -415,6 +394,12 @@ class WizStockBarcodesRead(models.AbstractModel):
                 self._set_messagge_info(
                     "not_found", _("Barcode not found with this screen values")
                 )
+            self.display_notification(
+                self.barcode,
+                message_type="danger",
+                title=_("Barcode not found"),
+                sticky=False,
+            )
             return False
         if not self.check_option_required():
             return False
@@ -473,7 +458,10 @@ class WizStockBarcodesRead(models.AbstractModel):
 
     def on_barcode_scanned(self, barcode):
         self.barcode = self._clean_barcode_scanned(barcode)
-        self.process_barcode(barcode)
+
+    def dummy_on_barcode_scanned(self):
+        """To avoid execute operations in onchange environment"""
+        self.process_barcode(self.barcode)
 
     def check_location_contidion(self):
         if not self.location_id:
@@ -558,9 +546,6 @@ class WizStockBarcodesRead(models.AbstractModel):
             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
 
@@ -625,7 +610,9 @@ class WizStockBarcodesRead(models.AbstractModel):
 
     def action_clean_values(self):
         options = self.option_group_id.option_ids
-        options_to_clean = options.filtered("clean_after_done")
+        options_to_clean = options.filtered(
+            lambda op: op.clean_after_done and op.field_name in self
+        )
         for option in options_to_clean:
             if option.field_name == "result_package_id" and self.keep_result_package:
                 continue
@@ -639,49 +626,11 @@ class WizStockBarcodesRead(models.AbstractModel):
     def action_manual_entry(self):
         return True
 
-    def _prepare_scan_log_values(self, log_detail=False):
-        return {
-            "name": self.barcode,
-            "location_id": self.location_id.id,
-            "product_id": self.product_id.id,
-            "packaging_id": self.packaging_id.id,
-            "lot_id": self.lot_id.id,
-            "packaging_qty": self.packaging_qty,
-            "product_qty": self.product_qty,
-            "manual_entry": self.manual_entry,
-            "res_model_id": self.res_model_id.id,
-            "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
 
@@ -703,11 +652,12 @@ class WizStockBarcodesRead(models.AbstractModel):
         self.visible_force_done = False
         return res
 
-    @api.model
-    def create(self, vals):
-        wiz = super().create(vals)
-        wiz.action_show_step()
-        return wiz
+    @api.model_create_multi
+    def create(self, vals_list):
+        wizards = super().create(vals_list)
+        for wiz in wizards:
+            wiz.action_show_step()
+        return wizards
 
     def action_manual_quantity(self):
         action = self.get_formview_action()
@@ -749,12 +699,13 @@ class WizStockBarcodesRead(models.AbstractModel):
 
     def action_confirm(self):
         if not self.check_option_required():
+            self.play_sounds(False)
             return False
         record = self.browse(self.ids)
         record.write(self._convert_to_write(self._cache))
         self = record
         res = self.action_done()
-        self.refresh()
+        self.invalidate_recordset()
         self.play_sounds(res)
         self._set_focus_on_qty_input()
         return res
@@ -773,15 +724,15 @@ class WizStockBarcodesRead(models.AbstractModel):
     def play_sounds(self, res):
         if res:
             self.env["bus.bus"]._sendone(
-                "stock_barcodes-{}".format(self.ids[0]),
-                "stock_barcodes_sound-{}".format(self.ids[0]),
-                {"sound": "ok"},
+                "stock_barcodes_scan",
+                "stock_barcodes_sound",
+                {"sound": "ok", "res_model": self._name, "res_id": self.ids[0]},
             )
         else:
             self.env["bus.bus"]._sendone(
-                "stock_barcodes-{}".format(self.ids[0]),
-                "stock_barcodes_sound-{}".format(self.ids[0]),
-                {"sound": "ko"},
+                "stock_barcodes_scan",
+                "stock_barcodes_sound",
+                {"sound": "ko", "res_model": self._name, "res_id": self.ids[0]},
             )
 
     def _set_focus_on_qty_input(self, field_name=None):
@@ -790,9 +741,14 @@ class WizStockBarcodesRead(models.AbstractModel):
         if field_name == "product_qty" and self.packaging_id:
             field_name = "packaging_qty"
         self.env["bus.bus"]._sendone(
-            "stock_barcodes-{}".format(self.ids[0]),
-            "stock_barcodes_read-{}".format(self.ids[0]),
-            {"action": "focus", "field_name": field_name},
+            "stock_barcodes_scan",
+            "stock_barcodes_focus",
+            {
+                "action": "focus",
+                "field_name": field_name,
+                "res_model": self._name,
+                "res_id": self.ids[0],
+            },
         )
 
     @api.onchange("product_id")
@@ -812,7 +768,7 @@ class WizStockBarcodesRead(models.AbstractModel):
         }
 
     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),
@@ -835,12 +791,18 @@ class WizStockBarcodesRead(models.AbstractModel):
         """Send notifications to web client
         message_type:
          [options.type='warning'] 'info', 'success', 'warning', 'danger' or ''
-         See web/static/src/legacy/js/core/service_mixins.js#L241 to implement more
-         options.
          sticky: Permanent notification until user removes it
         """
-        if self.option_group_id.display_notification:
-            message = {"message": message, "type": message_type, "sticky": sticky}
+        if self.option_group_id.display_notification and not self.env.context.get(
+            "skip_display_notification", False
+        ):
+            message = {
+                "message": message,
+                "type": message_type,
+                "sticky": sticky,
+                "res_model": self._name,
+                "res_id": self.ids[0],
+            }
             if title:
                 message["title"] = title
             self.env["bus.bus"]._sendone(

odoo/addons/stock_barcodes/wizard/stock_barcodes_read_inventory.py

@@ -98,10 +98,7 @@ class WizStockBarcodesReadInventory(models.TransientModel):
         )
 
     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:

odoo/addons/stock_barcodes/wizard/stock_barcodes_read_inventory_views.xml

@@ -14,7 +14,10 @@
             <group name="quant_package" position="replace">
                 <div class="mt4">
                     <strong class="d-none d-sm-block">Package</strong>
-                    <span class="fa fa-inbox d-sm-none oe_span_small_icon" />
+                    <span
+                        class="fa fa-inbox d-sm-none oe_span_small_icon"
+                        title="package"
+                    />
                     <field
                         name="package_id"
                         options="{'no_create': True}"
@@ -34,11 +37,13 @@
                 <group
                     string="Inventory quants"
                     attrs="{'invisible': [('inventory_quant_ids', '=', [])]}"
+                    col="2"
                 >
                     <field
                         name="inventory_quant_ids"
                         options="{'no_open': True}"
                         nolabel="1"
+                        colspan="2"
                         mode="tree,kanban"
                     >
                         <tree>
@@ -80,6 +85,7 @@
                                 type="object"
                                 class="btn"
                                 icon="fa-recycle"
+                                title="Remove quant"
                                 context="{'wiz_barcode_id': parent.id}"
                             />
                         </tree>
@@ -100,12 +106,12 @@
                                             </div>
                                             <div class="col-2">
                                                 <span
-                                                    class="pull-right text-right font-weight-bold"
+                                                    class="float-end text-end fw-bold"
                                                 >
                                                     <field name="inventory_quantity" />
                                                 </span>
                                             </div>
-                                            <div class="col-3 text-right">
+                                            <div class="col-3 text-end">
                                                 <button
                                                     name="action_barcode_inventory_quant_edit"
                                                     type="object"
@@ -121,15 +127,11 @@
                                                 <button
                                                     name="action_barcode_inventory_quant_unlink"
                                                     type="object"
+                                                    icon="fa-recycle"
+                                                    title="Reset inventory quantity"
                                                     class="btn mt0"
                                                     context="{'wiz_barcode_id': parent.id}"
-                                                >
-                                                    <i
-                                                        class="fa fa-recycle"
-                                                        title="Reset inventory quantity"
-                                                        style="font-size:1.5em"
-                                                    />
-                                                </button>
+                                                />
                                             </div>
                                         </div>
                                         <div class="row">
@@ -156,10 +158,7 @@
             </group>
             <div name="manual_entry" position="after">
                 <div class="d-flex" name="display_read_quant">
-                    <field
-                        name="display_read_quant"
-                        widget="FieldBarcodeBooleanToggle"
-                    />
+                    <field name="display_read_quant" widget="barcode_boolean_toggle" />
                     <label for="display_read_quant" />
                 </div>
             </div>
@@ -167,7 +166,7 @@
                 <button
                     name="apply_inventory"
                     type="object"
-                    class="btn-primary ml-auto oe_kanban_action_button btn-sm"
+                    class="btn-primary ms-auto oe_kanban_action_button btn-sm"
                     attrs="{'invisible': ['|', ('display_menu', '=', True), ('inventory_quant_ids', '=', [])]}"
                     data-hotkey="7"
                     groups="stock.group_stock_manager"