odoo-addon-stock-barcodes 15.0.3.1.6__py3-none-any.whl → 16.0.1.0.0.19__py3-none-any.whl

odoo/addons/stock_barcodes/wizard/stock_barcodes_read_picking_views.xml

@@ -13,7 +13,8 @@
                     attrs="{'invisible': [('candidate_picking_ids', '=', [])]}"
                     nolabel="1"
                     force_save="1"
-                    options='{"always_reload": True}'
+                    class="o_x2m_control_panel"
+                    options="{'always_reload': True}"
                 >
                     <kanban>
                         <field name="name" />
@@ -39,14 +40,14 @@
                                             type="object"
                                             title="lock picking"
                                             t-if="record.picking_id.raw_value != record.wiz_picking_id.raw_value"
-                                            class="fa fa-thumb-tack fa-2x pull-right"
+                                            class="fa fa-thumb-tack fa-2x float-end"
                                             context="{'wiz_barcode_id': parent.id, 'picking_id': picking_id}"
                                         />
                                         <a
                                             name="action_unlock_picking"
                                             type="object"
                                             title="unlock picking"
-                                            class="pull-right"
+                                            class="float-end"
                                             t-if="record.picking_id.raw_value == record.wiz_picking_id.raw_value"
                                             context="{'wiz_barcode_id': parent.id}"
                                         >
@@ -83,7 +84,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,8 +97,9 @@
                                                 <button
                                                     name="action_open_picking"
                                                     type="object"
-                                                    class="btn btn-secondary pull-left"
+                                                    class="float-start btn btn-secondary border"
                                                     context="{'wiz_barcode_id': parent.id, 'picking_id': picking_id}"
+                                                    data-hotkey="'shift+o'"
                                                 >Open</button>
                                             </div>
                                             <div class="col">
@@ -105,10 +107,11 @@
                                                 <button
                                                     name="action_validate_picking"
                                                     type="object"
-                                                    t-att-class="'btn pull-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}"
+                                                    data-hotkey="'shift+v'"
                                                 >Validate</button>
                                             </div>
                                         </div>
@@ -118,7 +121,12 @@
                         </templates>
                     </kanban>
                 </field>
-                <field name="todo_line_display_ids" mode="kanban" force_save="1" />
+                <field
+                    name="todo_line_display_ids"
+                    mode="kanban"
+                    force_save="1"
+                    attrs="{'invisible': [('todo_line_display_ids', '=', [])]}"
+                />
             </xpath>
             <field name="location_id" position="before">
                 <field name="picking_type_code" invisible="1" force_save="1" />
@@ -127,6 +135,8 @@
                 <field name="picking_location_id" invisible="1" />
                 <field name="picking_location_dest_id" invisible="1" />
                 <field name="company_id" invisible="1" />
+                <field name="todo_line_is_extra_line" invisible="1" />
+                <field name="qty_available" invisible="1" />
             </field>
             <field name="location_id" position="attributes">
                 <attribute
@@ -139,45 +149,52 @@
                 >{'readonly': [('manual_entry', '=', False)], 'invisible': [('picking_type_code', '=', 'incoming')]}</attribute>
             </group>
             <group name="location" position="after">
-                <group
-                    name="location_dest"
-                    attrs="{'invisible': [('picking_type_code', '=', 'outgoing')]}"
-                >
-                    <div>
-                        <strong class=" d-none d-sm-block">Dest. Location</strong>
-                        <span
-                            class="fa fa-share text-center d-sm-none oe_span_small_icon"
-                            title="Destination Location"
-                        />
-                        <field
-                            name="location_dest_id"
-                            options="{'no_create': True}"
-                            attrs="{'readonly': [('manual_entry', '=', False)]}"
-                            force_save="1"
-                            style="width:85%"
-                            class="h5"
-                            domain="[('id', 'child_of', picking_location_dest_id), '|', ('company_id', '=', False), ('company_id', '=', company_id), ('usage', '!=', 'view')]"
-                        />
-                    </div>
-                </group>
+                <div attrs="{'invisible': [('picking_type_code', '=', 'outgoing')]}">
+                    <strong class=" d-none d-sm-block">Dest. Location</strong>
+                    <span
+                        class="fa fa-share text-center d-sm-none oe_span_small_icon"
+                        title="Destination Location"
+                    />
+                    <field
+                        name="location_dest_id"
+                        options="{'no_create': True, 'no_open': True}"
+                        attrs="{'readonly': [('manual_entry', '=', False)]}"
+                        force_save="1"
+                        nolabel="1"
+                        style="width:90%"
+                        class="h5"
+                        domain="[('id', 'child_of', picking_location_dest_id), '|', ('company_id', '=', False), ('company_id', '=', company_id), ('usage', '!=', 'view')]"
+                    />
+                </div>
+            </group>
+            <group name="scan_fields" position="attributes">
+                <!--  hide group scan_fields for extra todo lines -->
+                <attribute
+                    name="attrs"
+                >{'invisible': [('todo_line_is_extra_line', '!=', False)]}</attribute>
             </group>
             <group name="scan_fields" position="after">
                 <group
                     string="Pending moves"
                     attrs="{'invisible': [('pending_move_ids', '=', [])]}"
