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

odoo/addons/stock_barcodes/views/stock_barcodes_action_view.xml

@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <!-- Main menu from scan wizard -->
-    <record model="ir.actions.act_window" id="action_stock_barcodes_action">
-        <field name="res_model">wiz.stock.barcodes.read.picking</field>
-        <field name="name">Barcodes actions</field>
-        <field name="view_mode">form</field>
-        <field
-            name="context"
-        >{'control_panel_hidden': True, 'default_display_menu': True}</field>
-    </record>
     <!-- Actions inside the menu -->
     <record id="view_stock_barcodes_action_tree" model="ir.ui.view">
         <field name="name">stock.barcodes.action.tree</field>
         <field name="model">stock.barcodes.action</field>
         <field name="arch" type="xml">
             <tree editable="top">
+                <header>
+                    <button
+                        string="Print barcodes"
+                        type="object"
+                        name="print_barcodes"
+                    />
+                </header>
                 <field name="sequence" widget="handle" />
                 <field name="name" />
                 <field name="action_window_id" />
@@ -22,15 +20,89 @@
                 <field name="key_shortcut" />
                 <field name="key_char_shortcut" />
                 <field name="active" widget="boolean_toggle" />
+                <field name="barcode" />
                 <field name="icon_class" />
             </tree>
         </field>
     </record>
+
     <record model="ir.actions.act_window" id="action_stock_barcodes">
         <field name="res_model">stock.barcodes.action</field>
         <field name="name">Barcodes actions</field>
         <field name="view_mode">tree</field>
     </record>
+
+
+    <record id="view_stock_barcodes_action_kanban" model="ir.ui.view">
+        <field name="name">stock.barcodes.action.kanban</field>
+        <field name="model">stock.barcodes.action</field>
+        <field name="arch" type="xml">
+            <kanban
+                class="o_kanban_mobile stock_barcodes_action_kanban"
+                create="0"
+                edit="0"
+                delete="0"
+                action="open_action"
+                type="object"
+            >
+                <field name="name" />
+                <field name="action_window_id" />
+                <field name="key_shortcut" />
+                <field name="key_char_shortcut" />
+                <field name="icon_class" />
+                <templates>
+                    <t t-name="kanban-box">
+                        <div class="oe_kanban_card oe_kanban_content">
+                            <t t-set="shortcut" t-value="record.key_char_shortcut" />
+                            <t
+                                t-set="hotkey"
+                                t-value="context.context_display_menu &amp;&amp; record.key_char_shortcut.raw_value || ''"
+                            />
+                            <div class="d-flex justify-content-between">
+                                <div>
+                                    <i
+                                        t-if="record.icon_class.raw_value != false"
+                                        t-attf-class="mx-2 #{record.icon_class.raw_value}"
+                                    />
+                                    <field name="name" />
+                                </div>
+                                <div class="rounded-circle count-elements">
+                                    <field name="count_elements" />
+                                </div>
+                            </div>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record>
+
+
+    <!-- Main menu from scan wizard -->
+    <record id="action_stock_barcodes_action_kanban" model="ir.actions.act_window">
+        <field name="res_model">stock.barcodes.action</field>
+        <field name="name">Barcodes</field>
+        <field name="view_mode">kanban</field>
+        <field name="view_id" ref="view_stock_barcodes_action_kanban" />
+        <field name="domain">[('action_window_id', '!=', False)]</field>
+        <field name="target">fullscreen</field>
+    </record>
+
+    <record id="action_stock_barcodes_action_client" model="ir.actions.client">
+        <field name="name">Barcodes</field>
+        <field name="tag">stock_barcodes_main_menu</field>
+        <field name="target">fullscreen</field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_stock_barcodes_action">
+        <field name="res_model">wiz.stock.barcodes.read.picking</field>
+        <field name="name">Barcodes actions</field>
+        <field name="view_mode">form</field>
+        <field
+            name="context"
+        >{'control_panel_hidden': True, 'default_display_menu': True}</field>
+    </record>
+
     <menuitem
         action="action_stock_barcodes"
         id="menu_action_stock_barcodes"
@@ -39,4 +111,6 @@
         parent="stock.menu_product_in_config_stock"
         sequence="100"
     />
+
+
 </odoo>

odoo/addons/stock_barcodes/views/stock_barcodes_menu.xml

