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

odoo/addons/shopfloor/services/cluster_picking.py

@@ -144,10 +144,10 @@ class ClusterPicking(Component):
             message=message,
         )
 
-    def _response_for_confirm_unload_all(self, batch, message=None):
+    def _response_for_confirm_unload_all(self, batch, message=None, confirmation=None):
         return self._response(
             next_state="confirm_unload_all",
-            data=self._data_for_unload_all(batch),
+            data=self._data_for_unload_all(batch, confirmation=confirmation),
             message=message,
         )
 
@@ -166,10 +166,14 @@ class ClusterPicking(Component):
             message=message,
         )
 
-    def _response_for_confirm_unload_set_destination(self, batch, package):
+    def _response_for_confirm_unload_set_destination(
+        self, batch, package, confirmation=None
+    ):
         return self._response(
             next_state="confirm_unload_set_destination",
-            data=self._data_for_unload_single(batch, package),
+            data=self._data_for_unload_single(
+                batch, package, confirmation=confirmation
+            ),
         )
 
     def find_batch(self):
@@ -776,8 +780,11 @@ class ClusterPicking(Component):
                 qty_done=quantity,
             )
         move_line.write({"qty_done": quantity, "result_package_id": bin_package.id})
-
-        zero_check = move_line.picking_id.picking_type_id.shopfloor_zero_check
+        # Only apply zero check if the product is of type "product".
+        zero_check = (
+            move_line.product_id.type == "product"
+            and move_line.picking_id.picking_type_id.shopfloor_zero_check
+        )
         if zero_check and move_line.location_id.planned_qty_in_location_is_empty():
             return self._response_for_zero_check(batch, move_line)
 
@@ -814,20 +821,24 @@ class ClusterPicking(Component):
             # the lines have different destinations
             return self._unload_next_package(batch)
 
-    def _data_for_unload_all(self, batch):
+    def _data_for_unload_all(self, batch, confirmation=None):
         lines = self._lines_to_unload(batch)
         # all the lines destinations are the same here, it looks
         # only for the first one
         first_line = fields.first(lines)
         data = self.data.picking_batch(batch)
         data.update({"location_dest": self.data.location(first_line.location_dest_id)})
+        if confirmation:
+            data.update({"confirmation": confirmation})
         return data
 
-    def _data_for_unload_single(self, batch, package):
+    def _data_for_unload_single(self, batch, package, confirmation=None):
         line = fields.first(
             package.planned_move_line_ids.filtered(self._filter_for_unload)
         )
         data = self.data.picking_batch(batch)
