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/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/rma_account/views/account_move_view.xml b/rma_account/views/account_move_view.xml
index b1a9e47f..553f8559 100644
--- a/rma_account/views/account_move_view.xml
+++ b/rma_account/views/account_move_view.xml
@@ -17,11 +17,7 @@
                         icon="fa-eject"
                         groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"
                     >
-                        <field
-                            name="rma_count"
-                            widget="statinfo"
-                            string="RMA"
-                        />
+                        <field name="rma_count" widget="statinfo" string="RMA" />
                     </button>
                 </div>
             </field>
@@ -39,9 +35,7 @@
                 <field name="name" position="after">
                     <field name="rma_line_count" invisible="1" />
                     <field name="rma_line_id" string="RMA line originated" />
-                    <notebook
-                        attrs="{'invisible': [('rma_line_count', '=', 0)]}"
-                    >
+                    <notebook attrs="{'invisible': [('rma_line_count', '=', 0)]}">
                         <page string="RMA Lines">
                             <field name="rma_line_ids" />
                         </page>
diff --git a/rma_account/views/rma_account_menu.xml b/rma_account/views/rma_account_menu.xml
index b5cb1ef3..4e535193 100644
--- a/rma_account/views/rma_account_menu.xml
+++ b/rma_account/views/rma_account_menu.xml
@@ -3,10 +3,7 @@
      License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
 <odoo>
 
-    <record
-        id="action_rma_account_customer_lines"
-        model="ir.actions.act_window"
-    >
+    <record id="action_rma_account_customer_lines" model="ir.actions.act_window">
         <field name="name">Customer RMA</field>
         <field name="res_model">rma.order.line</field>
         <field name="domain">[('type','=', 'customer')]</field>
@@ -18,9 +15,7 @@
         <field name="name">Supplier RMA</field>
         <field name="res_model">rma.order.line</field>
         <field name="domain">[('type','=', 'supplier')]</field>
-        <field
-            name="context"
-        >{"search_default_to_refund":1, "supplier":1}</field>
+        <field name="context">{"search_default_to_refund":1, "supplier":1}</field>
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="rma.view_rma_line_supplier_tree" />
     </record>
diff --git a/rma_account/views/rma_order_line_view.xml b/rma_account/views/rma_order_line_view.xml
index 47fa18ef..c6671dcf 100644
--- a/rma_account/views/rma_order_line_view.xml
+++ b/rma_account/views/rma_order_line_view.xml
@@ -21,11 +21,7 @@
                     icon="fa-pencil-square-o"
                     groups="account.group_account_user"
                 >
-                        <field
-                        name="refund_count"
-                        widget="statinfo"
-                        string="Refunds"
-                    />
+                        <field name="refund_count" widget="statinfo" string="Refunds" />
                     </button>
             </button>
             <group name="main_info" position="inside">
@@ -82,11 +78,7 @@
                     icon="fa-pencil-square-o"
                     groups="account.group_account_user"
                 >
-                        <field
-                        name="refund_count"
-                        widget="statinfo"
-                        string="Refunds"
-                    />
+                        <field name="refund_count" widget="statinfo" string="Refunds" />
                     </button>
             </button>
             <group name="main_info" position="inside">
diff --git a/rma_account/views/rma_order_view.xml b/rma_account/views/rma_order_view.xml
index 4378e3eb..bd969d5c 100644
--- a/rma_account/views/rma_order_view.xml
+++ b/rma_account/views/rma_order_view.xml
@@ -26,11 +26,7 @@
                     icon="fa-pencil-square-o"
                     groups="account.group_account_user"
                 >
-                    <field
-                        name="invoice_count"
-                        widget="statinfo"
-                        string="Origin Inv"
-                    />
+                    <field name="invoice_count" widget="statinfo" string="Origin Inv" />
                 </button>
             </button>
             <!--
diff --git a/rma_account/wizards/rma_add_account_move.xml b/rma_account/wizards/rma_add_account_move.xml
index 2b383dd7..70047ed8 100644
--- a/rma_account/wizards/rma_add_account_move.xml
+++ b/rma_account/wizards/rma_add_account_move.xml
@@ -22,10 +22,7 @@
                     <tree string="Invoice Lines">
                         <field name="move_id" />
                         <field name="name" />
