odoo-addon-shopfloor 18.0.0.3.1__py3-none-any.whl → 18.0.0.5.0__py3-none-any.whl

odoo/addons/shopfloor/README.rst

@@ -11,7 +11,7 @@ Shopfloor
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:ba88a2ff0fc8dc7ea2a811a9507ddb4144cef230f98b4cbb1a6b506edefe389f
+   !! source digest: sha256:82699fc8ed59ec349f18149761cdefd28a4d13c4b41274373aa4e1ff02cc593b
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |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": "18.0.0.3.1",
+    "version": "18.0.0.5.0",
     "development_status": "Beta",
     "category": "Inventory",
     "website": "https://github.com/OCA/stock-logistics-shopfloor",

odoo/addons/shopfloor/actions/stock.py

@@ -1,7 +1,7 @@
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 from odoo import _, fields
-from odoo.tools.float_utils import float_round
+from odoo.tools.float_utils import float_compare, float_round
 
 from odoo.addons.component.core import Component
 
@@ -252,3 +252,16 @@ class StockAction(Component):
         # when no putaway is found, the move line destination stays the
         # default's of the picking type
         return any(line.location_dest_id in base_locations for line in move_lines)
+
+    def move_line_increment_qty_picked(self, move_line, packaging=False):
+        qty = packaging and packaging.qty or 1
+        move_line.qty_picked += qty
+
+    def move_line_check_qty_picked(self, move_line):
+        rounding = move_line.product_id.uom_id.rounding
+        qty_picked = move_line.qty_picked
+        qty_todo = move_line.quantity
+        # If qty picked is >= qty todo, then there's nothing more to pick
+        if float_compare(qty_picked, qty_todo, precision_rounding=rounding) > 0:
+            return False
+        return True

odoo/addons/shopfloor/services/cluster_picking.py

@@ -379,7 +379,7 @@ class ClusterPicking(Component):
         """Get the last line picked and put in a pack for this picking"""
         return fields.first(
             picking.move_line_ids.filtered(
-                lambda x: x.qty_done > 0
+                lambda x: x.picked
                 and x.result_package_id
                 # if we are moving the entire package, we shouldn't
                 # add stuff inside it, it's not a new package
@@ -737,7 +737,7 @@ class ClusterPicking(Component):
         * zero_check: if the quantity of product moved is 0 in the
         source location after the move (beware: at this point the product we put in
         a bin is still considered to be in the source location, so we have to compute
-        the source location's quantity - qty_done).
+        the source location's quantity - qty_picked).
         * unload_all: when all lines have a destination package and they all
         have the same destination.
         * unload_single: when all lines have a destination package and they all
@@ -795,10 +795,10 @@ class ClusterPicking(Component):
                 },
                 qty_done=quantity,
             )
-        move_line.write({"qty_done": quantity, "result_package_id": bin_package.id})
+        move_line.write({"qty_picked": quantity, "result_package_id": bin_package.id})
         # Only apply zero check if the product is of type "product".
         zero_check = (
-            move_line.product_id.type == "product"
+            move_line.product_id.is_storable
             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():
@@ -807,7 +807,7 @@ class ClusterPicking(Component):
         return self._pick_next_line(
             batch,
             message=self.msg_store.x_units_put_in_package(
-                move_line.qty_done, move_line.product_id, move_line.result_package_id
+                move_line.qty_picked, move_line.product_id, move_line.result_package_id
             ),
             # if we split the move line, we want to process the one generated by the
             # split right now
@@ -866,7 +866,7 @@ class ClusterPicking(Component):
     def _filter_for_unload(self, line):
         return (
             line.state in ("assigned", "partially_available")
-            and line.qty_done > 0
+            and line.picked
             and line.result_package_id
             and not line.shopfloor_unloaded
         )
@@ -917,7 +917,7 @@ class ClusterPicking(Component):
         return self._pick_next_line(
             batch,
             message=self.msg_store.x_units_put_in_package(
-                move_line.qty_done, move_line.product_id, move_line.result_package_id
+                move_line.qty_picked, move_line.product_id, move_line.result_package_id
             ),
         )
 
@@ -1014,6 +1014,13 @@ class ClusterPicking(Component):
         inventory.create_stock_issue(move, location, package, lot)
 
         # try to reassign the moves in case we have stock in another location
+        for move in unreserve_moves:
+            picked_lines = move.move_line_ids.filtered(lambda line: line.picked)
+            # extract picked lin
+            if picked_lines != move.move_line_ids:
+                # Extract picked lines in another move, because _action_assign will
+                # not do anything if the moved is picked.
+                move.split_other_move_lines(picked_lines, intersection=True)
         unreserve_moves._action_assign()
 
         return self._pick_next_line(batch)
@@ -1036,7 +1043,7 @@ class ClusterPicking(Component):
             ("package_id", "=", package.id),
             ("lot_id", "=", lot.id),
             ("state", "not in", ("cancel", "done")),
-            ("qty_done", "=", 0),
+            ("picked", "=", False),
             ("picking_id.batch_id", "=", batch.id),
         ]
         return domain

odoo/addons/shopfloor/static/description/index.html

@@ -372,7 +372,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:ba88a2ff0fc8dc7ea2a811a9507ddb4144cef230f98b4cbb1a6b506edefe389f
+!! source digest: sha256:82699fc8ed59ec349f18149761cdefd28a4d13c4b41274373aa4e1ff02cc593b
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/stock-logistics-shopfloor/tree/18.0/shopfloor"><img alt="OCA/stock-logistics-shopfloor" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--shopfloor-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/stock-logistics-shopfloor-18-0/stock-logistics-shopfloor-18-0-shopfloor"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/stock-logistics-shopfloor&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Shopfloor is a barcode scanner application for internal warehouse

odoo/addons/shopfloor/tests/__init__.py

@@ -10,19 +10,19 @@ from . import test_actions_stock
 
 # from . import test_single_pack_transfer
 # from . import test_single_pack_transfer_putaway
-# from . import test_cluster_picking_base
-# from . import test_cluster_picking_batch
-# from . import test_cluster_picking_select
-# from . import test_cluster_picking_scan_line
-# from . import test_cluster_picking_scan_line_location_or_pack_first
-# from . import test_cluster_picking_scan_line_no_prefill_qty
-# from . import test_cluster_picking_scan_destination
-# from . import test_cluster_picking_scan_destination_no_prefill_qty
-# from . import test_cluster_picking_is_zero
-# from . import test_cluster_picking_skip
-# from . import test_cluster_picking_stock_issue
-# from . import test_cluster_picking_change_pack_lot
-# from . import test_cluster_picking_unload
+from . import test_cluster_picking_base
+from . import test_cluster_picking_batch
+from . import test_cluster_picking_select
+from . import test_cluster_picking_scan_line
+from . import test_cluster_picking_scan_line_location_or_pack_first
+from . import test_cluster_picking_scan_line_no_prefill_qty
+from . import test_cluster_picking_scan_destination
+from . import test_cluster_picking_scan_destination_no_prefill_qty
+from . import test_cluster_picking_is_zero
+from . import test_cluster_picking_skip
+from . import test_cluster_picking_stock_issue
+from . import test_cluster_picking_change_pack_lot
+from . import test_cluster_picking_unload
 from . import test_checkout_base
 from . import test_checkout_scan
 from . import test_checkout_select

odoo/addons/shopfloor/tests/test_cluster_picking_base.py

@@ -53,7 +53,7 @@ class ClusterPickingCommonCase(CommonCase, PickingBatchMixin):
         for line in move_lines:
             line.write(
                 {
-                    "qty_done": line.quantity,
+                    "qty_picked": line.quantity,
                     "result_package_id": dest_package.id,
                 }
             )

odoo/addons/shopfloor/tests/test_cluster_picking_change_pack_lot.py

@@ -28,7 +28,7 @@ class ClusterPickingChangePackLotCase(ClusterPickingCommonCase):
                 "picking_batch_id": batch.id,
                 "move_line_id": line.id,
                 "barcode": barcode,
-                "quantity": line.qty_done,
+                "quantity": line.qty_picked,
             },
         )
         if success:

