odoo-addon-stock-barcodes 16.0.1.1.0.10__py3-none-any.whl → 16.0.2.0.0.1__py3-none-any.whl

odoo/addons/stock_barcodes/wizard/stock_barcodes_read_picking_views.xml

@@ -6,11 +6,50 @@
         <field name="inherit_id" ref="stock_barcodes.view_stock_barcodes_read_form" />
         <field name="mode">primary</field>
         <field name="arch" type="xml">
+            <xpath expr="//button[@name='open_actions']" position="after">
+                <button
+                    name="action_open_picking"
+                    type="object"
+                    class="btn btn-primary"
+                    data-hotkey="'shift+o'"
+                >
+                    <field name="picking_id" />
+                </button>
+                <t t-if="partner_id">
+                    [<field
+                        name="partner_id"
+                        invisible="context.get('hide_partner', False)"
+                    />]
+                </t>
+                <field name="candidate_picking_id" invisible="1" />
+
+                <button
+                    name="action_unlock_picking"
+                    type="object"
+                    title="unlock picking"
+                    attrs="{'invisible': [('candidate_picking_id', '=', 'picking_id')]}"
+                    class="float-end"
+                >
+                    <span class="fa-stack fa-lg">
+                        <!-- FIXME: Use fa-thumbtack fa-stack-2x on v13 with FA v5.4 -->
+                        <i class="fa fa-thumb-tack fa-stack-1x" />
+                        <!-- FIXME: Use fa-slash on v13 with FA v5.4 -->
+                        <i class="fa fa-ban fa-stack-2x" />
+                    </span>
+                </button>
+                <button
+                    name="action_lock_picking"
+                    type="object"
+                    title="lock picking"
+                    attrs="{'invisible': [('candidate_picking_id', '!=', 'picking_id')]}"
+                    class="fa fa-thumb-tack fa-2x float-end"
+                />
+            </xpath>
             <xpath expr="//field[@name='message_type']" position="before">
                 <field
                     name="candidate_picking_ids"
-                    mode="kanban"
                     attrs="{'invisible': [('candidate_picking_ids', '=', [])]}"
+                    mode="kanban"
                     nolabel="1"
                     force_save="1"
                     class="o_x2m_control_panel"
@@ -32,88 +71,22 @@
                         <templates>
                             <t t-name="kanban-box">
                                 <div
+                                    t-if="!widget.isHtmlEmpty(record.note.raw_value)"
                                     t-att-class="'oe_kanban_color_alert' + (record.is_pending.raw_value == false ? ' bg-success' : '')"
                                 >
-                                    <div>
-                                        <a
-                                            name="action_lock_picking"
-                                            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 float-end"
-                                            context="{'wiz_barcode_id': parent.id, 'picking_id': picking_id}"
+                                    <div class="oe_kanban_details p-2">
+                                        <field
+                                            name="scan_count"
+                                            invisible="1"
+                                            force_save="1"
                                         />
-                                        <a
-                                            name="action_unlock_picking"
-                                            type="object"
-                                            title="unlock picking"
-                                            class="float-end"
-                                            t-if="record.picking_id.raw_value == record.wiz_picking_id.raw_value"
-                                            context="{'wiz_barcode_id': parent.id}"
+                                        <div
+                                            class="fw-bold text-center text-danger fst-italic"
                                         >