-                        <field
-                            name="account_id"
-                            groups="account.group_account_user"
-                        />
+                        <field name="account_id" groups="account.group_account_user" />
                         <field name="quantity" />
                         <field name="product_id" />
                         <field name="product_uom_id" />
@@ -75,10 +72,7 @@
                     <tree string="Invoice Lines">
                         <field name="move_id" />
                         <field name="name" />
-                        <field
-                            name="account_id"
-                            groups="account.group_account_user"
-                        />
+                        <field name="account_id" groups="account.group_account_user" />
                         <field name="quantity" />
                         <field name="product_id" />
                         <field name="product_uom_id" />
@@ -114,16 +108,10 @@
         <field name="view_mode">form</field>
         <field name="target">new</field>
         <field name="view_id" ref="view_rma_add_account_move" />
-        <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>
 
-    <record
-        id="action_rma_add_account_move_supplier"
-        model="ir.actions.act_window"
-    >
+    <record id="action_rma_add_account_move_supplier" model="ir.actions.act_window">
         <field name="name">Add Invoice</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">rma_add_account_move</field>
@@ -131,10 +119,7 @@
         <field name="view_mode">form</field>
         <field name="target">new</field>
         <field name="view_id" ref="view_rma_add_account_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_account_move_form" model="ir.ui.view">
diff --git a/rma_account/wizards/rma_refund.xml b/rma_account/wizards/rma_refund.xml
index 7adbe282..8cf80e8e 100644
--- a/rma_account/wizards/rma_refund.xml
+++ b/rma_account/wizards/rma_refund.xml
@@ -32,11 +32,7 @@
                         type="object"
                         class="btn-primary"
                     />
-                    <button
-                        string="Cancel"
-                        class="btn-default"
-                        special="cancel"
-                    />
+                    <button string="Cancel" class="btn-default" special="cancel" />
                 </footer>
            </form>
         </field>
@@ -48,10 +44,7 @@
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="view_rma_refund" />
         <field name="binding_model_id" ref="rma.model_rma_order_line" />
-        <field
-            name="groups_id"
-            eval="[(4, ref('account.group_account_invoice'))]"
-        />
+        <field name="groups_id" eval="[(4, ref('account.group_account_invoice'))]" />
         <field name="target">new</field>
     </record>
 
diff --git a/rma_repair/data/repair_sequence.xml b/rma_repair/data/repair_sequence.xml
index 23f61a16..73ba79df 100644
--- a/rma_repair/data/repair_sequence.xml
+++ b/rma_repair/data/repair_sequence.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
 
     <record id="repair.seq_repair" model="ir.sequence">
diff --git a/rma_repair/views/repair_view.xml b/rma_repair/views/repair_view.xml
index 8a37e7e2..894f897f 100644
--- a/rma_repair/views/repair_view.xml
+++ b/rma_repair/views/repair_view.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <record id="view_repair_order_form" model="ir.ui.view">
         <field name="name">repair.order.form rma_repair</field>
         <field name="model">repair.order</field>
-        <field name="inherit_id" ref="repair.view_repair_order_form"/>
+        <field name="inherit_id" ref="repair.view_repair_order_form" />
         <field name="arch" type="xml">
             <field name="guarantee_limit" position="after">
-                <field name="rma_line_id"/>
-                <field name="under_warranty"/>
+                <field name="rma_line_id" />
+                <field name="under_warranty" />
             </field>
         </field>
     </record>
diff --git a/rma_repair/views/rma_operation_view.xml b/rma_repair/views/rma_operation_view.xml
index 5d1f9060..22d7315f 100644
--- a/rma_repair/views/rma_operation_view.xml
+++ b/rma_repair/views/rma_operation_view.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <record id="rma_operation_tree" model="ir.ui.view">
         <field name="name">rma.operation.tree - rma_repair</field>
         <field name="model">rma.operation</field>
