From 924e565542b7970536a5bf20bd9d14f82d473beb Mon Sep 17 00:00:00 2001
From: JasminSForgeFlow <jasmin.solanki@forgeflow.com>
Date: Thu, 28 Nov 2024 18:05:37 +0530
Subject: [PATCH] [MIG] rma_sale: Migration to 18.0

---
 rma_sale/__manifest__.py                                 | 2 +-
 rma_sale/tests/test_rma_sale.py                          | 4 ++--
 rma_sale/tests/test_rma_stock_account_sale.py            | 2 +-
 rma_sale/views/rma_operation_view.xml                    | 2 +-
 rma_sale/views/rma_order_view.xml                        | 2 +-
 rma_sale/wizards/rma_add_sale.xml                        | 4 ++--
 rma_sale/wizards/rma_order_line_make_sale_order_view.xml | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/rma_sale/__manifest__.py b/rma_sale/__manifest__.py
index 0bd2d5212..e8ec935a4 100644
--- a/rma_sale/__manifest__.py
+++ b/rma_sale/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "RMA Sale",
-    "version": "17.0.1.0.0",
+    "version": "18.0.1.0.0",
     "license": "LGPL-3",
     "category": "RMA",
     "summary": "Links RMA with Sales Orders",
diff --git a/rma_sale/tests/test_rma_sale.py b/rma_sale/tests/test_rma_sale.py
index af12ef9fa..76dec9f78 100644
--- a/rma_sale/tests/test_rma_sale.py
+++ b/rma_sale/tests/test_rma_sale.py
@@ -26,10 +26,10 @@ def setUpClass(cls):
 
         # Create products
         cls.product_1 = cls.product_obj.create(
-            {"name": "Test Product 1", "type": "product", "list_price": 100.0}
+            {"name": "Test Product 1", "is_storable": True, "list_price": 100.0}
         )
         cls.product_2 = cls.product_obj.create(
-            {"name": "Test Product 2", "type": "product", "list_price": 150.0}
+            {"name": "Test Product 2", "is_storable": True, "list_price": 150.0}
         )
 
         # Create SO:
diff --git a/rma_sale/tests/test_rma_stock_account_sale.py b/rma_sale/tests/test_rma_stock_account_sale.py
index 4868a4f3c..fc081aac3 100644
--- a/rma_sale/tests/test_rma_stock_account_sale.py
+++ b/rma_sale/tests/test_rma_stock_account_sale.py
@@ -1,7 +1,7 @@
 # Copyright 2022 ForgeFlow S.L.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
 
-from odoo.tests.common import Form
+from odoo.tests import Form
 
 # pylint: disable=odoo-addons-relative-import
 from odoo.addons.rma_account.tests.test_rma_stock_account import TestRmaStockAccount
diff --git a/rma_sale/views/rma_operation_view.xml b/rma_sale/views/rma_operation_view.xml
index 3fb083b41..5cb1f1960 100644
--- a/rma_sale/views/rma_operation_view.xml
+++ b/rma_sale/views/rma_operation_view.xml
@@ -2,7 +2,7 @@
 <odoo>
 
         <record id="rma_operation_tree" model="ir.ui.view">
-            <field name="name">rma.operation.tree</field>
+            <field name="name">rma.operation.list</field>
             <field name="model">rma.operation</field>
             <field name="inherit_id" ref="rma.rma_operation_tree" />
             <field name="arch" type="xml">
diff --git a/rma_sale/views/rma_order_view.xml b/rma_sale/views/rma_order_view.xml
index e8a1767ed..2da54ff53 100644
--- a/rma_sale/views/rma_order_view.xml
+++ b/rma_sale/views/rma_order_view.xml
@@ -17,7 +17,7 @@
                         <field name="sale_count" widget="statinfo" string="Origin SO" />
                     </button>
                 </div>
-                <xpath expr="//field[@name='rma_line_ids']/tree" position="inside">
+                <xpath expr="//field[@name='rma_line_ids']/list" position="inside">
                     <field name="sale_policy" invisible="True" />
                 </xpath>
             </field>
diff --git a/rma_sale/wizards/rma_add_sale.xml b/rma_sale/wizards/rma_add_sale.xml
index 9743b2486..60331073b 100644
--- a/rma_sale/wizards/rma_add_sale.xml
+++ b/rma_sale/wizards/rma_add_sale.xml
@@ -23,7 +23,7 @@
                     domain="[('order_id', '=', sale_id)]"
                     string="Sale Order Lines"
                 >
-                    <tree>
+                    <list>
                         <field name="product_id" invisible="1" />
                         <field name="order_id" />
                         <field name="order_partner_id" />
@@ -39,7 +39,7 @@
                             groups="uom.group_uom"
                         />
                         <field name="price_subtotal" sum="Total" widget="monetary" />
-                    </tree>
+                    </list>
 
                 </field>
                 <field name="show_lot_filter" invisible="1" />
diff --git a/rma_sale/wizards/rma_order_line_make_sale_order_view.xml b/rma_sale/wizards/rma_order_line_make_sale_order_view.xml
index 8709ec842..00e9f6b9d 100644
--- a/rma_sale/wizards/rma_order_line_make_sale_order_view.xml
+++ b/rma_sale/wizards/rma_order_line_make_sale_order_view.xml
@@ -27,7 +27,7 @@
                      <newline />
                      <group>
                          <field name="item_ids" nolabel="1" colspan="2">
-                              <tree name="Details" editable="bottom">
+                              <list name="Details" editable="bottom">
                                   <field name="wiz_id" invisible="True" />
                                   <field name="line_id" invisible="True" />
                                   <field name="product_id" />
@@ -35,7 +35,7 @@
                                   <field name="product_qty" />
                                   <field name="product_uom_id" groups="uom.group_uom" />
                                   <field name="free_of_charge" />
-                              </tree>
+                              </list>
                          </field>
                      </group>
                      <footer colspan="2">