+        if confirmation:
+            data.update({"confirmation": confirmation})
         data.update(
             {
                 "package": self.data.package(package),
@@ -1068,7 +1079,7 @@ class ClusterPicking(Component):
             message=self.msg_store.no_package_or_lot_for_barcode(barcode),
         )
 
-    def set_destination_all(self, picking_batch_id, barcode, confirmation=False):
+    def set_destination_all(self, picking_batch_id, barcode, confirmation=None):
         """Set the destination for all the lines of the batch with a dest. package
 
         This method must be used only if all the move lines which have a destination
@@ -1109,10 +1120,10 @@ class ClusterPicking(Component):
                 batch, message=self.msg_store.dest_location_not_allowed()
             )
 
-        if not confirmation and self.is_dest_location_to_confirm(
+        if confirmation != barcode and self.is_dest_location_to_confirm(
             first_line.location_dest_id, scanned_location
         ):
-            return self._response_for_confirm_unload_all(batch)
+            return self._response_for_confirm_unload_all(batch, confirmation=barcode)
 
         self._unload_write_destination_on_lines(lines, scanned_location)
         completion_info = self._actions_for("completion.info")
@@ -1220,7 +1231,7 @@ class ClusterPicking(Component):
         return self._response_for_unload_set_destination(batch, package)
 
     def unload_scan_destination(
-        self, picking_batch_id, package_id, barcode, confirmation=False
+        self, picking_batch_id, package_id, barcode, confirmation=None
     ):
         """Scan the final destination for all the move lines moved with the Bin
 
@@ -1232,7 +1243,7 @@ class ClusterPicking(Component):
         * unload_single: line is processed and the next bin can be unloaded
         * confirm_unload_set_destination: the destination is valid but not the
           expected, ask a confirmation. This state has to call again the
-          endpoint with confirmation=True
+          endpoint with confirmation=barcode
         * start_line: if the batch still has lines to pick
         * start: if the batch is done. In this case, this method *has*
           to handle the closing of the batch to create backorders.
@@ -1262,7 +1273,7 @@ class ClusterPicking(Component):
         self._actions_for("lock").for_update(lines)
 
     def _unload_scan_destination_lines(
-        self, batch, package, lines, barcode, confirmation=False
+        self, batch, package, lines, barcode, confirmation=None
     ):
         # Lock move lines that will be updated
         self._lock_lines(lines)
@@ -1276,10 +1287,12 @@ class ClusterPicking(Component):
             return self._response_for_unload_set_destination(
                 batch, package, message=self.msg_store.dest_location_not_allowed()
             )
-        if not confirmation and self.is_dest_location_to_confirm(
+        if confirmation != barcode and self.is_dest_location_to_confirm(
             first_line.location_dest_id, scanned_location
         ):
-            return self._response_for_confirm_unload_set_destination(batch, package)
+            return self._response_for_confirm_unload_set_destination(
+                batch, package, confirmation=barcode
+            )
 
         self._unload_write_destination_on_lines(lines, scanned_location)
 
@@ -1384,7 +1397,7 @@ class ShopfloorClusterPickingValidator(Component):
         return {
             "picking_batch_id": {"coerce": to_int, "required": True, "type": "integer"},
             "barcode": {"required": True, "type": "string"},
-            "confirmation": {"type": "boolean", "nullable": True, "required": False},
+            "confirmation": {"type": "string", "nullable": True, "required": False},
         }
 
     def unload_split(self):
@@ -1404,7 +1417,7 @@ class ShopfloorClusterPickingValidator(Component):
             "picking_batch_id": {"coerce": to_int, "required": True, "type": "integer"},
             "package_id": {"coerce": to_int, "required": True, "type": "integer"},
             "barcode": {"required": True, "type": "string"},
-            "confirmation": {"type": "boolean", "nullable": True, "required": False},
+            "confirmation": {"type": "string", "nullable": True, "required": False},
         }
 
 
@@ -1599,6 +1612,7 @@ class ShopfloorClusterPickingValidatorResponse(Component):
     def _schema_for_unload_all(self):
         schema = self.schemas.picking_batch()
         schema["location_dest"] = self.schemas._schema_dict_of(self.schemas.location())
+        schema["confirmation"] = {"type": "string", "nullable": True, "required": False}
         return schema
 
     @property
@@ -1606,6 +1620,7 @@ class ShopfloorClusterPickingValidatorResponse(Component):
         schema = self.schemas.picking_batch()
         schema["package"] = self.schemas._schema_dict_of(self.schemas.package())
         schema["location_dest"] = self.schemas._schema_dict_of(self.schemas.location())
+        schema["confirmation"] = {"type": "string", "nullable": True, "required": False}
         return schema
 
     @property

odoo/addons/shopfloor/services/delivery.py

@@ -259,13 +259,14 @@ class Delivery(Component):
             # we added auto_join for this, otherwise, the ORM would search all pickings
             # in the picking type, and then use IN (ids)
             ("picking_id.picking_type_id", "in", self.picking_types.ids),
+            ("picking_id.state", "not in", ("done", "cancel")),
         ]
         if no_qty_done:
             domain.append(("qty_done", "=", 0))
         return domain
 
     def _lines_from_lot_domain(
-        self, lot, no_qty_done=True, product_qty=None, location=None
+        self, lot, no_qty_done=True, product_qty=None, location=None, picking=None
     ):
         location_domain = (
             [("picking_id.location_id", "=", location.id)] if location else []
@@ -283,10 +284,12 @@ class Delivery(Component):
                     ("reserved_qty", ">=", product_qty),
                 ]
             )
