odoo-addon-shopfloor 16.0.1.0.0.24__py3-none-any.whl → 16.0.2.1.0__py3-none-any.whl

odoo/addons/shopfloor/README.rst

@@ -7,7 +7,7 @@ Shopfloor
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:993547f893f6715d97989e36897fae01ba59faacf8a2a9f66f202d3130bba967
+   !! source digest: sha256:835c681f1a1e049cfb7792d6dd69c0214bfbaad4775d134f6e5a47900e8aeb4a
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

odoo/addons/shopfloor/__manifest__.py

@@ -6,7 +6,7 @@
 {
     "name": "Shopfloor",
     "summary": "manage warehouse operations with barcode scanners",
-    "version": "16.0.1.0.0",
+    "version": "16.0.2.1.0",
     "development_status": "Beta",
     "category": "Inventory",
     "website": "https://github.com/OCA/wms",

odoo/addons/shopfloor/actions/data.py

@@ -13,34 +13,23 @@ class DataAction(Component):
     def location(self, record, **kw):
         parser = self._location_parser
         data = self._jsonify(record.with_context(location=record.id), parser, **kw)
-        if "with_operation_progress" in kw:
-            operation_progress = self._get_location_operations_progress(record)
-            data.update({"operation_progress": operation_progress})
-        return data
-
-    def locations(self, record, **kw):
-        return self.location(record, multi=True)
-
-    def _get_location_operations_progress(self, location):
-        lines = self.env["stock.move.line"].search(
-            [
-                ("location_id", "=", location.id),
+        if kw.get("with_operation_progress"):
+            lines_blacklist = (
+                kw.get("progress_lines_blacklist")
+                or self.env["stock.move.line"].browse()
+            )
+            domain = [
+                ("location_id", "=", record.id),
                 ("state", "in", ["partially_available", "assigned"]),
                 ("picking_id.state", "=", "assigned"),
+                ("id", "not in", lines_blacklist.ids),
             ]
-        )
-        # operations_to_do = number of total operations that are pending for this location.
-        # operations_done = number of operations already done.
-        # A line with an assigned package counts as 1 operation.
-        operations_to_do = 0
-        operations_done = 0
-        for line in lines:
-            operations_done += line.qty_done if not line.package_id else 1
-            operations_to_do += line.reserved_uom_qty if not line.package_id else 1
-        return {
-            "done": operations_done,
-            "to_do": operations_to_do,
-        }
+            operation_progress = self._get_operation_progress(domain)
+            data.update({"operation_progress": operation_progress})
+        return data
+
+    def locations(self, records, **kw):
+        return [self.location(rec, **kw) for rec in records]
 
     @property
     def _location_parser(self):
@@ -51,16 +40,19 @@ class DataAction(Component):
             ("barcode", lambda rec, fname: rec[fname] if rec[fname] else rec.name),
         ]
 
-    @ensure_model("stock.picking")
-    def picking(self, record, **kw):
+    def _get_picking_parser(self, record, **kw):
         parser = self._picking_parser
         # progress is a heavy computed field,
         # and it may reduce performance significatively
         # when dealing with a large number of pickings.
         # Thus, we make it optional.
-        if "with_progress" in kw:
+        if kw.get("with_progress"):
             parser.append("progress")
-        return self._jsonify(record, parser, **kw)
+        return parser
+
+    @ensure_model("stock.picking")
+    def picking(self, record, **kw):
+        return self._jsonify(record, self._get_picking_parser(record, **kw), **kw)
 
     def pickings(self, record, **kw):
         return self.picking(record, multi=True)
@@ -80,6 +72,7 @@ class DataAction(Component):
             "bulk_line_count",
             "total_weight:weight",
             "scheduled_date",
+            "priority",
         ]
 
     @ensure_model("stock.quant.package")
@@ -93,13 +86,37 @@ class DataAction(Component):
         if with_packaging:
             parser += self._package_packaging_parser
         data = self._jsonify(record, parser, **kw)
+        qty = len(record.quant_ids)
         # handle special cases
