Merge pull request #235 from ForgeFlow/14.0-fix-separate_stock_moves_handle_serial_lot

[14.0][FIX] rma: separate stock.move by rma_line_id to fix picking association

rma/models/stock_move.py

@@ -99,3 +99,8 @@ class StockMove(models.Model):
             owner_id=owner_id,
             strict=strict,
         )
+
+    @api.model
+    def _prepare_merge_moves_distinct_fields(self):
+        res = super()._prepare_merge_moves_distinct_fields()
+        return res + ["rma_line_id"]