+                    col="2"
                 >
                     <field
                         name="pending_move_ids"
                         options="{'no_open': True, 'always_reload': True}"
                         nolabel="1"
+                        colspan="2"
                         force_save="1"
                         mode="tree,kanban"
                     >
-                        <tree>
+                        <tree decoration-warning="is_extra_line">
                             <field name="state" invisible="1" />
+                            <field name="is_extra_line" invisible="1" />
                             <field name="product_id" />
                             <field name="product_uom_qty" />
                             <field name="line_ids" invisible="1" />
+                            <field name="location_id" optional="hide" />
+                            <field name="location_dest_id" optional="hide" />
                             <field
                                 name="lot_id"
                                 groups="stock.group_production_lot"
@@ -191,6 +208,7 @@
                             <field name="qty_done" />
                             <button
                                 name="fill_from_pending_line"
+                                title="Fill from pending line"
                                 type="object"
                                 class="btn"
                                 icon="fa-upload"
@@ -215,20 +233,20 @@
                                             </div>
                                             <div class="col-2">
                                                 <span
-                                                    class="pull-right text-right text-muted"
+                                                    class="float-end text-end text-muted"
                                                 >
                                                     <field name="product_uom_qty" />
                                                 </span>
                                             </div>
                                             <div class="col-2">
                                                 <span
-                                                    class="pull-right text-right"
-                                                    t-att-class="qty_done >= product_uom_qty ? 'text-success' : ''"
+                                                    class="float-end text-end"
+                                                    t-att-class="qty_done &gt;= product_uom_qty ? 'text-success' : ''"
                                                 >
                                                     <field name="qty_done" />
                                                 </span>
                                             </div>
-                                            <div class="col-2 text-right">
+                                            <div class="text-end col-2">
                                                 <button
                                                     name="fill_from_pending_line"
                                                     type="object"
@@ -251,12 +269,14 @@
                 </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"
                     >
@@ -297,6 +317,7 @@
                             />
                             <button
                                 name="action_barcode_detailed_operation_unlink"
+                                title="Remove detailed operation"
                                 type="object"
                                 class="btn"
                                 icon="fa-trash"
@@ -320,12 +341,12 @@
                                             </div>
                                             <div class="col-2">
                                                 <span
-                                                    class="pull-right text-right font-weight-bold"
+                                                    class="fw-bold text-end float-end"
                                                 >
                                                     <field name="qty_done" />
                                                 </span>
                                             </div>
-                                            <div class="col-3 text-right">
+                                            <div class="text-end col-3">
                                                 <button
                                                     name="action_barcode_detailed_operation_unlink"
                                                     type="object"
@@ -378,12 +399,13 @@
                     name="action_put_in_pack"
                     help="Put in pack"
                     type="object"
+                    icon="fa-cubes"
+                    title="Put in Pack"
                     attrs="{'invisible': ['|', ('picking_state', 'in', ('draft', 'done', 'cancel')), ('display_menu', '=', True)]}"
-                    class="ml-auto oe_kanban_action_button btn btn-secondary btn-sm pl-3 pr-3"
+                    class="ms-auto oe_kanban_action_button btn btn-secondary btn-sm ps-3 pe-3"
                     groups="stock.group_tracking_lot"
                     data-hotkey="6"
                 >
-                     <i class="fa fa-cubes" title="Put in Pack" />
                 </button>
             </xpath>
         </field>

odoo/addons/stock_barcodes/wizard/stock_barcodes_read_todo.py

@@ -1,9 +1,8 @@
 # Copyright 2019 Sergio Teruel <sergio.teruel@tecnativa.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from collections import OrderedDict
 
 from odoo import api, fields, models
-from odoo.tools.safe_eval import safe_eval
+from odoo.tools.float_utils import float_compare
 
 
 class WizStockBarcodesReadTodo(models.TransientModel):
