diff --git a/rma_account/__manifest__.py b/rma_account/__manifest__.py
index 05b4e858d..796f2ec92 100644
--- a/rma_account/__manifest__.py
+++ b/rma_account/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "RMA Account",
-    "version": "17.0.1.0.0",
+    "version": "18.0.1.0.0",
     "license": "LGPL-3",
     "category": "RMA",
     "summary": "Integrates RMA with Invoice Processing",
diff --git a/rma_account/models/rma_order.py b/rma_account/models/rma_order.py
index 1b6f0fab9..6c66a012a 100644
--- a/rma_account/models/rma_order.py
+++ b/rma_account/models/rma_order.py
@@ -97,23 +97,23 @@ def _prepare_rma_data(self, partner, origin_rma):
     def action_view_invoice_refund(self):
         move_ids = self.mapped("rma_line_ids.move_id").ids
         form_view_ref = self.env.ref("account.view_move_form", False)
-        tree_view_ref = self.env.ref("account.view_move_tree", False)
+        list_view_ref = self.env.ref("account.view_move_tree", False)
 
         return {
             "domain": [("id", "in", move_ids)],
             "name": "Refunds",
             "res_model": "account.move",
-            "views": [(tree_view_ref.id, "tree"), (form_view_ref.id, "form")],
+            "views": [(list_view_ref.id, "list"), (form_view_ref.id, "form")],
         }
 
     def action_view_invoice(self):
         move_ids = self.mapped("rma_line_ids.move_id").ids
         form_view_ref = self.env.ref("account.view_move_form", False)
-        tree_view_ref = self.env.ref("account.view_move_tree", False)
+        list_view_ref = self.env.ref("account.view_move_tree", False)
 
         return {
             "domain": [("id", "in", move_ids)],
             "name": "Originating Invoice",
             "res_model": "account.move",
-            "views": [(tree_view_ref.id, "tree"), (form_view_ref.id, "form")],
+            "views": [(list_view_ref.id, "list"), (form_view_ref.id, "form")],
         }
diff --git a/rma_account/models/rma_order_line.py b/rma_account/models/rma_order_line.py
index b659cae52..89d9a891a 100644
--- a/rma_account/models/rma_order_line.py
+++ b/rma_account/models/rma_order_line.py
@@ -281,27 +281,27 @@ def _check_duplicated_lines(self):
 
     def action_view_invoice(self):
         form_view_ref = self.env.ref("account.view_move_form", False)
-        tree_view_ref = self.env.ref("account.view_move_tree", False)
+        list_view_ref = self.env.ref("account.view_move_tree", False)
 
         return {
             "domain": [("id", "in", [self.account_move_line_id.move_id.id])],
             "name": "Originating Invoice",
             "res_model": "account.move",
             "type": "ir.actions.act_window",
-            "views": [(tree_view_ref.id, "tree"), (form_view_ref.id, "form")],
+            "views": [(list_view_ref.id, "list"), (form_view_ref.id, "form")],
         }
 
     def action_view_refunds(self):
         moves = self.mapped("refund_line_ids.move_id")
         form_view_ref = self.env.ref("account.view_move_form", False)
-        tree_view_ref = self.env.ref("account.view_move_tree", False)
+        list_view_ref = self.env.ref("account.view_move_tree", False)
 
         return {
             "domain": [("id", "in", moves.ids)],
             "name": "Refunds",
             "res_model": "account.move",
             "type": "ir.actions.act_window",
-            "views": [(tree_view_ref.id, "tree"), (form_view_ref.id, "form")],
+            "views": [(list_view_ref.id, "list"), (form_view_ref.id, "form")],
         }
 
     def _compute_display_name(self):