-                                            <span class="fa-stack fa-lg">
-                                                <!-- FIXME: Use fa-thumbtack fa-stack-2x on v13 with FA v5.4 -->
-                                                <i
-                                                    class="fa fa-thumb-tack fa-stack-1x"
-                                                />
-                                                <!-- FIXME: Use fa-slash on v13 with FA v5.4 -->
-                                                <i class="fa fa-ban fa-stack-2x" />
-                                            </span>
-                                        </a>
-                                    </div>
-                                    <div>
-                                    </div>
-                                    <div class="oe_kanban_details">
-                                        <div>
-                                            <strong>
-                                                <field name="name" />
-                                                <t t-if="record.partner_id.raw_value">
-                                                    [<field
-                                                        name="partner_id"
-                                                        invisible="context.get('hide_partner', False)"
-                                                    />]
-                                                </t>
-                                                <field
-                                                    name="scan_count"
-                                                    invisible="1"
-                                                    force_save="1"
-                                                />
-                                            </strong>
-                                        </div>
-                                        <t
-                                            t-if="!widget.isHtmlEmpty(record.note.raw_value)"
-                                        >
-                                            <div
-                                                class="fw-bold text-center text-danger fst-italic"
-                                            >
-                                                <t
-                                                    t-out="record.note.value"
-                                                    invisible="context.get('hide_note', False)"
-                                                />
-                                            </div>
-                                        </t>
-                                        <div class="row">
-                                            <div class="col">
-                                                <button
-                                                    name="action_open_picking"
-                                                    type="object"
-                                                    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">
-                                                <!-- FIXME:  Fix confirm question -->
-                                                <button
-                                                    name="action_validate_picking"
-                                                    type="object"
-                                                    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>
+                                            <t
+                                                t-out="record.note.value"
+                                                invisible="context.get('hide_note', False)"
+                                            />
                                         </div>
                                     </div>
                                 </div>
@@ -141,18 +114,21 @@
             <field name="location_id" position="attributes">
                 <attribute
                     name="domain"
-                >[('id', 'child_of', picking_location_id), '|', ('company_id', '=', False), ('company_id', '=', company_id), ('usage', '!=', 'view')]</attribute>
+                >[('id', 'child_of', picking_location_id), '|', ('company_id', '=', False), ('company_id', '=',
+                    company_id), ('usage', '!=', 'view')]
+                </attribute>
             </field>
             <group name="location" position="attributes">
                 <attribute
                     name="attrs"
-                >{'readonly': [('manual_entry', '=', False)], 'invisible': [('picking_type_code', '=', 'incoming')]}</attribute>
+                >{'readonly': [('manual_entry', '=', False)], 'invisible': [('picking_type_code', '=', 'incoming')]}
+                </attribute>
             </group>
             <group name="location" position="after">
                 <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"
+                        class="fa fa-2x fa-share text-center d-sm-none oe_span_small_icon"
                         title="Destination Location"
                     />
                     <field
@@ -171,12 +147,22 @@
                 <!--  hide group scan_fields for extra todo lines -->
                 <attribute
                     name="attrs"
-                >{'invisible': [('todo_line_is_extra_line', '!=', False)]}</attribute>
+                >{'invisible': [('todo_line_is_extra_line', '!=', False)]}
+                </attribute>
             </group>
             <group name="scan_fields" position="after">
+                <div
+                    attrs="{'invisible': [('picking_state', '!=', 'done')]}"
+                    class="oe_kanban_picking_done bg-dark d-flex flex-column justify-content-center align-items-center text-white"
+                >
+                    <span class="fa fa-6x mb-4 fa-exclamation-triangle" />
+                    <span class="fa fa-2x fa-exclamation-triangle">
+                        This picking is already done
+                    </span>
+                </div>
                 <group
                     string="Pending moves"
-                    attrs="{'invisible': [('pending_move_ids', '=', [])]}"
+                    attrs="{'invisible': ['|', ('picking_state', '=', 'done'), ('pending_move_ids', '=', [])]}"
                     col="2"
                 >
                     <field
@@ -185,78 +171,66 @@
                         nolabel="1"
                         colspan="2"
                         force_save="1"
-                        mode="tree,kanban"
+                        mode="kanban"
                     >
-                        <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"
-                                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="id" />
                             <field name="state" />
                             <field name="product_id" />
                             <field name="product_uom_qty" />
                             <field name="qty_done" />
+                            <field name="qty_done_rest" />
+                            <field name="uom_id" />
+                            <field name="product_qty_reserved" />
+                            <field name="picking_state" />
                             <templates>
                                 <t t-name="kanban-box">
-                                    <div t-attf-class="oe_kanban_card">
+                                    <div class="oe_kanban_global_click">
                                         <div class="row">