-        <field name="inherit_id" ref="rma.rma_operation_tree"/>
+        <field name="inherit_id" ref="rma.rma_operation_tree" />
         <field name="arch" type="xml">
             <field name="delivery_policy" position="after">
-                <field name="repair_type"/>
+                <field name="repair_type" />
             </field>
         </field>
     </record>
@@ -15,10 +15,10 @@
     <record id="rma_operation_form" model="ir.ui.view">
         <field name="name">rma.operation.form - rma_repair</field>
         <field name="model">rma.operation</field>
-        <field name="inherit_id" ref="rma.rma_operation_form"/>
+        <field name="inherit_id" ref="rma.rma_operation_form" />
         <field name="arch" type="xml">
             <field name="delivery_policy" position="after">
-                <field name="repair_type"/>
+                <field name="repair_type" />
             </field>
         </field>
     </record>
diff --git a/rma_repair/views/rma_order_line_view.xml b/rma_repair/views/rma_order_line_view.xml
index d9a5f5a2..7928a39a 100644
--- a/rma_repair/views/rma_order_line_view.xml
+++ b/rma_repair/views/rma_order_line_view.xml
@@ -1,34 +1,40 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <record id="view_rma_line_form" model="ir.ui.view">
         <field name="name">rma.order.line.form - rma_repair</field>
         <field name="model">rma.order.line</field>
-        <field name="inherit_id" ref="rma.view_rma_line_form"/>
+        <field name="inherit_id" ref="rma.view_rma_line_form" />
         <field name="arch" type="xml">
             <div name='button_box' position="inside">
-                <button type="object"  name="action_view_repair_order"
-                        class="oe_stat_button"
-                        icon="fa-wrench"
-                        groups="stock.group_stock_user">
-                        <field name="repair_count" widget="statinfo"
-                               string="Repair Orders"/>
+                <button
+                    type="object"
+                    name="action_view_repair_order"
+                    class="oe_stat_button"
+                    icon="fa-wrench"
+                    groups="stock.group_stock_user"
+                >
+                        <field
+                        name="repair_count"
+                        widget="statinfo"
+                        string="Repair Orders"
+                    />
                 </button>
             </div>
             <group name="quantities" position="inside">
                 <group>
-                    <field name="qty_to_repair"/>
-                    <field name="qty_under_repair"/>
-                    <field name="qty_to_pay"/>
-                    <field name="qty_repaired"/>
+                    <field name="qty_to_repair" />
+                    <field name="qty_under_repair" />
+                    <field name="qty_to_pay" />
+                    <field name="qty_repaired" />
                 </group>
             </group>
             <field name="delivery_policy" position="after">
-                <field name="repair_type"/>
+                <field name="repair_type" />
             </field>
             <notebook position="inside">
                 <page name="repair" string="Repair Orders">
-                    <field name="repair_ids" nolabel="1"/>
+                    <field name="repair_ids" nolabel="1" />
                 </page>
             </notebook>
         </field>
@@ -37,14 +43,16 @@
     <record id="view_rma_line_button_repair_form" model="ir.ui.view">
         <field name="name">rma.order.line.form - rma_repair</field>
         <field name="model">rma.order.line</field>
-        <field name="inherit_id" ref="rma.view_rma_line_button_form"/>
+        <field name="inherit_id" ref="rma.view_rma_line_button_form" />
         <field name="arch" type="xml">
             <header position="inside">
-                <button name="%(action_rma_order_line_make_repair)d"
-                        states="approved"
-                        string="Create Repair Order"
-                        class="oe_highlight"
-                        type="action"/>
+                <button
+                    name="%(action_rma_order_line_make_repair)d"
+                    states="approved"
+                    string="Create Repair Order"
+                    class="oe_highlight"
+                    type="action"
+                />
             </header>
         </field>
     </record>
diff --git a/rma_repair/views/rma_order_view.xml b/rma_repair/views/rma_order_view.xml
index 73546bcc..c1e0faae 100644
--- a/rma_repair/views/rma_order_view.xml
+++ b/rma_repair/views/rma_order_view.xml
@@ -1,18 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <record id="view_rma_form" model="ir.ui.view">
         <field name="name">rma.order.form - rma_repair</field>
         <field name="model">rma.order</field>