+        if picking:
+            domain.extend([("picking_id", "=", picking.id)])
         return domain
 
     def _lines_from_product_domain(
-        self, product, no_qty_done=True, product_qty=None, location=None
+        self, product, no_qty_done=True, product_qty=None, location=None, picking=None
     ):
         # TODO: searching lines is common to other scenario, to refactor
         domain = expression.AND(
@@ -300,12 +303,17 @@ class Delivery(Component):
                     ("reserved_qty", ">=", product_qty),
                 ]
             )
+        if picking:
+            domain.extend([("picking_id", "=", picking.id)])
         return domain
 
-    def _lines_from_package_domain(self, package, no_qty_done=True):
-        return expression.AND(
+    def _lines_from_package_domain(self, package, no_qty_done=True, picking=None):
+        domain = expression.AND(
             [self._lines_base_domain(no_qty_done), [("package_id", "=", package.id)]]
         )
+        if picking:
+            domain.extend([("picking_id", "=", picking.id)])
+        return domain
 
     def _deliver_product(self, picking, product, product_qty=None, location=None):
         """Handle the scan_deliver end point for a product."""
@@ -318,7 +326,11 @@ class Delivery(Component):
 
         lines = self.env["stock.move.line"].search(
             self._lines_from_product_domain(
-                product, no_qty_done=False, product_qty=product_qty, location=location
+                product,
+                no_qty_done=False,
+                product_qty=product_qty,
+                location=location,
+                picking=picking,
             ),
             order="date_planned",
         )
@@ -403,7 +415,11 @@ class Delivery(Component):
     def _deliver_lot(self, picking, lot, product_qty=None, location=None):
         lines = self.env["stock.move.line"].search(
             self._lines_from_lot_domain(
-                lot, no_qty_done=False, product_qty=product_qty, location=location
+                lot,
+                no_qty_done=False,
+                product_qty=product_qty,
+                location=location,
+                picking=picking,
             )
         )
         if not lines:
@@ -608,7 +624,9 @@ class Delivery(Component):
         package = self.env["stock.quant.package"].browse(package_id).exists()
         if package:
             lines = self.env["stock.move.line"].search(
-                self._lines_from_package_domain(package, no_qty_done=False)
+                self._lines_from_package_domain(
+                    package, no_qty_done=False, picking=picking
+                )
             )
             if not lines:
                 return self._response_for_deliver(

odoo/addons/shopfloor/services/location_content_transfer.py

@@ -80,7 +80,7 @@ class LocationContentTransfer(Component):
         )
 
     def _response_for_scan_destination_all(
-        self, pickings, message=None, confirmation_required=False
+        self, pickings, message=None, confirmation_required=None
     ):
         """Transition to the 'scan_destination_all' state
 
@@ -116,7 +116,7 @@ class LocationContentTransfer(Component):
         )
 
     def _response_for_scan_destination(
-        self, location, next_content, message=None, confirmation_required=False
+        self, location, next_content, message=None, confirmation_required=None
     ):
         """Transition to the 'scan_destination' state
 
@@ -461,7 +461,7 @@ class LocationContentTransfer(Component):
         """Lock move lines"""
         self._actions_for("lock").for_update(lines)
 
-    def set_destination_all(self, location_id, barcode, confirmation=False):
+    def set_destination_all(self, location_id, barcode, confirmation=None):
         """Scan destination location for all the moves of the location
 
         barcode is a stock.location for the destination
@@ -489,11 +489,11 @@ class LocationContentTransfer(Component):
             return self._response_for_scan_destination_all(
                 pickings, message=self.msg_store.dest_location_not_allowed()
             )
-        if not confirmation and self.is_dest_location_to_confirm(
+        if confirmation != barcode and self.is_dest_location_to_confirm(
             move_lines.location_dest_id, scanned_location
         ):
             return self._response_for_scan_destination_all(
-                pickings, confirmation_required=True
+                pickings, confirmation_required=barcode
             )
         self._lock_lines(move_lines)
 
@@ -663,7 +663,7 @@ class LocationContentTransfer(Component):
         )
 
     def set_destination_package(
-        self, location_id, package_level_id, barcode, confirmation=False
+        self, location_id, package_level_id, barcode, confirmation=None
     ):
         """Scan destination location for package level
 
@@ -697,11 +697,11 @@ class LocationContentTransfer(Component):
                 package_level,
                 message=self.msg_store.dest_location_not_allowed(),
             )