-        if data and picking:
-            lines = picking.move_line_ids.filtered(
-                lambda l: l.result_package_id == record
-                and l.state in ["partially_available", "assigned", "done"]
+        progress_package_key = ""
+        if kw.get("with_operation_progress_src"):
+            progress_package_key = "package_id"
+        elif kw.get("with_operation_progress_dest"):
+            progress_package_key = "result_package_id"
+        if progress_package_key:
+            lines_blacklist = (
+                kw.get("progress_lines_blacklist")
+                or self.env["stock.move.line"].browse()
             )
-            data.update({"move_line_count": len(lines)})
+            domain = [
+                (progress_package_key, "=", record.id),
+                ("state", "in", ["partially_available", "assigned"]),
+                ("picking_id.state", "=", "assigned"),
+                ("id", "not in", lines_blacklist.ids),
+            ]
+            operation_progress = self._get_operation_progress(domain)
+            data.update({"operation_progress": operation_progress})
+        if kw.get("with_package_move_line_count") and data and picking:
+            move_line_count = self.env["stock.move.line"].search_count(
+                [
+                    ("picking_id.picking_type_id", "=", picking.picking_type_id.id),
+                    ("result_package_id", "=", record.id),
+                    ("state", "in", ["partially_available", "assigned"]),
+                ]
+            )
+            qty += move_line_count
+            # TODO does this name really makes sense?
+            data.update({"move_line_count": qty})
         return data
 
     def packages(self, records, picking=None, **kw):
@@ -112,6 +129,10 @@ class DataAction(Component):
             "name",
             "shopfloor_weight:weight",
             ("package_type_id:storage_type", ["id", "name"]),
+            (
+                "quant_ids:total_quantity",
+                lambda rec, fname: sum(rec.quant_ids.mapped("quantity")),
+            ),
         ]
 
     @property
@@ -327,3 +348,17 @@ class DataAction(Component):
             "id",
             "name",
         ]
+
+    def _get_operation_progress(self, domain):
+        lines = self.env["stock.move.line"].search(domain)
+        # operations_to_do = number of total operations that are pending for this location.
+        # operations_done = number of operations already done.
+        operations_to_do = 0
+        operations_done = 0
+        for line in lines:
+            operations_done += line.qty_done
+            operations_to_do += line.reserved_uom_qty - line.qty_done
+        return {
+            "done": operations_done,
+            "to_do": operations_to_do,
+        }

odoo/addons/shopfloor/actions/data_detail.py

@@ -152,3 +152,23 @@ class DataDetailAction(Component):
             "product_name",
             "product_code",
         ]
+
+    @ensure_model("product.packaging")
+    def packaging_detail(self, record, **kw):
+        return self._jsonify(
+            record.with_context(packaging=record.id),
+            self._packaging_detail_parser,
+            **kw
+        )
+
+    @property
+    def _packaging_detail_parser(self):
+        return self._packaging_parser + [
+            "packaging_length:length",
+            "width",
+            "height",
+            ("max_weight", lambda rec, fname: rec.package_type_id.max_weight),
+            "length_uom_name:length_uom",
+            "weight_uom_name:weight_uom",
+            "barcode:barcode",
+        ]

odoo/addons/shopfloor/actions/message.py

@@ -113,8 +113,10 @@ class MessageAction(Component):
         return {
             "message_type": "warning",
             "body": _(
-                "Package %(package_name)s is not available in transfer %(picking_name)s."
-            ).format(package.name, picking.name),
+                "Package %(package_name)s is not available in transfer %(picking_name)s.",
+                package_name=package.name,
+                picking_name=picking.name,
+            ),
         }
 
     def package_not_empty(self, package):
@@ -129,6 +131,17 @@ class MessageAction(Component):
             "body": _("Package {} is already used.").format(package.name),
         }
 