@@ -50,7 +49,7 @@ class WizStockBarcodesReadTodo(models.TransientModel):
         string="Destinatino Name", related="location_dest_id.name"
     )
     product_id = fields.Many2one(comodel_name="product.product")
-    lot_id = fields.Many2one(comodel_name="stock.production.lot")
+    lot_id = fields.Many2one(comodel_name="stock.lot")
     uom_id = fields.Many2one(comodel_name="uom.uom")
     package_id = fields.Many2one(comodel_name="stock.quant.package")
     result_package_id = fields.Many2one(comodel_name="stock.quant.package")
@@ -62,111 +61,27 @@ class WizStockBarcodesReadTodo(models.TransientModel):
     stock_move_ids = fields.Many2many(comodel_name="stock.move")
     position_index = fields.Integer()
     picking_code = fields.Char("Type of Operation")
-
-    def _group_key(self, wiz, line):
-        group_key_for_todo_records = wiz.option_group_id.group_key_for_todo_records
-        if group_key_for_todo_records:
-            return safe_eval(group_key_for_todo_records, globals_dict={"object": line})
-        if wiz.option_group_id.source_pending_moves == "move_line_ids":
-            return (line.location_id, line.product_id, line.lot_id, line.package_id)
-        else:
-            return (line.location_id, line.product_id)
-
-    def _get_all_products_quantities_in_package(self, package):
-        res = {}
-        for quant in package._get_contained_quants():
-            if quant.product_id not in res:
-                res[quant.product_id] = 0
-            res[quant.product_id] += quant.quantity
-        return res
-
-    def _prepare_fill_record_values(self, wiz_barcode, line, position):
-        vals = {
-            "product_id": line.product_id.id,
-            "product_uom_qty": line.product_uom_qty,
-            "name": "To do action",
-            "position_index": position,
-            "picking_code": line.picking_code,
-        }
-        if wiz_barcode.option_group_id.source_pending_moves == "move_line_ids":
-            package_product_dic = self._get_all_products_quantities_in_package(
-                line.package_id
-            )
-            vals.update(
-                {
-                    "location_id": line.location_id.id,
-                    "location_dest_id": line.location_dest_id.id,
-                    "lot_id": line.lot_id.id,
-                    "package_id": line.package_id.id,
-                    "result_package_id": line.result_package_id.id,
-                    "uom_id": line.product_uom_id.id,
-                    "product_qty_reserved": line.product_qty,
-                    "line_ids": [(6, 0, line.ids)],
-                    "stock_move_ids": [(6, 0, line.move_id.ids)],
-                    "package_product_qty": package_product_dic
-                    and package_product_dic[line.product_id]
-                    or 0.0,
-                }
-            )
-        else:
-            vals.update(
-                {
-                    "location_id": (line.move_line_ids[:1] or line).location_id.id,
-                    "location_dest_id": (
-                        line.move_line_ids[:1] or line
-                    ).location_dest_id.id,
-                    "uom_id": line.product_uom.id,
-                    "product_qty_reserved": line.move_line_ids
-                    and sum(line.move_line_ids.mapped("product_qty"))
-                    or line.product_uom_qty,
-                    "line_ids": [(6, 0, line.move_line_ids.ids)],
-                    "stock_move_ids": [(6, 0, line.ids)],
-                }
-            )
-        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_qty_reserved"] += line.product_qty
-            vals["line_ids"][0][2].append(line.id)
-            vals["stock_move_ids"][0][2].append(line.move_id.id)
-        else:
-            vals["product_qty_reserved"] += (
-                line.move_line_ids
-                and sum(line.move_line_ids.mapped("product_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)
-        return vals
-
-    @api.model
-    def fill_records(self, wiz_barcode, lines_list):
-        """
-        :param lines_list: browse list
-        :return:
-        """
-        wiz_barcode.todo_line_ids = self.browse()
-        todo_vals = OrderedDict()
-        position = 0
-        for lines in lines_list:
-            for line in lines:
-                key = self._group_key(wiz_barcode, line)
-                if key not in todo_vals:
-                    todo_vals[key] = self._prepare_fill_record_values(
-                        wiz_barcode, line, position
-                    )
-                    position += 1
-                else:
-                    todo_vals[key] = self._update_fill_record_values(
-                        wiz_barcode, line, todo_vals[key]
-                    )
-        wiz_barcode.todo_line_ids = self.create(list(todo_vals.values()))
+    is_extra_line = fields.Boolean()
+    # Used in kanban view
+    is_stock_move_line_origin = fields.Boolean()
 
     def action_todo_next(self):
         self.state = "done_forced"
         self.line_ids.barcode_scan_state = "done_forced"
+        for sml in self.line_ids:
+            if sml.reserved_uom_qty != sml.qty_done and sml.move_id.state != "waiting":
+                sml.reserved_uom_qty = sml.qty_done
+        if self.is_extra_line or not self.is_stock_move_line_origin:
+            barcode_backorder_action = self.env.context.get(
+                "barcode_backorder_action", "create_backorder"
+            )
+            self.stock_move_ids.barcode_backorder_action = barcode_backorder_action
+            if barcode_backorder_action == "pending":
+                self.stock_move_ids.move_line_ids.unlink()
+                self.stock_move_ids._action_assign()
+        wiz_barcode = self.wiz_barcode_id
+        self.wiz_barcode_id.fill_todo_records()
+        self.wiz_barcode_id = wiz_barcode
         self.wiz_barcode_id.determine_todo_action()
 
     def action_reset_lines(self):
@@ -174,6 +89,7 @@ class WizStockBarcodesReadTodo(models.TransientModel):
         self.line_ids.barcode_scan_state = "pending"
         self.line_ids.qty_done = 0.0
         self.wiz_barcode_id.action_clean_values()
+        self.wiz_barcode_id.fill_todo_records()
         self.wiz_barcode_id.determine_todo_action()
 
     def action_back_line(self):
@@ -194,18 +110,28 @@ class WizStockBarcodesReadTodo(models.TransientModel):
     @api.depends(
         "line_ids",
         "line_ids.qty_done",
-        "line_ids.product_uom_qty",
+        "line_ids.reserved_uom_qty",
         "line_ids.barcode_scan_state",
         "qty_done",
         "product_uom_qty",
     )
     def _compute_state(self):
         for rec in self:
-            if rec.qty_done >= rec.product_uom_qty or (
+            if float_compare(
+                rec.qty_done,
+                rec.product_uom_qty,
+                precision_rounding=rec.uom_id.rounding,
+            ) > -1 or (
                 rec.wiz_barcode_id.option_group_id.source_pending_moves
                 == "move_line_ids"
                 and rec.line_ids
-                and not any(ln.barcode_scan_state == "pending" for ln in rec.line_ids)
+                and (
+                    sum(rec.stock_move_ids.mapped("quantity_done"))
+                    >= sum(rec.stock_move_ids.mapped("product_uom_qty"))
+                    or not any(
+                        ln.barcode_scan_state == "pending" for ln in rec.line_ids
+                    )
+                )
             ):
                 rec.state = "done"
             else:

odoo/addons/stock_barcodes/wizard/stock_barcodes_read_todo_view.xml

@@ -20,11 +20,13 @@
                 <field name="qty_done" />
                 <field name="line_ids" invisible="1" />
                 <field name="state" />
+                <field name="is_extra_line" />
+                <field name="is_stock_move_line_origin" />
                 <templates>
                     <t t-name="kanban-box">
                         <div
                             t-attf-class="oe_kanban_content "
-                            style="background-color: #FFF8DC;"
+                            t-attf-style="background-color: {{record.is_extra_line.raw_value == true and '#ffd683' or '#f0f9fb'}};"
                         >
                             <div class="row">
                                 <div class="col">
@@ -41,7 +43,7 @@
                                         <span
                                             attrs="{'invisible': [('picking_code', '!=', 'internal')]}"
                                         >
-                                            <field name="location_name" /> \u21E8 <field
+                                            <field name="location_name" /> ⇨ <field
                                                 name="location_dest_name"
                                             />
                                         </span>
@@ -71,10 +73,13 @@
                                                     class="fa fa-tags"
                                                     title="Lot S/N"
                                                 />
-                                                <field name="lot_id" />
+                                                <field
+                                                    name="lot_id"
+                                                    options="{'no_open': True}"
+                                                />
                                             </span>
                                         </td>
-                                        <td class="text-right">
+                                        <td class="text-end">
                                             <span class="fa fa-dropbox" />
                                             <span>
                                                 <field name="package_id" />
@@ -94,72 +99,109 @@
                             <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"
                                         /> <t t-esc="record.uom_id.value.slice(0,3)" />
                                     </span>
+                                    <strong
+                                        class="bg-danger"
+                                        t-if="record.is_extra_line.raw_value == true"
+                                    >NOT AVAILABLE</strong>
                                 </div>
                             </div>
                             <div name="action" class="row">
-                                <div class="col-3">
+                                <div class="col-2">
                                     <button
                                         name="action_back_line"
                                         type="object"
-                                        class="btn btn-primary pull-left btn-sm"
+                                        icon="fa-step-backward"
+                                        title="Previous"
+                                        class="btn-sm float-start btn btn-primary"
                                         context="{'wiz_barcode_id': parent.id}"
                                         data-hotkey="1"
-                                    >
-                                        <i
-                                            class="fa fa-step-backward"
-                                            title="Previous"
-                                        />
-                                    </button>
+                                    />
                                 </div>
-                                <div class="col-3">
+                                <div class="col-4 p-0">
                                     <button
                                         name="action_reset_lines"
                                         type="object"
-                                        class="btn btn-warning pull-right btn-sm"
+                                        icon="fa-trash"
+                                        title="Clean"
+                                        class="btn-sm btn mx-auto d-block btn-warning"
                                         context="{'wiz_barcode_id': parent.id}"
                                         data-hotkey="2"
-                                    >
-                                        <i class="fa fa-trash" title="Clean" />
-                                    </button>
+                                    />
                                 </div>
-                                <div class="col-3">
+                                <div class="col-4 p-0">
                                     <button
                                         name="action_todo_next"
                                         type="object"
-                                        class="btn btn-warning pull-right btn-sm"
+                                        class="btn-sm mx-auto d-block btn-danger btn"
                                         context="{'wiz_barcode_id': parent.id}"
                                         data-hotkey="3"
-                                        attrs="{'invisible': [('qty_done', '=', 0.0)]} "
+                                        attrs="{'invisible': ['|','|', ('qty_done', '=', 0.0), ('is_extra_line', '=', True), ('is_stock_move_line_origin', '=', False)]} "
                                     >
                                     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 btn-danger pull-right btn-sm"
+                                        class="btn-sm mx-auto d-block btn-danger btn"
                                         context="{'wiz_barcode_id': parent.id}"
                                         data-hotkey="3"
-                                        attrs="{'invisible': [('qty_done', '!=', 0.0)]} "
+                                        attrs="{'invisible': ['|', '|', ('qty_done', '!=', 0.0), ('is_extra_line', '=', True), ('is_stock_move_line_origin', '=', False)]} "
                                         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">
+                                <div class="col-2">
                                     <button
                                         name="action_next_line"
                                         type="object"
-                                        class="btn btn-primary pull-right btn-sm"
+                                        icon="fa-step-forward"
+                                        title="Next"
+                                        class="btn-sm float-end btn btn-primary"
                                         context="{'wiz_barcode_id': parent.id}"
                                         data-hotkey="4"
+                                    />
+                                </div>
+                            </div>
+                            <div name="action_extra" class="row mt-2">
+                                <div class="col-12">
+                                    <button
+                                        name="action_todo_next"
+                                        type="object"
+                                        class="btn btn-warning float-end btn-sm"
+                                        context="{'wiz_barcode_id': parent.id, 'barcode_backorder_action': 'pending'}"
+                                        data-hotkey="3"
+                                        attrs="{'invisible': [('is_extra_line', '=', False), ('is_stock_move_line_origin', '=', True)]} "
+                                        confirm="This move will be set to pending. Are you sure?"
+                                    >
+                                    Restore to pending
+                                    </button>
+                                    <button
+                                        name="action_todo_next"
+                                        type="object"
+                                        class="btn btn-danger float-end btn-sm me-5"
+                                        context="{'wiz_barcode_id': parent.id, 'barcode_backorder_action': 'skip_backorder'}"
+                                        data-hotkey="3"
+                                        attrs="{'invisible': [('is_extra_line', '=', False), ('is_stock_move_line_origin', '=', True)]} "
+                                        confirm="Odoo will not create a backorder for this move. Are you sure?"
+                                    >
+                                    No Backorder
+                                    </button>
+                                    <button
+                                        name="action_todo_next"
+                                        type="object"
+                                        class="btn btn-primary float-end btn-sm me-3"
+                                        context="{'wiz_barcode_id': parent.id, 'barcode_backorder_action': 'create_backorder'}"
+                                        data-hotkey="3"
+                                        attrs="{'invisible': [('is_extra_line', '=', False), ('is_stock_move_line_origin', '=', True)]} "
                                     >
-                                        <i class="fa fa-step-forward" title="Next" />
+                                    Create Backorder
                                     </button>
                                 </div>
                             </div>