diff --git a/payroll/README.rst b/payroll/README.rst
index 68138ba7..70610e71 100644
--- a/payroll/README.rst
+++ b/payroll/README.rst
@@ -65,6 +65,7 @@ Contributors
 -  Hilar AK <hilarak@gmail.com>
 -  Nimarosa (Nicolas Rodriguez) <nicolarsande@gmail.com>
 -  Henrik Norlin (@appstogrow)
+-  Régis Pirard <regis.pirard@tincid.com>
 
 Maintainers
 -----------
diff --git a/payroll/__manifest__.py b/payroll/__manifest__.py
index b23f35e7..d3f35336 100644
--- a/payroll/__manifest__.py
+++ b/payroll/__manifest__.py
@@ -2,7 +2,7 @@
 
 {
     "name": "Payroll",
-    "version": "17.0.1.0.0",
+    "version": "18.0.1.0.0",
     "category": "Payroll",
     "website": "https://github.com/OCA/payroll",
     "sequence": 38,
diff --git a/payroll/models/hr_payroll_structure.py b/payroll/models/hr_payroll_structure.py
index f5d9d6d9..a68a27a8 100644
--- a/payroll/models/hr_payroll_structure.py
+++ b/payroll/models/hr_payroll_structure.py
@@ -59,7 +59,7 @@ def _compute_require_code(self):
 
     @api.constrains("parent_id")
     def _check_parent_id(self):
-        if not self._check_recursion():
+        if self._has_cycle():
             raise ValidationError(_("You cannot create a recursive salary structure."))
 
     @api.returns("self", lambda value: value.id)
diff --git a/payroll/models/hr_payslip.py b/payroll/models/hr_payslip.py
index 88b0ae69..d2c7d376 100644
--- a/payroll/models/hr_payslip.py
+++ b/payroll/models/hr_payslip.py
@@ -8,9 +8,8 @@
 from dateutil.relativedelta import relativedelta
 from pytz import timezone
 
-from odoo import _, api, fields, models, tools
+from odoo import _, api, fields, models
 from odoo.exceptions import UserError, ValidationError
-from odoo.tools.safe_eval import safe_eval
 
 from .base_browsable import (
     BaseBrowsableObject,
@@ -228,34 +227,44 @@ def action_payslip_cancel(self):
         return self.write({"state": "cancel"})
 
     def refund_sheet(self):
+        copied_payslips = self.env["hr.payslip"]
         for payslip in self:
+            # Create a refund slip
             copied_payslip = payslip.copy(
                 {"credit_note": True, "name": _("Refund: %s") % payslip.name}
             )
+            # Assign a number
             number = copied_payslip.number or self.env["ir.sequence"].next_by_code(
                 "salary.slip"
             )
             copied_payslip.write({"number": number})
+            # Validated refund slip
             copied_payslip.with_context(
                 without_compute_sheet=True
             ).action_payslip_done()
+            # Write refund reference on payslip
+            payslip.write(
+                {"refunded_id": copied_payslip.id if copied_payslip else False}
+            )
+            # Add to list of refund slips
+            copied_payslips |= copied_payslip
+        # Action to open list view of refund slips
         formview_ref = self.env.ref("payroll.hr_payslip_view_form", False)
         treeview_ref = self.env.ref("payroll.hr_payslip_view_tree", False)
         res = {
             "name": _("Refund Payslip"),
-            "view_mode": "tree, form",
+            "view_mode": "list, form",
             "view_id": False,
             "res_model": "hr.payslip",
             "type": "ir.actions.act_window",
             "target": "current",
-            "domain": "[('id', 'in', %s)]" % copied_payslip.ids,
+            "domain": [("id", "in", copied_payslips.ids)],
             "views": [
-                (treeview_ref and treeview_ref.id or False, "tree"),
+                (treeview_ref and treeview_ref.id or False, "list"),
                 (formview_ref and formview_ref.id or False, "form"),
             ],
             "context": {},
         }
-        payslip.write({"refunded_id": safe_eval(res["domain"])[0][2][0] or False})
         return res
 
     def unlink(self):
@@ -756,15 +765,14 @@ def onchange_employee(self):
 
     def _compute_name(self):
         for record in self:
+            date_formatted = babel.dates.format_date(
+                date=datetime.combine(record.date_from, time.min),
+                format="MMMM-y",
+                locale=record.env.context.get("lang") or "en_US",
+            )
             record.name = _("Salary Slip of %(name)s for %(dt)s") % {
                 "name": record.employee_id.name,
-                "dt": tools.ustr(
-                    babel.dates.format_date(
-                        date=datetime.combine(record.date_from, time.min),
-                        format="MMMM-y",
-                        locale=record.env.context.get("lang") or "en_US",
-                    )
-                ),
+                "dt": str(date_formatted),
             }
 
     @api.onchange("contract_id")
diff --git a/payroll/models/hr_salary_rule.py b/payroll/models/hr_salary_rule.py
index 2a57eec3..eb89edf6 100644
--- a/payroll/models/hr_salary_rule.py
+++ b/payroll/models/hr_salary_rule.py
@@ -37,7 +37,7 @@ class HrSalaryRule(models.Model):
         help="Used to display the salary rule on payslip.",
     )
     parent_rule_id = fields.Many2one(
-        "hr.salary.rule", string="Parent Salary Rule", index=True
+        comodel_name="hr.salary.rule", string="Parent Salary Rule", index=True
     )
     company_id = fields.Many2one(
         "res.company",
@@ -167,10 +167,15 @@ class HrSalaryRule(models.Model):
 
     @api.constrains("parent_rule_id")
     def _check_parent_rule_id(self):
-        if not self._check_recursion(parent="parent_rule_id"):
-            raise ValidationError(
-                _("Error! You cannot create recursive hierarchy of Salary Rules.")
-            )
+        if self.env.registry[self._name]._name != "hr.salary.rule":
+            # HrPayslipLine inherits from "hr.salary.rule" and we don't
+            # want to do this check on a payslip line
+            return
+        for rule in self:
+            if rule._has_cycle(field_name="parent_rule_id"):
+                raise ValidationError(
+                    _("Error! You cannot create recursive hierarchy of Salary Rules.")
+                )
 
     def _recursive_search_of_rules(self):
         """
diff --git a/payroll/models/hr_salary_rule_category.py b/payroll/models/hr_salary_rule_category.py
index 357acbc9..2f2c731d 100644
--- a/payroll/models/hr_salary_rule_category.py
+++ b/payroll/models/hr_salary_rule_category.py
@@ -45,7 +45,7 @@ def _compute_require_code(self):
 
     @api.constrains("parent_id")
     def _check_parent_id(self):
-        if not self._check_recursion():
+        if self._has_cycle():
             raise ValidationError(
                 _(
                     "Error! You cannot create recursive hierarchy of Salary "
diff --git a/payroll/readme/CONTRIBUTORS.md b/payroll/readme/CONTRIBUTORS.md
index 0bc8d15e..11cb0ddf 100644
--- a/payroll/readme/CONTRIBUTORS.md
+++ b/payroll/readme/CONTRIBUTORS.md
@@ -3,3 +3,4 @@
 - Hilar AK \<<hilarak@gmail.com>\>
 - Nimarosa (Nicolas Rodriguez) \<<nicolarsande@gmail.com>\>
 - Henrik Norlin (@appstogrow)
+- Régis Pirard \<<regis.pirard@tincid.com>\>
diff --git a/payroll/static/description/index.html b/payroll/static/description/index.html
index 30db5c6f..5ca9bc4c 100644
--- a/payroll/static/description/index.html
+++ b/payroll/static/description/index.html
@@ -410,6 +410,7 @@ <h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
 <li>Hilar AK &lt;<a class="reference external" href="mailto:hilarak&#64;gmail.com">hilarak&#64;gmail.com</a>&gt;</li>
 <li>Nimarosa (Nicolas Rodriguez) &lt;<a class="reference external" href="mailto:nicolarsande&#64;gmail.com">nicolarsande&#64;gmail.com</a>&gt;</li>
 <li>Henrik Norlin (&#64;appstogrow)</li>
+<li>Régis Pirard &lt;<a class="reference external" href="mailto:regis.pirard&#64;tincid.com">regis.pirard&#64;tincid.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
diff --git a/payroll/tests/test_hr_payslip_worked_days.py b/payroll/tests/test_hr_payslip_worked_days.py
index 8ffc9b3e..fd2e3460 100644
--- a/payroll/tests/test_hr_payslip_worked_days.py
+++ b/payroll/tests/test_hr_payslip_worked_days.py
@@ -3,7 +3,7 @@
 import time
 from datetime import date, datetime
 
-from odoo.tests.common import Form
+from odoo.tests import Form
 
 from .common import TestPayslipBase
 
@@ -20,7 +20,7 @@ def setUp(self):
             {
                 "name": "TestLeaveType",
                 "code": "TESTLV",
-                "allocation_validation_type": "no",
+                "allocation_validation_type": "no_validation",
                 "leave_validation_type": "no_validation",
             }
         )
diff --git a/payroll/views/hr_contribution_register_views.xml b/payroll/views/hr_contribution_register_views.xml
index af0d99a8..19dc02a6 100644
--- a/payroll/views/hr_contribution_register_views.xml
+++ b/payroll/views/hr_contribution_register_views.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <record id="hr_contribution_register_view_tree" model="ir.ui.view">
-        <field name="name">hr.contribution.register.tree</field>
+        <field name="name">hr.contribution.register.list</field>
         <field name="model">hr.contribution.register</field>
         <field name="arch" type="xml">
-            <tree>
+            <list>
                 <field name="name" />
                 <field
                     name="company_id"
                     groups="base.group_multi_company"
                     options="{'no_create': True}"
                 />
-            </tree>
+            </list>
         </field>
     </record>
     <record id="hr_contribution_register_view_kanban" model="ir.ui.view">
@@ -20,7 +20,7 @@
         <field name="arch" type="xml">
             <kanban class="o_kanban_mobile">
                 <templates>
-                    <t t-name="kanban-box">
+                    <t t-name="card">
                         <div t-attf-class="oe_kanban_content oe_kanban_global_click">
                             <div class="row">
                                 <div class="col-12">
@@ -72,7 +72,7 @@
     <record id="hr_contribution_register_action" model="ir.actions.act_window">
         <field name="name">Contribution Registers</field>
         <field name="res_model">hr.contribution.register</field>
-        <field name="view_mode">tree,kanban,form</field>
+        <field name="view_mode">list,kanban,form</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">Add a new contribution register</p>
             <p>
diff --git a/payroll/views/hr_payroll_structure_views.xml b/payroll/views/hr_payroll_structure_views.xml
index f5c27405..7bad06f7 100644
--- a/payroll/views/hr_payroll_structure_views.xml
+++ b/payroll/views/hr_payroll_structure_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <record id="hr_payroll_structure_view_tree" model="ir.ui.view">
-        <field name="name">hr.payroll.structure.tree</field>
+        <field name="name">hr.payroll.structure.list</field>
         <field name="model">hr.payroll.structure</field>
         <field name="arch" type="xml">
-            <tree>
+            <list>
                 <field name="name" />
                 <field name="code" />
                 <field name="rule_ids" />
@@ -13,14 +13,14 @@
                     groups="base.group_multi_company"
                     options="{'no_create': True}"
                 />
-            </tree>
+            </list>
         </field>
     </record>
     <record id="hr_payroll_structure_view_tree_children" model="ir.ui.view">
-        <field name="name">hr.payroll.structure.tree</field>
+        <field name="name">hr.payroll.structure.list</field>
         <field name="model">hr.payroll.structure</field>
         <field name="arch" type="xml">
-            <tree>
+            <list>
                 <field name="name" />
                 <field name="code" />
                 <field
@@ -28,7 +28,7 @@
                     groups="base.group_multi_company"
                     options="{'no_create': True}"
                 />
-            </tree>
+            </list>
         </field>
     </record>
     <record id="hr_payroll_structure_view_kanban" model="ir.ui.view">
@@ -37,7 +37,7 @@
         <field name="arch" type="xml">
             <kanban class="o_kanban_mobile">
                 <templates>
-                    <t t-name="kanban-box">
+                    <t t-name="card">
                         <div t-attf-class="oe_kanban_content oe_kanban_global_click">
                             <div class="row">
                                 <div class="col-12">
@@ -92,13 +92,13 @@
                 <notebook colspan="4">
                     <page string="Salary Rules">
                         <field name="rule_ids" domain="[('parent_rule_id','=',False)]">
-                            <tree>
+                            <list>
                                 <field name="name" />
                                 <field name="code" />
                                 <field name="category_id" />
                                 <field name="sequence" column_invisible="1" />
                                 <field name="register_id" />
-                            </tree>
+                            </list>
                         </field>
                     </page>
                 </notebook>
@@ -108,7 +108,7 @@
     <record id="hr_payroll_structure_action" model="ir.actions.act_window">
         <field name="name">Salary Structures</field>
         <field name="res_model">hr.payroll.structure</field>
-        <field name="view_mode">tree,kanban,form</field>
+        <field name="view_mode">list,kanban,form</field>
     </record>
     <menuitem
         id="hr_payroll_structure_menu"
diff --git a/payroll/views/hr_payslip_line_views.xml b/payroll/views/hr_payslip_line_views.xml
index 1afb226b..fd732d0c 100644
--- a/payroll/views/hr_payslip_line_views.xml
+++ b/payroll/views/hr_payslip_line_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <record id="hr_payslip_line_view_tree" model="ir.ui.view">
-        <field name="name">hr.payslip.line.tree</field>
+        <field name="name">hr.payslip.line.list</field>
         <field name="model">hr.payslip.line</field>
         <field name="arch" type="xml">
-            <tree editable="bottom" decoration-info="total == 0">
+            <list editable="bottom" decoration-info="total == 0">
                 <field name="allow_edit_payslip_lines" column_invisible="1" />
                 <field name="category_id" />
                 <field name="employee_id" column_invisible="1" />
@@ -18,7 +18,7 @@
                 <field name="amount_select" column_invisible="1" />
                 <field name="register_id" column_invisible="1" />
                 <field name="payslip_run_id" optional="hide" />
-            </tree>
+            </list>
         </field>
     </record>
     <record id="hr_payslip_line_view_form" model="ir.ui.view">
@@ -62,8 +62,8 @@
                     <page name="child_ids" string="Child Line Details">
                         <group>
                             <field name="child_ids" readonly="1" nolabel="1">
-                                <tree
-                                    editable="false"
+                                <list
+                                    edit="false"
                                     decoration-info="total == 0"
                                     decoration-bf="parent_line_id == False"
                                 >
@@ -82,7 +82,7 @@
                                         decoration-success="total > 0 and parent_line_id == False"
                                         sum="total_net"
                                     />
-                                </tree>
+                                </list>
                             </field>
                         </group>
                     </page>
@@ -155,14 +155,14 @@
     >
         <field name="name">Payslip Computation Details</field>
         <field name="res_model">hr.payslip.line</field>
-        <field name="view_mode">tree,pivot,form</field>
+        <field name="view_mode">list,pivot,form</field>
         <field name="domain">[('slip_id', 'in', active_ids)]</field>
         <field name="binding_model_id" ref="model_hr_payslip" />
     </record>
     <record id="action_get_batch_payslip_lines" model="ir.actions.act_window">
         <field name="name">Batch Payslip Lines</field>
         <field name="res_model">hr.payslip.line</field>
-        <field name="view_mode">pivot,tree,form</field>
+        <field name="view_mode">pivot,list,form</field>
         <field name="domain">[('payslip_run_id', 'in', active_ids)]</field>
         <field name="binding_model_id" ref="model_hr_payslip_run" />
     </record>
diff --git a/payroll/views/hr_payslip_run_views.xml b/payroll/views/hr_payslip_run_views.xml
index 7e9ced07..8228e070 100644
--- a/payroll/views/hr_payslip_run_views.xml
+++ b/payroll/views/hr_payslip_run_views.xml
@@ -26,10 +26,10 @@
         </field>
     </record>
     <record id="hr_payslip_run_view_tree" model="ir.ui.view">
-        <field name="name">hr.payslip.run.tree</field>
+        <field name="name">hr.payslip.run.list</field>
         <field name="model">hr.payslip.run</field>
         <field name="arch" type="xml">
-            <tree
+            <list
                 decoration-info="state in ('confirm','hr_check','accont_check')"
                 decoration-muted="state == 'cancel'"
                 multi_edit="1"
@@ -53,7 +53,7 @@
                     groups="base.group_multi_company"
                     optional="show"
                 />
-            </tree>
+            </list>
         </field>
     </record>
     <record id="hr_payslip_run_view_kanban" model="ir.ui.view">
@@ -62,7 +62,7 @@
         <field name="arch" type="xml">
             <kanban class="o_kanban_mobile">
                 <templates>
-                    <t t-name="kanban-box">
+                    <t t-name="card">
                         <div t-attf-class="oe_kanban_content oe_kanban_global_click">
                             <div class="row">
                                 <div class="col-6">
@@ -163,7 +163,7 @@
     <record id="hr_payslip_run_action" model="ir.actions.act_window">
         <field name="name">Payslips Batches</field>
         <field name="res_model">hr.payslip.run</field>
-        <field name="view_mode">tree,kanban,form</field>
+        <field name="view_mode">list,kanban,form</field>
         <field name="search_view_id" ref="hr_payslip_run_view_search" />
     </record>
     <menuitem
diff --git a/payroll/views/hr_payslip_views.xml b/payroll/views/hr_payslip_views.xml
index 343936c9..71ae8957 100644
--- a/payroll/views/hr_payslip_views.xml
+++ b/payroll/views/hr_payslip_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <record id="hr_payslip_view_tree" model="ir.ui.view">
-        <field name="name">hr.payslip.tree</field>
+        <field name="name">hr.payslip.list</field>
         <field name="model">hr.payslip</field>
         <field name="arch" type="xml">
-            <tree decoration-muted="state == 'cancel'" multi_edit="1" sample="1">
+            <list decoration-muted="state == 'cancel'" multi_edit="1" sample="1">
                 <field name="number" readonly="1" decoration-bf="1" />
                 <field name="employee_id" readonly="1" />
                 <field name="name" />
@@ -27,7 +27,7 @@
                 />
                 <field name="payslip_run_id" column_invisible="1" />
                 <field name="message_needaction" column_invisible="1" />
-            </tree>
+            </list>
         </field>
     </record>
     <record id="hr_payslip_view_kanban" model="ir.ui.view">
@@ -36,7 +36,7 @@
         <field name="arch" type="xml">
             <kanban class="o_kanban_mobile">
                 <templates>
-                    <t t-name="kanban-box">
+                    <t t-name="card">
                         <div t-attf-class="oe_kanban_content oe_kanban_global_click">
                             <div class="row">
                                 <div class="col-6">
@@ -183,7 +183,7 @@
                                 name="worked_days_line_ids"
                                 readonly="state != 'draft'"
                             >
-                                <tree editable="bottom">
+                                <list editable="bottom">
                                     <field name="name" />
                                     <field name="code" />
                                     <field name="number_of_days" string="Days" />
@@ -194,7 +194,7 @@
                                         context="{'default_employee_id': parent.employee_id}"
                                     />
                                     <field name="sequence" column_invisible="True" />
-                                </tree>
+                                </list>
                                 <form string="Worked Day">
                                     <group col="4">
                                         <field name="name" />
@@ -213,7 +213,7 @@
                                 nolabel="1"
                                 readonly="state != 'draft'"
                             >
-                                <tree editable="bottom">
+                                <list editable="bottom">
                                     <field name="name" />
                                     <field name="code" />
                                     <field name="amount_qty" />
@@ -224,7 +224,7 @@
                                         context="{'default_employee_id': parent.employee_id}"
                                     />
                                     <field name="sequence" column_invisible="True" />
-                                </tree>
+                                </list>
                                 <form string="Payslip Line">
                                     <group col="4">
                                         <field name="name" />
@@ -252,7 +252,7 @@
                                 colspan="4"
                                 nolabel="1"
                             >
-                                <tree
+                                <list
                                     decoration-info="total == 0 and appears_on_payslip == True"
                                     decoration-bf="parent_rule_id == False"
                                     decoration-it="parent_rule_id != False"
@@ -284,7 +284,7 @@
                                         decoration-success="total > 0 and parent_rule_id == False"
                                         readonly="1"
                                     />
-                                </tree>
+                                </list>
                             </field>
                         </page>
                         <page name="accounting" string="Accounting Information">
@@ -315,11 +315,7 @@
                         </page>
                     </notebook>
                 </sheet>
-                <div class="oe_chatter">
-                    <field name="message_follower_ids" />
-                    <field name="activity_ids" />
-                    <field name="message_ids" />
-                </div>
+                <chatter />
             </form>
         </field>
     </record>
@@ -358,7 +354,7 @@
                     string="Date"
                     name="date_filter"
                     date="date_to"
-                    default_period="last_month"
+                    default_period="month-1"
                 />
                 <separator />
                 <filter
@@ -396,13 +392,13 @@
     <record id="hr_payslip_action" model="ir.actions.act_window">
         <field name="name">Employee Payslips</field>
         <field name="res_model">hr.payslip</field>
-        <field name="view_mode">tree,kanban,form</field>
+        <field name="view_mode">list,kanban,form</field>
         <field name="search_view_id" ref="hr_payslip_view_search" />
     </record>
     <record id="hr_payslip_action_employee" model="ir.actions.act_window">
         <field name="res_model">hr.payslip</field>
         <field name="name">Payslips</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">list,form</field>
         <field name="context">
             {
                 'search_default_employee_id': [active_id],
diff --git a/payroll/views/hr_salary_rule_category_views.xml b/payroll/views/hr_salary_rule_category_views.xml
index 67e9508b..0845d1ad 100644
--- a/payroll/views/hr_salary_rule_category_views.xml
+++ b/payroll/views/hr_salary_rule_category_views.xml
@@ -21,10 +21,10 @@
                         <page string="Salary Rules">
                             <separator string="Associated Salary Rules" />
                             <field name="salary_rules_ids" nolabel="1" create="false">
-                                <tree>
+                                <list>
                                     <field name="code" decoration-bf="1" />
                                     <field name="name" />
-                                </tree>
+                                </list>
                             </field>
                         </page>
                     </notebook>
@@ -41,14 +41,14 @@
         </field>
     </record>
     <record id="hr_salary_rule_category_view_tree" model="ir.ui.view">
-        <field name="name">hr.salary.rule.category.tree</field>
+        <field name="name">hr.salary.rule.category.list</field>
         <field name="model">hr.salary.rule.category</field>
         <field name="arch" type="xml">
-            <tree>
+            <list>
                 <field name="name" />
                 <field name="code" />
                 <field name="parent_id" column_invisible="1" />
-            </tree>
+            </list>
         </field>
     </record>
     <record id="hr_salary_rule_category_view_search" model="ir.ui.view">
diff --git a/payroll/views/hr_salary_rule_views.xml b/payroll/views/hr_salary_rule_views.xml
index acd4c33c..9c0051db 100644
--- a/payroll/views/hr_salary_rule_views.xml
+++ b/payroll/views/hr_salary_rule_views.xml
@@ -4,13 +4,13 @@
         <field name="name">hr.salary.rule.list</field>
         <field name="model">hr.salary.rule</field>
         <field name="arch" type="xml">
-            <tree>
+            <list>
                 <field name="name" />
                 <field name="code" decoration-bf="1" />
                 <field name="category_id" widget="badge" />
                 <field name="sequence" column_invisible="1" />
                 <field name="register_id" />
-            </tree>
+            </list>
         </field>
     </record>
     <record id="hr_salary_rule_view_kanban" model="ir.ui.view">
@@ -19,7 +19,7 @@
         <field name="arch" type="xml">
             <kanban class="o_kanban_mobile">
                 <templates>
-                    <t t-name="kanban-box">
+                    <t t-name="card">
                         <div t-attf-class="oe_kanban_content oe_kanban_global_click">
                             <div class="row">
                                 <div class="col-8">
@@ -48,11 +48,11 @@
         </field>
     </record>
     <record id="hr_salary_rule_view_tree" model="ir.ui.view">
-        <field name="name">hr.salary.rule.tree</field>
+        <field name="name">hr.salary.rule.list</field>
         <field name="model">hr.salary.rule</field>
         <field eval="20" name="priority" />
         <field name="arch" type="xml">
-            <tree>
+            <list>
                 <field name="name" />
                 <field name="code" />
                 <field name="category_id" column_invisible="True" />
@@ -61,7 +61,7 @@
                     groups="base.group_multi_company"
                     options="{'no_create': True}"
                 />
-            </tree>
+            </list>
         </field>
     </record>
     <record id="hr_salary_rule_view_form" model="ir.ui.view">
@@ -224,11 +224,11 @@
                             <field name="child_ids" />
                         </page>
                         <page name="inputs" string="Inputs">
-                            <field name="input_ids" mode="tree">
-                                <tree editable="bottom">
+                            <field name="input_ids" mode="list">
+                                <list editable="bottom">
                                     <field name="code" />
                                     <field name="name" />
-                                </tree>
+                                </list>
                             </field>
                         </page>
                         <page name="help" string="Help">
@@ -364,7 +364,7 @@
     <record id="action_salary_rule_form" model="ir.actions.act_window">
         <field name="name">Salary Rules</field>
         <field name="res_model">hr.salary.rule</field>
-        <field name="view_mode">tree,kanban,form</field>
+        <field name="view_mode">list,kanban,form</field>
         <field name="domain">[('parent_rule_id','=',False)]</field>
         <field name="search_view_id" ref="hr_salary_rule_view_search" />
     </record>
diff --git a/payroll/views/res_config_settings_views.xml b/payroll/views/res_config_settings_views.xml
index ebb2f9ae..766a26c6 100644
--- a/payroll/views/res_config_settings_views.xml
+++ b/payroll/views/res_config_settings_views.xml
@@ -3,7 +3,7 @@
     <record id="open_payroll_modules" model="ir.actions.act_window">
         <field name="name">Payroll</field>
         <field name="res_model">ir.module.module</field>
-        <field name="view_mode">kanban,tree,form</field>
+        <field name="view_mode">kanban,list,form</field>
         <field
             name="context"
             eval="{'search_default_category_id': ref('base.module_category_payroll_localization'), 'search_default_name': 'Payroll'}"
diff --git a/payroll/wizard/hr_payroll_payslips_by_employees_views.xml b/payroll/wizard/hr_payroll_payslips_by_employees_views.xml
index bb7581af..4fa0764b 100644
--- a/payroll/wizard/hr_payroll_payslips_by_employees_views.xml
+++ b/payroll/wizard/hr_payroll_payslips_by_employees_views.xml
@@ -33,7 +33,7 @@
     <record id="action_hr_payslip_by_employees" model="ir.actions.act_window">
         <field name="name">Generate Payslips</field>
         <field name="res_model">hr.payslip.employees</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">list,form</field>
         <field name="view_id" ref="view_hr_payslip_by_employees" />
         <field name="target">new</field>
     </record>
diff --git a/payroll/wizard/hr_payslip_change_state.py b/payroll/wizard/hr_payslip_change_state.py
index 5457d3b0..676ad8aa 100644
--- a/payroll/wizard/hr_payslip_change_state.py
+++ b/payroll/wizard/hr_payslip_change_state.py
@@ -83,7 +83,7 @@ def change_state_confirm(self):
         return {
             "domain": "[('id','in', [" + ",".join(map(str, record_ids)) + "])]",
             "name": _("Payslips"),
-            "view_mode": "tree,form",
+            "view_mode": "list,form",
             "res_model": "hr.payslip",
             "view_id": False,
             "context": False,
diff --git a/payroll/wizard/hr_payslip_change_state_view.xml b/payroll/wizard/hr_payslip_change_state_view.xml
index a5c38151..d4ae040e 100644
--- a/payroll/wizard/hr_payslip_change_state_view.xml
+++ b/payroll/wizard/hr_payslip_change_state_view.xml
@@ -27,7 +27,7 @@
     <record id="action_hr_payslip_change_state_form" model="ir.actions.act_window">
         <field name="name">Change state</field>
         <field name="res_model">hr.payslip.change.state</field>
-        <field name="view_mode">form,tree</field>
+        <field name="view_mode">form,list</field>
         <field name="view_id" ref="hr_payslip_change_state_form" />
         <field name="target">new</field>
         <field name="binding_model_id" ref="payroll.model_hr_payslip" />