Merge PR #402 into 16.0

Signed-off-by pedrobaeza
OCA · Jun 28, 2024 · 0166be4 · 0166be4
2 parents 54f601c + 28df77d
commit 0166be4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
@@ -76,7 +76,6 @@ def setUpClass(cls):
             {"name": "[Test] It's out of warranty. To be scrapped"}
         )
         cls.env.ref("rma.group_rma_manual_finalization").users |= cls.env.user
-        cls.env.ref("stock.group_stock_multi_locations").users |= cls.env.user
         cls.warehouse = cls.env.ref("stock.warehouse0")
         # Ensure grouping
         cls.env.company.rma_return_grouping = True

diff --git a/rma/wizard/stock_picking_return_views.xml b/rma/wizard/stock_picking_return_views.xml
@@ -17,6 +17,7 @@
                     <field name="rma_location_ids" invisible="1" />
                     <field name="picking_id" invisible="1" />
                     <field name="picking_type_code" invisible="1" />
+                    <field name="location_id" invisible="1" />
                 </group>
             </field>
         </field>