@@ -4,7 +4,7 @@
         id="stock_barcodes_root"
         name="Barcodes"
         web_icon="stock_barcodes,static/description/icon.png"
-        action="stock_barcodes.action_stock_barcodes_action"
+        action="stock_barcodes.action_stock_barcodes_action_client"
         groups="stock.group_stock_user"
     />
 </odoo>

odoo/addons/stock_barcodes/views/stock_picking_views.xml

@@ -24,16 +24,14 @@
         <field name="model">stock.picking</field>
         <field name="inherit_id" ref="stock.stock_picking_kanban" />
         <field name="arch" type="xml">
-            <xpath expr="//t[@t-name='kanban-box']/div" position="inside">
-                <button
-                    name="action_barcode_scan"
-                    class="btn btn-secondary"
-                    type="object"
-                    help="Start barcode interface"
-                    states="assigned"
-                >
-                    <i class="fa fa-barcode fa-2x" title="Start barcode interface" />
-                </button>
+            <xpath expr="//kanban" position="attributes">
+                <attribute name="type">object</attribute>
+            </xpath>
+            <xpath expr="//kanban" position="attributes">
+                <attribute name="action">action_barcode_scan</attribute>
+            </xpath>
+            <xpath expr="//kanban" position="attributes">
+                <attribute name="js_class">stock_barcodes_kanban</attribute>
             </xpath>
         </field>
     </record>
@@ -109,4 +107,25 @@
             </field>
         </field>
     </record>
+
+
+    <record id="stock_barcodes_action_picking_tree_ready" model="ir.actions.act_window">
+        <field name="name">Operations</field>
+        <field name="res_model">stock.picking</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="view_mode">kanban</field>
+        <field
+            name="context"
+        >{'contact_display': 'partner_address', 'search_default_available': 1}
+        </field>
+        <field name="search_view_id" ref="stock.view_picking_internal_search" />
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                No transfer found. Let's create one!
+            </p>
+            <p>
+                Transfers allow you to move products from one location to another.
+            </p>
+        </field>
+    </record>
 </odoo>

odoo/addons/stock_barcodes/wizard/__init__.py

@@ -1,5 +1,6 @@
 from . import stock_barcodes_read
 from . import stock_barcodes_read_inventory
+from . import stock_barcodes_candidate_picking
 from . import stock_barcodes_read_picking
 from . import stock_barcodes_read_todo
 from . import stock_production_lot

odoo/addons/stock_barcodes/wizard/stock_barcodes_candidate_picking.py

