[IMP] shopfloor: location_content_transfer: Let Odoo manage the backo…

…rder strategy

Prior to this change, when a line was partially picking the  created a new move for the remaining qty. We now let the validation mechanism of odoo create the remaining move since it will take into account the backorder strategy defined on the picking type

shopfloor/services/location_content_transfer.py

@@ -764,9 +764,6 @@ def set_destination_line(
         self._lock_lines(move_line)
 
         move_line.qty_done = quantity
-        remaining_move_line = move_line._split_partial_quantity()
-        move_line._extract_in_split_order({"user_id": self.env.uid})
-        remaining_move_line.qty_done = remaining_move_line.reserved_uom_qty
 
         self._write_destination_on_lines(move_line, scanned_location)
         stock = self._actions_for("stock")

shopfloor/tests/test_location_content_transfer_base.py

@@ -37,6 +37,11 @@ def setUp(self):
         self.service = self.get_service(
             "location_content_transfer", menu=self.menu, profile=self.profile
         )
+        self.stock_action = self.service._actions_for("stock")
+
+    def _simulate_selected_move_line(self, move_line):
+        """Mark the move line as picked (as it's done into the scan_location method)"""
+        self.stock_action.mark_move_line_as_picked(move_line)
 
     @classmethod
     def _simulate_pickings_selected(cls, pickings):

shopfloor/tests/test_location_content_transfer_set_destination_package_or_line.py

@@ -59,6 +59,7 @@ def test_set_destination_package_wrong_parameters(self):
         user to the 'start' screen.
         """
         package_level = self.picking1.package_level_ids[0]
+        self._simulate_selected_move_line(package_level.move_line_ids)
         response = self.service.dispatch(
             "set_destination_package",
             params={
@@ -87,6 +88,7 @@ def test_set_destination_package_wrong_parameters(self):
     def test_set_destination_package_dest_location_nok(self):
         """Scanned destination location not valid, redirect to 'scan_destination'."""
         package_level = self.picking1.package_level_ids[0]
+        self._simulate_selected_move_line(package_level.move_line_ids)
         # Unknown destination location
         response = self.service.dispatch(
             "set_destination_package",
@@ -127,6 +129,7 @@ def test_set_destination_package_dest_location_move_nok(self):
         move = package_level.move_line_ids.move_id
         move.location_dest_id = self.shelf1
         move.picking_id.location_dest_id = self.shelf1
+        self._simulate_selected_move_line(package_level.move_line_ids)
         response = self.service.dispatch(
             "set_destination_package",
             params={
@@ -144,6 +147,7 @@ def test_set_destination_package_dest_location_move_nok(self):
     def test_set_destination_package_dest_location_to_confirm(self):
         """Scanned destination location valid, but need a confirmation."""
         package_level = self.picking1.package_level_ids[0]
+        self._simulate_selected_move_line(package_level.move_line_ids)
         response = self.service.dispatch(
             "set_destination_package",
             params={
@@ -163,6 +167,7 @@ def test_set_destination_package_dest_location_ok(self):
         """Scanned destination location valid, moves set to done."""
         original_picking = self.picking1
         package_level = original_picking.package_level_ids[0]
+        self._simulate_selected_move_line(package_level.move_line_ids)
         response = self.service.dispatch(
             "set_destination_package",
             params={
@@ -207,6 +212,7 @@ def test_set_destination_package_dest_location_ok_with_completion_info(self):
         next_move._assign_picking()
         self.assertEqual(next_move.state, "waiting")
         self.assertTrue(next_move.picking_id)
+        self._simulate_selected_move_line(package_level.move_line_ids)
         response = self.service.dispatch(
             "set_destination_package",
             params={
@@ -240,6 +246,7 @@ def test_set_destination_line_wrong_parameters(self):
         user to the 'start' screen.
         """
         move_line = self.picking2.move_line_ids[0]
+        self._simulate_selected_move_line(move_line)
         response = self.service.dispatch(
             "set_destination_line",
             params={
@@ -270,6 +277,7 @@ def test_set_destination_line_wrong_parameters(self):
     def test_set_destination_line_dest_location_nok(self):
         """Scanned destination location not valid, redirect to 'scan_destination'."""
         move_line = self.picking2.move_line_ids[0]
+        self._simulate_selected_move_line(move_line)
         # Unknown destination location
         response = self.service.dispatch(
             "set_destination_line",
@@ -311,6 +319,7 @@ def test_set_destination_line_dest_location_move_nok(self):
         # refuse the action
         move_line.move_id.location_dest_id = self.shelf1
         move_line.picking_id.location_dest_id = self.shelf1
+        self._simulate_selected_move_line(move_line)
         response = self.service.dispatch(
             "set_destination_line",
             params={
@@ -329,6 +338,7 @@ def test_set_destination_line_dest_location_move_nok(self):
     def test_set_destination_line_dest_location_to_confirm(self):
         """Scanned destination location valid, but need a confirmation."""
         move_line = self.picking2.move_line_ids[0]
+        self._simulate_selected_move_line(move_line)
         response = self.service.dispatch(
             "set_destination_line",
             params={
@@ -349,6 +359,7 @@ def test_set_destination_line_dest_location_ok(self):
         """Scanned destination location valid, moves set to done."""
         original_picking = self.picking2
         move_line = original_picking.move_line_ids[0]
+        self._simulate_selected_move_line(move_line)
         response = self.service.dispatch(
             "set_destination_line",
             params={
@@ -396,6 +407,7 @@ def test_set_destination_line_dest_location_ok_with_completion_info(self):
         next_move._assign_picking()
         self.assertEqual(next_move.state, "waiting")
         self.assertTrue(next_move.picking_id)
+        self._simulate_selected_move_line(move_line)
         response = self.service.dispatch(
             "set_destination_line",
             params={
@@ -435,9 +447,9 @@ def test_set_destination_line_partial_qty(self):
         move_line_c = original_picking.move_line_ids.filtered(
             lambda m: m.product_id == self.product_c
         )
-        move = move_line_c.move_id
         self.assertEqual(move_line_c.reserved_uom_qty, 10)
         self.assertEqual(move_line_c.qty_done, 10)
+        self._simulate_selected_move_line(move_line_c)
         # Scan partial qty (6/10)
         response = self.service.dispatch(
             "set_destination_line",
@@ -456,13 +468,16 @@ def test_set_destination_line_partial_qty(self):
         self.assertEqual(move_line_c.state, "done")
         self.assertEqual(original_picking.backorder_ids, done_picking)
         self.assertEqual(done_picking.state, "done")
-        # the move is split with the remaining
-        self.assertEqual(original_picking.state, "assigned")
+
+        # the remaining move is put in a backorder
+        move = done_picking.backorder_ids.move_ids
+        self.assertEqual(move.picking_id.state, "assigned")
+
         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.qty_done, 4)
+        self.assertEqual(move.move_line_ids.qty_done, 0)
         # Check the response
         move_lines = self.service._find_transfer_move_lines(self.content_loc)
         self.assert_response_start_single(
@@ -475,7 +490,8 @@ def test_set_destination_line_partial_qty(self):
         self.assertEqual(move_line_c.move_id.state, "done")
         # Scan remaining qty (4/10)
         remaining_move_line_c = move.move_line_ids
-        response = self.service.dispatch(
+        self._simulate_selected_move_line(remaining_move_line_c)
+        self.service.dispatch(
             "set_destination_line",
             params={
                 "location_id": self.content_loc.id,
@@ -508,7 +524,8 @@ def test_set_destination_line_partial_qty(self):
         move_line_d = original_picking.move_line_ids.filtered(
             lambda m: m.product_id == self.product_d
         )
-        response = self.service.dispatch(
+        self._simulate_selected_move_line(move_line_d)
+        self.service.dispatch(
             "set_destination_line",
             params={
                 "location_id": self.content_loc.id,
@@ -596,6 +613,7 @@ def test_set_destination_package_split_move(self):
         self.assertEqual(len(original_picking.move_ids), 2)
         self.assertEqual(len(self.move_product_a.move_line_ids), 2)
         package_level = original_picking.package_level_ids[0]
+        self._simulate_selected_move_line(package_level.move_line_ids)
         response = self.service.dispatch(
             "set_destination_package",
             params={
@@ -642,6 +660,7 @@ def test_set_destination_line_split_move(self):
         move_line = self.move_product_b.move_line_ids.filtered(
             lambda ml: ml.reserved_uom_qty == 6
         )
+        self._simulate_selected_move_line(move_line)
         response = self.service.dispatch(
             "set_destination_line",
             params={
@@ -694,6 +713,7 @@ def test_set_destination_line_split_move(self):
             lambda ml: ml.state == "assigned"
         )
         for ml in remaining_move_lines:
+            self._simulate_selected_move_line(ml)
             self.service.dispatch(
                 "set_destination_line",
                 params={
@@ -705,6 +725,7 @@ def test_set_destination_line_split_move(self):
             )
         self.assertEqual(original_picking.state, "assigned")
         package_level = original_picking.package_level_ids[0]
+        self._simulate_selected_move_line(package_level.move_line_ids)
         self.service.dispatch(
             "set_destination_package",
             params={
@@ -773,7 +794,6 @@ def test_set_destination_line_partial_qty_with_move_orig_ids(self):
         move_line_c = picking_b.move_line_ids.filtered(
             lambda m: m.product_id == self.product_c
         )
-        move = move_line_c.move_id
 
         self.assertEqual(move_line_c.reserved_uom_qty, 10)
         self.assertEqual(move_line_c.qty_done, 10)
@@ -787,22 +807,21 @@ def test_set_destination_line_partial_qty_with_move_orig_ids(self):
                 "barcode": self.dest_location.barcode,
             },
         )
-        done_picking = move_line_c.picking_id
         # Check move line data
-        self.assertEqual(picking_b.backorder_ids, done_picking)
         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.qty_done, 6)
         self.assertEqual(move_line_c.state, "done")
         # the move has been split
+        move = move_line_c.picking_id.backorder_ids.move_ids
         self.assertNotEqual(move_line_c.move_id, move)
 
         # Check the move handling the remaining qty
         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.qty_done, 4)
+        self.assertEqual(move_line.qty_done, 0)
 
     def test_set_destination_package_partial_qty_with_move_orig_ids(self):
         """Scanned destination location with partial qty, but related moves
@@ -833,6 +852,7 @@ def test_set_destination_package_partial_qty_with_move_orig_ids(self):
 
         self.assertEqual(move_line.reserved_uom_qty, 6.0)
         self.assertEqual(move_line.qty_done, 6.0)
+        self._simulate_selected_move_line(move_line)
         # Scan partial qty (6/10)
         self.service.dispatch(
             "set_destination_line",