diff --git a/rma_account/tests/test_account_move_line_rma_order_line.py b/rma_account/tests/test_account_move_line_rma_order_line.py
index f9ee4fead..21a621afa 100644
--- a/rma_account/tests/test_account_move_line_rma_order_line.py
+++ b/rma_account/tests/test_account_move_line_rma_order_line.py
@@ -87,7 +87,7 @@ def _create_account(cls, acc_type, name, code, company, reconcile=False):
                 "name": name,
                 "code": code,
                 "account_type": acc_type,
-                "company_id": company.id,
+                "company_ids": [(4, company.id)],
                 "reconcile": reconcile,
             }
         )
@@ -110,7 +110,7 @@ def _create_product(cls):
             {
                 "name": "test_product",
                 "categ_id": product_ctg.id,
-                "type": "product",
+                "is_storable": True,
                 "standard_price": 1.0,
                 "list_price": 1.0,
             }
diff --git a/rma_account/tests/test_rma_account.py b/rma_account/tests/test_rma_account.py
index bfc33bb2b..57bb23ff2 100644
--- a/rma_account/tests/test_rma_account.py
+++ b/rma_account/tests/test_rma_account.py
@@ -3,8 +3,7 @@
 
 from odoo import fields
 from odoo.fields import Date
-from odoo.tests import common
-from odoo.tests.common import Form
+from odoo.tests import Form, common
 
 
 class TestRmaAccount(common.SingleTransactionCase):