@@ -0,0 +1,148 @@
+# Copyright 2019 Sergio Teruel <sergio.teruel@tecnativa.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).f
+from odoo import api, fields, models
+
+
+class WizCandidatePicking(models.TransientModel):
+
+    _name = "wiz.candidate.picking"
+    _description = "Candidate pickings for barcode interface"
+    # To prevent remove the record wizard until 2 days old
+    _transient_max_hours = 48
+
+    wiz_barcode_id = fields.Many2one(
+        comodel_name="wiz.stock.barcodes.read.picking", readonly=True
+    )
+    picking_id = fields.Many2one(
+        comodel_name="stock.picking", string="Picking", readonly=True
+    )
+    wiz_picking_id = fields.Many2one(
+        comodel_name="stock.picking",
+        related="wiz_barcode_id.picking_id",
+        string="Wizard Picking",
+        readonly=True,
+    )
+    name = fields.Char(
+        related="picking_id.name", readonly=True, string="Candidate Picking"
+    )
+    partner_id = fields.Many2one(
+        comodel_name="res.partner",
+        related="picking_id.partner_id",
+        readonly=True,
+        string="Partner",
+    )
+    state = fields.Selection(related="picking_id.state", readonly=True)
+    date = fields.Datetime(
+        related="picking_id.date", readonly=True, string="Creation Date"
+    )
+    product_qty_reserved = fields.Float(
+        "Reserved",
+        compute="_compute_picking_quantity",
+        digits="Product Unit of Measure",
+        readonly=True,
+    )
+    product_uom_qty = fields.Float(
+        "Demand",
+        compute="_compute_picking_quantity",
+        digits="Product Unit of Measure",
+        readonly=True,
+    )
+    product_qty_done = fields.Float(
+        "Done",
+        compute="_compute_picking_quantity",
+        digits="Product Unit of Measure",
+        readonly=True,
+    )
+    # For reload kanban view
+    scan_count = fields.Integer()
+    is_pending = fields.Boolean(compute="_compute_is_pending")
+    note = fields.Html(related="picking_id.note")
+
+    @api.depends("scan_count")
+    def _compute_picking_quantity(self):
+        for candidate in self:
+            qty_reserved = 0
+            qty_demand = 0
+            qty_done = 0
+            candidate.product_qty_reserved = sum(
+                candidate.picking_id.mapped("move_ids.reserved_availability")
+            )
+            for move in candidate.picking_id.move_ids:
+                qty_reserved += move.reserved_availability
+                qty_demand += move.product_uom_qty
+                qty_done += move.quantity_done
+            candidate.update(
+                {
+                    "product_qty_reserved": qty_reserved,
+                    "product_uom_qty": qty_demand,
+                    "product_qty_done": qty_done,
+                }
+            )
+
+    @api.depends("scan_count")
+    def _compute_is_pending(self):
+        for rec in self:
+            rec.is_pending = bool(rec.wiz_barcode_id.pending_move_ids)
+
+    def _get_wizard_barcode_read(self):
+        return self.env["wiz.stock.barcodes.read.picking"].browse(
+            self.env.context["wiz_barcode_id"]
+        )
+
+    def action_lock_picking(self):
+        wiz = self._get_wizard_barcode_read()
+        picking_id = self.env.context["picking_id"]
+        wiz.picking_id = picking_id
+        wiz._set_candidate_pickings(wiz.picking_id)
+        return wiz.action_confirm()
+
+    def action_unlock_picking(self):
+        wiz = self._get_wizard_barcode_read()
+        wiz.update(
+            {
+                "picking_id": False,
+                "candidate_picking_ids": False,
+                "message_type": False,
+                "message": False,
+            }
+        )
+        return wiz.action_cancel()
+
+    def _get_picking_to_validate(self):
+        """Inject context show_picking_type_action_tree to redirect to picking list
+        after validate picking in barcodes environment.
+        The stock_barcodes_validate_picking key allows to know when a picking has been
+        validated from stock barcodes interface.
+        """
+        return (
+            self.env["stock.picking"]
+            .browse(self.env.context.get("picking_id", False))
+            .with_context(
+                show_picking_type_action_tree=True, stock_barcodes_validate_picking=True
+            )
+        )
+
+    def action_validate_picking(self):
+        context = dict(self.env.context)
+        picking = self._get_picking_to_validate()
+        if picking._check_immediate():
+            return False, picking.with_context(
+                button_validate_picking_ids=picking.ids, operations_mode=True
+            )._action_generate_immediate_wizard(
+                show_transfers=picking._should_show_transfers()
+            )
+        return (
+            True,
+            picking.with_context(
+                skip_sms=context.get("skip_sms", False)
+            ).button_validate(),
+        )
+
+    def action_open_picking(self):
+        picking = self.env["stock.picking"].browse(
+            self.env.context.get("picking_id", False)
+        )
+        return picking.with_context(control_panel_hidden=False).get_formview_action()
+
+    def action_put_in_pack(self):
+        self.picking_id.action_put_in_pack()

odoo/addons/stock_barcodes/wizard/stock_barcodes_read.py

@@ -6,6 +6,8 @@ from odoo import _, api, fields, models
 
 _logger = logging.getLogger(__name__)
 
+TYPE_ERROR = ["more_match", "not_found"]
+
 
 class WizStockBarcodesRead(models.AbstractModel):
     _name = "wiz.stock.barcodes.read"
@@ -14,6 +16,7 @@ class WizStockBarcodesRead(models.AbstractModel):
     # To prevent remove the record wizard until 2 days old
     _transient_max_hours = 48
     _allowed_product_types = ["product", "consu"]
+    _rec_name = "barcode"
 
     barcode = fields.Char()
     res_model_id = fields.Many2one(comodel_name="ir.model", index=True)