odoo/addons/shopfloor/tests/test_cluster_picking_is_zero.py

@@ -57,7 +57,10 @@ class ClusterPickingIsZeroCase(ClusterPickingCommonCase):
             data=self._line_data(self.next_line),
             message={
                 "message_type": "success",
-                "body": f"{self.line.qty_done} {self.line.product_id.display_name} put in {self.bin1.name}",  # noqa
+                "body": (
+                    f"{self.line.qty_picked} {self.line.product_id.display_name} "
+                    f"put in {self.bin1.name}"
+                ),
             },
         )
 
@@ -85,6 +88,6 @@ class ClusterPickingIsZeroCase(ClusterPickingCommonCase):
             data=self._line_data(self.next_line),
             message={
                 "message_type": "success",
-                "body": f"{self.line.qty_done} {self.line.product_id.display_name} put in {self.bin1.name}",  # noqa
+                "body": f"{self.line.qty_picked} {self.line.product_id.display_name} put in {self.bin1.name}",  # noqa
             },
         )

odoo/addons/shopfloor/tests/test_cluster_picking_scan_destination.py

@@ -45,18 +45,18 @@ class ClusterPickingScanDestinationPackCase(ClusterPickingCommonCase):
         """
         line = self.batch.picking_ids.move_line_ids[0]
         next_line = self.batch.picking_ids.move_line_ids[1]
-        qty_done = line.quantity
+        qty_picked = line.quantity
         response = self.service.dispatch(
             "scan_destination_pack",
             params={
                 "picking_batch_id": self.batch.id,
                 "move_line_id": line.id,
                 "barcode": self.bin1.name,
-                "quantity": qty_done,
+                "quantity": qty_picked,
             },
         )
         self.assertRecordValues(
-            line, [{"qty_done": qty_done, "result_package_id": self.bin1.id}]
+            line, [{"qty_picked": qty_picked, "result_package_id": self.bin1.id}]
         )
         self.assert_response(
             response,
@@ -64,7 +64,7 @@ class ClusterPickingScanDestinationPackCase(ClusterPickingCommonCase):
             data=self._line_data(next_line),
             message={
                 "message_type": "success",
-                "body": f"{line.qty_done} {line.product_id.display_name} put in {self.bin1.name}",  # noqa
+                "body": f"{line.qty_picked} {line.product_id.display_name} put in {self.bin1.name}",  # noqa
             },
         )
 
@@ -79,18 +79,18 @@ class ClusterPickingScanDestinationPackCase(ClusterPickingCommonCase):
         )
         # this is the only remaining line to pick
         line = self.two_lines_picking.move_line_ids[1]
-        qty_done = line.quantity
+        qty_picked = line.quantity
         response = self.service.dispatch(
             "scan_destination_pack",
             params={
                 "picking_batch_id": self.batch.id,
                 "move_line_id": line.id,
                 "barcode": self.bin2.name,
-                "quantity": qty_done,
+                "quantity": qty_picked,
             },
         )
         self.assertRecordValues(
-            line, [{"qty_done": qty_done, "result_package_id": self.bin2.id}]
+            line, [{"qty_picked": qty_picked, "result_package_id": self.bin2.id}]
         )
         data = self._data_for_batch(self.batch, self.packing_location)
         self.assert_response(
@@ -140,7 +140,7 @@ class ClusterPickingScanDestinationPackCase(ClusterPickingCommonCase):
                 "quantity": line.quantity,
             },
         )
-        self.assertRecordValues(line, [{"qty_done": 0, "result_package_id": False}])
+        self.assertRecordValues(line, [{"qty_picked": 0, "result_package_id": False}])
         self.assert_response(
             response,
             next_state="scan_destination",
@@ -177,7 +177,7 @@ class ClusterPickingScanDestinationPackCase(ClusterPickingCommonCase):
             line,
             [
                 {
-                    "qty_done": 10,
+                    "qty_picked": 10,
                     "result_package_id": self.bin1.id,
                     "quantity": 10,
                 }
@@ -185,7 +185,7 @@ class ClusterPickingScanDestinationPackCase(ClusterPickingCommonCase):
         )
         self.assertRecordValues(
             new_line,
-            [{"qty_done": 0, "result_package_id": False, "quantity": 10}],
+            [{"qty_picked": 0, "result_package_id": False, "quantity": 10}],
         )
 
     def test_scan_destination_pack_bin_not_found(self):
@@ -267,17 +267,17 @@ class ClusterPickingScanDestinationPackCase(ClusterPickingCommonCase):
             data=self._line_data(new_line),
             message={
                 "message_type": "success",
-                "body": f"{line.qty_done} {line.product_id.display_name} put in {self.bin1.name}",  # noqa
+                "body": f"{line.qty_picked} {line.product_id.display_name} put in {self.bin1.name}",  # noqa
             },
         )
 
         self.assertRecordValues(
             line,
-            [{"qty_done": 7, "result_package_id": self.bin1.id, "quantity": 7}],
+            [{"qty_picked": 7, "result_package_id": self.bin1.id, "quantity": 7}],
         )
         self.assertRecordValues(
             new_line,
-            [{"qty_done": 0, "result_package_id": False, "quantity": 3}],
+            [{"qty_picked": 0, "result_package_id": False, "quantity": 3}],
         )
         # the reserved quantity on the quant must stay the same
         self.assertRecordValues(quant, [{"quantity": 40.0, "reserved_quantity": 20.0}])
@@ -307,9 +307,9 @@ class ClusterPickingScanDestinationPackCase(ClusterPickingCommonCase):
         # ensure we have activated the zero check
         self.one_line_picking.picking_type_id.sudo().shopfloor_zero_check = True
         # Update the quantity in the location to be equal to the line's
-        # so when scan_destination_pack sets the qty_done, the planned
+        # so when scan_destination_pack sets the qty_picked, the planned
         # qty should be zero and trigger a zero check
-        self._update_qty_in_location(location, product, qty)
+        self._update_qty_in_location(location, product, qty / 2)
         # Reserve goods (now the move line has the expected source location)
         self.one_line_picking.move_ids.location_id = location
         self.one_line_picking.action_assign()
@@ -340,7 +340,7 @@ class ClusterPickingScanDestinationPackCase(ClusterPickingCommonCase):
         # ensure we have deactivated the zero check
         self.one_line_picking.picking_type_id.sudo().shopfloor_zero_check = False
         # Update the quantity in the location to be equal to the line's
-        # so when scan_destination_pack sets the qty_done, the planned
+        # so when scan_destination_pack sets the qty_picked, the planned
         # qty should be zero and trigger a zero check
         self._update_qty_in_location(line.location_id, line.product_id, line.quantity)
         response = self.service.dispatch(
@@ -361,6 +361,6 @@ class ClusterPickingScanDestinationPackCase(ClusterPickingCommonCase):
             data=self._line_data(next_line),
             message={
                 "message_type": "success",
-                "body": f"{line.qty_done} {line.product_id.display_name} put in {self.bin1.name}",  # noqa
+                "body": f"{line.qty_picked} {line.product_id.display_name} put in {self.bin1.name}",  # noqa
             },
         )

odoo/addons/shopfloor/tests/test_cluster_picking_scan_destination_no_prefill_qty.py

@@ -42,21 +42,21 @@ class ClusterPickingScanDestinationPackPrefillQtyCase(ClusterPickingCommonCase):
     def test_scan_destination_pack_increment_with_product(self):
         """Check quantity increment by scanning the product."""
         line = self.batch.picking_ids.move_line_ids[0]
-        previous_qty_done = line.qty_done
-        for qty_done in range(1, 2):
+        previous_qty_picked = line.qty_picked
+        for qty_picked in range(1, 2):
             response = self.service.dispatch(
                 "scan_destination_pack",
                 params={
                     "picking_batch_id": self.batch.id,
                     "move_line_id": line.id,
                     "barcode": line.product_id.barcode,
-                    "quantity": qty_done,
+                    "quantity": qty_picked,
                 },
             )
             # Ensure the qty has not changed.
-            self.assertEqual(line.qty_done, previous_qty_done)
+            self.assertEqual(line.qty_picked, previous_qty_picked)
 
-            expected_qty_done = qty_done + 1
+            expected_qty_done = qty_picked + 1
             self.assert_response(
                 response,
                 next_state="scan_destination",
@@ -66,24 +66,24 @@ class ClusterPickingScanDestinationPackPrefillQtyCase(ClusterPickingCommonCase):
     def test_scan_destination_pack_increment_with_wrong_product(self):
         """Check quantity is not incremented by scanning the wrong product."""
         line = self.batch.picking_ids.move_line_ids[0]
-        previous_qty_done = line.qty_done
-        qty_done = 2
+        previous_qty_picked = line.qty_picked
+        qty_picked = 2
         response = self.service.dispatch(
             "scan_destination_pack",
             params={
                 "picking_batch_id": self.batch.id,
                 "move_line_id": line.id,
                 "barcode": self.product_b.barcode,
-                "quantity": qty_done,
+                "quantity": qty_picked,
             },
         )
         # Ensure the qty has not changed.
-        self.assertEqual(line.qty_done, previous_qty_done)
+        self.assertEqual(line.qty_picked, previous_qty_picked)
         new_move_line = self.env["stock.move.line"].search(
             [("move_id", "=", line.move_id.id), ("id", ">", line.id)]
         )
         self.assertFalse(new_move_line)
-        expected_qty_done = qty_done
+        expected_qty_done = qty_picked
         self.assert_response(
             response,
             next_state="scan_destination",
@@ -94,22 +94,22 @@ class ClusterPickingScanDestinationPackPrefillQtyCase(ClusterPickingCommonCase):
     def test_scan_destination_pack_increment_with_packaging(self):
         """Check quantity incremented by scanning the packaging."""
         line = self.batch.picking_ids.move_line_ids[0]
-        previous_qty_done = line.qty_done
+        previous_qty_picked = line.qty_picked
         packaging = self.product_a_packaging
-        qty_done = 2
+        qty_picked = 2
         response = self.service.dispatch(
             "scan_destination_pack",
             params={
                 "picking_batch_id": self.batch.id,
                 "move_line_id": line.id,
                 "barcode": packaging.barcode,
-                "quantity": qty_done,
+                "quantity": qty_picked,
             },
         )
         # Ensure the qty has not changed in the record.
-        self.assertEqual(line.qty_done, previous_qty_done)
+        self.assertEqual(line.qty_picked, previous_qty_picked)
 
-        expected_qty_done = qty_done + packaging.qty
+        expected_qty_done = qty_picked + packaging.qty
         self.assert_response(
             response,
             next_state="scan_destination",

odoo/addons/shopfloor/tests/test_cluster_picking_scan_line.py

@@ -16,7 +16,7 @@ class ClusterPickingScanLineCase(ClusterPickingLineCommonCase):
 
     def _scan_line_ok(self, line, scanned, expected_qty_done=1):
         batch = line.picking_id.batch_id
-        previous_qty_done = line.qty_done
+        previous_qty_done = line.qty_picked
         response = self.service.dispatch(
             "scan_line",
             params={
@@ -28,7 +28,7 @@ class ClusterPickingScanLineCase(ClusterPickingLineCommonCase):
         # For any barcode scanned, the quantity done is set in
         # the response data to fully done but the record is not updated.
         # We ensure the qty has not changed in the record.
-        self.assertEqual(line.qty_done, previous_qty_done)
+        self.assertEqual(line.qty_picked, previous_qty_done)
 
         self.assert_response(
             response,

odoo/addons/shopfloor/tests/test_cluster_picking_stock_issue.py

@@ -195,7 +195,7 @@ class ClusterPickingStockIssue(ClusterPickingCommonCase):
             [
                 {
                     "location_id": self.shelf1.id,
-                    "qty_done": 5.0,
+                    "qty_picked": 5.0,
                     "result_package_id": self.dest_package.id,
                 }
             ],
@@ -349,7 +349,8 @@ class ClusterPickingStockIssue(ClusterPickingCommonCase):
             [
                 {
                     "location_id": self.shelf1.id,
-                    "qty_done": 1.0,
+                    "qty_picked": 1.0,
+                    "picked": True,
                     "result_package_id": self.dest_package.id,
                 }
             ],

odoo/addons/shopfloor/tests/test_cluster_picking_unload.py

@@ -155,19 +155,25 @@ class ClusterPickingSetDestinationAllCase(ClusterPickingUnloadingCommonCase):
             [
                 {
                     "shopfloor_unloaded": True,
-                    "qty_done": 10,
+                    "qty_picked": 10,
+                    "quantity": 10,
+                    "picked": True,
                     "state": "done",
                     "location_dest_id": self.packing_location.id,
                 },
                 {
                     "shopfloor_unloaded": True,
-                    "qty_done": 10,
+                    "qty_picked": 10,
+                    "quantity": 10,
+                    "picked": True,
                     "state": "done",
                     "location_dest_id": self.packing_location.id,
                 },
                 {
                     "shopfloor_unloaded": True,
-                    "qty_done": 10,
+                    "qty_picked": 10,
+                    "quantity": 10,
+                    "picked": True,
                     "state": "done",
                     "location_dest_id": self.packing_location.id,
                 },
@@ -178,6 +184,7 @@ class ClusterPickingSetDestinationAllCase(ClusterPickingUnloadingCommonCase):
             response,
             next_state="start",
             message={"message_type": "success", "body": "Batch Transfer complete"},
+            popup=self.ANY,
         )
 
     def test_set_destination_all_remaining_lines(self):
@@ -209,14 +216,18 @@ class ClusterPickingSetDestinationAllCase(ClusterPickingUnloadingCommonCase):
             [
                 {
                     "shopfloor_unloaded": True,
-                    "qty_done": 10,
+                    "qty_picked": 10,
+                    "quantity": 10,
+                    "picked": True,
                     "state": "done",
                     "picking_id": self.one_line_picking.id,
                     "location_dest_id": self.packing_location.id,
                 },
                 {
                     "shopfloor_unloaded": True,
-                    "qty_done": 10,
+                    "qty_picked": 10,
+                    "quantity": 10,
+                    "picked": True,
                     # will be done when the second line of the picking is unloaded
                     "state": "assigned",
                     "picking_id": self.two_lines_picking.id,
@@ -224,7 +235,9 @@ class ClusterPickingSetDestinationAllCase(ClusterPickingUnloadingCommonCase):
                 },
                 {
                     "shopfloor_unloaded": False,
-                    "qty_done": 0,
+                    "qty_picked": 0,
+                    "quantity": 10,
+                    "picked": False,
                     "state": "assigned",
                     "picking_id": self.two_lines_picking.id,
                     "location_dest_id": self.packing_location.id,
@@ -239,6 +252,7 @@ class ClusterPickingSetDestinationAllCase(ClusterPickingUnloadingCommonCase):
             next_state="start_line",
             data=self._line_data(self.move_lines[2]),
             message={"body": "Batch Transfer line done", "message_type": "success"},
+            popup=self.ANY,
         )
 
     def test_set_destination_all_picking_unassigned(self):
@@ -278,6 +292,7 @@ class ClusterPickingSetDestinationAllCase(ClusterPickingUnloadingCommonCase):
             response,
             next_state="start",
             message=self.service.msg_store.batch_transfer_complete(),
+            popup=self.ANY,
         )
 
     def test_set_destination_all_but_different_dest(self):
@@ -358,8 +373,8 @@ class ClusterPickingSetDestinationAllCase(ClusterPickingUnloadingCommonCase):
         """
         move_lines = self.move_lines
         self._set_dest_package_and_done(move_lines, self.bin1)
