diff --git a/mrp_repair_proforma_report/README.rst b/mrp_repair_proforma_report/README.rst
deleted file mode 100644
index 6764be6..0000000
--- a/mrp_repair_proforma_report/README.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
-   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
-   :alt: License: AGPL-3
-
-==========================
-Machine manager preventive
-==========================
-
-This module add the 'proforma' checkbox to repair orders. If this check is
-checked, the mrp repair report header changes to 'Proforma'.
-
-Credits
-=======
-
-Contributors
-------------
-* Esther Martín <esthermartin@avanzosc.es>
-* Ana Juaristi <anajuaristi@avanzosc.es>
diff --git a/mrp_repair_proforma_report/__init__.py b/mrp_repair_proforma_report/__init__.py
deleted file mode 100644
index d92bc22..0000000
--- a/mrp_repair_proforma_report/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- coding: utf-8 -*-
-# (c) 2015 Esther Martín - AvanzOSC
-# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
-
-from . import models
diff --git a/mrp_repair_proforma_report/__openerp__.py b/mrp_repair_proforma_report/__openerp__.py
deleted file mode 100644
index 5b09102..0000000
--- a/mrp_repair_proforma_report/__openerp__.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# (c) 2015 Esther Martín - AvanzOSC
-# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
-
-{
-    "name": "Mrp Repair - Proforma Report",
-    "version": "8.0.1.0.0",
-    "depends": [
-        "mrp_repair",
-    ],
-    "author": "AvanzOSC",
-    "contributors": [
-        "Esther Martín <esthermartin@avanzosc.es>",
-        "Ana Juaristi <anajuaristi@avanzosc.es>",
-    ],
-    "category": "Manufacturing",
-    "website": "http://www.avanzosc.es",
-    "data": [
-        "views/mrp_repair_report.xml",
-        "views/mrp_repair_view.xml",
-    ],
-    "installable": True,
-}
diff --git a/mrp_repair_proforma_report/models/__init__.py b/mrp_repair_proforma_report/models/__init__.py
deleted file mode 100644
index f63f9ac..0000000
--- a/mrp_repair_proforma_report/models/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- coding: utf-8 -*-
-# (c) 2015 Esther Martín - AvanzOSC
-# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
-
-from . import mrp_repair
diff --git a/mrp_repair_proforma_report/models/mrp_repair.py b/mrp_repair_proforma_report/models/mrp_repair.py
deleted file mode 100644
index 6d4cc9c..0000000
--- a/mrp_repair_proforma_report/models/mrp_repair.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- coding: utf-8 -*-
-# (c) 2015 Esther Martín - AvanzOSC
-# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
-
-from openerp import fields, models
-
-
-class MrpRepair(models.Model):
-    _inherit = 'mrp.repair'
-
-    proforma = fields.Boolean(string='Proforma')
diff --git a/mrp_repair_proforma_report/views/mrp_repair_report.xml b/mrp_repair_proforma_report/views/mrp_repair_report.xml
deleted file mode 100644
index 5200151..0000000
--- a/mrp_repair_proforma_report/views/mrp_repair_report.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <template id="report_mrprepair_proforma" inherit_id="mrp_repair.report_mrprepairorder">
-            <xpath expr="//div[@class='page']/h2" position="replace">
-                <h2>
-                    <span t-if="o.state != 'draft' and o.proforma == False">Repair Order N°:</span>
-                    <span t-if="o.state == 'draft' and o.proforma == False">Repair Quotation N°:</span>
-                    <span t-if="o.proforma == True">Proforma Nº:</span>
-                    <span t-field="o.name"/>
-                </h2>
-            </xpath>
-        </template>
-    </data>
-</openerp>
diff --git a/mrp_repair_proforma_report/views/mrp_repair_view.xml b/mrp_repair_proforma_report/views/mrp_repair_view.xml
deleted file mode 100644
index 9619556..0000000
--- a/mrp_repair_proforma_report/views/mrp_repair_view.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        <record id="mrp_repair_proforma_view_form" model="ir.ui.view">
-            <field name="name">mrp.repair.proforma.form</field>
-            <field name="model">mrp.repair</field>
-            <field name="inherit_id" ref="mrp_repair.view_repair_order_form"/>
-            <field name="arch" type="xml">
-                <h1 position="after">
-                    <label for="proforma" />
-                    <field name="proforma" />
-                </h1>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/repair_order_proforma_report/README.rst b/repair_order_proforma_report/README.rst
new file mode 100644
index 0000000..b9c2092
--- /dev/null
+++ b/repair_order_proforma_report/README.rst
@@ -0,0 +1,28 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+
+============================
+Repair order proforma report
+============================
+
+* This module add the 'proforma' checkbox to repair orders. If this check is
+  checked, the repair report header changes to 'Proforma'.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues
+<https://github.com/avanzosc/mrp-repair-addons/issues>`_. In case of trouble,
+please check there if your issue has already been reported. If you spotted
+it first, help us smash it by providing detailed and welcomed feedback.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Contributors
+------------
+* Esther Martín <esthermartin@avanzosc.es>
+* Ana Juaristi <anajuaristi@avanzosc.es>
diff --git a/repair_order_proforma_report/__init__.py b/repair_order_proforma_report/__init__.py
new file mode 100644
index 0000000..0650744
--- /dev/null
+++ b/repair_order_proforma_report/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/repair_order_proforma_report/__manifest__.py b/repair_order_proforma_report/__manifest__.py
new file mode 100644
index 0000000..154598c
--- /dev/null
+++ b/repair_order_proforma_report/__manifest__.py
@@ -0,0 +1,22 @@
+# Copyright 2015 Esther Martín - AvanzOSC
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+{
+    "name": "Repair Order Proforma Report",
+    "version": "16.0.1.0.0",
+    "license": "AGPL-3",
+    "depends": [
+        "repair",
+    ],
+    "author": "AvanzOSC",
+    "contributors": [
+        "Esther Martín <esthermartin@avanzosc.es>",
+        "Ana Juaristi <anajuaristi@avanzosc.es>",
+    ],
+    "category": "Inventory/Inventory",
+    "website": "https://github.com/avanzosc/mrp-repair-addons",
+    "data": [
+        "views/repair_order_report.xml",
+        "views/repair_order_views.xml",
+    ],
+    "installable": True,
+}
diff --git a/repair_order_proforma_report/i18n/ca_ES.po b/repair_order_proforma_report/i18n/ca_ES.po
new file mode 100644
index 0000000..c3a880b
--- /dev/null
+++ b/repair_order_proforma_report/i18n/ca_ES.po
@@ -0,0 +1,52 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* repair_order_proforma_report
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-10-03 06:46+0000\n"
+"PO-Revision-Date: 2024-10-03 06:46+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: repair_order_proforma_report
+#: model_terms:ir.ui.view,arch_db:repair_order_proforma_report.view_repair_order_form_filter
+msgid "Is Not Proforma"
+msgstr ""
+
+#. module: repair_order_proforma_report
+#: model_terms:ir.ui.view,arch_db:repair_order_proforma_report.view_repair_order_form_filter
+msgid "Is Proforma"
+msgstr ""
+
+#. module: repair_order_proforma_report
+#: model:ir.model.fields,field_description:repair_order_proforma_report.field_repair_order__proforma
+#: model_terms:ir.ui.view,arch_db:repair_order_proforma_report.view_repair_order_form_filter
+msgid "Proforma"
+msgstr ""
+
+#. module: repair_order_proforma_report
+#: model_terms:ir.ui.view,arch_db:repair_order_proforma_report.report_repairorder
+msgid "Proforma Nº:"
+msgstr ""
+
+#. module: repair_order_proforma_report
+#: model:ir.model,name:repair_order_proforma_report.model_repair_order
+msgid "Repair Order"
+msgstr "Ordre de reparació"
+
+#. module: repair_order_proforma_report
+#: model_terms:ir.ui.view,arch_db:repair_order_proforma_report.report_repairorder
+msgid "Repair Order N°:"
+msgstr ""
+
+#. module: repair_order_proforma_report
+#: model_terms:ir.ui.view,arch_db:repair_order_proforma_report.report_repairorder
+msgid "Repair Quotation N°:"
+msgstr ""
diff --git a/repair_order_proforma_report/i18n/en_GB.po b/repair_order_proforma_report/i18n/en_GB.po
new file mode 100644
index 0000000..90ef4f3
--- /dev/null
+++ b/repair_order_proforma_report/i18n/en_GB.po
@@ -0,0 +1,52 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* repair_order_proforma_report
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-10-03 06:46+0000\n"
+"PO-Revision-Date: 2024-10-03 06:46+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: repair_order_proforma_report
+#: model_terms:ir.ui.view,arch_db:repair_order_proforma_report.view_repair_order_form_filter
+msgid "Is Not Proforma"
+msgstr ""
+
+#. module: repair_order_proforma_report
+#: model_terms:ir.ui.view,arch_db:repair_order_proforma_report.view_repair_order_form_filter
+msgid "Is Proforma"
+msgstr ""
+
+#. module: repair_order_proforma_report
+#: model:ir.model.fields,field_description:repair_order_proforma_report.field_repair_order__proforma
+#: model_terms:ir.ui.view,arch_db:repair_order_proforma_report.view_repair_order_form_filter
+msgid "Proforma"
+msgstr ""
+
+#. module: repair_order_proforma_report
+#: model_terms:ir.ui.view,arch_db:repair_order_proforma_report.report_repairorder
+msgid "Proforma Nº:"
+msgstr ""
+
+#. module: repair_order_proforma_report
+#: model:ir.model,name:repair_order_proforma_report.model_repair_order
+msgid "Repair Order"
+msgstr ""
+
+#. module: repair_order_proforma_report
+#: model_terms:ir.ui.view,arch_db:repair_order_proforma_report.report_repairorder
+msgid "Repair Order N°:"
+msgstr ""
+
+#. module: repair_order_proforma_report
+#: model_terms:ir.ui.view,arch_db:repair_order_proforma_report.report_repairorder
+msgid "Repair Quotation N°:"
+msgstr ""
diff --git a/repair_order_proforma_report/i18n/es.po b/repair_order_proforma_report/i18n/es.po
new file mode 100644
index 0000000..b61b3ee
--- /dev/null
+++ b/repair_order_proforma_report/i18n/es.po
@@ -0,0 +1,52 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* repair_order_proforma_report
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-10-03 06:47+0000\n"
+"PO-Revision-Date: 2024-10-03 06:47+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: repair_order_proforma_report
+#: model_terms:ir.ui.view,arch_db:repair_order_proforma_report.view_repair_order_form_filter
+msgid "Is Not Proforma"
+msgstr "No es proforma"
+
+#. module: repair_order_proforma_report
+#: model_terms:ir.ui.view,arch_db:repair_order_proforma_report.view_repair_order_form_filter
+msgid "Is Proforma"
+msgstr "Es proforma"
+
+#. module: repair_order_proforma_report
+#: model:ir.model.fields,field_description:repair_order_proforma_report.field_repair_order__proforma
+#: model_terms:ir.ui.view,arch_db:repair_order_proforma_report.view_repair_order_form_filter
+msgid "Proforma"
+msgstr "Proforma"
+
+#. module: repair_order_proforma_report
+#: model_terms:ir.ui.view,arch_db:repair_order_proforma_report.report_repairorder
+msgid "Proforma Nº:"
+msgstr "Proforma Nº:"
+
+#. module: repair_order_proforma_report
+#: model:ir.model,name:repair_order_proforma_report.model_repair_order
+msgid "Repair Order"
+msgstr "Orden de reparación"
+
+#. module: repair_order_proforma_report
+#: model_terms:ir.ui.view,arch_db:repair_order_proforma_report.report_repairorder
+msgid "Repair Order N°:"
+msgstr "Orden de reparación nº:"
+
+#. module: repair_order_proforma_report
+#: model_terms:ir.ui.view,arch_db:repair_order_proforma_report.report_repairorder
+msgid "Repair Quotation N°:"
+msgstr "Presupuesto de reparación nº:"
diff --git a/repair_order_proforma_report/i18n/fr.po b/repair_order_proforma_report/i18n/fr.po
new file mode 100644
index 0000000..7d78957
--- /dev/null
+++ b/repair_order_proforma_report/i18n/fr.po
@@ -0,0 +1,52 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* repair_order_proforma_report
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-10-03 06:46+0000\n"
+"PO-Revision-Date: 2024-10-03 06:46+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: repair_order_proforma_report
+#: model_terms:ir.ui.view,arch_db:repair_order_proforma_report.view_repair_order_form_filter
+msgid "Is Not Proforma"
+msgstr ""
+
+#. module: repair_order_proforma_report
+#: model_terms:ir.ui.view,arch_db:repair_order_proforma_report.view_repair_order_form_filter
+msgid "Is Proforma"
+msgstr ""
+
+#. module: repair_order_proforma_report
+#: model:ir.model.fields,field_description:repair_order_proforma_report.field_repair_order__proforma
+#: model_terms:ir.ui.view,arch_db:repair_order_proforma_report.view_repair_order_form_filter
+msgid "Proforma"
+msgstr ""
+
+#. module: repair_order_proforma_report
+#: model_terms:ir.ui.view,arch_db:repair_order_proforma_report.report_repairorder
+msgid "Proforma Nº:"
+msgstr ""
+
+#. module: repair_order_proforma_report
+#: model:ir.model,name:repair_order_proforma_report.model_repair_order
+msgid "Repair Order"
+msgstr "Ordre de réparation"
+
+#. module: repair_order_proforma_report
+#: model_terms:ir.ui.view,arch_db:repair_order_proforma_report.report_repairorder
+msgid "Repair Order N°:"
+msgstr ""
+
+#. module: repair_order_proforma_report
+#: model_terms:ir.ui.view,arch_db:repair_order_proforma_report.report_repairorder
+msgid "Repair Quotation N°:"
+msgstr ""
diff --git a/repair_order_proforma_report/models/__init__.py b/repair_order_proforma_report/models/__init__.py
new file mode 100644
index 0000000..2251f67
--- /dev/null
+++ b/repair_order_proforma_report/models/__init__.py
@@ -0,0 +1 @@
+from . import repair_order
diff --git a/repair_order_proforma_report/models/repair_order.py b/repair_order_proforma_report/models/repair_order.py
new file mode 100644
index 0000000..a8ca424
--- /dev/null
+++ b/repair_order_proforma_report/models/repair_order.py
@@ -0,0 +1,9 @@
+# Copyright 2015 Esther Martín - AvanzOSC
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+from odoo import fields, models
+
+
+class RepairOrder(models.Model):
+    _inherit = "repair.order"
+
+    proforma = fields.Boolean(copy=False)
diff --git a/repair_order_proforma_report/views/repair_order_report.xml b/repair_order_proforma_report/views/repair_order_report.xml
new file mode 100644
index 0000000..f2c09e9
--- /dev/null
+++ b/repair_order_proforma_report/views/repair_order_report.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <template
+    id="report_repairorder"
+    inherit_id="repair.report_repairorder"
+    priority="100"
+  >
+        <xpath expr="//div[@class='page']/h2" position="replace">
+            <h2>
+                <span
+          t-if="o.state != 'draft' and not o.proforma"
+        >Repair Order N°:</span>
+                <span
+          t-if="o.state == 'draft' and not o.proforma"
+        >Repair Quotation N°:</span>
+                <span t-if="o.proforma">Proforma Nº:</span>
+                <span t-field="o.name" />
+            </h2>
+        </xpath>
+    </template>
+</odoo>
diff --git a/repair_order_proforma_report/views/repair_order_views.xml b/repair_order_proforma_report/views/repair_order_views.xml
new file mode 100644
index 0000000..167ad6e
--- /dev/null
+++ b/repair_order_proforma_report/views/repair_order_views.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="view_repair_order_form" model="ir.ui.view">
+        <field name="model">repair.order</field>
+        <field name="inherit_id" ref="repair.view_repair_order_form" />
+        <field name="arch" type="xml">
+            <h1 position="after">
+                <label for="proforma" />
+                <field name="proforma" />
+            </h1>
+        </field>
+    </record>
+
+    <record id="view_repair_order_tree" model="ir.ui.view">
+        <field name="model">repair.order</field>
+        <field name="inherit_id" ref="repair.view_repair_order_tree" />
+        <field name="arch" type="xml">
+            <field name="name" position="after">
+                <field name="proforma" optional="show" />
+            </field>
+        </field>
+    </record>
+
+    <record id="view_repair_order_form_filter" model="ir.ui.view">
+        <field name="model">repair.order</field>
+        <field name="inherit_id" ref="repair.view_repair_order_form_filter" />
+        <field name="arch" type="xml">
+            <field name="sale_order_id" position="after">
+                <field name="proforma" />
+            </field>
+            <filter name="is_returned" position="after">
+                <separator />
+                <filter
+          string="Is Proforma"
+          name="is_proforma"
+          domain="[('proforma', '=', True)]"
+        />
+                <filter
+          string="Is Not Proforma"
+          name="is_not_proforma"
+          domain="[('proforma', '=', False)]"
+        />
+            </filter>
+            <filter name="status" position="before">
+                <filter
+          string="Proforma"
+          name="group-proforma"
+          domain="[]"
+          context="{'group_by': 'proforma'}"
+        />
+            </filter>
+        </field>
+    </record>
+</odoo>
diff --git a/setup/repair_order_proforma_report/odoo/addons/repair_order_proforma_report b/setup/repair_order_proforma_report/odoo/addons/repair_order_proforma_report
new file mode 120000
index 0000000..0cd050f
--- /dev/null
+++ b/setup/repair_order_proforma_report/odoo/addons/repair_order_proforma_report
@@ -0,0 +1 @@
+../../../../repair_order_proforma_report
\ No newline at end of file
diff --git a/setup/repair_order_proforma_report/setup.py b/setup/repair_order_proforma_report/setup.py
new file mode 100644
index 0000000..28c57bb
--- /dev/null
+++ b/setup/repair_order_proforma_report/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)