diff --git a/agreement/README.rst b/agreement/README.rst
index 952e2bab..8997c37a 100644
--- a/agreement/README.rst
+++ b/agreement/README.rst
@@ -85,6 +85,16 @@ Contributors
 
   - Maxime Franco
 
+- `Trobz <https://www.trobz.com/>`__:
+
+  - Nhan Tran <nhant@trobz.com>
+
+Other credits
+-------------
+
+The migration of this module from 17.0 to 18.0 was financially supported
+by Camptocamp.
+
 Maintainers
 -----------
 
diff --git a/agreement/__manifest__.py b/agreement/__manifest__.py
index 95a53d12..1da5a063 100644
--- a/agreement/__manifest__.py
+++ b/agreement/__manifest__.py
@@ -4,7 +4,7 @@
 {
     "name": "Agreement",
     "summary": "Adds an agreement object",
-    "version": "17.0.1.0.0",
+    "version": "18.0.1.0.0",
     "category": "Contract",
     "author": "Akretion, "
     "Yves Goldberg (Ygol Internetwork), "
diff --git a/agreement/models/agreement.py b/agreement/models/agreement.py
index c69532ce..5f54b12b 100644
--- a/agreement/models/agreement.py
+++ b/agreement/models/agreement.py
@@ -26,7 +26,6 @@ class Agreement(models.Model):
     )
     is_template = fields.Boolean(
         string="Is a Template?",
-        default=False,
         copy=False,
         help="Set if the agreement is a template. "
         "Template agreements don't require a partner.",
@@ -63,14 +62,9 @@ def _compute_domain(self):
             else:
                 rec.domain = "sale"
 
-    def name_get(self):
-        res = []
-        for agr in self:
-            name = agr.name
-            if agr.code:
-                name = f"[{agr.code}] {agr.name}"
-            res.append((agr.id, name))
-        return res
+    def _compute_display_name(self):
+        for rec in self:
+            rec.display_name = f"[{rec.code}] {rec.name}"
 
     _sql_constraints = [
         (
diff --git a/agreement/readme/CONTRIBUTORS.md b/agreement/readme/CONTRIBUTORS.md
index f4c5e31d..2fc3936d 100644
--- a/agreement/readme/CONTRIBUTORS.md
+++ b/agreement/readme/CONTRIBUTORS.md
@@ -13,3 +13,7 @@
 - [Acsone](https://www.acsone.eu/):
 
   - Maxime Franco
+
+- [Trobz](https://www.trobz.com/):
+
+  - Nhan Tran \<<nhant@trobz.com>\>
diff --git a/agreement/readme/CREDITS.md b/agreement/readme/CREDITS.md
new file mode 100644
index 00000000..8edec949
--- /dev/null
+++ b/agreement/readme/CREDITS.md
@@ -0,0 +1,2 @@
+The migration of this module from 17.0 to 18.0 was financially supported
+by Camptocamp.
diff --git a/agreement/static/description/index.html b/agreement/static/description/index.html
index 6e3329f1..ba3a8e00 100644
--- a/agreement/static/description/index.html
+++ b/agreement/static/description/index.html
@@ -389,7 +389,8 @@ <h1 class="title">Agreement</h1>
 <li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
 <li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
 <li><a class="reference internal" href="#contributors" id="toc-entry-4">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-5">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-6">Maintainers</a></li>
 </ul>
 </li>
 </ul>
@@ -434,10 +435,20 @@ <h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
 <li>Maxime Franco</li>
 </ul>
 </li>
+<li><p class="first"><a class="reference external" href="https://www.trobz.com/">Trobz</a>:</p>
+<ul class="simple">
+<li>Nhan Tran &lt;<a class="reference external" href="mailto:nhant&#64;trobz.com">nhant&#64;trobz.com</a>&gt;</li>
+</ul>
+</li>
 </ul>
 </div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-5">Other credits</a></h2>
+<p>The migration of this module from 17.0 to 18.0 was financially supported
+by Camptocamp.</p>
+</div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org">
 <img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
diff --git a/agreement/tests/test_agreement.py b/agreement/tests/test_agreement.py
index 89eb91cd..59e4b8b9 100644
--- a/agreement/tests/test_agreement.py
+++ b/agreement/tests/test_agreement.py
@@ -27,10 +27,9 @@ def test_agreement_type_change(self):
         self.agreement.write({"agreement_type_id": self.agreement_type.id})
         self.assertEqual(self.agreement.domain, self.agreement_type.domain)
 
-    def test_name_get(self):
-        res = self.agreement.name_get()
-        self.assertEqual(res[0][0], self.agreement.id)
-        self.assertEqual(res[0][1], f"[{self.agreement.code}] {self.agreement.name}")
+    def test_compute_display_name(self):
+        display_name = self.agreement.display_name
+        self.assertEqual(display_name, f"[{self.agreement.code}] {self.agreement.name}")
 
     def test_copy(self):
         agreement1 = self.agreement.copy(default={"code": "Test Code"})
diff --git a/agreement/views/agreement.xml.orig b/agreement/views/agreement.xml.orig
deleted file mode 100644
index 592bd565..00000000
--- a/agreement/views/agreement.xml.orig
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
-  © 2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
-  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
--->
-<odoo>
-    <record id="agreement_form" model="ir.ui.view">
-        <field name="name">agreement.form</field>
-        <field name="model">agreement</field>
-        <field name="arch" type="xml">
-            <form string="Agreement">
-                <sheet>
-                    <div class="oe_button_box" name="button_box" />
-                    <widget
-                        name="web_ribbon"
-                        title="Archived"
-                        bg_color="bg-danger"
-                        invisible="active"
-                    />
-                    <div class="oe_title">
-                        <label
-                            for="name"
-                            class="oe_edit_only"
-                            string="Agreement Name"
-                        />
-                        <h1>
-                            <field name="name" />
-                        </h1>
-                    </div>
-                    <group name="main">
-                        <group name="left">
-                            <field name="code" />
-                            <field name="partner_id" required="not is_template" />
-                            <field
-                                name="agreement_type_id"
-                                groups="agreement.group_use_agreement_type"
-                            />
-                            <field name="domain" widget="radio" />
-                            <field
-                                name="is_template"
-                                groups="agreement.group_use_agreement_template"
-                            />
-                        </group>
-                        <group name="right">
-                            <field name="signature_date" />
-                            <field name="start_date" />
-                            <field name="end_date" />
-                            <field
-                                name="company_id"
-                                groups="base.group_multi_company"
-                            />
-                        </group>
-                    </group>
-                    <notebook>
-                        <page name="config" string="Configuration" invisible="True" />
-                    </notebook>
-                </sheet>
-<<<<<<< HEAD
-                <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers" />
-                    <field name="activity_ids" widget="mail_activity" />
-                    <field name="message_ids" widget="mail_thread" />
-                </div>
-=======
-                <chatter />
->>>>>>> 00d357b ([IMP] agreement: pre-commit execution)
-            </form>
-        </field>
-    </record>
-    <record id="agreement_tree" model="ir.ui.view">
-        <field name="name">agreement.tree</field>
-        <field name="model">agreement</field>
-        <field name="arch" type="xml">
-            <tree>
-                <field name="partner_id" />
-                <field name="code" />
-                <field name="name" />
-                <field name="signature_date" />
-                <field name="start_date" />
-                <field name="end_date" />
-                <field name="domain" />
-                <field name="company_id" groups="base.group_multi_company" />
-            </tree>
-        </field>
-    </record>
-    <record id="agreement_search" model="ir.ui.view">
-        <field name="name">agreement.search</field>
-        <field name="model">agreement</field>
-        <field name="arch" type="xml">
-            <search string="Search Agreements">
-                <field
-                    name="name"
-                    filter_domain="['|', ('name', 'ilike', self), ('code', 'ilike', self)]"
-                    string="Name or Number"
-                />
-                <field name="partner_id" />
-                <separator />
-                <filter name="sale" string="Sale" domain="[('domain', '=', 'sale')]" />
-                <filter
-                    name="purchase"
-                    string="Purchase"
-                    domain="[('domain', '=', 'purchase')]"
-                />
-                <separator />
-                <filter
-                    name="inactive"
-                    string="Archived"
-                    domain="[('active', '=', False)]"
-                />
-                <group name="groupby">
-                    <filter
-                        name="partner_groupby"
-                        string="Partner"
-                        context="{'group_by': 'partner_id'}"
-                    />
-                    <filter
-                        name="signature_date_groupby"
-                        string="Signature Date"
-                        context="{'group_by': 'signature_date'}"
-                    />
-                    <filter
-                        name="domain_groupby"
-                        string="Domain"
-                        context="{'group_by': 'domain'}"
-                    />
-                </group>
-            </search>
-        </field>
-    </record>
-    <record id="agreement_action" model="ir.actions.act_window">
-        <field name="name">Agreements</field>
-        <field name="res_model">agreement</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-</odoo>
diff --git a/agreement/views/agreement_type.xml b/agreement/views/agreement_type.xml
index 234a265a..068b95e0 100644
--- a/agreement/views/agreement_type.xml
+++ b/agreement/views/agreement_type.xml
@@ -5,10 +5,10 @@
         <field name="name">Agreement Type List</field>
         <field name="model">agreement.type</field>
         <field name="arch" type="xml">
-            <tree default_order="name">
+            <list default_order="name">
                 <field name="name" string="Type Name" />
                 <field name="domain" />
-            </tree>
+            </list>
         </field>
     </record>
     <!-- Agreement Type Form View -->
@@ -71,6 +71,6 @@
     <record id="agreement_type_action" model="ir.actions.act_window">
         <field name="name">Agreement Types</field>
         <field name="res_model">agreement.type</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">list,form</field>
     </record>
 </odoo>