[FIX] repair_stock_consumption_step: cancel consumption picking when cancelling the repair

Author: nicolas-delbovier-acsone

repair_stock_consumption_step/models/repair_order.py

@@ -38,7 +38,9 @@ def action_repair_done(self):
                 RepairOrder, rec.with_context(dont_validate_repair_move=True)
             ).action_repair_done()
             res.update(rec_res)
-            moves = self.env["stock.move"].search([("repair_id", "=", rec.id)])
+            moves = self.env["stock.move"].search(
+                [("repair_id", "=", rec.id), ("state", "!=", "cancel")]
+            )
             if not moves:
                 continue
             picking = self.env["stock.picking"].create(
@@ -72,6 +74,15 @@ def action_repair_done(self):
             rec.state = "consumption"
         return res
 
+    def action_repair_cancel(self):
+        res = super().action_repair_cancel()
+        if self.consumption_picking_id and self.consumption_picking_id.state not in (
+            "done",
+            "cancel",
+        ):
+            self.consumption_picking_id.action_cancel()
+        return res
+
     def action_repair_end(self):
         super().action_repair_end()
         need_consumption_step = self.filtered("consumption_picking_id")

repair_stock_consumption_step/tests/test_repair_stock_consumption_step.py

@@ -49,3 +49,30 @@ def test_repair_done_with_consumption_step_invoice_after_repair(self):
         self.assertEqual(self.repair.state, "consumption")
         self._do_picking(self.repair.consumption_picking_id)
         self.assertEqual(self.repair.state, "2binvoiced")
+
+    def test_repair_cancelled(self):
+        self.repair.action_repair_end()
+        self.assertTrue(self.repair.consumption_picking_id)
+        self.repair.action_repair_cancel()
+        self.assertEqual(self.repair.consumption_picking_id.state, "cancel")
+        self.assertTrue(
+            all(
+                state == "cancel"
+                for state in self.repair.consumption_picking_id.move_ids.mapped("state")
+            ),
+        )
+
+        # Case: Cancel -> draft -> New consumption
+        # Ensure the old moves do not get transfered to the new consu pick
+        previous_consumption_picking = self.repair.consumption_picking_id
+        previous_consumption_picking_moves = self.repair.consumption_picking_id.move_ids
+        self.repair.action_repair_cancel_draft()
+        self.repair.action_validate()
+        self.repair.action_repair_start()
+        self.repair.action_repair_end()
+        new_consumption_picking = self.repair.consumption_picking_id
+
+        self.assertNotEqual(previous_consumption_picking, new_consumption_picking)
+        self.assertNotIn(
+            previous_consumption_picking_moves, new_consumption_picking.move_ids
+        )