From 8dff5e3299ec7dd0a35e4bca00b389b8846b31f5 Mon Sep 17 00:00:00 2001
From: Christopher Ormaza <chris.ormaza@forgeflow.com>
Date: Thu, 3 Mar 2022 11:53:14 -0500
Subject: [PATCH] [14.0][FIX] rma: separate stock.move by rma_line_id to fix
 picking association

---
 rma/models/stock_move.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rma/models/stock_move.py b/rma/models/stock_move.py
index c227e3f9..c17b0170 100644
--- a/rma/models/stock_move.py
+++ b/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"]