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/tests/test_zone_picking_base.py

@@ -176,6 +176,19 @@ class ZonePickingCommonCase(CommonCase):
                 }
             )
         )
+        cls.product_i = (
+            cls.env["product.product"]
+            .sudo()
+            .create(
+                {
+                    "name": "Product I",
+                    "type": "product",
+                    "default_code": "I",
+                    "barcode": "I",
+                    "weight": 3,
+                }
+            )
+        )
         products = (
             cls.product_a
             + cls.product_b
@@ -185,6 +198,7 @@ class ZonePickingCommonCase(CommonCase):
             + cls.product_f
             + cls.product_g
             + cls.product_h
+            + cls.product_i
         )
         for product in products:
             cls.env["stock.putaway.rule"].sudo().create(
@@ -218,12 +232,12 @@ class ZonePickingCommonCase(CommonCase):
         cls._update_qty_in_location(cls.zone_sublocation4, cls.product_e, 4)
         # 2 products in a package available in zone_sublocation4
         cls.picking5 = picking5 = cls._create_picking(
-            lines=[(cls.product_b, 10), (cls.product_f, 10)]
+            lines=[(cls.product_i, 10), (cls.product_f, 10)]
         )
         cls._fill_stock_for_moves(
             picking5.move_ids,
             in_package=True,
-            same_package=False,
+            same_package=True,
             location=cls.zone_sublocation4,
         )
         # 2 products available in zone_sublocation5, but one is partially available
@@ -261,6 +275,7 @@ class ZonePickingCommonCase(CommonCase):
             current_zone_location=self.zone_location,
             current_picking_type=self.picking_type,
         )
+        self.menu.sudo().allow_alternative_destination_package = True
 
     def _assert_response_select_zone(self, response, zone_locations, message=None):
         data = {"zones": self.service._data_for_select_zone(zone_locations)}
@@ -307,7 +322,7 @@ class ZonePickingCommonCase(CommonCase):
         move_lines,
         message=None,
         popup=None,
-        confirmation_required=False,
+        confirmation_required=None,
         product=None,
         sublocation=None,
         location_first=None,
@@ -331,6 +346,9 @@ class ZonePickingCommonCase(CommonCase):
             data_move_line[
                 "location_will_be_empty"
             ] = move_line.location_id.planned_qty_in_location_is_empty(move_line)
+            data_move_line[
+                "handle_complete_mix_pack"
+            ] = self.service._handle_complete_mix_pack(move_line.package_id)
         self.assert_response(
             response,
             next_state=state,
@@ -347,7 +365,7 @@ class ZonePickingCommonCase(CommonCase):
         move_lines,
         message=None,
         popup=None,
-        confirmation_required=False,
+        confirmation_required=None,
         product=None,
         sublocation=None,
         location_first=False,
@@ -376,12 +394,16 @@ class ZonePickingCommonCase(CommonCase):
         picking_type,
         move_line,
         message=None,
-        confirmation_required=False,
+        confirmation_required=None,
         qty_done=None,
+        handle_complete_mix_pack=False,
     ):
         expected_move_line = self.data.move_line(move_line, with_picking=True)
         if qty_done is not None:
             expected_move_line["qty_done"] = qty_done
+        allow_alternative_destination_package = (
+            self.menu.allow_alternative_destination_package
+        )
         self.assert_response(
             response,
             next_state=state,
@@ -390,6 +412,8 @@ class ZonePickingCommonCase(CommonCase):
                 "picking_type": self.data.picking_type(picking_type),
                 "move_line": expected_move_line,
                 "confirmation_required": confirmation_required,
+                "allow_alternative_destination_package": allow_alternative_destination_package,
+                "handle_complete_mix_pack": handle_complete_mix_pack,
             },
             message=message,
         )
@@ -401,8 +425,9 @@ class ZonePickingCommonCase(CommonCase):
         picking_type,
         move_line,
         message=None,
-        confirmation_required=False,
+        confirmation_required=None,
         qty_done=None,