-                                            <div class="col-6">
-                                                <strong>
-                                                    <span>
-                                                        <field name="product_id" />
-                                                    </span>
-                                                </strong>
-                                            </div>
-                                            <div class="col-2">
-                                                <span
-                                                    class="float-end text-end text-muted"
+                                            <div class="col-8 col-md-8">
+                                                <field name="product_id" class="h2" />
+                                                <div
+                                                    class="d-flex justify-content-start align-items-center indent h4 pt-3"
                                                 >
-                                                    <field name="product_uom_qty" />
-                                                </span>
-                                            </div>
-                                            <div class="col-2">
-                                                <span
-                                                    class="float-end text-end"
-                                                    t-att-class="qty_done &gt;= product_uom_qty ? 'text-success' : ''"
-                                                >
-                                                    <field name="qty_done" />
-                                                </span>
+                                                    <span
+                                                        t-esc="record.qty_done.raw_value"
+                                                    />
+                                                    &#32;/&#32;
+                                                    <span
+                                                        t-esc="record.product_uom_qty.raw_value"
+                                                    />
+
+                                                    <span
+                                                        t-if="record.uom_id"
+                                                        t-esc="record.uom_id.value"
+                                                    />
+                                                </div>
                                             </div>
-                                            <div class="text-end col-2">
+                                            <div
+                                                class="col-4 col-md-4 d-flex justify-content-end align-items-center"
+                                            >
+
                                                 <button
-                                                    name="fill_from_pending_line"
+                                                    name="action_barcode_inventory_quant_edit"
                                                     type="object"
-                                                    class="btn"
+                                                    class="btn mt0"
                                                     context="{'wiz_barcode_id': parent.id}"
                                                 >
                                                     <i
-                                                        class="fa fa-upload"
-                                                        title="Fill from pencil"
-                                                        style="font-size:1.5em"
+                                                        class="fa fa-pencil"
+                                                        title="Edit inventory quantity"
+                                                    />
+                                                </button>
+                                                <button
+                                                    name="operation_quantities"
+                                                    type="object"
+                                                    class="btn btn-lg btn-primary btn-op-sum"
+                                                    t-if="record.qty_done_rest.raw_value > 0"
+                                                >
+                                                    +
+                                                    <span
+                                                        class="text-white"
+                                                        t-esc="record.qty_done_rest.raw_value"
                                                     />
                                                 </button>
                                             </div>
@@ -267,6 +241,12 @@
                         </kanban>
                     </field>
                 </group>
+                <h3
+                    class="mt-4 w-100 px-4"
+                    attrs="{'invisible': ['|', ('move_line_ids', '=', []), ('show_detailed_operations', '=', False)]}"
+                >
+                    Detailed operations
+                </h3>
                 <group
                     string="Detailed operations"
                     col="2"
@@ -278,75 +258,47 @@
                         nolabel="1"
                         colspan="2"
                         force_save="1"
-                        mode="tree,kanban"
+                        mode="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" />
+                            <field name="lot_id" />
+                            <field name="result_package_id" />
                             <templates>
                                 <t t-name="kanban-box">
-                                    <div t-attf-class="oe_kanban_card">
+                                    <div class="oe_kanban_global_click">
                                         <div class="row">
-                                            <div class="col-7">
-                                                <strong>
-                                                    <span>
-                                                        <field name="product_id" />
-                                                    </span>
-                                                </strong>
-                                            </div>
-                                            <div class="col-2">
-                                                <span
-                                                    class="fw-bold text-end float-end"
+                                            <div class="col-8 col-md-8">
+                                                <field name="product_id" class="h2" />
+                                                <div
+                                                    class="d-flex justify-content-start align-items-center indent h4 pt-3"
                                                 >
-                                                    <field name="qty_done" />
-                                                </span>
+                                                    <t t-if="record.lot_id.raw_value">
+                                                        Lot:
+                                                        <span
+                                                            t-esc="record.lot_id.raw_value"
+                                                        />
+                                                    </t>
+                                                    <t
+                                                        t-if="record.result_package_id.raw_value"
+                                                    >
+                                                        Package:
+                                                        <span
+                                                            t-esc="record.result_package_id.raw_value"
+                                                        />
+                                                    </t>
+                                                </div>
                                             </div>