-        if not confirmation and self.is_dest_location_to_confirm(
+        if confirmation != barcode and self.is_dest_location_to_confirm(
             package_level.location_dest_id, scanned_location
         ):
             return self._response_for_scan_destination(
-                location, package_level, confirmation_required=True
+                location, package_level, confirmation_required=barcode
             )
         package_move_lines = package_level.move_line_ids
         self._lock_lines(package_move_lines)
@@ -722,7 +722,7 @@ class LocationContentTransfer(Component):
         )
 
     def set_destination_line(
-        self, location_id, move_line_id, quantity, barcode, confirmation=False
+        self, location_id, move_line_id, quantity, barcode, confirmation=None
     ):
         """Scan destination location for move line
 
@@ -754,11 +754,11 @@ class LocationContentTransfer(Component):
             return self._response_for_scan_destination(
                 location, move_line, message=self.msg_store.dest_location_not_allowed()
             )
-        if not confirmation and self.is_dest_location_to_confirm(
+        if confirmation != barcode and self.is_dest_location_to_confirm(
             move_line.location_dest_id, scanned_location
         ):
             return self._response_for_scan_destination(
-                location, move_line, confirmation_required=True
+                location, move_line, confirmation_required=barcode
             )
 
         self._lock_lines(move_line)
@@ -833,9 +833,10 @@ class LocationContentTransfer(Component):
         splits the move to have no side-effect on the other package levels/move
         lines.
 
-        It unreserves the move, create an inventory at 0 in the move's source
-        location, create a second draft inventory (if none exists) to check later.
-        Finally, it cancels the move.
+        If the move has been created by the shopfloor user it will be canceled
+        otherwise it is unreserved.
+        Then create an inventory at 0 in the move's source location, create a
+        second draft inventory (if none exists) to check later.
 
         Transitions:
         * start: no more content to move
@@ -861,15 +862,23 @@ class LocationContentTransfer(Component):
             # We need to set qty_done at 0 because otherwise
             # the move_line will not be deleted
             package_move.move_line_ids.write({"qty_done": 0})
-            package_move._do_unreserve()
-            package_move._recompute_state()
+            package = package_level.package_id
+            if (
+                self.is_allow_move_create()
+                and self.env.user == package_move.picking_id.create_uid
+            ):
+                # Owned by the user deleting the move
+                package_move._action_cancel()
+            else:
+                # Not owned only unreserved
+                package_move._do_unreserve()
+                package_move._recompute_state()
             # Create an inventory at 0 in the move's source location
             inventory.create_stock_issue(package_move, location, package, lot)
             # Create a draft inventory to control stock
             inventory.create_control_stock(
                 location, package_move.product_id, package, lot
             )
-            package_move._action_cancel()
         # remove the package level (this is what does the `picking.do_unreserve()`
         # method, but here we want to unreserve+unlink this package alone)
         move_lines = self._find_transfer_move_lines(location)
@@ -882,9 +891,10 @@ class LocationContentTransfer(Component):
         splits the move to have no side-effect on the other package levels/move
         lines.
 
-        It unreserves the move, create an inventory at 0 in the move's source
-        location, create a second draft inventory (if none exists) to check later.
-        Finally, it cancels the move.
+        If the move has been created by the shopfloor user it will be canceled
+        otherwise it will be unreserved.
+        Then an inventory is created at 0 in the move's source location,
+        create a second draft inventory (if none exists) to check later.
 
         Transitions:
         * start: no more content to move
@@ -906,15 +916,19 @@ class LocationContentTransfer(Component):
         # We need to set qty_done at 0 because otherwise
         # the move_line will not be deleted
         move_line.qty_done = 0
-        move._do_unreserve()
-        move._recompute_state()
+        if self.is_allow_move_create() and self.env.user == move.picking_id.create_uid:
+            # Owned by the user deleting the move
+            move._action_cancel()
+        else:
+            # Not owned unreserve
+            move._do_unreserve()
+            move._recompute_state()
         # Create an inventory at 0 in the move's source location
         inventory.create_stock_issue(move, move_line_src_location, package, lot)
         # Create a draft inventory to control stock
         inventory.create_control_stock(
             move_line_src_location, move.product_id, package, lot
         )
-        move._action_cancel()
         move_lines = self._find_transfer_move_lines(location)
         return self._response_for_start_single(move_lines.mapped("picking_id"))
 
@@ -976,7 +990,7 @@ class ShopfloorLocationContentTransferValidator(Component):
         return {
             "location_id": {"coerce": to_int, "required": True, "type": "integer"},
             "barcode": {"required": True, "type": "string"},
-            "confirmation": {"type": "boolean", "nullable": True, "required": False},
+            "confirmation": {"type": "string", "nullable": True, "required": False},
         }
 
     def go_to_single(self):
@@ -1001,7 +1015,7 @@ class ShopfloorLocationContentTransferValidator(Component):
             "location_id": {"coerce": to_int, "required": True, "type": "integer"},
             "package_level_id": {"coerce": to_int, "required": True, "type": "integer"},
             "barcode": {"required": True, "type": "string"},
-            "confirmation": {"type": "boolean", "nullable": True, "required": False},
+            "confirmation": {"type": "string", "nullable": True, "required": False},
         }
 
     def set_destination_line(self):
@@ -1010,7 +1024,7 @@ class ShopfloorLocationContentTransferValidator(Component):
             "move_line_id": {"coerce": to_int, "required": True, "type": "integer"},
             "quantity": {"coerce": to_float, "required": True, "type": "float"},
             "barcode": {"required": True, "type": "string"},
-            "confirmation": {"type": "boolean", "nullable": True, "required": False},
+            "confirmation": {"type": "string", "nullable": True, "required": False},
         }
 
     def postpone_package(self):
@@ -1077,7 +1091,7 @@ class ShopfloorLocationContentTransferValidatorResponse(Component):
             "package_levels": self.schemas._schema_list_of(package_level_schema),
             "move_lines": self.schemas._schema_list_of(move_line_schema),
             "confirmation_required": {
-                "type": "boolean",
+                "type": "string",
                 "nullable": True,
                 "required": False,
             },
@@ -1092,7 +1106,7 @@ class ShopfloorLocationContentTransferValidatorResponse(Component):
             "package_level": self.schemas._schema_dict_of(schema_package_level),
             "move_line": self.schemas._schema_dict_of(schema_move_line),
             "confirmation_required": {
-                "type": "boolean",
+                "type": "string",
                 "nullable": True,
                 "required": False,
             },

odoo/addons/shopfloor/services/single_pack_transfer.py

@@ -29,6 +29,9 @@ class SinglePackTransfer(Component):
         return {
             "id": package_level.id,
             "name": package.name,
+            "weight_uom": package.weight_uom_id.name,
+            "weight": package.pack_weight,
+            "estimated_weight_kg": package.estimated_pack_weight_kg,
             "location_src": self.data.location(package.location_id),
             "location_dest": self.data.location(package_level.location_dest_id),
             "products": self.data.products(move_lines.product_id),
@@ -38,9 +41,9 @@ class SinglePackTransfer(Component):
     def _response_for_start(self, message=None, popup=None):
         return self._response(next_state="start", message=message, popup=popup)
 
-    def _response_for_confirm_start(self, package_level, message=None):
+    def _response_for_confirm_start(self, package_level, message=None, barcode=""):
         data = self._data_after_package_scanned(package_level)
-        data["confirmation_required"] = True
+        data["confirmation_required"] = barcode
         return self._response(
             next_state="start",
             data=data,
@@ -48,7 +51,7 @@ class SinglePackTransfer(Component):
         )
 
     def _response_for_scan_location(
-        self, package_level, message=None, confirmation_required=False
+        self, package_level, message=None, confirmation_required=None
     ):
         data = self._data_after_package_scanned(package_level)
         data["confirmation_required"] = confirmation_required
@@ -58,7 +61,7 @@ class SinglePackTransfer(Component):
             message=message,
         )
 
-    def _scan_source(self, barcode, confirmation=False):
+    def _scan_source(self, barcode, confirmation=None):
         """Search a package"""
         search = self._actions_for("search")
         location = search.location_from_scan(barcode)
@@ -90,7 +93,7 @@ class SinglePackTransfer(Component):
 
         return (None, package)
 
-    def start(self, barcode, confirmation=False):
+    def start(self, barcode, confirmation=None):
         picking_types = self.picking_types
         message, package = self._scan_source(barcode, confirmation)
         if message:
@@ -161,9 +164,11 @@ class SinglePackTransfer(Component):
                 message=self.msg_store.no_putaway_destination_available()
             )
 
-        if package_level.is_done and not confirmation:
+        if package_level.is_done and confirmation != barcode:
             return self._response_for_confirm_start(
-                package_level, message=self.msg_store.already_running_ask_confirmation()
+                package_level,
+                message=self.msg_store.already_running_ask_confirmation(),
+                barcode=barcode,
             )
         if not package_level.is_done:
             package_level.is_done = True
@@ -202,7 +207,7 @@ class SinglePackTransfer(Component):
     def _is_move_state_valid(self, moves):
         return all(move.state != "cancel" for move in moves)
 
-    def validate(self, package_level_id, location_barcode, confirmation=False):
+    def validate(self, package_level_id, location_barcode, confirmation=None):
         """Validate the transfer"""
         search = self._actions_for("search")
 
@@ -232,12 +237,12 @@ class SinglePackTransfer(Component):
                 package_level, message=self.msg_store.dest_location_not_allowed()
             )
 
-        if not confirmation and self.is_dest_location_to_confirm(
+        if confirmation != location_barcode and self.is_dest_location_to_confirm(
             package_level.location_dest_id, scanned_location
         ):
             return self._response_for_scan_location(
                 package_level,
-                confirmation_required=True,
+                confirmation_required=location_barcode,
                 message=self.msg_store.confirm_location_changed(
                     package_level.location_dest_id, scanned_location
                 ),
@@ -280,6 +285,17 @@ class SinglePackTransfer(Component):
             return self._response_for_start(message=self.msg_store.already_done())
 
         package_level.is_done = False
+        if (
+            self.is_allow_move_create()
+            and package_level.picking_id.create_uid == self.env.user
+        ):
+            # Cancel the transfer when it has been created by the shopfloor user
+            moves.picking_id.action_cancel()
+        else:
+            # Not owned only unassign the user
+            stock = self._actions_for("stock")
+            stock.unmark_move_line_as_picked(moves.move_line_ids)
+
         return self._response_for_start(
             message=self.msg_store.confirm_canceled_scan_next_pack()
         )
@@ -295,7 +311,7 @@ class SinglePackTransferValidator(Component):
     def start(self):
         return {
             "barcode": {"type": "string", "nullable": False, "required": True},
-            "confirmation": {"type": "boolean", "required": False},
+            "confirmation": {"type": "string", "required": False},
         }
 
     def cancel(self):
@@ -307,7 +323,7 @@ class SinglePackTransferValidator(Component):
         return {
             "package_level_id": {"coerce": to_int, "required": True, "type": "integer"},
             "location_barcode": {"type": "string", "nullable": False, "required": True},
-            "confirmation": {"type": "boolean", "required": False},
+            "confirmation": {"type": "string", "required": False},
         }
 
 
@@ -347,6 +363,13 @@ class SinglePackTransferValidatorResponse(Component):
         return {
             "id": {"required": required, "type": "integer"},
             "name": {"type": "string", "nullable": False, "required": required},
+            "weight_uom": {"type": "string", "nullable": False, "required": required},
+            "weight": {"type": "float", "nullable": False, "required": required},
+            "estimated_weight_kg": {
+                "type": "float",
+                "nullable": False,
+                "required": required,
+            },
             "location_src": {"type": "dict", "schema": self.schemas.location()},
             "location_dest": {"type": "dict", "schema": self.schemas.location()},
             "products": {
@@ -359,7 +382,7 @@ class SinglePackTransferValidatorResponse(Component):
     def _schema_confirmation_required(self):
         return {
             "confirmation_required": {
-                "type": "boolean",
+                "type": "string",
                 "nullable": True,
                 "required": False,
             },