+        handle_complete_mix_pack=False,
     ):
         self._assert_response_set_line_destination(
             "set_line_destination",
@@ -413,6 +438,7 @@ class ZonePickingCommonCase(CommonCase):
             message=message,
             confirmation_required=confirmation_required,
             qty_done=qty_done,
+            handle_complete_mix_pack=handle_complete_mix_pack,
         )
 
     def _assert_response_zero_check(
@@ -498,7 +524,7 @@ class ZonePickingCommonCase(CommonCase):
         picking_type,
         move_line,
         message=None,
-        confirmation_required=False,
+        confirmation_required=None,
     ):
         self.assert_response(
             response,
@@ -519,7 +545,7 @@ class ZonePickingCommonCase(CommonCase):
         picking_type,
         move_line,
         message=None,
-        confirmation_required=False,
+        confirmation_required=None,
     ):
         self._assert_response_unload_set_destination(
             "unload_set_destination",
@@ -539,7 +565,7 @@ class ZonePickingCommonCase(CommonCase):
         picking_type,
         move_lines,
         message=None,
-        confirmation_required=False,
+        confirmation_required=None,
     ):
         self.assert_response(
             response,
@@ -560,7 +586,7 @@ class ZonePickingCommonCase(CommonCase):
         picking_type,
         move_lines,
         message=None,
-        confirmation_required=False,
+        confirmation_required=None,
     ):
         self._assert_response_unload_all(
             "unload_all",

odoo/addons/shopfloor/tests/test_zone_picking_change_pack_lot.py

@@ -87,6 +87,7 @@ class ZonePickingChangePackLotCase(ZonePickingCommonCase):
             message=self.service.msg_store.package_replaced_by_package(
                 previous_package, self.free_package
             ),
+            qty_done=self.service._get_prefill_qty(move_line),
         )
 
     def test_change_pack_lot_change_lot_ok(self):
@@ -137,4 +138,5 @@ class ZonePickingChangePackLotCase(ZonePickingCommonCase):
             message=self.service.msg_store.lot_replaced_by_lot(
                 previous_lot, self.free_lot
             ),
+            qty_done=self.service._get_prefill_qty(move_line),
         )

odoo/addons/shopfloor/tests/test_zone_picking_complete_mix_pack_flux.py

@@ -0,0 +1,59 @@
+# Copyright 2023 Camptocamp SA (http://www.camptocamp.com)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from .test_zone_picking_base import ZonePickingCommonCase
+
+
+class ZonePickingCompleteMixPackageFluxCase(ZonePickingCommonCase):
+    """Tests for the flux of complete mix packages."""
+
+    def setUp(self):
+        super().setUp()
+        self.service.work.current_picking_type = self.picking1.picking_type_id
+
+    def test_scan_source_and_set_destination_on_mixed_package(self):
+        package = self.picking5.package_level_ids[0].package_id
+        self.assertTrue(len(package.move_line_ids.product_id) > 1)
+        response = self.service.dispatch(
+            "scan_source",
+            params={"barcode": package.name},
+        )
+        self.assertTrue(
+            response["data"]["set_line_destination"]["handle_complete_mix_pack"]
+        )
+        move_lines = self.service._find_location_move_lines(
+            package=package,
+        )
+        move_lines = move_lines.sorted(lambda l: l.move_id.priority, reverse=True)
+        move_line = move_lines[0]
+        self.assert_response_set_line_destination(
+            response,
+            zone_location=self.zone_location,
+            picking_type=self.picking_type,
+            move_line=move_line,
+            qty_done=0,
+            handle_complete_mix_pack=True,
+        )
+        # Lets move this pack somwehere...
+        move_line.location_dest_id = self.shelf1
+        quantity_done = move_line.reserved_uom_qty
+        response = self.service.dispatch(
+            "set_destination",
+            params={
+                "move_line_id": move_line.id,
+                "barcode": self.packing_location.barcode,
+                "quantity": quantity_done,
+                "confirmation": self.packing_location.barcode,
+                "handle_complete_mix_pack": True,
+            },
+        )
+        # Check response
+        move_lines = self.service._find_location_move_lines()
+        move_lines = move_lines.sorted(lambda l: l.move_id.priority, reverse=True)
+        self.assert_response_select_line(
+            response,
+            zone_location=self.zone_location,
+            picking_type=self.picking_type,
+            move_lines=move_lines,
+            message=self.service.msg_store.confirm_pack_moved(),
+        )