@@ -48,6 +51,7 @@ class WizStockBarcodesRead(models.AbstractModel):
     message_type = fields.Selection(
         [
             ("info", "Barcode read with additional info"),
+            ("info_page", "Info page"),
             ("not_found", "No barcode found"),
             ("more_match", "More than one matches found"),
             ("success", "Barcode read correctly"),
@@ -92,9 +96,13 @@ class WizStockBarcodesRead(models.AbstractModel):
         string="Product Qty. Done", digits="Product Unit of Measure", store=False
     )
 
+    enable_add_product = fields.Boolean(default=True)
+
     @api.depends("res_id")
     def _compute_action_ids(self):
-        actions = self.env["stock.barcodes.action"].search([])
+        actions = self.env["stock.barcodes.action"].search(
+            [("action_window_id", "!=", False)]
+        )
         self.action_ids = actions
 
     @api.depends("option_group_id")
@@ -146,14 +154,36 @@ class WizStockBarcodesRead(models.AbstractModel):
         For manual entry mode barcode is not set so is not displayed
         """
         self.message_type = message_type
-        # TODO: Uncomment this line when the tests of all modules have been adapted
         # if self.barcode and self.message_type in ["more_match", "not_found"]:
         if self.barcode:
             self.message = _(
                 "%(barcode)s (%(message)s)", barcode=self.barcode, message=message
             )
         else:
-            self.message = "%s" % message
+            if message_type in TYPE_ERROR:
+                self.manual_entry = True
+                self.send_bus_done(
+                    "stock_barcodes_scan",
+                    "actions_barcode_notification",
+                    {
+                        "message": message,
+                        "sticky": True,
+                        "message_type": "danger"
+                        if message_type in TYPE_ERROR
+                        else message_type,
+                    },
+                )
+            elif message_type != "info_page":
+                self.send_bus_done(
+                    "stock_barcodes_scan",
+                    "actions_barcode_notification",
+                    {
+                        "message": message,
+                        "message_type": message_type,
+                    },
+                )
+            else:
+                self.message = "%s" % message
 
     def process_barcode_location_id(self):
         location = self.env["stock.location"].search(self._barcode_domain(self.barcode))
@@ -361,52 +391,73 @@ class WizStockBarcodesRead(models.AbstractModel):
         return False
 
     def process_barcode(self, barcode):
-        self._set_messagge_info("success", _("OK"))
-        options = self.option_group_id.option_ids
-        barcode_found = False
-        options_to_scan = options.filtered("to_scan")
-        options_required = options.filtered("required")
-        options_to_scan = options_to_scan.filtered(lambda op: op.step == self.step)
-        for option in options_to_scan:
-            if (
-                self.option_group_id.ignore_filled_fields
-                and option in options_required
-                and getattr(self, option.field_name, False)
-            ):
-                continue
-            option_func = getattr(self, "process_barcode_%s" % option.field_name, False)
-            if option_func:
-                res = option_func()
-                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")
+        if not self:
+            barcode_action = self.env["stock.barcodes.action"].search(
+                [
+                    ("action_window_id", "!=", False),
+                    ("barcode", "=", barcode),
+                ],
+                limit=1,
+            )
+
+            self.env["bus.bus"]._sendone(
+                "stock_barcodes_scan",
+                "actions_main_menu_barcode",
+                {
+                    "action_ok": len(barcode_action) > 0,
+                    "action": barcode_action.open_action() if barcode_action else "",
+                    "barcode": barcode,
+                },
+            )
+        else:
+            self._set_messagge_info("success", _("OK"))
+            options = self.option_group_id.option_ids
+            barcode_found = False
+            options_to_scan = options.filtered("to_scan")
+            options_required = options.filtered("required")
+            options_to_scan = options_to_scan.filtered(lambda op: op.step == self.step)
+            for option in options_to_scan:
+                if (
+                    self.option_group_id.ignore_filled_fields
+                    and option in options_required
+                    and getattr(self, option.field_name, False)
+                ):
+                    continue
+                option_func = getattr(
+                    self, "process_barcode_%s" % option.field_name, False
                 )
-            else:
-                self._set_messagge_info(
-                    "not_found", _("Barcode not found with this screen values")
+                if option_func:
+                    res = option_func()
+                    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(
+                        "not_found", _("Barcode not found or field already filled")
+                    )
+                else:
+                    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,
                 )
-            self.display_notification(
-                self.barcode,
-                message_type="danger",
-                title=_("Barcode not found"),
-                sticky=False,
-            )
-            return False
-        if not self.check_option_required():
-            return False
-        if self.is_manual_confirm or self.manual_entry:
-            self._set_messagge_info("info", _("Review and confirm"))
-            return False
-        return self.action_confirm()
+                return False
+            if not self.check_option_required():
+                return False
+            if self.is_manual_confirm or self.manual_entry:
+                self._set_messagge_info("info", _("Review and confirm"))
+                return False
+            return self.action_confirm()
 
     def check_option_required(self):
         options = self.option_group_id.option_ids
@@ -626,16 +677,18 @@ class WizStockBarcodesRead(models.AbstractModel):
     def action_manual_entry(self):
         return True
 
-    # TODO: To remove when stock_move_location uses action_clean_values
     def reset_qty(self):
         self.product_qty = 0
         self.packaging_qty = 0
 
     def open_actions(self):
         self.display_menu = True
+        return self.env.ref(
+            "stock_barcodes.action_stock_barcodes_action_client"
+        ).read()[0]
 
     def action_back(self):
-        self.display_menu = False
+        return self.env.ref("stock.stock_picking_type_action").read()[0]
 
     def open_records(self):
         action = self.action_ids
@@ -688,7 +741,7 @@ class WizStockBarcodesRead(models.AbstractModel):
             lambda op: op.step == self.step and op.to_scan
         )
         self._set_messagge_info(
-            "info", _("Scan {}").format(", ".join(options.mapped("name")))
+            "info_page", _("Scan {}").format(", ".join(options.mapped("name")))
         )
 
     @api.onchange("package_id")
@@ -704,12 +757,50 @@ class WizStockBarcodesRead(models.AbstractModel):
         record = self.browse(self.ids)
         record.write(self._convert_to_write(self._cache))
         self = record
-        res = self.action_done()
+        no_increase_qty_done, force_create_move = False, False
+        context = dict(self.env.context)
+        if self._name == "wiz.stock.barcodes.read.picking":
+            no_increase_qty_done = (
+                context.get("no_increase_qty_done", False) or self.manual_entry
+            )
+            force_create_move = context.get("force_create_move", False)
+        res = self.with_context(
+            no_increase_qty_done=no_increase_qty_done,
+            force_create_move=force_create_move,
+        ).action_done()
         self.invalidate_recordset()
         self.play_sounds(res)
         self._set_focus_on_qty_input()
+
+        if force_create_move:
+            # Hide Form Edit
+            self.manual_entry = False
+            self.send_bus_done(
+                "stock_barcodes_scan",
+                "stock_barcodes_edit_manual",
+                {
+                    "manual_entry": False,
+                },
+            )
+
+            # Count elements for apply in inventory
+            if self._name == "wiz.stock.barcodes.read.inventory":
+                self.display_read_quant = True
+                self._compute_count_inventory_quants()
+                self.send_bus_done(
+                    "stock_barcodes_form_update",
+                    "count_apply_inventory",
+                    {"count": self.count_inventory_quants},
+                )
+
         return res
 
+    def action_add_scan_manual(self):
+        self.manual_entry = True
+        self.send_bus_done(
+            "stock_barcodes_scan", "stock_barcodes_edit_manual", {"manual_entry": True}
+        )
+
     def process_lot_before_done(self):
         if (
             not self.lot_id
@@ -723,13 +814,14 @@ class WizStockBarcodesRead(models.AbstractModel):
 
     def play_sounds(self, res):
         if res:
-            self.env["bus.bus"]._sendone(
+            self.send_bus_done(
                 "stock_barcodes_scan",
                 "stock_barcodes_sound",
                 {"sound": "ok", "res_model": self._name, "res_id": self.ids[0]},
             )
+
         else:
-            self.env["bus.bus"]._sendone(
+            self.send_bus_done(
                 "stock_barcodes_scan",
                 "stock_barcodes_sound",
                 {"sound": "ko", "res_model": self._name, "res_id": self.ids[0]},
@@ -740,7 +832,8 @@ class WizStockBarcodesRead(models.AbstractModel):
             field_name = "product_qty"
         if field_name == "product_qty" and self.packaging_id:
             field_name = "packaging_qty"
-        self.env["bus.bus"]._sendone(
+
+        self.send_bus_done(
             "stock_barcodes_scan",
             "stock_barcodes_focus",
             {
@@ -805,7 +898,7 @@ class WizStockBarcodesRead(models.AbstractModel):
             }
             if title:
                 message["title"] = title
-            self.env["bus.bus"]._sendone(
+            self.send_bus_done(
                 "stock_barcodes-{}".format(self.ids[0]),
                 "stock_barcodes_notify-{}".format(self.ids[0]),
                 message,