diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 873c7b36..44b1d604 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -9,7 +9,7 @@
     "summary": "Introduces the return merchandise authorization (RMA) process "
     "in odoo",
     "author": "ForgeFlow",
-    "website": "https://github.com/ForgeFlow/stock-rma",
+    "website": "https://github.com/OCA/account-budgeting",
     "depends": ["stock", "mail", "web"],
     "demo": ["demo/stock_demo.xml"],
     "data": [
diff --git a/rma/data/stock_data.xml b/rma/data/stock_data.xml
index eab5ee67..f78880a3 100644
--- a/rma/data/stock_data.xml
+++ b/rma/data/stock_data.xml
@@ -46,10 +46,7 @@
         <field name="sequence_id" ref="seq_picking_type_rma_cust_out" />
         <field name="sequence_code">RMA → Customer</field>
         <field name="default_location_src_id" ref="rma.location_rma" />
-        <field
-            name="default_location_dest_id"
-            ref="stock.stock_location_customers"
-        />
+        <field name="default_location_dest_id" ref="stock.stock_location_customers" />
         <field name="warehouse_id" eval="False" />
         <field name="code">outgoing</field>
     </record>
@@ -58,10 +55,7 @@
         <field name="name">Customer → RMA</field>
         <field name="sequence_id" ref="seq_picking_type_rma_cust_in" />
         <field name="sequence_code">Customer → RMA</field>
-        <field
-            name="default_location_src_id"
-            ref="stock.stock_location_customers"
-        />
+        <field name="default_location_src_id" ref="stock.stock_location_customers" />
         <field name="default_location_dest_id" ref="rma.location_rma" />
         <field name="warehouse_id" eval="False" />
         <field name="code">incoming</field>
@@ -72,10 +66,7 @@
         <field name="sequence_id" ref="seq_picking_type_rma_sup_out" />
         <field name="sequence_code">RMA -> Supplier</field>
         <field name="default_location_src_id" ref="rma.location_rma" />
-        <field
-            name="default_location_dest_id"
-            ref="stock.stock_location_suppliers"
-        />
+        <field name="default_location_dest_id" ref="stock.stock_location_suppliers" />
         <field name="warehouse_id" eval="False" />
         <field name="code">outgoing</field>
     </record>
@@ -84,10 +75,7 @@
         <field name="name">Supplier -> RMA</field>
         <field name="sequence_id" ref="seq_picking_type_rma_sup_in" />
         <field name="sequence_code">Supplier -> RMA</field>
-        <field
-            name="default_location_src_id"
-            ref="stock.stock_location_suppliers"
-        />
+        <field name="default_location_src_id" ref="stock.stock_location_suppliers" />
         <field name="default_location_dest_id" ref="rma.location_rma" />
         <field name="warehouse_id" eval="False" />
         <field name="code">incoming</field>
@@ -97,14 +85,8 @@
         <field name="name">Customer -> Supplier</field>
         <field name="sequence_id" ref="seq_picking_type_rma_dropship" />
         <field name="sequence_code">Customer -> Supplier</field>
-        <field
-            name="default_location_src_id"
-            ref="stock.stock_location_customers"
-        />
-        <field
-            name="default_location_dest_id"
-            ref="stock.stock_location_suppliers"
-        />
+        <field name="default_location_src_id" ref="stock.stock_location_customers" />
+        <field name="default_location_dest_id" ref="stock.stock_location_suppliers" />
         <field name="warehouse_id" eval="False" />
         <field name="code">incoming</field>
     </record>
@@ -113,14 +95,8 @@
         <field name="name">Supplier -> Customer</field>
         <field name="sequence_id" ref="seq_picking_type_rma_dropship" />
         <field name="sequence_code">Supplier -> Customer</field>
-        <field
-            name="default_location_src_id"
-            ref="stock.stock_location_suppliers"
-        />
-        <field
-            name="default_location_dest_id"
-            ref="stock.stock_location_customers"
-        />
+        <field name="default_location_src_id" ref="stock.stock_location_suppliers" />
+        <field name="default_location_dest_id" ref="stock.stock_location_customers" />
         <field name="warehouse_id" eval="False" />
         <field name="code">incoming</field>
     </record>
@@ -214,10 +190,7 @@
         <field name="location_src_id" ref="stock.stock_location_customers" />
         <field name="procure_method">make_to_stock</field>
         <field name="route_id" ref="rma.route_rma_dropship" />
-        <field
-            name="picking_type_id"
-            ref="rma.picking_type_rma_dropship_return"
-        />
+        <field name="picking_type_id" ref="rma.picking_type_rma_dropship_return" />
     </record>
 
     <record id="rule_rma_dropship" model="stock.rule">
diff --git a/rma/demo/stock_demo.xml b/rma/demo/stock_demo.xml
index 8149b189..087e143f 100644
--- a/rma/demo/stock_demo.xml
+++ b/rma/demo/stock_demo.xml
@@ -41,14 +41,8 @@
     <record id="picking_type_rma_dropship_return" model="stock.picking.type">
         <field name="name">Customer -> Supplier</field>
         <field name="sequence_id" ref="seq_picking_type_rma_dropship" />
-        <field
-            name="default_location_src_id"
-            ref="stock.stock_location_customers"
-        />
-        <field
-            name="default_location_dest_id"
-            ref="stock.stock_location_suppliers"
-        />
+        <field name="default_location_src_id" ref="stock.stock_location_customers" />
+        <field name="default_location_dest_id" ref="stock.stock_location_suppliers" />
         <field name="warehouse_id" eval="False" />
         <field name="code">incoming</field>
     </record>
@@ -56,14 +50,8 @@
     <record id="picking_type_rma_dropship" model="stock.picking.type">
         <field name="name">Supplier -> Customer</field>
         <field name="sequence_id" ref="seq_picking_type_rma_dropship" />
-        <field
-            name="default_location_src_id"
-            ref="stock.stock_location_suppliers"
-        />
-        <field
-            name="default_location_dest_id"
-            ref="stock.stock_location_customers"
-        />
+        <field name="default_location_src_id" ref="stock.stock_location_suppliers" />
+        <field name="default_location_dest_id" ref="stock.stock_location_customers" />
         <field name="warehouse_id" eval="False" />
         <field name="code">incoming</field>
     </record>
@@ -105,10 +93,7 @@
         <field name="location_src_id" ref="stock.stock_location_customers" />
         <field name="procure_method">make_to_stock</field>
         <field name="route_id" ref="rma.route_rma_dropship" />
-        <field
-            name="picking_type_id"
-            ref="rma.picking_type_rma_dropship_return"
-        />
+        <field name="picking_type_id" ref="rma.picking_type_rma_dropship_return" />
     </record>
 
     <record id="rule_rma_dropship" model="stock.rule">
diff --git a/rma/models/rma_order.py b/rma/models/rma_order.py
index 38c53a93..99851202 100644
--- a/rma/models/rma_order.py
+++ b/rma/models/rma_order.py
@@ -226,8 +226,7 @@ class RmaOrder(models.Model):
         return result
 
     def _get_valid_lines(self):
-        """:return: A recordset of rma lines.
-        """
+        """:return: A recordset of rma lines."""
         self.ensure_one()
         return self.rma_line_ids
 
diff --git a/rma/report/rma_report_templates.xml b/rma/report/rma_report_templates.xml
index d9815000..fd218c2b 100644
--- a/rma/report/rma_report_templates.xml
+++ b/rma/report/rma_report_templates.xml
@@ -2,10 +2,7 @@
 <odoo>
     <template id="report_rma_order_line_document">
         <t t-call="web.external_layout">
-            <t
-                t-set="doc"
-                t-value="doc.with_context({'lang':doc.partner_id.lang})"
-            />
+            <t t-set="doc" t-value="doc.with_context({'lang':doc.partner_id.lang})" />
             <div class="page">
                 <div class="oe_structure" />
                 <div class="row">
@@ -19,9 +16,7 @@
                                     t-field="doc.in_warehouse_id.partner_id"
                                     t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'
                                 />
-                                <p
-                                    t-if="doc.in_warehouse_id.partner_id.vat"
-                                >VAT: <span
+                                <p t-if="doc.in_warehouse_id.partner_id.vat">VAT: <span
                                         t-field="doc.in_warehouse_id.partner_id.vat"
                                     /></p>
                             </div>
@@ -80,11 +75,7 @@
                         <strong>Contact Person:</strong>
                         <p t-field="doc.requested_by.name" />
                     </div>
-                    <div
-                        name="operation_id"
-                        t-if="doc.operation_id"
-                        class="col-3"
-                    >
+                    <div name="operation_id" t-if="doc.operation_id" class="col-3">
                         <strong>Operation:</strong>
                         <p t-field="doc.operation_id.name" />
                     </div>
@@ -103,10 +94,7 @@
                             <td><span t-field="doc.product_id" /></td>
                             <td class="text-right">
                                 <span t-field="doc.product_qty" />
-                                <span
-                                    t-field="doc.uom_id"
-                                    groups="uom.group_uom"
-                                />
+                                <span t-field="doc.uom_id" groups="uom.group_uom" />
                             </td>
                             <td class="text-right">
                                 <span
@@ -144,10 +132,7 @@
 
     <template id="report_rma_order_document">
         <t t-call="web.external_layout">
-            <t
-                t-set="doc"
-                t-value="doc.with_context({'lang':doc.partner_id.lang})"
-            />
+            <t t-set="doc" t-value="doc.with_context({'lang':doc.partner_id.lang})" />
             <div class="page">
                 <div class="oe_structure" />
                 <div class="row">
@@ -161,9 +146,7 @@
                                     t-field="doc.in_warehouse_id.partner_id"
                                     t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'
                                 />
-                                <p
-                                    t-if="doc.in_warehouse_id.partner_id.vat"
-                                >VAT: <span
+                                <p t-if="doc.in_warehouse_id.partner_id.vat">VAT: <span
                                         t-field="doc.in_warehouse_id.partner_id.vat"
                                     /></p>
                             </div>
@@ -241,10 +224,7 @@
                             <td><span t-field="l.product_id" /></td>
                             <td class="text-right">
                                 <span t-field="l.product_qty" />
-                                <span
-                                    t-field="l.uom_id"
-                                    groups="uom.group_uom"
-                                />
+                                <span t-field="l.uom_id" groups="uom.group_uom" />
                             </td>
                             <td class="text-right">
                                 <span t-field="l.price_unit" />
diff --git a/rma/security/rma.xml b/rma/security/rma.xml
index d6de5e04..e525e177 100644
--- a/rma/security/rma.xml
+++ b/rma/security/rma.xml
@@ -10,19 +10,13 @@
 
         <record id="group_rma_customer_user" model="res.groups">
             <field name="name">RMA Customer User</field>
-            <field
-                name="implied_ids"
-                eval="[(4, ref('stock.group_stock_user'))]"
-            />
+            <field name="implied_ids" eval="[(4, ref('stock.group_stock_user'))]" />
             <field name="category_id" ref="module_category_rma" />
         </record>
 
         <record id="group_rma_supplier_user" model="res.groups">
             <field name="name">RMA Supplier User</field>
-            <field
-                name="implied_ids"
-                eval="[(4, ref('stock.group_stock_user'))]"
-            />
+            <field name="implied_ids" eval="[(4, ref('stock.group_stock_user'))]" />
             <field name="category_id" ref="module_category_rma" />
         </record>
 
diff --git a/rma/views/product_view.xml b/rma/views/product_view.xml
index 368b3e49..9c3486f1 100644
--- a/rma/views/product_view.xml
+++ b/rma/views/product_view.xml
@@ -3,10 +3,7 @@
     <record id="product_category_form_view" model="ir.ui.view">
         <field name="name">product.category.form</field>
         <field name="model">product.category</field>
-        <field
-            name="inherit_id"
-            ref="stock.product_category_form_view_inherit"
-        />
+        <field name="inherit_id" ref="stock.product_category_form_view_inherit" />
         <field name="arch" type="xml">
                 <field name="removal_strategy_id" position="after">
                     <group name="rma">
diff --git a/rma/views/rma_order_line_view.xml b/rma/views/rma_order_line_view.xml
index 20c4ee4d..6a7b9fe3 100644
--- a/rma/views/rma_order_line_view.xml
+++ b/rma/views/rma_order_line_view.xml
@@ -39,10 +39,7 @@
                     <field name="lot_id" groups="stock.group_production_lot" />
                     <field name="rma_id" groups="rma.group_rma_groups" />
                     <field name="origin" />
-                    <field
-                        name="operation_id"
-                        domain="[('type','=','supplier')]"
-                    />
+                    <field name="operation_id" domain="[('type','=','supplier')]" />
                     <field name="uom_id" groups="uom.group_uom" />
                     <field name="product_qty" />
                     <field name="price_unit" />
@@ -233,11 +230,7 @@
                                 </group>
                             </page>
                             <page name="stock" string="Stock Moves">
-                                <field
-                                    name="move_ids"
-                                    nolabel="1"
-                                    readonly="1"
-                                />
+                                <field name="move_ids" nolabel="1" readonly="1" />
                             </page>
                             <page name="quantities" string="Quantities">
                                 <group>
@@ -480,18 +473,10 @@
                                 </group>
                             </page>
                             <page name="stock" string="Stock Moves">
-                                <field
-                                    name="move_ids"
-                                    nolabel="1"
-                                    readonly="1"
-                                />
+                                <field name="move_ids" nolabel="1" readonly="1" />
                             </page>
                             <page name="quantities" string="Quantities">
-                                <group
-                                    name="quantities"
-                                    col="4"
-                                    string="Quantities"
-                                >
+                                <group name="quantities" col="4" string="Quantities">
                                     <group name="receive">
                                         <field name="qty_to_receive" />
                                         <field name="qty_incoming" />
@@ -561,10 +546,7 @@
                         help="My RMAs"
                     />
                     <separator />
-                    <group
-                        name="stock_quantities"
-                        groups="stock.group_stock_user"
-                    >
+                    <group name="stock_quantities" groups="stock.group_stock_user">
                         <filter
                             name="to_receive"
                             domain="[('state','!=', 'done'),('qty_to_receive','>',0.0)]"
@@ -645,19 +627,13 @@
             <field name="view_id" ref="view_rma_line_supplier_tree" />
         </record>
 
-        <record
-            id="action_rma_line_supplier_tree"
-            model="ir.actions.act_window.view"
-        >
+        <record id="action_rma_line_supplier_tree" model="ir.actions.act_window.view">
             <field eval="3" name="sequence" />
             <field name="view_mode">tree</field>
             <field name="act_window_id" ref="action_rma_supplier_lines" />
         </record>
 
-        <record
-            id="action_rma_line_supplier_form"
-            model="ir.actions.act_window.view"
-        >
+        <record id="action_rma_line_supplier_form" model="ir.actions.act_window.view">
             <field eval="4" name="sequence" />
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_rma_line_supplier_form" />
diff --git a/rma/views/rma_order_view.xml b/rma/views/rma_order_view.xml
index e471e9e9..6c9bb306 100644
--- a/rma/views/rma_order_view.xml
+++ b/rma/views/rma_order_view.xml
@@ -7,11 +7,7 @@
             <tree string="RMA">
                 <field name="name" />
                 <field name="reference" />
-                <field
-                    name="partner_id"
-                    groups="base.group_user"
-                    string="Customer"
-                />
+                <field name="partner_id" groups="base.group_user" string="Customer" />
                 <field name="date_rma" />
             </tree>
         </field>
@@ -24,11 +20,7 @@
             <tree string="RMA">
                 <field name="name" />
                 <field name="reference" />
-                <field
-                    name="partner_id"
-                    groups="base.group_user"
-                    string="Supplier"
-                />
+                <field name="partner_id" groups="base.group_user" string="Supplier" />
                 <field name="date_rma" />
             </tree>
         </field>
@@ -75,11 +67,7 @@
                             icon="fa-list"
                             groups="rma.group_rma_customer_user"
                         >
-                        <field
-                                name="line_count"
-                                widget="statinfo"
-                                string="RMA Lines"
-                            />
+                        <field name="line_count" widget="statinfo" string="RMA Lines" />
                     </button>
                     <button
                             type="object"
@@ -147,10 +135,7 @@
                                 name="assigned_to"
                                 attrs="{'readonly':[('state', '!=', 'draft')]}"
                             />
-                        <field
-                                name="company_id"
-                                groups="base.group_multi_company"
-                            />
+                        <field name="company_id" groups="base.group_multi_company" />
                     </group>
                 </group>
                 <notebook colspan="4">
@@ -232,11 +217,7 @@
                             icon="fa-list"
                             groups="rma.group_rma_supplier_user"
                         >
-                        <field
-                                name="line_count"
-                                widget="statinfo"
-                                string="RMA Lines"
-                            />
+                        <field name="line_count" widget="statinfo" string="RMA Lines" />
                     </button>
                 </div>
                 <div class="oe_title" name="title">
@@ -293,10 +274,7 @@
                                 name="assigned_to"
                                 attrs="{'readonly':[('state', '!=', 'draft')]}"
                             />
-                        <field
-                                name="company_id"
-                                groups="base.group_multi_company"
-                            />
+                        <field name="company_id" groups="base.group_multi_company" />
                     </group>
                 </group>
                 <notebook colspan="4">
diff --git a/rma/views/stock_view.xml b/rma/views/stock_view.xml
index c097ff3c..564ec7ce 100644
--- a/rma/views/stock_view.xml
+++ b/rma/views/stock_view.xml
@@ -13,10 +13,7 @@
         </field>
     </record>
 
-    <record
-        id="stock_location_route_form_view_inherit_rma_stock"
-        model="ir.ui.view"
-    >
+    <record id="stock_location_route_form_view_inherit_rma_stock" model="ir.ui.view">
         <field name="name">stock.location.route.form</field>
         <field name="inherit_id" ref="stock.stock_location_route_form_view" />
         <field name="model">stock.location.route</field>
diff --git a/rma/views/stock_warehouse.xml b/rma/views/stock_warehouse.xml
index ebdf941c..701edd8e 100644
--- a/rma/views/stock_warehouse.xml
+++ b/rma/views/stock_warehouse.xml
@@ -5,10 +5,7 @@
         <field name="model">stock.warehouse</field>
         <field name="inherit_id" ref="stock.view_warehouse" />
         <field name="arch" type="xml">
-            <xpath
-                expr="//field[@name='wh_output_stock_loc_id']"
-                position="after"
-            >
+            <xpath expr="//field[@name='wh_output_stock_loc_id']" position="after">
                 <field name="lot_rma_id" />
             </xpath>
             <field name="resupply_wh_ids" position="after">
diff --git a/rma/wizards/rma_add_stock_move_view.xml b/rma/wizards/rma_add_stock_move_view.xml
index 53e4f392..e0b4cbc5 100644
--- a/rma/wizards/rma_add_stock_move_view.xml
+++ b/rma/wizards/rma_add_stock_move_view.xml
@@ -35,11 +35,7 @@
                             groups="stock.group_stock_multi_locations"
                         />
                         <field name="create_date" groups="base.group_no_one" />
-                        <field
-                            name="date"
-                            string="Date"
-                            groups="base.group_no_one"
-                        />
+                        <field name="date" string="Date" groups="base.group_no_one" />
                         <field name="date_expected" string="Date Expected" />
                         <field name="state" />
                     </tree>
@@ -63,20 +59,14 @@
         </field>
     </record>
 
-    <record
-        id="action_rma_add_stock_move_customer"
-        model="ir.actions.act_window"
-    >
+    <record id="action_rma_add_stock_move_customer" model="ir.actions.act_window">
         <field name="name">Add from Stock Move</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">rma_add_stock_move</field>
         <field name="view_mode">form</field>
         <field name="target">new</field>
         <field name="view_id" ref="view_rma_add_stock_move_customer" />
-        <field
-            name="groups_id"
-            eval="[(4, ref('rma.group_rma_customer_user'))]"
-        />
+        <field name="groups_id" eval="[(4, ref('rma.group_rma_customer_user'))]" />
     </record>
 
 
@@ -131,26 +121,17 @@
         </field>
     </record>
 
-    <record
-        id="action_rma_add_stock_move_supplier"
-        model="ir.actions.act_window"
-    >
+    <record id="action_rma_add_stock_move_supplier" model="ir.actions.act_window">
         <field name="name">Add from Stock Move</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">rma_add_stock_move</field>
         <field name="view_mode">form</field>
         <field name="target">new</field>
         <field name="view_id" ref="view_rma_add_stock_move_supplier" />
-        <field
-            name="groups_id"
-            eval="[(4, ref('rma.group_rma_supplier_user'))]"
-        />
+        <field name="groups_id" eval="[(4, ref('rma.group_rma_supplier_user'))]" />
     </record>
 
-    <record
-        id="view_rma_add_stock_move_button_supplier_form"
-        model="ir.ui.view"
-    >
+    <record id="view_rma_add_stock_move_button_supplier_form" model="ir.ui.view">
         <field name="name">rma.order.supplier.form - stock.move wizard</field>
         <field name="model">rma.order</field>
         <field name="inherit_id" ref="rma.view_rma_supplier_form" />
diff --git a/rma/wizards/rma_order_line_make_supplier_rma_view.xml b/rma/wizards/rma_order_line_make_supplier_rma_view.xml
index cbba885c..f862c775 100644
--- a/rma/wizards/rma_order_line_make_supplier_rma_view.xml
+++ b/rma/wizards/rma_order_line_make_supplier_rma_view.xml
@@ -25,15 +25,8 @@
                  <newline />
                  <group>
                      <field name="item_ids" nolabel="1" colspan="2">
-                          <tree
-                            string="Details"
-                            editable="bottom"
-                            create="false"
-                        >
-                              <field
-                                name="line_id"
-                                options="{'no_open': true}"
-                            />
+                          <tree string="Details" editable="bottom" create="false">
+                              <field name="line_id" options="{'no_open': true}" />
                               <field name="product_id" />
                               <field name="name" />
                               <field name="operation_id" />
@@ -56,10 +49,7 @@
         </field>
     </record>
 
-    <record
-        id="action_rma_order_line_make_supplier_rma"
-        model="ir.actions.act_window"
-    >
+    <record id="action_rma_order_line_make_supplier_rma" model="ir.actions.act_window">
         <field name="name">Create Supplier RMA</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">rma.order.line.make.supplier.rma</field>
diff --git a/setup/rma/odoo/addons/rma b/setup/rma/odoo/addons/rma
new file mode 120000
index 00000000..8475ad50
--- /dev/null
+++ b/setup/rma/odoo/addons/rma
@@ -0,0 +1 @@
+../../../../rma
\ No newline at end of file
diff --git a/setup/rma/setup.py b/setup/rma/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/rma/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)