-                                            <div class="text-end col-3">
+                                            <div
+                                                class="col-4 col-md-4 d-flex justify-content-end align-items-center"
+                                            >
+                                                <span
+                                                    class="h3"
+                                                    t-esc="record.qty_done.raw_value"
+                                                />
+
                                                 <button
                                                     name="action_barcode_detailed_operation_unlink"
                                                     type="object"
@@ -356,25 +308,10 @@
                                                     <i
                                                         class="fa fa-trash"
                                                         title="Remove"
-                                                        style="font-size:1.5em"
                                                     />
                                                 </button>
                                             </div>
                                         </div>
-                                        <div class="row">
-                                            <div class="col-4">
-                                                Lot: <field name="lot_id" />
-                                            </div>
-                                            <t
-                                                t-if="record.result_package_id.raw_value"
-                                            >
-                                                <div class="col-4">
-                                                    Package: <field
-                                                        name="result_package_id"
-                                                    />
-                                                </div>
-                                            </t>
-                                        </div>
                                     </div>
                                 </t>
                             </templates>
@@ -399,15 +336,55 @@
                     name="action_put_in_pack"
                     help="Put in pack"
                     type="object"
-                    icon="fa-cubes"
+                    icon="fa-cube fa-2x"
                     title="Put in Pack"
                     attrs="{'invisible': ['|', ('picking_state', 'in', ('draft', 'done', 'cancel')), ('display_menu', '=', True)]}"
-                    class="ms-auto oe_kanban_action_button btn btn-secondary btn-sm ps-3 pe-3"
+                    class="btn btn-secondary w-100 oe_kanban_action_button btn-sm text-uppercase
+                    d-flex justify-content-center align-items-center fs-2"
                     groups="stock.group_tracking_lot"
                     data-hotkey="6"
                 >
+                    <span class="d-none d-lg-block">Put in back</span>
+                </button>
+                <!--                t-att-class="'btn float-end' + (record.is_pending.raw_value == false ? ' btn-primary' : ' btn-secondary border')"-->
+                <button
+                    name="action_validate_picking"
+                    type="object"
+                    icon="fa-check fa-2x"
+                    class="btn btn-secondary w-100 oe_kanban_action_button btn-sm text-uppercase
+                    d-flex justify-content-center align-items-center fs-2"
+                    attrs="{'invisible': [('picking_state', 'not in', ['draft', 'assigned', 'confirmed'])]}"
+                    confirm="Are you sure to validate the picking ?"
+                    data-hotkey="'shift+v'"
+                >
+                    <span class="d-none d-lg-block">Validate</span>
                 </button>
             </xpath>
+            <xpath
+                expr="//div[hasclass('oe_stock_barcodes_bottombar')]//div[hasclass('dropup')]"
+                position="inside"
+            >
+                <field
+                    name="show_detailed_operations"
+                    widget="barcode_boolean_toggle"
+                    class="d-none"
+                />
+                <button
+                    name="action_show_detailed_operations"
+                    type="object"
+                    title="Detailed operations"
+                    icon="fa-eye fa-2x"
+                    attrs="{'invisible': ['|', ('move_line_ids', '=', []), ('show_detailed_operations', '=', True)]}"
+                />
+
+                <button
+                    name="action_show_detailed_operations"
+                    type="object"
+                    title="Detailed operations"
+                    icon="fa-eye-slash fa-2x"
+                    attrs="{'invisible': ['|', ('move_line_ids', '=', []), ('show_detailed_operations', '=', False)]}"
+                />
+            </xpath>
         </field>
     </record>
     <!--
@@ -419,10 +396,10 @@
         <field name="name">Barcodes Read</field>
         <field name="view_mode">form</field>
         <field name="context">{"control_panel_hidden": True,
-                               "form_view_initial_mode": "edit"}
+            "form_view_initial_mode": "edit"}
         </field>
         <field name="view_id" ref="view_stock_barcodes_read_picking_form" />