+    def package_different_picking_type(self, package, picking_type):
+        return {
+            "message_type": "warning",
+            "body": _(
+                "Package %(package_name)s contains already lines from a different "
+                "operation type %(picking_type_name)s.",
+                package_name=package.name,
+                picking_type_name=picking_type.name,
+            ),
+        }
+
     def dest_package_required(self):
         return {
             "message_type": "warning",
@@ -435,6 +448,18 @@ class MessageAction(Component):
             "body": _("No transfer found for this product."),
         }
 
+    def product_not_found_in_location_or_transfer(self, product, location, picking):
+        return {
+            "message_type": "error",
+            "body": _(
+                "Product %(product_name)s not found in location %(location_name)s "
+                "or transfer %(picking_name)s.",
+                product_name=product.name,
+                location_name=location.name,
+                picking_name=picking.name,
+            ),
+        }
+
     def x_not_found_or_already_in_dest_package(self, message_code):
         return {
             "message_type": "warning",
@@ -449,6 +474,12 @@ class MessageAction(Component):
             "body": _("Packaging not found in the current transfer."),
         }
 
+    def packaging_dimension_updated(self, packaging):
+        return {
+            "message_type": "success",
+            "body": _("Packaging {} dimension updated.").format(packaging.name),
+        }
+
     def expiration_date_missing(self):
         return {
             "message_type": "error",
@@ -512,6 +543,26 @@ class MessageAction(Component):
             "body": _("No transfer found for this lot."),
         }
 
+    def lot_not_found_in_location(self, lot, location):
+        return {
+            "message_type": "error",
+            "body": _(
+                "Lot %(lot_name)s not found in location %(location_name)s",
+                lot_name=lot.name,
+                location_name=location.name,
+            ),
+        }
+
+    def lot_not_found_in_picking(self, lot, picking):
+        return {
+            "message_type": "error",
+            "body": _(
+                "Lot %(lot_name)s not found in transfer %(picking_name)s",
+                lot_name=lot.name,
+                pcking_name=picking.name,
+            ),
+        }
+
     def batch_transfer_complete(self):
         return {
             "message_type": "success",
@@ -662,6 +713,12 @@ class MessageAction(Component):
             "body": _("No lines to process."),
         }
 
+    def no_lines_to_process_set_quantities(self):
+        return {
+            "message_type": "info",
+            "body": _("No lines to process, set quantities on some"),
+        }
+
     def location_empty(self, location):
         return {
             "message_type": "error",
@@ -686,6 +743,12 @@ class MessageAction(Component):
             "body": _("You must not pick more than {} units.").format(quantity),
         }
 
+    def unable_to_pick_qty(self):
+        return {
+            "message_type": "error",
+            "body": _("You cannot process that much units."),
+        }
+
     def lot_replaced_by_lot(self, old_lot, new_lot):
         return {
             "message_type": "success",
@@ -729,6 +792,26 @@ class MessageAction(Component):
             ),
         }
 
+    def package_not_found_in_location(self, package, location):
+        return {
+            "message_type": "error",
+            "body": _(
+                "Package %(package_name)s not found in location %(location_name)s",
+                package_name=package.name,
+                location_name=location.name,
+            ),
+        }
+
+    def package_not_found_in_picking(self, package, picking):
+        return {
+            "message_type": "error",
+            "body": _(
+                "Package %(package_name)s not found in transfer %(picking_name)s",
+                package_name=package.name,
+                picking_name=picking.name,
+            ),
+        }
+
     def cannot_change_lot_already_picked(self, lot):
         return {
             "message_type": "error",
@@ -844,3 +927,12 @@ class MessageAction(Component):
             "message_type": "warning",
             "body": _("No line to pack found."),
         }
+
+    def package_transfer_not_allowed_scan_location(self):
+        return {
+            "message_type": "warning",
+            "body": _(
+                "Transferring to a different package is not allowed, "
+                "please scan a location instead."
+            ),
+        }

odoo/addons/shopfloor/actions/move_line_search.py