@@ -68,7 +67,7 @@ def setUpClass(cls):
         cls.product_1 = cls.product_obj.create(
             {
                 "name": "Test Product 1",
-                "type": "product",
+                "is_storable": True,
                 "list_price": 100.0,
                 "rma_customer_operation_id": cls.cust_refund_op.id,
                 "rma_supplier_operation_id": cls.sup_refund_op.id,
@@ -77,7 +76,7 @@ def setUpClass(cls):
         cls.product_2 = cls.product_obj.create(
             {
                 "name": "Test Product 2",
-                "type": "product",
+                "is_storable": True,
                 "list_price": 150.0,
                 "rma_customer_operation_id": cls.operation_1.id,
                 "rma_supplier_operation_id": cls.sup_refund_op.id,
diff --git a/rma_account/tests/test_rma_stock_account.py b/rma_account/tests/test_rma_stock_account.py
index 428f96f22..039ad5fb3 100644
--- a/rma_account/tests/test_rma_stock_account.py
+++ b/rma_account/tests/test_rma_stock_account.py
@@ -1,7 +1,7 @@
 # Copyright 2017-22 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.tests.test_rma import TestRma
@@ -71,7 +71,7 @@ def _create_account(cls, acc_type, name, code, company, reconcile):
                 "name": name,
                 "code": code,
                 "account_type": acc_type,
-                "company_id": company.id,
+                "company_ids": [(4, company.id)],
                 "reconcile": reconcile,
             }
         )
diff --git a/rma_account/views/account_move_view.xml b/rma_account/views/account_move_view.xml
index 491731f78..1c538794f 100644
--- a/rma_account/views/account_move_view.xml
+++ b/rma_account/views/account_move_view.xml
@@ -29,13 +29,13 @@
             </div>
             <!-- Add link to rma_line_id to account.move.line -->
             <xpath
-                expr="//field[@name='invoice_line_ids']/tree/field[@name='company_id']"
+                expr="//field[@name='invoice_line_ids']/list/field[@name='company_id']"
                 position="after"
             >
                 <field name="rma_line_id" invisible="1" />
             </xpath>
             <xpath
-                expr="//field[@name='line_ids']/tree/field[@name='company_id']"
+                expr="//field[@name='line_ids']/list/field[@name='company_id']"
                 position="after"
             >
                 <field name="rma_line_id" invisible="1" />
@@ -60,7 +60,7 @@
                             <field name="rma_line_id" />
                         </group>
                         <group name="rma_line" string="RMA Lines">
-	                        <field name="rma_line_ids" colspan="4" nolabel="1" />
+                            <field name="rma_line_ids" colspan="4" nolabel="1" />
                         </group>
                     </page>
                 </xpath>
@@ -74,7 +74,7 @@
         <field name="inherit_id" ref="account.view_move_form" />
         <field name="arch" type="xml">
             <field name="invoice_vendor_bill_id" position="after">
-                 <field
+                <field
                     name="add_rma_line_id"
                     context="{'rma': True}"
                     domain="[('type', '=', 'supplier'),('partner_id', '=', partner_id)]"
diff --git a/rma_account/views/rma_account_menu.xml b/rma_account/views/rma_account_menu.xml
index 82e3470fb..0af37f2a6 100644
--- a/rma_account/views/rma_account_menu.xml
+++ b/rma_account/views/rma_account_menu.xml
@@ -8,7 +8,7 @@
         <field name="res_model">rma.order.line</field>
         <field name="domain">[('type','=', 'customer')]</field>
         <field name="context">{"search_default_to_refund":1}</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">list,form</field>
     </record>
 
     <record id="action_rma_supplier_lines" model="ir.actions.act_window">
@@ -16,7 +16,7 @@
         <field name="res_model">rma.order.line</field>
         <field name="domain">[('type','=', 'supplier')]</field>
         <field name="context">{"search_default_to_refund":1, "supplier":1}</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">list,form</field>
         <field name="view_id" ref="rma.view_rma_line_supplier_tree" />
     </record>
 
diff --git a/rma_account/views/rma_operation_view.xml b/rma_account/views/rma_operation_view.xml
index 922f52aa8..70f3bb06f 100644
--- a/rma_account/views/rma_operation_view.xml
+++ b/rma_account/views/rma_operation_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <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_account/views/rma_order_line_view.xml b/rma_account/views/rma_order_line_view.xml
index eae0fad9f..e1d8b1935 100644
--- a/rma_account/views/rma_order_line_view.xml
+++ b/rma_account/views/rma_order_line_view.xml
@@ -34,7 +34,7 @@
                     string="Origin Inv"
                 >
                 </button>
-                 <button
+                <button
                     type="object"
                     name="action_view_refunds"
                     class="oe_stat_button"
@@ -42,8 +42,8 @@
                     invisible="refund_count == 0"
                     groups="account.group_account_invoice"
                 >
-                        <field name="refund_count" widget="statinfo" string="Refunds" />
-                    </button>
+                    <field name="refund_count" widget="statinfo" string="Refunds" />
+                </button>
             </button>
             <group name="main_info" position="inside">
                 <field name="commercial_partner_id" invisible="1" />
diff --git a/rma_account/views/rma_order_view.xml b/rma_account/views/rma_order_view.xml
index 883ad6c05..669785189 100644
--- a/rma_account/views/rma_order_view.xml
+++ b/rma_account/views/rma_order_view.xml
@@ -29,7 +29,7 @@
                     <field name="invoice_count" widget="statinfo" string="Origin Inv" />
                 </button>
             </button>
-            <xpath expr="//field[@name='rma_line_ids']/tree" position="inside">
+            <xpath expr="//field[@name='rma_line_ids']/list" position="inside">
                 <field name="refund_policy" invisible="True" />
             </xpath>
         </field>
diff --git a/rma_account/wizards/rma_add_account_move.xml b/rma_account/wizards/rma_add_account_move.xml
index 74413fbba..a949d56da 100644
--- a/rma_account/wizards/rma_add_account_move.xml
+++ b/rma_account/wizards/rma_add_account_move.xml
@@ -14,7 +14,7 @@
                     name="line_ids"
                     domain="[('move_id.partner_id', '=', partner_id)]"
                 >
-                    <tree name="Invoice Lines">
+                    <list name="Invoice Lines">
                         <field name="move_id" />
                         <field name="name" />
                         <field
@@ -28,7 +28,7 @@
                         <field name="discount" groups="base.group_no_one" />
                         <field name="price_subtotal" />
                         <field name="currency_id" invisible="1" />
-                    </tree>
+                    </list>
                 </field>
                 <footer>
                     <button
@@ -36,9 +36,7 @@
                         name="add_lines"
                         type="object"
                         class="oe_highlight"
-                    />
-                    or
-                    <button
+                    /> or <button
                         name="action_cancel"
                         string="Cancel"
                         class="oe_link"
@@ -62,7 +60,7 @@
                     name="line_ids"
                     domain="[('move_id.partner_id', '=', partner_id)]"
                 >
-                    <tree name="Invoice Lines">
+                    <list name="Invoice Lines">
                         <field name="move_id" />
                         <field name="name" />
                         <field
@@ -76,7 +74,7 @@
                         <field name="discount" groups="base.group_no_one" />
                         <field name="price_subtotal" />
                         <field name="currency_id" invisible="1" />
-                    </tree>
+                    </list>
                 </field>
                 <footer>
                     <button
@@ -84,9 +82,7 @@
                         name="add_lines"
                         type="object"
                         class="oe_highlight"
-                    />
-                    or
-                    <button
+                    /> or <button
                         name="action_cancel"
                         string="Cancel"
                         class="oe_link"
diff --git a/rma_account/wizards/rma_refund.py b/rma_account/wizards/rma_refund.py
index 62de5d5ac..fb4407db5 100644
--- a/rma_account/wizards/rma_refund.py
+++ b/rma_account/wizards/rma_refund.py
@@ -100,7 +100,7 @@ def invoice_refund(self):
             if (new_invoice.move_type in ["out_refund", "out_invoice"])
             else "action_move_in_refund_type"
         )
-        result = self.env.ref("account.%s" % action).sudo().read()[0]
+        result = self.env.ref(f"account.{action}").sudo().read()[0]
         form_view = self.env.ref("account.move_supplier_form", False)
         result["views"] = [(form_view and form_view.id or False, "form")]
         result["res_id"] = new_invoice.id
diff --git a/rma_account/wizards/rma_refund.xml b/rma_account/wizards/rma_refund.xml
index d5338e844..b60be88b7 100644
--- a/rma_account/wizards/rma_refund.xml
+++ b/rma_account/wizards/rma_refund.xml
@@ -6,16 +6,16 @@
         <field name="arch" type="xml">
             <form string="Credit Note">
                 <group>
-                     <group>
-                         <field name="description" />
-                     </group>
-                     <group>
-                         <field name="date_invoice" />
-                         <field name="date" />
-                     </group>
+                    <group>
+                        <field name="description" />
+                    </group>
+                    <group>
+                        <field name="date_invoice" />
+                        <field name="date" />
+                    </group>
                 </group>
                 <field name="item_ids">
-                    <tree name="RMA Lines" editable="bottom">
+                    <list name="RMA Lines" editable="bottom">
                         <field name="rma_id" invisible="1" readonly="1" />
                         <field name="product_id" invisible="1" readonly="1" />
                         <field name="product" />
@@ -24,7 +24,7 @@
                         <field name="product_qty" readonly="1" />
                         <field name="uom_id" groups="uom.group_uom" readonly="1" />
                         <field name="qty_to_refund" readonly="0" />
-                    </tree>
+                    </list>
                 </field>
                 <footer>
                     <button
@@ -35,14 +35,14 @@
                     />
                     <button string="Cancel" class="btn-default" special="cancel" />
                 </footer>
-           </form>
+            </form>
         </field>
     </record>
 
     <record id="action_rma_refund" model="ir.actions.act_window">
         <field name="name">Create Refund</field>
         <field name="res_model">rma.refund</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">list,form</field>
         <field name="view_id" ref="view_rma_refund" />
         <field name="binding_model_id" ref="rma.model_rma_order_line" />
         <field name="groups_id" eval="[(4, ref('account.group_account_invoice'))]" />