-        <field name="inherit_id" ref="rma.view_rma_form"/>
+        <field name="inherit_id" ref="rma.view_rma_form" />
         <field name="arch" type="xml">
             <div name="button_box" position="inside">
-                <button type="object" name="action_view_repair_order"
-                        class="oe_stat_button"
-                        icon="fa-wrench"
-                        groups="stock.group_stock_user">
-                    <field name="repair_count" widget="statinfo"
-                           string="Repair Orders"/>
+                <button
+                    type="object"
+                    name="action_view_repair_order"
+                    class="oe_stat_button"
+                    icon="fa-wrench"
+                    groups="stock.group_stock_user"
+                >
+                    <field
+                        name="repair_count"
+                        widget="statinfo"
+                        string="Repair Orders"
+                    />
                 </button>
             </div>
         </field>
diff --git a/rma_repair/wizards/rma_order_line_make_repair_view.xml b/rma_repair/wizards/rma_order_line_make_repair_view.xml
index 8d5cfb99..54ffaf6b 100644
--- a/rma_repair/wizards/rma_order_line_make_repair_view.xml
+++ b/rma_repair/wizards/rma_order_line_make_repair_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <record id="view_rma_order_line_make_repair" model="ir.ui.view">
@@ -7,43 +7,54 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
              <form string="Create Repair">
-                 <separator string="New Repair Orders details:"/>
-                 <newline/>
+                 <separator string="New Repair Orders details:" />
+                 <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}"/>
-                              <field name="product_id"/>
-                              <field name="product_qty"/>
-                              <field name="product_uom_id" groups="uom.group_uom"/>
-                              <field name="partner_id"/>
-                              <field name="to_refurbish"/>
-                              <field name="refurbish_product_id" attrs="{'required': [('to_refurbish', '=', True)]}"/>
-                              <field name="location_id" groups="stock.group_stock_multi_locations"/>
-                              <field name="location_dest_id" groups="stock.group_stock_multi_locations"/>
-                              <field name="invoice_method"/>
+                              <field name="line_id" options="{'no_open': true}" />
+                              <field name="product_id" />
+                              <field name="product_qty" />
+                              <field name="product_uom_id" groups="uom.group_uom" />
+                              <field name="partner_id" />
+                              <field name="to_refurbish" />
+                              <field
+                                name="refurbish_product_id"
+                                attrs="{'required': [('to_refurbish', '=', True)]}"
+                            />
+                              <field
+                                name="location_id"
+                                groups="stock.group_stock_multi_locations"
+                            />
+                              <field
+                                name="location_dest_id"
+                                groups="stock.group_stock_multi_locations"
+                            />
+                              <field name="invoice_method" />
                           </tree>
                      </field>
                  </group>
-                 <newline/>
+                 <newline />
                  <footer>
-                     <button name="make_repair_order"
-                             string="Create Repair Orders" type="object"
-                             class="oe_highlight"/>
-                     <button special="cancel" string="Cancel" class="oe_link"/>
+                     <button
+                        name="make_repair_order"
+                        string="Create Repair Orders"
+                        type="object"
+                        class="oe_highlight"
+                    />
+                     <button special="cancel" string="Cancel" class="oe_link" />
                  </footer>
             </form>
         </field>
     </record>
 
-    <record id="action_rma_order_line_make_repair"
-            model="ir.actions.act_window">
+    <record id="action_rma_order_line_make_repair" model="ir.actions.act_window">
         <field name="name">Create Repair</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">rma.order.line.make.repair</field>
         <field name="view_mode">form</field>
         <field name="target">new</field>
-        <field name="binding_model_id" ref="rma_repair.model_rma_order_line"/>
+        <field name="binding_model_id" ref="rma_repair.model_rma_order_line" />
     </record>
 
 </odoo>
