odoo-addon-shopfloor 16.0.2.12.0.1__py3-none-any.whl → 18.0.0.1.0.15__py3-none-any.whl

odoo/addons/shopfloor/tests/test_location_content_transfer_set_destination_package_or_line.py

@@ -253,7 +253,7 @@ class LocationContentTransferSetDestinationXCase(LocationContentTransferCommonCa
             params={
                 "location_id": 1234567890,  # Doesn't exist
                 "move_line_id": move_line.id,
-                "quantity": move_line.reserved_uom_qty,
+                "quantity": move_line.quantity,
                 "barcode": "TEST",
             },
         )
@@ -265,7 +265,7 @@ class LocationContentTransferSetDestinationXCase(LocationContentTransferCommonCa
             params={
                 "location_id": self.content_loc.id,
                 "move_line_id": 1234567890,  # Doesn't exist
-                "quantity": move_line.reserved_uom_qty,
+                "quantity": move_line.quantity,
                 "barcode": "TEST",
             },
         )
@@ -285,7 +285,7 @@ class LocationContentTransferSetDestinationXCase(LocationContentTransferCommonCa
             params={
                 "location_id": self.content_loc.id,
                 "move_line_id": move_line.id,
-                "quantity": move_line.reserved_uom_qty,
+                "quantity": move_line.quantity,
                 "barcode": "UNKNOWN_LOCATION",
             },
         )
@@ -302,7 +302,7 @@ class LocationContentTransferSetDestinationXCase(LocationContentTransferCommonCa
             params={
                 "location_id": self.content_loc.id,
                 "move_line_id": move_line.id,
-                "quantity": move_line.reserved_uom_qty,
+                "quantity": move_line.quantity,
                 "barcode": customer_location.barcode,
             },
         )
@@ -326,7 +326,7 @@ class LocationContentTransferSetDestinationXCase(LocationContentTransferCommonCa
             params={
                 "location_id": self.content_loc.id,
                 "move_line_id": move_line.id,
-                "quantity": move_line.reserved_uom_qty,
+                "quantity": move_line.quantity,
                 "barcode": self.shelf2.barcode,
             },
         )
@@ -346,7 +346,7 @@ class LocationContentTransferSetDestinationXCase(LocationContentTransferCommonCa
             params={
                 "location_id": self.content_loc.id,
                 "move_line_id": move_line.id,
-                "quantity": move_line.reserved_uom_qty,
+                "quantity": move_line.quantity,
                 "barcode": barcode,
             },
         )
@@ -367,7 +367,7 @@ class LocationContentTransferSetDestinationXCase(LocationContentTransferCommonCa
             params={
                 "location_id": self.content_loc.id,
                 "move_line_id": move_line.id,
-                "quantity": move_line.reserved_uom_qty,
+                "quantity": move_line.quantity,
                 "barcode": self.dest_location.barcode,
             },
         )
@@ -415,7 +415,7 @@ class LocationContentTransferSetDestinationXCase(LocationContentTransferCommonCa
             params={
                 "location_id": self.content_loc.id,
                 "move_line_id": move_line.id,
-                "quantity": move_line.reserved_uom_qty,
+                "quantity": move_line.quantity,
                 "barcode": self.dest_location.barcode,
             },
         )