@@ -101,8 +101,8 @@ class MoveLineSearch(Component):
             )
         elif order == "location":
             return lambda line: (
-                line.move_id.location_id.shopfloor_picking_sequence or "",
-                line.move_id.location_id.name,
+                line.location_id.shopfloor_picking_sequence or "",
+                line.location_id.name,
                 line.move_id.date,
                 line.move_id.id,
             )

odoo/addons/shopfloor/actions/packaging.py

@@ -57,3 +57,13 @@ class PackagingAction(Component):
 
     def package_has_several_lots(self, package):
         return len(package.quant_ids.lot_id) > 1
+
+    def is_complete_mix_pack(self, package):
+        """Check if a package is mixed and completely reserved.
+
+        Will return true if the package has multiple distinct products and
+        all the package quantities are reserved.
+        """
+        return self.package_has_several_products(package) and all(
+            quant.quantity == quant.reserved_quantity for quant in package.quant_ids
+        )

odoo/addons/shopfloor/actions/schema.py

@@ -26,6 +26,8 @@ class ShopfloorSchemaAction(Component):
             "ship_carrier": self._schema_dict_of(self._simple_record(), required=False),
             "scheduled_date": {"type": "string", "nullable": False, "required": True},
             "progress": {"type": "float", "nullable": True},
+            "location_dest": self._schema_dict_of(self.location(), required=False),
+            "priority": {"type": "string", "nullable": True, "required": False},
         }
 
     def move_line(self, with_packaging=False, with_picking=False):
@@ -91,6 +93,15 @@ class ShopfloorSchemaAction(Component):
             "weight": {"required": True, "nullable": True, "type": "float"},
             "move_line_count": {"required": False, "nullable": True, "type": "integer"},
             "storage_type": self._schema_dict_of(self._simple_record()),
+            "operation_progress": {
+                "type": "dict",
+                "required": False,
+                "schema": {
+                    "done": {"type": "float", "required": False},
+                    "to_do": {"type": "float", "required": False},
+                },
+            },
+            "total_quantity": {"required": False, "type": "float"},
         }
         if with_packaging:
             schema["packaging"] = self._schema_dict_of(self.packaging())

odoo/addons/shopfloor/actions/schema_detail.py

@@ -88,11 +88,17 @@ class ShopfloorSchemaDetailAction(Component):
             "product_code": {"type": "string", "nullable": True, "required": False},
         }
 
-    # TODO
-    # def packaging_detail(self):
-    #     schema = self.packaging()
-    #     schema.update(
-    #         {
-    #         }
-    #     )
-    #     return schema
+    def packaging_detail(self):
+        schema = self.packaging()
+        schema.update(
+            {
+                "length": {"type": "float", "nullable": True, "required": False},
+                "width": {"type": "float", "nullable": True, "required": False},
+                "height": {"type": "float", "nullable": True, "required": False},
+                "max_weight": {"type": "float", "nullable": True, "required": False},
+                "length_uom": {"type": "string", "nullable": True, "required": False},
+                "weight_uom": {"type": "string", "nullable": True, "required": False},
+                "barcode": {"type": "string", "nullable": True, "required": False},
+            }
+        )
+        return schema

odoo/addons/shopfloor/actions/search.py

@@ -1,4 +1,5 @@
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
+# Copyright 2024 Michael Tietz (MT Software) <mtietz@mt-software.de>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from odoo.osv.expression import AND
@@ -74,18 +75,20 @@ class SearchAction(Component):
         barcode = barcode or ""
         return self.generic_find(barcode, types=types, handler_kw=handler_kw)
 
-    def generic_find(self, barcode, types=None, handler_kw=None):
+    def _find_record_by_type(self, barcode, btype, handler_kw=None):
         handler_kw = handler_kw or {}
+        handler = self._barcode_type_handler.get(btype)
+        if not handler:
+            return
+        return handler(barcode, **handler_kw.get(btype, {}))
+
+    def generic_find(self, barcode, types=None, handler_kw=None):
         _types = types or self._barcode_type_handler.keys()
         # TODO: decide the best default order in case we don't pass `types`
         for btype in _types:
-            handler = self._barcode_type_handler.get(btype)
-            if not handler:
-                continue
-            record = handler(barcode, **handler_kw.get(btype, {}))
+            record = self._find_record_by_type(barcode, btype, handler_kw)
             if record:
                 return self._make_search_result(record=record, code=barcode, type=btype)
-
         return self._make_search_result(type="none")
 
     def location_from_scan(self, barcode, limit=1):

odoo/addons/shopfloor/components/scan_handler_product.py

@@ -16,6 +16,8 @@ class ProductHandler(Component):
 
     def search(self, identifier):
         res = self._search.find(identifier, types=("product", "packaging"))
+        if res.record and res.type == "packaging":
+            return res.record.product_id
         return res.record if res.record else self.env["product.product"]
 
     @property

odoo/addons/shopfloor/data/shopfloor_scenario_data.xml

@@ -20,7 +20,8 @@
     "unload_package_at_destination": true,
     "multiple_move_single_pack": true,
     "no_prefill_qty": true,
-    "scan_location_or_pack_first": true
+    "scan_location_or_pack_first": true,
+    "allow_alternative_destination_package": true
 }
         </field>
     </record>
@@ -43,7 +44,8 @@
 {
     "no_prefill_qty": true,
     "show_oneline_package_content": true,
-    "auto_post_line": true
+    "auto_post_line": true,
+    "scan_location_or_pack_first": true
 }
         </field>
     </record>

odoo/addons/shopfloor/docs/checkout_diag_seq.plantuml

@@ -1,7 +1,7 @@
 # Diagram to generate with PlantUML (https://plantuml.com/)
 #
 #   $ sudo apt install plantuml
-#   $ plantuml delivery_diag_seq.plantuml
+#   $ plantuml checkout_diag_seq.plantuml
 #
 
 @startuml
@@ -32,18 +32,29 @@ manual_selection -> select_line: **/select**(picking_id)
 select_document -> select_line: **/scan_document**(barcode, picking_id=None) \n(scan a picking a product or ???)
 
 == /select_line ==
-select_line -> select_package: **/select_line**(picking_id, package_id, move_line_ids)
+select_line -> select_package: **/select_line**(picking_id, package_id, move_line_id)
+
+== /scan_line ==
+select_line -> select_package: **/scan_line**(picking_id, barcode, confirm_pack_all, confirm_lot)
 
 == /list_delivery_packaging ==
 select_package -> select_delivery_packaging: **/list_delivery_packaging**(picking_id, selected_line_ids)
 
-
 == /list_dest_package ==
 select_package -> select_dest_package: **/list_dest_package**(picking_id, selected_line_ids)
 select_package -> select_package: **/list_dest_package**(picking_id, selected_line_ids) \n No Valid package to select
 
+== edit line ==
+select_package -> change_quantity: (State change without call to backend)
+
 == /set_dest_package ==
-select_dest_package -> select_line: **/set_dest_package(picking_id, selected_line_ids, package_id)
+select_dest_package -> select_line: **/set_dest_package**(picking_id, selected_line_ids, package_id)
+
+== /set_custom_qty ==
+change_quantity -> select_package: **/set_custom_qty**(picking_id, selected_line_ids, move_line_id, qty_done)
+
+== /reset_line_qty ==
+select_package -> select_package: **/reset_line_qty**(picking_id, selected_line_ids, move_line_id)
 
 == /scan_package_action ==
 select_delivery_packaging -> summary: **/scan_package_action**(picking_id, selected_line_ids, barcode)