diff --git a/rma_sale/views/rma_order_line_view.xml b/rma_sale/views/rma_order_line_view.xml
index de05431b..013011a1 100644
--- a/rma_sale/views/rma_order_line_view.xml
+++ b/rma_sale/views/rma_order_line_view.xml
@@ -127,10 +127,7 @@
         <field name="inherit_id" ref="rma.view_rma_rma_line_filter" />
         <field name="arch" type="xml">
             <group name="stock_quantities" position="after">
-                <group
-                    name="sale_quantities"
-                    groups="sales_team.group_sale_salesman"
-                >
+                <group name="sale_quantities" groups="sales_team.group_sale_salesman">
                     <filter
                         domain="[('state','!=', 'done'),('qty_to_sell','>',0.0)]"
                         help="To Sell"
diff --git a/rma_sale/views/rma_order_view.xml b/rma_sale/views/rma_order_view.xml
index 2bde19ac..905f67b4 100644
--- a/rma_sale/views/rma_order_view.xml
+++ b/rma_sale/views/rma_order_view.xml
@@ -13,11 +13,7 @@
                     icon="fa-pencil-square-o"
                     groups="sales_team.group_sale_salesman"
                 >
-                        <field
-                        name="sale_count"
-                        widget="statinfo"
-                        string="Origin SO"
-                    />
+                        <field name="sale_count" widget="statinfo" string="Origin SO" />
                     </button>
                 </div>
             </field>
diff --git a/rma_sale/views/sale_order_view.xml b/rma_sale/views/sale_order_view.xml
index 3c132486..ba2d9148 100644
--- a/rma_sale/views/sale_order_view.xml
+++ b/rma_sale/views/sale_order_view.xml
@@ -38,11 +38,7 @@
                         attrs="{'invisible': [('rma_count', '=', 0)]}"
                         groups="rma.group_rma_customer_user"
                     >
-                           <field
-                            name="rma_count"
-                            widget="statinfo"
-                            string="RMA"
-                        />
+                           <field name="rma_count" widget="statinfo" string="RMA" />
                        </button>
                     </xpath>
                 </data>
diff --git a/rma_sale/wizards/rma_add_sale.xml b/rma_sale/wizards/rma_add_sale.xml
index 6ebffb1b..10774c37 100644
--- a/rma_sale/wizards/rma_add_sale.xml
+++ b/rma_sale/wizards/rma_add_sale.xml
@@ -42,11 +42,7 @@
                             string="Unit of Measure"
                             groups="uom.group_uom"
                         />
-                        <field
-                            name="price_subtotal"
-                            sum="Total"
-                            widget="monetary"
-                        />
+                        <field name="price_subtotal" sum="Total" widget="monetary" />
                     </tree>
 
                 </field>
diff --git a/rma_sale/wizards/rma_order_line_make_sale_order_view.xml b/rma_sale/wizards/rma_order_line_make_sale_order_view.xml
index 93da4d4e..da6d5d30 100644
--- a/rma_sale/wizards/rma_order_line_make_sale_order_view.xml
+++ b/rma_sale/wizards/rma_order_line_make_sale_order_view.xml
@@ -33,10 +33,7 @@
                                   <field name="product_id" />
                                   <field name="name" />
                                   <field name="product_qty" />
-                                  <field
-                                name="product_uom_id"
-                                groups="uom.group_uom"
-                            />
+                                  <field name="product_uom_id" groups="uom.group_uom" />
                                   <field name="free_of_charge" />
                               </tree>
                          </field>
@@ -48,11 +45,7 @@
                         type="object"
                         class="oe_highlight"
                     />
-                         <button
-                        special="cancel"
-                        string="Cancel"
-                        class="oe_link"
-                    />
+                         <button special="cancel" string="Cancel" class="oe_link" />
                      </footer>
                 </form>
             </field>
diff --git a/setup/rma_repair/odoo/addons/rma_repair b/setup/rma_repair/odoo/addons/rma_repair
new file mode 120000
index 00000000..ecca5406
--- /dev/null
+++ b/setup/rma_repair/odoo/addons/rma_repair
@@ -0,0 +1 @@
+../../../../rma_repair
\ No newline at end of file
diff --git a/setup/rma_repair/setup.py b/setup/rma_repair/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/rma_repair/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)