-        <field name="target">current</field>
+        <field name="target">fullscreen</field>
     </record>
     <record model="ir.actions.act_window" id="action_stock_barcodes_menu">
         <field name="res_model">wiz.stock.barcodes.read.picking</field>
@@ -430,7 +407,8 @@
         <field name="view_mode">form</field>
         <field
             name="context"
-        >{'control_panel_hidden': True, "default_display_menu": True}</field>
+        >{'control_panel_hidden': True, "default_display_menu": True}
+        </field>
         <field name="view_id" ref="view_stock_barcodes_read_picking_form" />
         <field name="target">current</field>
     </record>

odoo/addons/stock_barcodes/wizard/stock_barcodes_read_todo.py

@@ -14,6 +14,7 @@ class WizStockBarcodesReadTodo(models.TransientModel):
 
     name = fields.Char()
     wiz_barcode_id = fields.Many2one(comodel_name="wiz.stock.barcodes.read.picking")
+    picking_state = fields.Selection(related="wiz_barcode_id.picking_state")
     partner_id = fields.Many2one(
         comodel_name="res.partner",
         readonly=True,
@@ -42,6 +43,7 @@ class WizStockBarcodesReadTodo(models.TransientModel):
         digits="Product Unit of Measure",
         compute="_compute_qty_done",
     )
+    qty_done_rest = fields.Float(compute="_compute_qty_done_rest", store=True)
     location_id = fields.Many2one(comodel_name="stock.location")
     location_name = fields.Char(related="location_id.name")
     location_dest_id = fields.Many2one(comodel_name="stock.location")
@@ -65,6 +67,11 @@ class WizStockBarcodesReadTodo(models.TransientModel):
     # Used in kanban view
     is_stock_move_line_origin = fields.Boolean()
 
+    @api.depends("qty_done", "product_uom_qty")
+    def _compute_qty_done_rest(self):
+        for rec in self:
+            rec.qty_done_rest = rec.product_uom_qty - rec.qty_done
+
     def action_todo_next(self):
         self.state = "done_forced"
         self.line_ids.barcode_scan_state = "done_forced"
@@ -176,3 +183,41 @@ class WizStockBarcodesReadTodo(models.TransientModel):
         self.wiz_barcode_id.product_uom_id = self.uom_id
         self.wiz_barcode_id.action_show_step()
         self.wiz_barcode_id._set_focus_on_qty_input()
+
+    def operation_quantities(self):
+        self.wiz_barcode_id.manual_entry = True
+        self.wiz_barcode_id.product_qty = self.product_qty_reserved
+        self.wiz_barcode_id.product_id = self.product_id.id
+        if self.wiz_barcode_id.picking_id.picking_type_id.code != "incoming":
+            self.wiz_barcode_id.qty_available = self.product_qty_reserved
+            self.wiz_barcode_id.product_id = self.product_id.id
+            self.wiz_barcode_id.location_id = self.location_id.id
+        self.wiz_barcode_id.with_context(manual_picking=True).action_confirm()
+
+    def _get_fields_to_edit(self):
+        return [
+            "location_dest_id",
+            "location_id",
+            "product_id",
+            "lot_id",
+            "package_id",
+        ]
+
+    def action_barcode_inventory_quant_edit(self):
+        wiz_barcode_id = self.env.context.get("wiz_barcode_id", False)
+        wiz_barcode = self.env["wiz.stock.barcodes.read.picking"].browse(wiz_barcode_id)
+        for quant in self:
+            # Try to assign fields with the same name between quant and the scan wizard
+            for fname in self._get_fields_to_edit():
+                if hasattr(wiz_barcode, fname):
+                    wiz_barcode[fname] = quant[fname]
+            wiz_barcode.product_qty = quant.qty_done
+
+        wiz_barcode.manual_entry = True
+        self.env["bus.bus"]._sendone(
+            "stock_barcodes_scan",
+            "stock_barcodes_edit_manual",
+            {
+                "manual_entry": True,
+            },
+        )