@@ -52,10 +63,13 @@ select_delivery_packaging -> summary: **/scan_package_action**(picking_id, selec
 summary -> select_line: **/cancel_line**(picking_id, package_id=None, line_id=None)
 
  == /select ==
- summary -> select_line: **/select**(picking_id) \nContinue checkout
+summary -> select_line: **/select**(picking_id) \nContinue checkout
 
 == /done ==
 summary -> select_document: **/done(picking_id)**
+summary -> select_child_location: **/done(picking_id)**
 
+== /scan_dest_location ==
+select_child_location -> select_document: **/scan_dest_location(picking_id, barcode)**
 
 @enduml

odoo/addons/shopfloor/docs/single_pack_transfer_diag_seq.plantuml

@@ -23,14 +23,14 @@ header <img:oca_logo.png>
 title <size:35>Single Pack Transfer scenario</size>
 
 == /start ==
-start -> scan_location: **/start**(barcode[pack|location], confirmation=False)
-start -> start: **/start**(barcode[pack|location], confirmation=False)
+start -> scan_location: **/start**(barcode[pack|location], confirmation=None)
+start -> start: **/start**(barcode[pack|location], confirmation=None)
 
 == /cancel ==
 scan_location -> start: **/cancel**(package_level_id)
 
 == /validate ==
-scan_location -> scan_location: **/validate**(package_level_id, location_barcode, confirmation=False)
-scan_location -> start: **/validate**(package_level_id, location_barcode, confirmation=False)
+scan_location -> scan_location: **/validate**(package_level_id, location_barcode, confirmation=None)
+scan_location -> start: **/validate**(package_level_id, location_barcode, confirmation=None)
 
 @enduml

odoo/addons/shopfloor/i18n/ca.po

@@ -897,6 +897,12 @@ msgstr ""
 msgid "Packaging not found in the current transfer."
 msgstr ""
 
+#. module: shopfloor
+#: code:addons/shopfloor/actions/message.py:0
+#, python-format
+msgid "Packaging {} dimension updated."
+msgstr ""
+
 #. module: shopfloor
 #: code:addons/shopfloor/actions/message.py:0
 #, python-format
@@ -1063,6 +1069,11 @@ msgstr ""
 msgid "Restart the operation, someone has canceled it."
 msgstr ""
 
+#. module: shopfloor
+#: model:ir.model.fields,field_description:shopfloor.field_shopfloor_menu__scan_location_or_pack_first
+msgid "Restrict scannable barcode at work selection"
+msgstr ""
+
 #. module: shopfloor
 #: model_terms:ir.ui.view,arch_db:shopfloor.view_stock_move_line_detailed_operation_tree
 msgid "SF Priority"
@@ -1094,11 +1105,6 @@ msgstr ""
 msgid "Scan Location Or Pack First Is Possible"
 msgstr ""
 
-#. module: shopfloor
-#: model:ir.model.fields,field_description:shopfloor.field_shopfloor_menu__scan_location_or_pack_first
-msgid "Scan first location or pack"
-msgstr ""
-
 #. module: shopfloor
 #: code:addons/shopfloor/actions/message.py:0
 #, python-format
@@ -1638,6 +1644,18 @@ msgid ""
 "with the remaining lines."
 msgstr ""
 
+#. module: shopfloor
+#: model:ir.model.fields,help:shopfloor.field_shopfloor_menu__scan_location_or_pack_first
+msgid ""
+"When checked, the user will be restricted by the type of object barcode  "
+"that he can scan to select the document/transfer/move line to work on."
+msgstr ""
+
+#. module: shopfloor
+#: model_terms:ir.ui.view,arch_db:shopfloor.shopfloor_menu_form_view
+msgid "When choosing an order to pack, do not allow to scan a product."
+msgstr ""
+
 #. module: shopfloor
 #: model:ir.model.fields,help:shopfloor.field_shopfloor_menu__allow_get_work
 msgid ""
@@ -1657,10 +1675,10 @@ msgid "When picking, prevent unloading the whole bin when full."
 msgstr ""
 
 #. module: shopfloor
-#: model:ir.model.fields,help:shopfloor.field_shopfloor_menu__scan_location_or_pack_first
+#: model_terms:ir.ui.view,arch_db:shopfloor.shopfloor_menu_form_view
 msgid ""
-"When selecting work, force the user to first scan a location or pack,then "
-"the product or lot."
+"When selecting a move line, force the user to first scan a package or a "
+"location and not a product or a lot."
 msgstr ""
 
 #. module: shopfloor