From 8db299c1521ff343e1d4b270e9c574e3409f1aab Mon Sep 17 00:00:00 2001
From: Christopher Ormaza <chris.ormaza@forgeflow.com>
Date: Wed, 23 Oct 2024 10:17:08 -0500
Subject: [PATCH] fix: ci

---
 rma/tests/test_rma.py | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
index 0ae4a9020..61a90eeea 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -3,6 +3,7 @@
 
 from odoo.exceptions import UserError, ValidationError
 from odoo.tests import Form, common
+from odoo.tools.safe_eval import safe_eval
 
 
 class TestRma(common.TransactionCase):
@@ -129,11 +130,20 @@ def _deliver_rma(cls, rma_line_ids):
         ).create({})
         wizard._create_picking()
         res = rma_line_ids.action_view_out_shipments()
-        picking = cls.env["stock.picking"].browse(res["res_id"])
-        picking.action_assign()
-        for mv in picking.move_ids:
-            mv.quantity_done = mv.product_uom_qty
-        picking._action_done()
+        picking = cls.env["stock.picking"].browse()
+        if res["res_id"]:
+            picking = cls.env["stock.picking"].browse(res["res_id"])
+        elif res.get("domain", False):
+            domain = res["domain"]
+            if isinstance(domain, str):
+                domain = safe_eval(domain)
+            picking = cls.env["stock.picking"].browse(domain[0][2])
+        if picking:
+            for pick in picking:
+                pick.action_assign()
+                for mv in pick.move_ids:
+                    mv.quantity_done = mv.product_uom_qty
+                pick._action_done()
         return picking
 
     @classmethod