odoo/addons/shopfloor/tests/test_zone_picking_select_line.py

@@ -73,6 +73,9 @@ class ZonePickingSelectLineCase(ZonePickingCommonCase):
 
     def test_list_move_lines_order_by_location(self):
         self.service.work.current_lines_order = "location"
+        last_move_line = self.picking1.move_line_ids[-1]
+        last_move_line_location = last_move_line.location_id
+        last_move_line_location.sudo().name = "z"
         response = self.service.dispatch("list_move_lines", params={})
         move_lines = self.service._find_location_move_lines()
         res = [
@@ -80,6 +83,7 @@ class ZonePickingSelectLineCase(ZonePickingCommonCase):
             for x in response["data"]["select_line"]["move_lines"]
         ]
         self.assertEqual(res, [x.location_id.name for x in move_lines])
+        self.assertEqual(res[-1], last_move_line_location.name)
         self.maxDiff = None
         self.assert_response_select_line(
             response,
@@ -260,7 +264,11 @@ class ZonePickingSelectLineCase(ZonePickingCommonCase):
     def test_scan_source_package_many_products(self):
         """Scan source: scanned package that several product, aborting
         next step 'select_line expected.
+
+        This is only when no prefill quantity option is enabled. If not
+        the related package will be move in one step.
         """
+        self.menu.sudo().no_prefill_qty = True
         pack = self.picking1.package_level_ids[0].package_id
         self._update_qty_in_location(pack.location_id, self.product_b, 2, pack)
         response = self.service.dispatch(
@@ -281,6 +289,28 @@ class ZonePickingSelectLineCase(ZonePickingCommonCase):
             location_first=False,
         )
 
+    def test_scan_source_empty_package(self):
+        """Scan source: scanned an empty package."""
+        pack_empty = self.env["stock.quant.package"].create({})
+        response = self.service.dispatch(
+            "scan_source",
+            params={"barcode": pack_empty.name},
+        )
+        move_lines = self.service._find_location_move_lines(
+            locations=self.zone_location
+        )
+        move_lines = move_lines.sorted(lambda l: l.move_id.priority, reverse=True)
+        self.assert_response_select_line(
+            response,
+            zone_location=self.zone_location,
+            picking_type=self.picking_type,
+            move_lines=move_lines,
+            message=self.service.msg_store.package_has_no_product_to_take(
+                pack_empty.name
+            ),
+            location_first=False,
+        )
+
     def test_scan_source_barcode_package_can_replace_in_line(self):
         """Scan source: scanned package has no related line but can replace
         next step 'select_line' expected with confirmation required set.
@@ -311,13 +341,13 @@ class ZonePickingSelectLineCase(ZonePickingCommonCase):
             picking_type=self.picking_type,
             move_lines=move_lines,
             message=self.service.msg_store.package_different_change(),
-            confirmation_required=True,
+            confirmation_required=package1b.name,
         )
         self.assertEqual(self.picking1.package_level_ids[0].package_id, package1)
         # 2nd scan
         response = self.service.dispatch(
             "scan_source",
-            params={"barcode": package1b.name, "confirmation": True},
+            params={"barcode": package1b.name, "confirmation": package1b.name},
         )
         self.assert_response_set_line_destination(
             response,
@@ -327,6 +357,7 @@ class ZonePickingSelectLineCase(ZonePickingCommonCase):
             message=self.service.msg_store.package_replaced_by_package(
                 package1, package1b
             ),
+            qty_done=self.service._get_prefill_qty(move_lines[0]),
         )
         # Check the package has been changed on the move line
         self.assertEqual(self.picking1.package_level_ids[0].package_id, package1b)

odoo/addons/shopfloor/tests/test_zone_picking_select_line_first_scan_location.py

@@ -136,14 +136,19 @@ class ZonePickingSelectLineFirstScanLocationCase(ZonePickingCommonCase):
 
     def test_scan_source_scan_package_first_with_two_product(self):
         """Scan a package with two product and then scan a product."""
-        pickingA = self._create_picking(
-            lines=[(self.product_a, 13), (self.product_b, 5)]
-        )
+        pickingA = self._create_picking(lines=[(self.product_a, 13)])
         self._fill_stock_for_moves(
             pickingA.move_ids, in_package=True, location=self.zone_sublocation1
         )
         pickingA.action_assign()
         package = pickingA.package_level_ids[0].package_id
+
+        pickingB = self._create_picking(lines=[(self.product_b, 5)])
+        self._fill_stock_for_moves(
+            pickingB.move_ids, in_package=package, location=self.zone_sublocation1
+        )
+        # If all products in package are reserved, it will be handle as a full package
+        # pickingB.action_assign()
         response = self.service.dispatch(
             "scan_source",
             params={

odoo/addons/shopfloor/tests/test_zone_picking_select_line_no_prefill_qty.py

@@ -34,8 +34,13 @@ class ZonePickingSelectLineCase(ZonePickingCommonCase):
         )
 
     def test_scan_source_barcode_package_no_prefill(self):
-        """When a package is scanned, qty_done in response is False."""
+        """When a package is scanned.
+
+        The user is required to scan a product.
+        Then redirected to the next screen, qty_done in response is False.
+        """
         package = self.picking1.package_level_ids[0].package_id
+        # Scan package with one product
         response = self.service.dispatch(
             "scan_source",
             params={"barcode": package.name},
@@ -45,12 +50,24 @@ class ZonePickingSelectLineCase(ZonePickingCommonCase):
         )
         move_lines = move_lines.sorted(lambda l: l.move_id.priority, reverse=True)
         move_line = move_lines[0]
+        self.assert_response_select_line(
+            response,
+            self.zone_location,
+            self.picking1.picking_type_id,
+            move_lines,
+            package=package,
+        )
+        # Scan the product
+        response = self.service.dispatch(
+            "scan_source",
+            params={"barcode": move_line.product_id.barcode},
+        )
         self.assert_response_set_line_destination(
             response,
             zone_location=self.zone_location,
             picking_type=self.picking_type,
             move_line=move_line,
-            qty_done=False,
+            qty_done=1.0,
         )
 
     def test_scan_source_barcode_product_no_prefill(self):

odoo/addons/shopfloor/tests/test_zone_picking_set_line_destination.py

@@ -24,7 +24,7 @@ class ZonePickingSetLineDestinationCase(ZonePickingCommonCase):
                 "move_line_id": 1234567890,
                 "barcode": self.packing_location.barcode,
                 "quantity": move_line.reserved_uom_qty,
-                "confirmation": False,
+                "confirmation": None,
             },
         )
         self.assert_response_start(
@@ -48,7 +48,7 @@ class ZonePickingSetLineDestinationCase(ZonePickingCommonCase):
                 "move_line_id": move_line.id,
                 "barcode": self.packing_location.barcode,
                 "quantity": quantity_done,
-                "confirmation": False,
+                "confirmation": None,
             },
         )
         # Check response
@@ -60,7 +60,7 @@ class ZonePickingSetLineDestinationCase(ZonePickingCommonCase):
             message=self.service.msg_store.confirm_location_changed(
                 move_line.location_dest_id, self.packing_location
             ),
-            confirmation_required=True,
+            confirmation_required=self.packing_location.barcode,
             qty_done=quantity_done,
         )
         # Confirm the destination with a wrong destination (should not happen)
@@ -70,7 +70,7 @@ class ZonePickingSetLineDestinationCase(ZonePickingCommonCase):
                 "move_line_id": move_line.id,
                 "barcode": self.customer_location.barcode,
                 "quantity": move_line.reserved_uom_qty,
-                "confirmation": True,
+                "confirmation": self.packing_location.barcode,
             },
         )
         # Check response
@@ -89,7 +89,7 @@ class ZonePickingSetLineDestinationCase(ZonePickingCommonCase):
                 "move_line_id": move_line.id,
                 "barcode": self.packing_location.barcode,
                 "quantity": move_line.reserved_uom_qty,
-                "confirmation": True,
+                "confirmation": self.packing_location.barcode,
             },
         )
         # Check response
@@ -118,7 +118,7 @@ class ZonePickingSetLineDestinationCase(ZonePickingCommonCase):
                 "move_line_id": move_line.id,
                 "barcode": self.packing_sublocation_b.barcode,
                 "quantity": quantity_done,
-                "confirmation": True,
+                "confirmation": self.packing_sublocation_b.barcode,
             },
         )
         # Check response
@@ -158,7 +158,7 @@ class ZonePickingSetLineDestinationCase(ZonePickingCommonCase):
                 "move_line_id": move_line.id,
                 "barcode": self.packing_location.barcode,
                 "quantity": move_line.reserved_uom_qty,
-                "confirmation": False,
+                "confirmation": None,
             },
         )
         self.assertEqual(move_line.state, "done")
@@ -207,7 +207,7 @@ class ZonePickingSetLineDestinationCase(ZonePickingCommonCase):
                 "move_line_id": move_line.id,
                 "barcode": barcode,
                 "quantity": 6,
-                "confirmation": False,
+                "confirmation": None,
             },
         )
         self.assert_response_set_line_destination(
@@ -253,7 +253,7 @@ class ZonePickingSetLineDestinationCase(ZonePickingCommonCase):
                 "move_line_id": move_line.id,
                 "barcode": self.packing_location.barcode,
                 "quantity": move_line.reserved_uom_qty,  # 6 qty
-                "confirmation": False,
+                "confirmation": None,
             },
         )
         self.assertEqual(move_line.state, "done")
@@ -315,7 +315,7 @@ class ZonePickingSetLineDestinationCase(ZonePickingCommonCase):
                 "move_line_id": move_line.id,
                 "barcode": barcode,
                 "quantity": 4,  # 4/6 qty
-                "confirmation": False,
+                "confirmation": None,
             },
         )
         self.assert_response_set_line_destination(
@@ -346,7 +346,7 @@ class ZonePickingSetLineDestinationCase(ZonePickingCommonCase):
                 "move_line_id": move_line.id,
                 "barcode": self.packing_location.barcode,
                 "quantity": move_line.reserved_uom_qty,
-                "confirmation": False,
+                "confirmation": None,
             },
         )
         self.assertTrue(location_is_empty())
@@ -380,7 +380,7 @@ class ZonePickingSetLineDestinationCase(ZonePickingCommonCase):
                 "move_line_id": move_line.id,
                 "barcode": self.free_package.name,
                 "quantity": move_line.reserved_uom_qty,
-                "confirmation": False,
+                "confirmation": None,
             },
         )
         # Check picking data
@@ -434,7 +434,7 @@ class ZonePickingSetLineDestinationCase(ZonePickingCommonCase):
                 "move_line_id": move_line.id,
                 "barcode": self.free_package.name,
                 "quantity": 6,
-                "confirmation": False,
+                "confirmation": None,
             },
         )
         # Check picking data
@@ -496,7 +496,7 @@ class ZonePickingSetLineDestinationCase(ZonePickingCommonCase):
                 "move_line_id": move_line.id,
                 "barcode": self.free_package.name,
                 "quantity": move_line.reserved_uom_qty,
-                "confirmation": False,
+                "confirmation": None,
             },
         )
         self.assertTrue(location_is_empty())
@@ -523,7 +523,7 @@ class ZonePickingSetLineDestinationCase(ZonePickingCommonCase):
                 "move_line_id": move_line.id,
                 "barcode": self.free_package.name,
                 "quantity": move_line.reserved_uom_qty,
-                "confirmation": False,
+                "confirmation": None,
             },
         )
         self.assertTrue(location_is_empty())
@@ -545,7 +545,7 @@ class ZonePickingSetLineDestinationCase(ZonePickingCommonCase):
                 "move_line_id": move_line.id,
                 "barcode": self.free_package.name,
                 "quantity": move_line.reserved_uom_qty,
-                "confirmation": False,
+                "confirmation": None,
             },
         )
         self.assertEqual(
@@ -568,7 +568,7 @@ class ZonePickingSetLineDestinationCase(ZonePickingCommonCase):
                 "move_line_id": move_line.id,
                 "barcode": self.free_package.name,
                 "quantity": move_line.reserved_uom_qty,
-                "confirmation": False,
+                "confirmation": None,
             },
         )
         # We now have no error in the response
@@ -582,6 +582,41 @@ class ZonePickingSetLineDestinationCase(ZonePickingCommonCase):
             message=self.service.msg_store.confirm_pack_moved(),
         )
 
+    def test_set_same_destination_package_different_picking_type(self):
+        self.menu.sudo().write({"multiple_move_single_pack": True})
+        picking_type1 = self.picking1.picking_type_id
+        self._update_qty_in_location(
+            picking_type1.default_location_src_id, self.product_a, 100
+        )
+        picking_type = picking_type1.sudo().copy(
+            {"name": "test", "shopfloor_menu_ids": False}
+        )
+        picking = self._create_picking(
+            picking_type=picking_type, lines=[(self.product_a, 10)]
+        )
+        self.assertEqual(picking.picking_type_id, picking_type)
+        picking.action_assign()
+        move_line = picking.move_line_ids
+        move_line.result_package_id = self.free_package.id
+        self.assertEqual(self.free_package.planned_move_line_ids, move_line)
+        response = self.service.dispatch(
+            "set_destination",
+            params={
+                "move_line_id": move_line.id,
+                "barcode": self.free_package.name,
+                "quantity": move_line.reserved_uom_qty,
+                "confirmation": None,
+            },
+        )
+        self.assertEqual(
+            response["message"],
+            {
+                "body": "Package FREE_PACKAGE contains already lines"
+                " from a different operation type test.",
+                "message_type": "warning",
+            },
+        )
+
     def test_set_destination_location_zero_quantity(self):
         """Scanned barcode is the destination location.
 
@@ -609,7 +644,7 @@ class ZonePickingSetLineDestinationCase(ZonePickingCommonCase):
             qty_done=move_line.reserved_uom_qty,
         )
 