@@ -449,7 +449,7 @@ class LocationContentTransferSetDestinationXCase(LocationContentTransferCommonCa
         move_line_c = original_picking.move_line_ids.filtered(
             lambda m: m.product_id == self.product_c
         )
-        self.assertEqual(move_line_c.reserved_uom_qty, 10)
+        self.assertEqual(move_line_c.quantity, 10)
         self.assertEqual(move_line_c.qty_done, 10)
         self._simulate_selected_move_line(move_line_c)
         # Scan partial qty (6/10)
@@ -458,14 +458,14 @@ class LocationContentTransferSetDestinationXCase(LocationContentTransferCommonCa
             params={
                 "location_id": self.content_loc.id,
                 "move_line_id": move_line_c.id,
-                "quantity": move_line_c.reserved_uom_qty - 4,  # Scan 6 qty
+                "quantity": move_line_c.quantity - 4,  # Scan 6 qty
                 "barcode": self.dest_location.barcode,
             },
         )
         done_picking = original_picking.backorder_ids
         # Check move line data
         self.assertEqual(move_line_c.move_id.product_uom_qty, 6)
-        self.assertEqual(move_line_c.reserved_uom_qty, 0)
+        self.assertEqual(move_line_c.quantity, 0)
         self.assertEqual(move_line_c.qty_done, 6)
         self.assertEqual(move_line_c.state, "done")
         self.assertEqual(original_picking.backorder_ids, done_picking)
@@ -478,7 +478,7 @@ class LocationContentTransferSetDestinationXCase(LocationContentTransferCommonCa
         self.assertEqual(move.state, "assigned")
         self.assertEqual(move.product_id, self.product_c)
         self.assertEqual(move.product_uom_qty, 4)
-        self.assertEqual(move.move_line_ids.reserved_uom_qty, 4)
+        self.assertEqual(move.move_line_ids.quantity, 4)
         self.assertEqual(move.move_line_ids.qty_done, 4)
         # Check the response -> we must first process the backorder
         self.assert_response_start_single(
@@ -497,14 +497,14 @@ class LocationContentTransferSetDestinationXCase(LocationContentTransferCommonCa
             params={
                 "location_id": self.content_loc.id,
                 "move_line_id": remaining_move_line_c.id,
-                "quantity": remaining_move_line_c.reserved_uom_qty,
+                "quantity": remaining_move_line_c.quantity,
                 "barcode": self.dest_location.barcode,
             },
         )
         done_picking2 = remaining_move_line_c.picking_id
         # Check move line data
         self.assertEqual(remaining_move_line_c.move_id.product_uom_qty, 4)
-        self.assertEqual(remaining_move_line_c.reserved_uom_qty, 0)
+        self.assertEqual(remaining_move_line_c.quantity, 0)
         self.assertEqual(remaining_move_line_c.qty_done, 4)
         self.assertEqual(remaining_move_line_c.state, "done")
         self.assertTrue(done_picking2 != original_picking)
@@ -517,8 +517,8 @@ class LocationContentTransferSetDestinationXCase(LocationContentTransferCommonCa
         )
         moves_product_c_done = all(move.state == "done" for move in moves_product_c)
         self.assertTrue(moves_product_c_done)
-        moves_product_c_qty_done = sum([move.quantity_done for move in moves_product_c])
-        self.assertEqual(moves_product_c_qty_done, 10)
+        moves_product_c_picked = sum([move.quantity_picked for move in moves_product_c])
+        self.assertEqual(moves_product_c_picked, 10)
         # The picking is still not done as product_d hasn't been processed
         self.assertEqual(original_picking.state, "assigned")
         # Let scan product_d quantity and check picking state
@@ -531,12 +531,12 @@ class LocationContentTransferSetDestinationXCase(LocationContentTransferCommonCa
             params={
                 "location_id": self.content_loc.id,
                 "move_line_id": move_line_d.id,
-                "quantity": move_line_d.reserved_uom_qty,
+                "quantity": move_line_d.quantity,
                 "barcode": self.dest_location.barcode,
             },
         )
         self.assertEqual(move_line_d.move_id.product_uom_qty, 10)
-        self.assertEqual(move_line_d.reserved_uom_qty, 0)
+        self.assertEqual(move_line_d.quantity, 0)
         self.assertEqual(move_line_d.qty_done, 10)
         self.assertEqual(move_line_d.state, "done")
         self.assertEqual(original_picking.state, "done")
@@ -562,14 +562,14 @@ class LocationContentTransferSetDestinationXCase(LocationContentTransferCommonCa
             params={
                 "location_id": self.content_loc.id,
                 "move_line_id": move_line.id,
-                "quantity": move_line.reserved_uom_qty - 4,  # Scan 6 qty
+                "quantity": move_line.quantity - 4,  # Scan 6 qty
                 "barcode": self.dest_location.barcode,
             },
         )
         done_picking = picking
         # Check move line data
         self.assertEqual(move_line.move_id.product_uom_qty, 6)
-        self.assertEqual(move_line.reserved_uom_qty, 0)
+        self.assertEqual(move_line.quantity, 0)
         self.assertEqual(move_line.qty_done, 6)
         self.assertEqual(move_line.state, "done")
         self.assertEqual(done_picking.state, "done")
@@ -605,7 +605,7 @@ class LocationContentTransferSetDestinationXCase(LocationContentTransferCommonCa
             params={
                 "location_id": self.content_loc.id,
                 "move_line_id": move_line.id,
-                "quantity": move_line.reserved_uom_qty - 4,  # Scan 6 qty
+                "quantity": move_line.quantity - 4,  # Scan 6 qty
                 "barcode": self.dest_location.barcode,
             },
         )
@@ -613,7 +613,7 @@ class LocationContentTransferSetDestinationXCase(LocationContentTransferCommonCa
         first_done_picking = picking.backorder_ids
         # Check move line data
         self.assertEqual(move_line.move_id.product_uom_qty, 6)
-        self.assertEqual(move_line.reserved_uom_qty, 0)
+        self.assertEqual(move_line.quantity, 0)
         self.assertEqual(move_line.qty_done, 6)
         self.assertEqual(move_line.state, "done")
         self.assertEqual(first_done_picking.state, "done")
@@ -632,7 +632,7 @@ class LocationContentTransferSetDestinationXCase(LocationContentTransferCommonCa
             params={
                 "location_id": self.content_loc.id,
                 "move_line_id": move_line.id,
-                "quantity": move_line.reserved_uom_qty - 4,  # Scan 6 qty
+                "quantity": move_line.quantity - 4,  # Scan 6 qty
                 "barcode": self.dest_location.barcode,
             },
         )
@@ -640,7 +640,7 @@ class LocationContentTransferSetDestinationXCase(LocationContentTransferCommonCa
         # the initial picking should be done
         # Check move line data
         self.assertEqual(move_line.move_id.product_uom_qty, 6)
-        self.assertEqual(move_line.reserved_uom_qty, 0)
+        self.assertEqual(move_line.quantity, 0)
         self.assertEqual(move_line.qty_done, 6)
         self.assertEqual(move_line.state, "done")
         self.assertEqual(picking.state, "done")
@@ -766,7 +766,7 @@ class LocationContentTransferSetDestinationXSpecialCase(
         self.assertEqual(len(original_picking.move_ids), 2)
         self.assertEqual(len(self.move_product_b.move_line_ids), 2)
         move_line = self.move_product_b.move_line_ids.filtered(
-            lambda ml: ml.reserved_uom_qty == 6
+            lambda ml: ml.quantity == 6
         )
         self._simulate_selected_move_line(move_line)
         response = self.service.dispatch(
@@ -774,7 +774,7 @@ class LocationContentTransferSetDestinationXSpecialCase(
             params={
                 "location_id": self.content_loc.id,
                 "move_line_id": move_line.id,
-                "quantity": move_line.reserved_uom_qty,
+                "quantity": move_line.quantity,
                 "barcode": self.dest_location.barcode,
             },
         )
@@ -784,7 +784,7 @@ class LocationContentTransferSetDestinationXSpecialCase(
         self.assertEqual(done_picking.state, "done")
         self.assertEqual(original_picking.state, "assigned")
         self.assertEqual(move_line.move_id.product_uom_qty, 6)
-        self.assertEqual(move_line.reserved_uom_qty, 0)
+        self.assertEqual(move_line.quantity, 0)
         self.assertEqual(move_line.qty_done, 6)
         self.assertEqual(move_line.location_dest_id, self.dest_location)
         self.assertEqual(len(original_picking.move_ids), 2)
@@ -804,7 +804,7 @@ class LocationContentTransferSetDestinationXSpecialCase(
         )
         self.assertEqual(remaining_move.state, "assigned")
         self.assertEqual(remaining_move.product_uom_qty, 4)
-        self.assertEqual(remaining_move.move_line_ids.reserved_uom_qty, 4)
+        self.assertEqual(remaining_move.move_line_ids.quantity, 4)
         self.assertEqual(remaining_move.move_line_ids.qty_done, 4)
         # Check the response
         move_lines = self.service._find_transfer_move_lines(self.content_loc)
@@ -827,7 +827,7 @@ class LocationContentTransferSetDestinationXSpecialCase(
                 params={
                     "location_id": self.content_loc.id,
                     "move_line_id": ml.id,
-                    "quantity": ml.reserved_uom_qty,
+                    "quantity": ml.quantity,
                     "barcode": self.dest_location.barcode,
                 },
             )
@@ -903,7 +903,7 @@ class LocationContentTransferSetDestinationChainSpecialCase(
             lambda m: m.product_id == self.product_c
         )
 
-        self.assertEqual(move_line_c.reserved_uom_qty, 10)
+        self.assertEqual(move_line_c.quantity, 10)
         self.assertEqual(move_line_c.qty_done, 10)
         # Scan partial qty (6/10)
         self.service.dispatch(
@@ -911,13 +911,13 @@ class LocationContentTransferSetDestinationChainSpecialCase(
             params={
                 "location_id": self.content_loc.id,
                 "move_line_id": move_line_c.id,
-                "quantity": move_line_c.reserved_uom_qty - 4,  # Scan 6 qty
+                "quantity": move_line_c.quantity - 4,  # Scan 6 qty
                 "barcode": self.dest_location.barcode,
             },
         )
         # Check move line data
         self.assertEqual(move_line_c.move_id.product_uom_qty, 6)
-        self.assertEqual(move_line_c.reserved_uom_qty, 0)
+        self.assertEqual(move_line_c.quantity, 0)
         self.assertEqual(move_line_c.qty_done, 6)
         self.assertEqual(move_line_c.state, "done")
         # the move has been split
@@ -928,7 +928,7 @@ class LocationContentTransferSetDestinationChainSpecialCase(
         self.assertEqual(move.state, "assigned")
         move_line = move.move_line_ids
         self.assertEqual(move_line.move_id.product_uom_qty, 4)
-        self.assertEqual(move_line.reserved_uom_qty, 4)
+        self.assertEqual(move_line.quantity, 4)
         self.assertEqual(move_line.qty_done, 4)
 
     def test_set_destination_package_partial_qty_with_move_orig_ids(self):
@@ -943,8 +943,8 @@ class LocationContentTransferSetDestinationChainSpecialCase(
         package1 = self.env["stock.quant.package"].create({})
         package2 = self.env["stock.quant.package"].create({})
         line1 = picking_a.move_line_ids
-        line2 = line1.copy({"reserved_uom_qty": 4, "qty_done": 4})
-        line1.with_context(bypass_reservation_update=True).reserved_uom_qty = 6
+        line2 = line1.copy({"quantity": 4, "qty_done": 4})
+        line1.with_context(bypass_reservation_update=True).quantity = 6
         line1.qty_done = 6
         line1.result_package_id = package1
         line2.result_package_id = package2
@@ -958,7 +958,7 @@ class LocationContentTransferSetDestinationChainSpecialCase(
         move_line = picking_b.move_line_ids.filtered(lambda m: m.package_id == package1)
         move = move_line.move_id
 
-        self.assertEqual(move_line.reserved_uom_qty, 6.0)
+        self.assertEqual(move_line.quantity, 6.0)
         self.assertEqual(move_line.qty_done, 6.0)
         self._simulate_selected_move_line(move_line)
         # Scan partial qty (6/10)
@@ -973,7 +973,7 @@ class LocationContentTransferSetDestinationChainSpecialCase(
         )
         # Check move line data
         self.assertEqual(move_line.move_id.product_uom_qty, 6)
-        self.assertEqual(move_line.reserved_uom_qty, 0)
+        self.assertEqual(move_line.quantity, 0)
         self.assertEqual(move_line.qty_done, 6)
         self.assertEqual(move_line.state, "done")
         # the move has been split
@@ -983,7 +983,7 @@ class LocationContentTransferSetDestinationChainSpecialCase(
         self.assertEqual(move.state, "assigned")
         move_line = move.move_line_ids
         self.assertEqual(move_line.move_id.product_uom_qty, 4)
-        self.assertEqual(move_line.reserved_uom_qty, 4)
+        self.assertEqual(move_line.quantity, 4)
         self.assertEqual(move_line.qty_done, 4)
 
 
@@ -1034,7 +1034,7 @@ class LocationContentTransferSetDestinationNextOperationSpecialCase(
             params={
                 "location_id": self.content_loc.id,
                 "move_line_id": move_line.id,
-                "quantity": move_line.reserved_uom_qty - 4,  # Scan 6 qty
+                "quantity": move_line.quantity - 4,  # Scan 6 qty
                 "barcode": self.dest_location.barcode,
             },
         )
@@ -1052,7 +1052,7 @@ class LocationContentTransferSetDestinationNextOperationSpecialCase(
         )
         # check that the next operation has the appropriate attributes
         move_line = backorder.move_line_ids
-        self.assertEqual(move_line.reserved_uom_qty, 4)
+        self.assertEqual(move_line.quantity, 4)
         self.assertEqual(move_line.qty_done, 4)
         self.assertEqual(move_line.picking_id.user_id, self.env.user)
         # if we process the quantity of the backorder, the next operation should
@@ -1063,7 +1063,7 @@ class LocationContentTransferSetDestinationNextOperationSpecialCase(
             params={
                 "location_id": self.content_loc.id,
                 "move_line_id": move_line.id,
-                "quantity": move_line.reserved_uom_qty,  # Scan 6 qty
+                "quantity": move_line.quantity,  # Scan 6 qty
                 "barcode": self.dest_location.barcode,
             },
         )

odoo/addons/shopfloor/tests/test_location_content_transfer_single.py

@@ -566,7 +566,7 @@ class LocationContentTransferSingleCase(LocationContentTransferCommonCase):
             params={
                 "location_id": self.content_loc.id,
                 "move_line_id": move_line.id,
-                "quantity": move_line.reserved_uom_qty,
+                "quantity": move_line.quantity,
                 "barcode": self.shelf1.barcode,
             },
         )
@@ -817,7 +817,7 @@ class LocationContentTransferSingleSpecialCase(LocationContentTransferCommonCase
         self.assertEqual(len(self.picking.move_ids), 2)
         self.assertEqual(len(self.move_product_b.move_line_ids), 2)
         move_line = self.move_product_b.move_line_ids.filtered(
-            lambda ml: ml.reserved_uom_qty == 4  # 4/10 to stock out
+            lambda ml: ml.quantity == 4  # 4/10 to stock out
         )
         self.assertEqual(self.product_b.qty_available, 10)
         response = self.service.dispatch(
@@ -855,7 +855,7 @@ class LocationContentTransferSingleSpecialCase(LocationContentTransferCommonCase
         self.env.user = self.shopfloor_manager
         self.assertTrue(self.env.user != self.picking.create_uid)
         move_line = self.move_product_b.move_line_ids.filtered(
-            lambda ml: ml.reserved_uom_qty == 4  # 4/10 to stock out
+            lambda ml: ml.quantity == 4  # 4/10 to stock out
         )
         move_line.shopfloor_user_id = self.env.user
         self.service.dispatch(

odoo/addons/shopfloor/tests/test_menu_base.py

@@ -149,7 +149,7 @@ class MenuCountersCommonCase(CommonMenuCase):
             .create(
                 {
                     "name": "Product E",
-                    "type": "product",
+                    "is_storable": True,
                     "default_code": "E",
                     "barcode": "E",
                     "weight": 3,
@@ -162,7 +162,7 @@ class MenuCountersCommonCase(CommonMenuCase):
             .create(
                 {
                     "name": "Product F",
-                    "type": "product",
+                    "is_storable": True,
                     "default_code": "F",
                     "barcode": "F",
                     "weight": 3,
@@ -175,7 +175,7 @@ class MenuCountersCommonCase(CommonMenuCase):
             .create(
                 {
                     "name": "Product G",
-                    "type": "product",
+                    "is_storable": True,
                     "default_code": "G",
                     "barcode": "G",
                     "weight": 3,
@@ -188,7 +188,7 @@ class MenuCountersCommonCase(CommonMenuCase):
             .create(
                 {
                     "name": "Product H",
-                    "type": "product",
+                    "is_storable": True,
                     "default_code": "H",
                     "barcode": "H",
                     "weight": 3,

odoo/addons/shopfloor/tests/test_move_action_assign.py

@@ -35,7 +35,7 @@ class TestStockMoveActionAssign(CommonCase):
         An override of ``StockPicking._check_move_lines_map_quant_package()`` ensures
         that we ignore:
 
-        * picked lines (qty_done > 0)
+        * picked lines
         * lines with a different result package already
         """
         package = self.env["stock.quant.package"].create({"name": "Src Pack"})
@@ -56,7 +56,7 @@ class TestStockMoveActionAssign(CommonCase):
         line = move.move_line_ids
 
         # we are no longer moving the entire package
-        line.qty_done = 20
+        line._pick_qty(20)
         line.result_package_id = dest_package1
 
         # create remaining quantity
@@ -65,7 +65,12 @@ class TestStockMoveActionAssign(CommonCase):
             picking.location_id, self.product_a, 30, package=new_package
         )
 
+        # Starting from Odoo 17.0+, if a move has been picked (even partially)
+        # no reservation can be done anymore on it (see '_action_assign()' method).
+        # To allow the 2nd reservation we have to unpicked first the 20 units.
+        line.picked = False
         move._action_assign()
+        line.picked = True  # Re-pick the 20 units
         new_line = move.move_line_ids - line
 
         # At the end of _action_assign(), StockPicking._check_entire_pack() is
@@ -81,7 +86,17 @@ class TestStockMoveActionAssign(CommonCase):
         self.assertRecordValues(
             line + new_line,
             [
-                {"qty_done": 20, "result_package_id": dest_package1.id},
-                {"qty_done": 0, "result_package_id": new_package.id},
+                {
+                    "quantity": 20,
+                    "qty_picked": 20,
+                    "picked": True,
+                    "result_package_id": dest_package1.id,
+                },
+                {
+                    "quantity": 30,
+                    "qty_picked": 0,
+                    "picked": False,
+                    "result_package_id": new_package.id,
+                },
             ],
         )

odoo/addons/shopfloor/tests/test_single_pack_transfer.py

@@ -2,7 +2,7 @@
 # Copyright 2020 Akretion (http://www.akretion.com)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from odoo.tests.common import Form
+from odoo.tests import Form
 
 from .test_single_pack_transfer_base import SinglePackTransferCommonBase
 
@@ -81,7 +81,7 @@ class TestSinglePackTransfer(SinglePackTransferCommonBase):
             "name": package_level.package_id.name,
             "weight_uom": package_level.package_id.weight_uom_id.name,
             "weight": package_level.package_id.pack_weight,
-            "estimated_weight_kg": package_level.package_id.estimated_pack_weight_kg,
+            "estimated_weight_kg": package_level.package_id.shopfloor_weight,
             "location_src": self.data.location(package_level.location_id),
             "location_dest": self.data.location(package_level.location_dest_id),
             "picking": self.data.picking(self.picking),
@@ -194,7 +194,7 @@ class TestSinglePackTransfer(SinglePackTransferCommonBase):
             "name": package_level.package_id.name,
             "weight_uom": package_level.package_id.weight_uom_id.name,
             "weight": package_level.package_id.pack_weight,
-            "estimated_weight_kg": package_level.package_id.estimated_pack_weight_kg,
+            "estimated_weight_kg": package_level.package_id.shopfloor_weight,
             "location_src": self.data.location(self.shelf1),
             "location_dest": self.data.location(
                 self.picking_type.default_location_dest_id

odoo/addons/shopfloor/tests/test_stock_split.py

@@ -13,7 +13,6 @@ class TestStockSplit(TransactionCase):
         super().setUpClass()
         cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True))
         cls.warehouse = cls.env.ref("stock.warehouse0")
-        cls.warehouse.delivery_steps = "pick_pack_ship"
         cls.customer_location = cls.env.ref("stock.stock_location_customers")
         cls.pack_location = cls.warehouse.wh_pack_stock_loc_id
         cls.ship_location = cls.warehouse.wh_output_stock_loc_id
@@ -25,7 +24,7 @@ class TestStockSplit(TransactionCase):
             .create(
                 {
                     "name": "Product A",
-                    "type": "product",
+                    "is_storable": True,
                     "default_code": "A",
                     "barcode": "A",
                     "weight": 2,
@@ -49,7 +48,7 @@ class TestStockSplit(TransactionCase):
             .create(
                 {
                     "name": "Product B",
-                    "type": "product",
+                    "is_storable": True,
                     "default_code": "B",
                     "barcode": "B",
                     "weight": 2,
@@ -95,7 +94,37 @@ class TestStockSplit(TransactionCase):
                 "warehouse_id": cls.warehouse.id,
                 "picking_type_id": cls.warehouse.out_type_id.id,
                 "procure_method": "make_to_order",
-                "state": "draft",
+                "state": "waiting",
+            }
+        )
+        cls.pack_move_a = cls.env["stock.move"].create(
+            {
+                "name": cls.product_a.display_name,
+                "product_id": cls.product_a.id,
+                "product_uom_qty": 15.0,
+                "product_uom": cls.product_a.uom_id.id,
+                "location_id": cls.pack_location.id,
+                "location_dest_id": cls.ship_location.id,
+                "warehouse_id": cls.warehouse.id,
+                "picking_type_id": cls.warehouse.pack_type_id.id,
+                "procure_method": "make_to_order",
+                "state": "waiting",
+                "move_dest_ids": [(4, cls.ship_move_a.id)],
+            }
+        )
+        cls.pick_move_a = cls.env["stock.move"].create(
+            {
+                "name": cls.product_a.display_name,
+                "product_id": cls.product_a.id,
+                "product_uom_qty": 15.0,
+                "product_uom": cls.product_a.uom_id.id,
+                "location_id": cls.stock_location.id,
+                "location_dest_id": cls.pack_location.id,
+                "warehouse_id": cls.warehouse.id,
+                "picking_type_id": cls.warehouse.pick_type_id.id,
+                "procure_method": "make_to_stock",
+                "state": "confirmed",
+                "move_dest_ids": [(4, cls.pack_move_a.id)],
             }
         )
         cls.ship_move_b = cls.env["stock.move"].create(
@@ -109,15 +138,47 @@ class TestStockSplit(TransactionCase):
                 "warehouse_id": cls.warehouse.id,
                 "picking_type_id": cls.warehouse.out_type_id.id,
                 "procure_method": "make_to_order",
-                "state": "draft",
+                "state": "waiting",
+            }
+        )
+        cls.pack_move_b = cls.env["stock.move"].create(
+            {
+                "name": cls.product_b.display_name,
+                "product_id": cls.product_b.id,
+                "product_uom_qty": 4.0,
+                "product_uom": cls.product_b.uom_id.id,
+                "location_id": cls.pack_location.id,
+                "location_dest_id": cls.ship_location.id,
+                "warehouse_id": cls.warehouse.id,
+                "picking_type_id": cls.warehouse.pack_type_id.id,
+                "procure_method": "make_to_order",
+                "state": "waiting",
+                "move_dest_ids": [(4, cls.ship_move_b.id)],
+            }
+        )
+        cls.pick_move_b = cls.env["stock.move"].create(
+            {
+                "name": cls.product_b.display_name,
+                "product_id": cls.product_b.id,
+                "product_uom_qty": 4.0,
+                "product_uom": cls.product_b.uom_id.id,
+                "location_id": cls.stock_location.id,
+                "location_dest_id": cls.pack_location.id,
+                "warehouse_id": cls.warehouse.id,
+                "picking_type_id": cls.warehouse.pick_type_id.id,
+                "procure_method": "make_to_stock",
+                "state": "confirmed",
+                "move_dest_ids": [(4, cls.pack_move_b.id)],
             }
         )
-        (cls.ship_move_a | cls.ship_move_b)._assign_picking()
-        (cls.ship_move_a | cls.ship_move_b)._action_confirm(merge=False)
-        cls.pack_move_a = cls.ship_move_a.move_orig_ids[0]
-        cls.pick_move_a = cls.pack_move_a.move_orig_ids[0]
-        cls.pack_move_b = cls.ship_move_b.move_orig_ids[0]
-        cls.pick_move_b = cls.pack_move_b.move_orig_ids[0]
+        (
+            cls.ship_move_a
+            | cls.ship_move_b
+            | cls.pack_move_a
+            | cls.pack_move_b
+            | cls.pick_move_a
+            | cls.pick_move_b
+        )._assign_picking()
         cls.picking = cls.pick_move_a.picking_id
         cls.packing = cls.pack_move_a.picking_id
         cls.picking.action_assign()
@@ -146,7 +207,7 @@ class TestStockSplit(TransactionCase):
         # Pick goods from stock and move some of them to a different destination
         self.assertEqual(self.pick_move_a.state, "assigned")
         for i, move_line in enumerate(self.pick_move_a.move_line_ids):
-            move_line.qty_done = move_line.reserved_uom_qty
+            move_line._pick_qty(move_line.quantity)
             if i % 2:
                 move_line.location_dest_id = dest_location
         self.pick_move_a.extract_and_action_done()
@@ -159,7 +220,8 @@ class TestStockSplit(TransactionCase):
         self.assertEqual(len(self.pack_move_a.move_line_ids), 3)
         self.assertEqual(len(self.packing.package_level_ids), 3)
         self.assertEqual(len(move_lines_to_process), 1)
-        new_packing = move_lines_to_process._split_pickings_from_source_location()
+        move_lines_to_process._extract_in_split_order()
+        new_packing = self.packing.backorder_ids
         self.assertEqual(len(self.packing.package_level_ids), 2)
         self.assertEqual(len(new_packing.package_level_ids), 1)
         self.assertEqual(len(new_packing.move_line_ids), 1)
@@ -176,8 +238,7 @@ class TestStockSplit(TransactionCase):
     def test_extract_and_action_done_one_assigned_move(self):
         self.assertFalse(self.picking.backorder_ids)
         self.assertEqual(self.picking.state, "assigned")
-        for move_line in self.pick_move_b.move_line_ids:
-            move_line.qty_done = move_line.reserved_uom_qty
+        self.pick_move_b.move_line_ids.picked = True
         self.pick_move_b.extract_and_action_done()
         new_picking = self.picking.backorder_ids
         self.assertTrue(new_picking)
@@ -192,8 +253,7 @@ class TestStockSplit(TransactionCase):
     def test_extract_and_action_done_multiple_assigned_moves(self):
         self.assertFalse(self.picking.backorder_ids)
         self.assertEqual(self.picking.state, "assigned")
-        for move_line in self.picking.move_line_ids:
-            move_line.qty_done = move_line.reserved_uom_qty
+        self.picking.move_line_ids.picked = True
         self.picking.move_ids.extract_and_action_done()
         # No backorder as all moves of the picking have been validated
         new_picking = self.picking.backorder_ids