-        move_lines[0].move_id.location_dest_id = self.packing_a_location
-        move_lines[0].picking_id.location_dest_id = self.packing_a_location
+        # writing dest loc on all moves to avoid entering _are_all_dest_location_same
+        move_lines.picking_id.location_dest_id = self.packing_a_location
 
         response = self.service.dispatch(
             "set_destination_all",
@@ -427,6 +442,7 @@ class ClusterPickingSetDestinationAllCase(ClusterPickingUnloadingCommonCase):
             response,
             next_state="start",
             message={"message_type": "success", "body": "Batch Transfer complete"},
+            popup=self.ANY,
         )
 
     def test_set_destination_all_check_confirmation(self):
@@ -589,7 +605,9 @@ class ClusterPickingUnloadScanDestinationCase(ClusterPickingUnloadingCommonCase)
             [
                 {
                     "shopfloor_unloaded": True,
-                    "qty_done": 10,
+                    "qty_picked": 10,
+                    "quantity": 10,
+                    "picked": True,
                     "state": "done",
                     "picking_id": self.one_line_picking.id,
                     "location_dest_id": self.packing_a_location.id,
@@ -601,14 +619,18 @@ class ClusterPickingUnloadScanDestinationCase(ClusterPickingUnloadingCommonCase)
             [
                 {
                     "shopfloor_unloaded": False,
-                    "qty_done": 10,
+                    "qty_picked": 10,
+                    "quantity": 10,
+                    "picked": True,
                     "state": "assigned",
                     "picking_id": self.two_lines_picking.id,
                     "location_dest_id": self.packing_b_location.id,
                 },
                 {
                     "shopfloor_unloaded": False,
-                    "qty_done": 10,
+                    "qty_picked": 10,
+                    "quantity": 10,
+                    "picked": True,
                     "state": "assigned",
                     "picking_id": self.two_lines_picking.id,
                     "location_dest_id": self.packing_b_location.id,
@@ -619,10 +641,15 @@ class ClusterPickingUnloadScanDestinationCase(ClusterPickingUnloadingCommonCase)
 
         location = self.bin2_lines[0].location_dest_id
         data = self._data_for_batch(self.batch, location, pack=self.bin2)
+        # Odoo might create new destination moves which will yield a popup message.
+        # We are not testing anything else than the next state here, which should
+        # be unload_single, as the only thing that matters here is that we were
+        # able to process the picking.
         self.assert_response(
             response,
             next_state="unload_single",
             data=data,
+            popup=self.ANY,
         )
 
     def test_scan_destination_unload_package_enabled(self):
@@ -705,7 +732,9 @@ class ClusterPickingUnloadScanDestinationCase(ClusterPickingUnloadingCommonCase)
             [
                 {
                     "shopfloor_unloaded": True,
-                    "qty_done": 10,
+                    "qty_picked": 10,
+                    "quantity": 10,
+                    "picked": True,
                     "state": "assigned",
                     "picking_id": self.two_lines_picking.id,
                     "location_dest_id": self.packing_b_location.id,
@@ -717,7 +746,9 @@ class ClusterPickingUnloadScanDestinationCase(ClusterPickingUnloadingCommonCase)
             [
                 {
                     "shopfloor_unloaded": False,
-                    "qty_done": 10,
+                    "qty_picked": 10,
+                    "quantity": 10,
+                    "picked": True,
                     "state": "assigned",
                     "picking_id": self.two_lines_picking.id,
                     "location_dest_id": self.packing_b_location.id,
@@ -765,7 +796,9 @@ class ClusterPickingUnloadScanDestinationCase(ClusterPickingUnloadingCommonCase)
             [
                 {
                     "shopfloor_unloaded": True,
-                    "qty_done": 10,
+                    "qty_picked": 10,
+                    "quantity": 10,
+                    "picked": True,
                     "state": "done",
                     "picking_id": self.two_lines_picking.id,
                     "location_dest_id": self.packing_b_location.id,
@@ -774,10 +807,15 @@ class ClusterPickingUnloadScanDestinationCase(ClusterPickingUnloadingCommonCase)
         )
         self.assertRecordValues(self.batch, [{"state": "done"}])
 
+        # Odoo might create new destination moves which will yield a popup message.
+        # We are not testing anything else than the next state here, which should
+        # be unload_single, as the only thing that matters here is that we were
+        # able to process the picking.
         self.assert_response(
             response,
             next_state="start",
             message={"body": "Batch Transfer complete", "message_type": "success"},
+            popup=self.ANY,
         )
 
     def test_unload_scan_destination_error_location_not_found(self):
@@ -895,7 +933,13 @@ class ClusterPickingUnloadScanDestinationCase(ClusterPickingUnloadingCommonCase)
                 {"location_dest_id": self.packing_a_location.id},
             ],
         )
-        self.assert_response(response, next_state="unload_single", data=self.ANY)
+        # Odoo might create new destination moves which will yield a popup message.
+        # We are not testing anything else than the next state here, which should
+        # be unload_single, as the only thing that matters here is that we were
+        # able to process the picking.
+        self.assert_response(
+            response, next_state="unload_single", data=self.ANY, popup=self.ANY
+        )
 
     def test_unload_scan_destination_completion_info(self):
         """/unload_scan_destination that make chained picking ready"""

odoo/addons/shopfloor/tests/test_stock_split.py

@@ -192,8 +192,10 @@ class TestStockSplit(TransactionCase):
         )
         # this method adds the quantity to the current quantity, so remove it
         quantity -= sum(quants.mapped("quantity"))
+        if not quantity:
+            return
         cls.env["stock.quant"]._update_available_quantity(
-            product, location, quantity, package_id=package, lot_id=lot
+            product, location, quantity=quantity, package_id=package, lot_id=lot
         )
 
     def test_split_pickings_from_source_location(self):

{odoo_addon_shopfloor-18.0.0.3.1.dist-info → odoo_addon_shopfloor-18.0.0.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-shopfloor
-Version: 18.0.0.3.1
+Version: 18.0.0.5.0
 Requires-Python: >=3.10
 Requires-Dist: odoo-addon-base_rest==18.0.*
 Requires-Dist: odoo-addon-jsonifier==18.0.*
@@ -42,7 +42,7 @@ Shopfloor
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:ba88a2ff0fc8dc7ea2a811a9507ddb4144cef230f98b4cbb1a6b506edefe389f
+   !! source digest: sha256:82699fc8ed59ec349f18149761cdefd28a4d13c4b41274373aa4e1ff02cc593b
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

{odoo_addon_shopfloor-18.0.0.3.1.dist-info → odoo_addon_shopfloor-18.0.0.5.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
-odoo/addons/shopfloor/README.rst,sha256=-Hc6d6pxlXdCzqheiYYk6moSPEe6P0qxKv42ADAMEuI,6138
+odoo/addons/shopfloor/README.rst,sha256=bWxl7EQ4nkZ2hXJJWTOwcvr7BSSbMzTj7VsfucYWi6I,6138
 odoo/addons/shopfloor/__init__.py,sha256=ke3RmZ7XkX-lz4S8NHAxNIEJ5_Nvj5bjBAqD-W-q73c,91
-odoo/addons/shopfloor/__manifest__.py,sha256=apuuRwH0nXDJJ8podHpNQzXRen-B7PK259o7dFKBjIo,2572
+odoo/addons/shopfloor/__manifest__.py,sha256=ZOAsrUj9vnrx8654PRYNGoku-2pBFJ9QB__MvaAzrkA,2572
 odoo/addons/shopfloor/exceptions.py,sha256=81KpIGVkuYRhA0cIuml4pg4G3izqkAAhLqoXZbUd4X8,197
 odoo/addons/shopfloor/utils.py,sha256=Be7J8Tu7ivOW4lpe8IjKxwqfTwfmK-ZkeFEavoYIIF4,375
 odoo/addons/shopfloor/actions/__init__.py,sha256=_yTf-NtaJmSylBJIoJJvKNYEI-wlqpyRw-S5eJRRzEM,400
@@ -17,7 +17,7 @@ odoo/addons/shopfloor/actions/savepoint.py,sha256=bIpPUPg-2BbO8hz277kWnq4DP_cayh
 odoo/addons/shopfloor/actions/schema.py,sha256=H_4HCaYB7HiqU35WO2NmHtOLJ087iFLbiJD4HdiHFjU,8555
 odoo/addons/shopfloor/actions/schema_detail.py,sha256=_xtm8ptRXAPBIMTyr8XKMQtogcjBudh-QRqKUZEEHGU,4968
 odoo/addons/shopfloor/actions/search.py,sha256=9mcpeYo1iFQPdt_F2wLkqK5nRpR_gkFaOTReaM2Q7r4,7014
-odoo/addons/shopfloor/actions/stock.py,sha256=oWy5QvZNv6IFbYhet0xtjV8T_bxrVi5UMy2-TIrUIko,11192
+odoo/addons/shopfloor/actions/stock.py,sha256=KjE7jyUQ0OoLdusiF4PPTfstUWX5xfaeCwoioyaHr4k,11755
 odoo/addons/shopfloor/actions/stock_unreserve.py,sha256=P0a9V53MqG4sDln8yX0Id-nEXz7cydiFY_BBznioQpg,3090
 odoo/addons/shopfloor/components/__init__.py,sha256=a3ox1WOD1JhrQUrYMRn-yDJI0Vvc7ciKdmXuZB29ToU,173
 odoo/addons/shopfloor/components/scan_handler_location.py,sha256=LImiaG4L4xBKUFWZLSnJV-eSCvj_NCDCM5GqZSnsPmE,825
@@ -71,7 +71,7 @@ odoo/addons/shopfloor/readme/USAGE.md,sha256=YHN8xXpASu7XGNvmpV453zK86e5UyWeHPm-
 odoo/addons/shopfloor/security/groups.xml,sha256=hdLqRUZM_4RQnleinRYhxDxqW4VOI5li4oTsB7m96LQ,578
 odoo/addons/shopfloor/services/__init__.py,sha256=4lhF0VNx8QosVEZj9QJYgv6oWD0kl9FX80rL5WMrXf4,303
 odoo/addons/shopfloor/services/checkout.py,sha256=E40wOnnuKhpc98Q27ePz0nAvd9xB3-o6GSz8C7Hj6oc,82616
-odoo/addons/shopfloor/services/cluster_picking.py,sha256=zbcD74GsGuC1EQzmj4_uXNV0oBULWw4C7uFm85YMh0w,68729
+odoo/addons/shopfloor/services/cluster_picking.py,sha256=mHnJnqTeeJkiD7pCKOb45E2Zd4mSEAYK2KcO2qgW8WA,69142
 odoo/addons/shopfloor/services/delivery.py,sha256=Gxbwp0x9XPLx9AJ3GFDSH69xHrQCD_R8m2i78kuuS6s,34352
 odoo/addons/shopfloor/services/location_content_transfer.py,sha256=ovx3w4xnACTlc-24JmUcGtcKgaTb1FXpZ31m2FhTGM4,50431
 odoo/addons/shopfloor/services/menu.py,sha256=m1eNOReTda_xD-p-m8k2Pn5cJQOLWTiaBGW46zxsYsk,2354
@@ -82,8 +82,8 @@ odoo/addons/shopfloor/services/zone_picking.py,sha256=BI25T234hcjlgGDIMjsO6PfDUK
 odoo/addons/shopfloor/services/forms/__init__.py,sha256=nxwJdKX47hb56ERf4Qb3UE5dkdsHCbkaXMAXs4XMAd8,27
 odoo/addons/shopfloor/services/forms/picking_form.py,sha256=pX1hbALlCqTVG3m1HYY5xtgbTcSHVnpaGaqm3akBS-U,2718
 odoo/addons/shopfloor/static/description/icon.png,sha256=6xBPJauaFOF0KDHfHgQopSc28kKvxMaeoQFQWZtfZDo,9455
-odoo/addons/shopfloor/static/description/index.html,sha256=CIM7XKUP900WQaicQfZz6OoRfT-p1ShIepEPKYE1Gdg,18540
-odoo/addons/shopfloor/tests/__init__.py,sha256=8t1Eocv-42M2tzBAkG3Wa6tsfhZIUIgxOspm3hqRCd4,4012
+odoo/addons/shopfloor/static/description/index.html,sha256=HoTSlz9robP64j8fSLEEAOSJ0mq8WwUwi2j7tACozmg,18540
+odoo/addons/shopfloor/tests/__init__.py,sha256=1L6fBScnX0sYhGhRfdrJAgc0BVT2bzO_43WJ8aiIhIU,3986
 odoo/addons/shopfloor/tests/common.py,sha256=lFdSQRXBjwCr7StVJltEwLtA_a4V77JcBcKkGAnAL5M,11676
 odoo/addons/shopfloor/tests/models.py,sha256=PWNPC6DgFMbrarojSxUqwycnBdePX-4Q5Z0rn1WwQqY,940
 odoo/addons/shopfloor/tests/test_actions_change_package_lot.py,sha256=bUn-FXPWY-eo4kaS0S7jU4ge_xl1A9jfU_rNZQT8ZPs,47528
@@ -115,19 +115,19 @@ odoo/addons/shopfloor/tests/test_checkout_select_line.py,sha256=LlyFiY5CL5i_kqXc
 odoo/addons/shopfloor/tests/test_checkout_select_package_base.py,sha256=Bm7J9lkq0NjXDB5o8wciK_tMW829EVRa-nQ_1wxB9og,2559
 odoo/addons/shopfloor/tests/test_checkout_set_qty.py,sha256=PFWh3_T3ccqS7q-ISuI6PKD1WjCGG3vrIv-kfGCUcRA,9491
 odoo/addons/shopfloor/tests/test_checkout_summary.py,sha256=n34MsVtM99B2rWHGyLDT-r2itWIhDXHbOKs47j2mDHE,2338
-odoo/addons/shopfloor/tests/test_cluster_picking_base.py,sha256=XN_LkgtCEnCoLgR9_WW38pmWqhOfJujn_InekRPY40c,2994
+odoo/addons/shopfloor/tests/test_cluster_picking_base.py,sha256=U4Iv5AKQ05D4BgDXlwtAnfVAICqSdvYfjqduYzppPXE,2996
 odoo/addons/shopfloor/tests/test_cluster_picking_batch.py,sha256=my3zHY8L-zuIkGl9riexR5zWmL6cr00g1dWr5nEb4Uk,4074
-odoo/addons/shopfloor/tests/test_cluster_picking_change_pack_lot.py,sha256=mAZv4W0crG-we4RPZjWORGQ9Z0F9POhFObmvHR6SSbw,4165
-odoo/addons/shopfloor/tests/test_cluster_picking_is_zero.py,sha256=SQgXLkhyBVC1064ZXlpVsny3wdRrRyiFKsaB77f0UA8,3322
-odoo/addons/shopfloor/tests/test_cluster_picking_scan_destination.py,sha256=YXf97IhOEF9WXKZJjb-155dS_-Um5bKWQsqIeAjXlBA,14043
-odoo/addons/shopfloor/tests/test_cluster_picking_scan_destination_no_prefill_qty.py,sha256=hboVxHXNFqZ0DDTBqUBW9r6Dq428Vq5uj7fgaGIdPAg,4464
-odoo/addons/shopfloor/tests/test_cluster_picking_scan_line.py,sha256=bHOK4eraF83SBYWCbu4lcJfJ7VYw0XgEDQaKMHn_wBY,15654
+odoo/addons/shopfloor/tests/test_cluster_picking_change_pack_lot.py,sha256=wQUwiRBjSSVOPVLqAYD3Rlz5Esx5nns5hzSgaTSzhjM,4167
+odoo/addons/shopfloor/tests/test_cluster_picking_is_zero.py,sha256=1PbboD9FHq6X7ONY-4ZeWHVvUhbJU_SeV-CLHvH8zbY,3382
+odoo/addons/shopfloor/tests/test_cluster_picking_scan_destination.py,sha256=ID1FZSBtJeq_9c_gAlYFfOrxDdIN3grV1MOaU80mMnI,14083
+odoo/addons/shopfloor/tests/test_cluster_picking_scan_destination_no_prefill_qty.py,sha256=W2aSmQjyeJCzsETp-CvcU9Olbp7BJGaL9-m8aN8G9fU,4506
+odoo/addons/shopfloor/tests/test_cluster_picking_scan_line.py,sha256=mHqqL9bvyOnWNRdvOrUpDSdBDyUnVKiIgMovMvNgphY,15658
 odoo/addons/shopfloor/tests/test_cluster_picking_scan_line_location_or_pack_first.py,sha256=cYzOtirVzMJUgO8oElrrRikq8ML1HXuHidBmEdVeL7M,4434
 odoo/addons/shopfloor/tests/test_cluster_picking_scan_line_no_prefill_qty.py,sha256=T-8V-Xug-T0cPe0XK09AlvL0S319QJk_-IPGP6v9es4,2897
 odoo/addons/shopfloor/tests/test_cluster_picking_select.py,sha256=BvuQznmCtOAipvgEhiUiTyeKR6nDkC5u9hCUZIF7MEc,15240
 odoo/addons/shopfloor/tests/test_cluster_picking_skip.py,sha256=CGTvP200X4XPX1sKIapTTJTw9Rs6aYh97c4k11IKBI8,3584
-odoo/addons/shopfloor/tests/test_cluster_picking_stock_issue.py,sha256=gpiRbyIjXkA_5Wbv75dc8ulFltFyj2iaBHijbf1stis,15790
-odoo/addons/shopfloor/tests/test_cluster_picking_unload.py,sha256=LWy1Fx7Pe1DJdwUdZPqQqKJVRG9UaL_0qo_vsE6JGDM,37029
+odoo/addons/shopfloor/tests/test_cluster_picking_stock_issue.py,sha256=lcPC-w5PlkoknO7BVEl_aJitrtcn1_7YHCXIx7dnxJw,15830
+odoo/addons/shopfloor/tests/test_cluster_picking_unload.py,sha256=3GqAj4jyCLaXEscCoNgS-wTSpbgO_1OoBp5a2vNZyxw,38989
 odoo/addons/shopfloor/tests/test_delivery_base.py,sha256=XlreffzVgz4aVlG2Vo5Q02ZB5cMV9kI5F1UUMGC9xQA,5005
 odoo/addons/shopfloor/tests/test_delivery_done.py,sha256=kKNvdxpIBmSMkDngENDBgpcQ-dA2x3863N42Si2N5Nw,4149
 odoo/addons/shopfloor/tests/test_delivery_list_stock_picking.py,sha256=g-oaXqQofQ8txnOmjt1WCogROhALNARHiZAgMTqXHt0,1922
@@ -158,7 +158,7 @@ odoo/addons/shopfloor/tests/test_scan_anything.py,sha256=3kgnAS60fmTYEsy6pK8pluK
 odoo/addons/shopfloor/tests/test_single_pack_transfer.py,sha256=GAzjurV-4e4xsWymo2LepjJq-aQI9lPNsoJBub9qVro,40934
 odoo/addons/shopfloor/tests/test_single_pack_transfer_base.py,sha256=kU_UyP0G3u3j9HmzMoNawd79w-hbN7zNxMiQ1CKSUyg,1255
 odoo/addons/shopfloor/tests/test_single_pack_transfer_putaway.py,sha256=ZcnzbrHpVFUeJJB2BywfkXpg8e7nyzvLP9v2Aqm2YPY,4415
-odoo/addons/shopfloor/tests/test_stock_split.py,sha256=OLADJMkFKcSU5E6hQe2eJqWEYEkPs2tsJvUgrWG2XOU,11208
+odoo/addons/shopfloor/tests/test_stock_split.py,sha256=VW0f3iuvp8sFJJGv2FTXPYepiAsUS1MajaWh1pQYGSg,11261
 odoo/addons/shopfloor/tests/test_user.py,sha256=tpjFFS1lJ4VwT8fwfz2GseXJy-JhAWC6TjNizFT_uSg,1423
 odoo/addons/shopfloor/tests/test_zone_picking_base.py,sha256=I4mw2TP74mwU1lTxKulbP-Wm6i0xyOndrFSNWlkyqEI,20121
 odoo/addons/shopfloor/tests/test_zone_picking_change_pack_lot.py,sha256=9Bg29Zp-vfgnF-P4U1xgXhHWhOWxfQkzzublZU2Ee-A,5414
@@ -183,7 +183,7 @@ odoo/addons/shopfloor/views/shopfloor_menu.xml,sha256=LK_XdKawKqXPTaE1tq4r5dXR62
 odoo/addons/shopfloor/views/stock_location.xml,sha256=d7iqbOQZbb5YPSdAXlQ6spcj8dUvQ37DpEGuaLX5B1M,829
 odoo/addons/shopfloor/views/stock_move_line.xml,sha256=AmIO95-G0AD5i5C3x_BQL_NARXvyCfe4mg9iM97wD1U,1996
 odoo/addons/shopfloor/views/stock_picking_type.xml,sha256=M3U8xijiL6ZJUx2IiYelIYECsCRtOCU1J6lwlWzx3Jo,778
-odoo_addon_shopfloor-18.0.0.3.1.dist-info/METADATA,sha256=KAzoXnLYJsO1nn3dxi3htUGhC7IL589REK-Pwi91fos,7580
-odoo_addon_shopfloor-18.0.0.3.1.dist-info/WHEEL,sha256=ZhOvUsYhy81Dx67gN3TV0RchQWBIIzutDZaJODDg2Vo,81
-odoo_addon_shopfloor-18.0.0.3.1.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
-odoo_addon_shopfloor-18.0.0.3.1.dist-info/RECORD,,
+odoo_addon_shopfloor-18.0.0.5.0.dist-info/METADATA,sha256=SN5p3DSulKpV2ckquBp006l1wwKvsLtYpbg1Gy-inOY,7580
+odoo_addon_shopfloor-18.0.0.5.0.dist-info/WHEEL,sha256=ZhOvUsYhy81Dx67gN3TV0RchQWBIIzutDZaJODDg2Vo,81
+odoo_addon_shopfloor-18.0.0.5.0.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
+odoo_addon_shopfloor-18.0.0.5.0.dist-info/RECORD,,