-    def test_set_destination_error_concurent_work(self):
+    def test_set_destination_package_error_concurent_work(self):
         """Scanned barcode is the destination package.
 
         Move line is already being worked on by someone else
@@ -626,7 +661,41 @@ class ZonePickingSetLineDestinationCase(ZonePickingCommonCase):
                 "move_line_id": move_line.id,
                 "barcode": self.free_package.name,
                 "quantity": move_line.reserved_uom_qty,
-                "confirmation": False,
+                "confirmation": None,
+            },
+        )
+        # Check response
+        self.assert_response_set_line_destination(
+            response,
+            zone_location,
+            picking_type,
+            move_line,
+            message={
+                "message_type": "error",
+                "body": "Someone is already working on these transfers",
+            },
+            qty_done=move_line.reserved_uom_qty,
+        )
+
+    def test_set_destination_location_error_concurent_work(self):
+        """Scanned barcode is the destination location.
+
+        Move line is already being worked on by someone else
+        """
+        zone_location = self.zone_location
+        picking_type = self.picking1.picking_type_id
+        picking_type.sudo().shopfloor_zero_check = True
+        self.assertEqual(len(self.picking1.move_line_ids), 1)
+        move_line = self.picking1.move_line_ids
+        move_line.picking_id.user_id = self.shopfloor_manager
+        response = self.service.dispatch(
+            "set_destination",
+            params={
+                "move_line_id": move_line.id,
+                "package_id": self.free_package.id,
+                "barcode": self.packing_location.barcode,
+                "quantity": move_line.reserved_uom_qty,
+                "confirmation": None,
             },
         )
         # Check response