diff --git a/rma_purchase/__manifest__.py b/rma_purchase/__manifest__.py
index 98267c08..ac0b9fa2 100644
--- a/rma_purchase/__manifest__.py
+++ b/rma_purchase/__manifest__.py
@@ -2,7 +2,7 @@
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
 {
     "name": "RMA Purchase",
-    "version": "17.0.1.0.0",
+    "version": "18.0.1.0.0",
     "category": "RMA",
     "summary": "RMA from PO",
     "license": "LGPL-3",
diff --git a/rma_purchase/tests/test_rma_purchase.py b/rma_purchase/tests/test_rma_purchase.py
index 8b4f546f..f16310d7 100644
--- a/rma_purchase/tests/test_rma_purchase.py
+++ b/rma_purchase/tests/test_rma_purchase.py
@@ -25,16 +25,10 @@ class TestRmaPurchase(common.TransactionCase):
 
         # Create products
         self.product_1 = self.product_obj.create(
-            {
-                "name": "Test Product 1",
-                "type": "product",
-            }
+            {"name": "Test Product 1", "is_storable": True}
         )
         self.product_2 = self.product_obj.create(
-            {
-                "name": "Test Product 2",
-                "type": "product",
-            }
+            {"name": "Test Product 2", "is_storable": True}
         )
 
         # Create PO:
diff --git a/rma_purchase/tests/test_rma_stock_account_purchase.py b/rma_purchase/tests/test_rma_stock_account_purchase.py
index b43f3209..5a4e9ab8 100644
--- a/rma_purchase/tests/test_rma_stock_account_purchase.py
+++ b/rma_purchase/tests/test_rma_stock_account_purchase.py
@@ -2,7 +2,7 @@
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
 
 from odoo.fields import Date, Datetime
-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_purchase/views/rma_order_line_view.xml b/rma_purchase/views/rma_order_line_view.xml
index ab839d01..c84368ac 100644
--- a/rma_purchase/views/rma_order_line_view.xml
+++ b/rma_purchase/views/rma_order_line_view.xml
@@ -5,7 +5,7 @@
         <field name="name">Purchase Order</field>
         <field name="res_model">purchase.order</field>
         <field name="target">current</field>
-        <field name="view_mode">form,tree</field>
+        <field name="view_mode">form,list</field>
     </record>
 
     <record id="view_rma_line_form" model="ir.ui.view">
diff --git a/rma_purchase/wizards/rma_add_purchase.xml b/rma_purchase/wizards/rma_add_purchase.xml
index be999935..8f1b9db0 100644
--- a/rma_purchase/wizards/rma_add_purchase.xml
+++ b/rma_purchase/wizards/rma_add_purchase.xml
@@ -23,7 +23,7 @@
                     domain="[('order_id', '=', purchase_id)]"
                     string="Purchase Order Lines"
                 >
-                    <tree name="Purchase Order Lines">
+                    <list name="Purchase Order Lines">
                         <field name="order_id" />
                         <field name="name" />
                         <field name="partner_id" string="Vendor" />
@@ -33,7 +33,7 @@
                         <field name="product_uom" groups="uom.group_uom" />
                         <field name="price_subtotal" widget="monetary" />
                         <field name="date_planned" widget="date" />
-                    </tree>
+                    </list>
                 </field>
                 <footer>
                     <button
diff --git a/rma_purchase/wizards/rma_order_line_make_purchase_order_view.xml b/rma_purchase/wizards/rma_order_line_make_purchase_order_view.xml
index 03eed7cc..6e6fdba8 100644
--- a/rma_purchase/wizards/rma_order_line_make_purchase_order_view.xml
+++ b/rma_purchase/wizards/rma_order_line_make_purchase_order_view.xml
@@ -24,14 +24,14 @@
                  <newline />
                  <group>
                      <field name="item_ids" nolabel="1" colspan="2">
-                          <tree name="Details" editable="bottom" create="false">
+                          <list name="Details" editable="bottom" create="false">
                               <field name="line_id" options="{'no_open': true}" />
                               <field name="product_id" />
                               <field name="name" />
                               <field name="product_qty" />
                               <field name="product_uom_id" groups="uom.group_uom" />
                               <field name="free_of_charge" />
-                          </tree>
+                          </list>
                      </field>
                  </group>
                  <newline />