diff --git a/account_payment_order_tier_validation/__manifest__.py b/account_payment_order_tier_validation/__manifest__.py
index ca8405b44..385f650c9 100644
--- a/account_payment_order_tier_validation/__manifest__.py
+++ b/account_payment_order_tier_validation/__manifest__.py
@@ -5,13 +5,11 @@
     "name": "Account Payment Order Tier Validation",
     "summary": """Extends the functionality of Payment Orders
         to support a tier validation process.""",
-    "version": "14.0.1.0.0",
+    "version": "13.0.1.0.0",
     "license": "AGPL-3",
     "author": "Escodoo,Odoo Community Association (OCA)",
     "maintainers": ["marcelsavegnago"],
     "website": "https://github.com/OCA/bank-payment",
     "depends": ["account_payment_order", "base_tier_validation"],
-    "data": [
-        "views/account_payment_order.xml",
-    ],
+    "data": ["views/account_payment_order.xml"],
 }
diff --git a/account_payment_order_tier_validation/views/account_payment_order.xml b/account_payment_order_tier_validation/views/account_payment_order.xml
index 296cd50e0..631ec0f2c 100644
--- a/account_payment_order_tier_validation/views/account_payment_order.xml
+++ b/account_payment_order_tier_validation/views/account_payment_order.xml
@@ -3,92 +3,6 @@
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
 
-    <record id="account_payment_order_form" model="ir.ui.view">
-        <field
-            name="name"
-        >account_payment_order_form in (account_payment_order_tier_validation)</field>
-        <field name="model">account.payment.order</field>
-        <field
-            name="inherit_id"
-            ref="account_payment_order.account_payment_order_form"
-        />
-        <field name="arch" type="xml">
-            <button name="draft2open" position="before">
-                <button
-                    name="request_validation"
-                    string="Request Validation"
-                    attrs="{'invisible': ['|','|',('need_validation', '!=', True),('rejected','=',True),('state','not in',['draft'])]}"
-                    type="object"
-                />
-                <button
-                    name="restart_validation"
-                    string="Restart Validation"
-                    attrs="{'invisible': ['|',('review_ids', '=', []),('state','not in',['draft'])]}"
-                    type="object"
-                />
-            </button>
-            <header position="after">
-                <field name="need_validation" invisible="1" />
-                <field name="validated" invisible="1" />
-                <field name="rejected" invisible="1" />
-                <div
-                    class="alert alert-warning"
-                    role="alert"
-                    attrs="{'invisible': ['|', '|', '|',
-                     ('validated', '=', True), ('state', 'not in', ['draft']),
-                     ('rejected', '=', True), ('review_ids', '=', [])]}"
-                    style="margin-bottom:0px;"
-                >
-                    <p><i class="fa fa-info-circle" />This Payment Order needs to be
-                        validated.
-                        <field name="can_review" invisible="1" />
-                        <button
-                            name="validate_tier"
-                            string="Validate"
-                            attrs="{'invisible': [('can_review', '=', False)]}"
-                            type="object"
-                            class="oe_inline oe_button btn-success"
-                            icon="fa-thumbs-up"
-                        />
-                        <button
-                            name="reject_tier"
-                            string="Reject"
-                            attrs="{'invisible': [('can_review', '=', False)]}"
-                            type="object"
-                            class="btn-icon btn-danger"
-                            icon="fa-thumbs-down"
-                        />
-                    </p>
-                </div>
-                <div
-                    class="alert alert-success"
-                    role="alert"
-                    attrs="{'invisible': ['|', '|', ('validated', '!=', True), ('state', 'not in', ['draft']), ('review_ids', '=', [])]}"
-                    style="margin-bottom:0px;"
-                >
-                    <p><i class="fa fa-thumbs-up" /> Operation has been <b
-                        >validated</b>!</p>
-                </div>
-                <div
-                    class="alert alert-danger"
-                    role="alert"
-                    attrs="{'invisible': ['|', '|', ('rejected', '!=', True), ('state', 'not in', ['draft']), ('review_ids', '=', [])]}"
-                    style="margin-bottom:0px;"
-                >
-                    <p><i class="fa fa-thumbs-down" /> Operation has been <b
-                        >rejected</b>.</p>
-                </div>
-            </header>
-            <xpath expr="//form/div[hasclass('oe_chatter')]" position="before">
-                <field
-                    name="review_ids"
-                    widget="tier_validation"
-                    attrs="{'invisible':[('review_ids', '=', [])]}"
-                />
-            </xpath>
-        </field>
-    </record>
-
     <record model="ir.ui.view" id="account_payment_order_search_view">
         <field
             name="name"
diff --git a/setup/account_payment_order_tier_validation/odoo/addons/account_payment_order_tier_validation b/setup/account_payment_order_tier_validation/odoo/addons/account_payment_order_tier_validation
new file mode 120000
index 000000000..e396f217c
--- /dev/null
+++ b/setup/account_payment_order_tier_validation/odoo/addons/account_payment_order_tier_validation
@@ -0,0 +1 @@
+../../../../account_payment_order_tier_validation
\ No newline at end of file
diff --git a/setup/account_payment_order_tier_validation/setup.py b/setup/account_payment_order_tier_validation/setup.py
new file mode 100644
index 000000000..28c57bb64
--- /dev/null
+++ b/setup/account_payment_order_tier_validation/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)