diff --git a/rma/data/rma_operation.xml b/rma/data/rma_operation.xml
index 9d1fc02f..92e3fec0 100644
--- a/rma/data/rma_operation.xml
+++ b/rma/data/rma_operation.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <odoo noupdate="1">
     <record id="rma_operation_customer_replace" model="rma.operation">
         <field name="name">Replace After Receive</field>
@@ -6,8 +6,8 @@
         <field name="receipt_policy">ordered</field>
         <field name="delivery_policy">received</field>
         <field name="type">customer</field>
-        <field name="in_route_id" ref="rma.route_rma_customer"/>
-        <field name="out_route_id" ref="rma.route_rma_customer"/>
+        <field name="in_route_id" ref="rma.route_rma_customer" />
+        <field name="out_route_id" ref="rma.route_rma_customer" />
     </record>
 
     <record id="rma_operation_supplier_replace" model="rma.operation">
@@ -16,8 +16,8 @@
         <field name="receipt_policy">ordered</field>
         <field name="delivery_policy">ordered</field>
         <field name="type">supplier</field>
-        <field name="in_route_id" ref="rma.route_rma_supplier"/>
-        <field name="out_route_id" ref="rma.route_rma_supplier"/>
+        <field name="in_route_id" ref="rma.route_rma_supplier" />
+        <field name="out_route_id" ref="rma.route_rma_supplier" />
     </record>
 
     <record id="rma_operation_ds_replace" model="rma.operation">
@@ -26,9 +26,9 @@
         <field name="receipt_policy">ordered</field>
         <field name="delivery_policy">no</field>
         <field name="type">customer</field>
-        <field name="customer_to_supplier" eval="True"/>
-        <field name="out_route_id" ref="rma.route_rma_dropship"/>
-        <field name="in_route_id" ref="rma.route_rma_dropship"/>
+        <field name="customer_to_supplier" eval="True" />
+        <field name="out_route_id" ref="rma.route_rma_dropship" />
+        <field name="in_route_id" ref="rma.route_rma_dropship" />
     </record>
 
     <record id="rma_operation_ds_replace_supplier" model="rma.operation">
@@ -37,9 +37,9 @@
         <field name="receipt_policy">no</field>
         <field name="delivery_policy">ordered</field>
         <field name="type">supplier</field>
-        <field name="supplier_to_customer" eval="True"/>
-        <field name="out_route_id" ref="rma.route_rma_dropship"/>
-        <field name="in_route_id" ref="rma.route_rma_dropship"/>
+        <field name="supplier_to_customer" eval="True" />
+        <field name="out_route_id" ref="rma.route_rma_dropship" />
+        <field name="in_route_id" ref="rma.route_rma_dropship" />
     </record>
 
 </odoo>
diff --git a/rma/data/rma_sequence.xml b/rma/data/rma_sequence.xml
index d025881e..db71c5ca 100644
--- a/rma/data/rma_sequence.xml
+++ b/rma/data/rma_sequence.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <odoo noupdate="1">
     <record id="rma_seq" model="ir.sequence">
         <field name="name">Customer RMA sequence</field>
         <field name="code">rma.order.customer</field>
         <field name="padding">5</field>
         <field name="prefix">RMAG/%(year)s/</field>
-        <field eval="1" name="number_next"/>
-        <field eval="1" name="number_increment"/>
+        <field eval="1" name="number_next" />
+        <field eval="1" name="number_increment" />
     </record>
 
     <record id="rma_supplier_seq" model="ir.sequence">
@@ -14,9 +14,9 @@
         <field name="code">rma.order.supplier</field>
         <field name="padding">5</field>
         <field name="prefix">RTVG/%(year)s/</field>
-        <field eval="1" name="number_next"/>
-        <field eval="1" name="number_increment"/>
-        <field name="company_id" eval="False"/>
+        <field eval="1" name="number_next" />
+        <field eval="1" name="number_increment" />
+        <field name="company_id" eval="False" />
     </record>
 
     <record id="rma_line_seq" model="ir.sequence">
@@ -24,9 +24,9 @@
         <field name="code">rma.order.line.customer</field>
         <field name="padding">5</field>
         <field name="prefix">RMA/%(year)s/</field>
-        <field eval="1" name="number_next"/>
-        <field eval="1" name="number_increment"/>
-        <field name="company_id" eval="False"/>
+        <field eval="1" name="number_next" />
+        <field eval="1" name="number_increment" />
+        <field name="company_id" eval="False" />
     </record>
 
     <record id="rma_line_supplier_seq" model="ir.sequence">
@@ -34,9 +34,9 @@
         <field name="code">rma.order.line.supplier</field>
         <field name="padding">5</field>
         <field name="prefix">RTV/%(year)s/</field>
-        <field eval="1" name="number_next"/>
-        <field eval="1" name="number_increment"/>
-        <field name="company_id" eval="False"/>
+        <field eval="1" name="number_next" />
+        <field eval="1" name="number_increment" />
+        <field name="company_id" eval="False" />
     </record>
 
 </odoo>
diff --git a/rma/data/stock_data.xml b/rma/data/stock_data.xml
index 08d4e687..eab5ee67 100644
--- a/rma/data/stock_data.xml
+++ b/rma/data/stock_data.xml
@@ -1,216 +1,233 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <odoo noupdate="1">
     <record id="location_rma" model="stock.location">
         <field name="name">WH RMA</field>
         <field name="usage">internal</field>
-        <field name="location_id" ref="stock.stock_location_stock"/>
+        <field name="location_id" ref="stock.stock_location_stock" />
     </record>
 
     <record id="seq_picking_type_rma_cust_out" model="ir.sequence">
         <field name="name">DOC</field>
         <field name="prefix">RCO</field>
         <field name="padding">5</field>
-        <field name="company_id" eval="False"/>
+        <field name="company_id" eval="False" />
     </record>
 
     <record id="seq_picking_type_rma_cust_in" model="ir.sequence">
         <field name="name">INC</field>
         <field name="prefix">RCI</field>
         <field name="padding">5</field>
-        <field name="company_id" eval="False"/>
+        <field name="company_id" eval="False" />
     </record>
 
     <record id="seq_picking_type_rma_sup_out" model="ir.sequence">
         <field name="name">DOS</field>
         <field name="prefix">RSO</field>
         <field name="padding">5</field>
-        <field name="company_id" eval="False"/>
+        <field name="company_id" eval="False" />
     </record>
 
     <record id="seq_picking_type_rma_sup_in" model="ir.sequence">
         <field name="name">INS</field>
         <field name="prefix">RSI</field>
         <field name="padding">5</field>
-        <field name="company_id" eval="False"/>
+        <field name="company_id" eval="False" />
     </record>
 
     <record id="seq_picking_type_rma_dropship" model="ir.sequence">
         <field name="name">DSS</field>
         <field name="prefix">DSS</field>
         <field name="padding">5</field>
-        <field name="company_id" eval="False"/>
+        <field name="company_id" eval="False" />
     </record>
 
     <record id="picking_type_rma_cust_out" model="stock.picking.type">
         <field name="name">RMA → Customer</field>
-        <field name="sequence_id" ref="seq_picking_type_rma_cust_out"/>
+        <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="warehouse_id" eval="False"/>
+        <field name="default_location_src_id" ref="rma.location_rma" />
+        <field
+            name="default_location_dest_id"
+            ref="stock.stock_location_customers"
+        />
+        <field name="warehouse_id" eval="False" />
         <field name="code">outgoing</field>
     </record>
 
     <record id="picking_type_rma_cust_in" model="stock.picking.type">
         <field name="name">Customer → RMA</field>
-        <field name="sequence_id" ref="seq_picking_type_rma_cust_in"/>
+        <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_dest_id"
-               ref="rma.location_rma"/>
-        <field name="warehouse_id" eval="False"/>
+        <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>
     </record>
 
     <record id="picking_type_rma_sup_out" model="stock.picking.type">
         <field name="name">RMA -> Supplier</field>
-        <field name="sequence_id" ref="seq_picking_type_rma_sup_out"/>
+        <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="warehouse_id" eval="False"/>
+        <field name="default_location_src_id" ref="rma.location_rma" />
+        <field
+            name="default_location_dest_id"
+            ref="stock.stock_location_suppliers"
+        />
+        <field name="warehouse_id" eval="False" />
         <field name="code">outgoing</field>
     </record>
 
     <record id="picking_type_rma_sup_in" model="stock.picking.type">
         <field name="name">Supplier -> RMA</field>
-        <field name="sequence_id" ref="seq_picking_type_rma_sup_in"/>
+        <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_dest_id"
-               ref="rma.location_rma"/>
-        <field name="warehouse_id" eval="False"/>
+        <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>
     </record>
 
     <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="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="warehouse_id" eval="False"/>
+        <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>
 
     <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="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="warehouse_id" eval="False"/>
+        <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>
 
     <record id="stock.warehouse0" model="stock.warehouse">
-        <field name="lot_rma_id" ref="location_rma"/>
-        <field name="rma_cust_out_type_id" ref="picking_type_rma_cust_out"/>
-        <field name="rma_cust_in_type_id" ref="picking_type_rma_cust_in"/>
-        <field name="rma_sup_out_type_id" ref="picking_type_rma_sup_out"/>
-        <field name="rma_sup_in_type_id" ref="picking_type_rma_sup_in"/>
+        <field name="lot_rma_id" ref="location_rma" />
+        <field name="rma_cust_out_type_id" ref="picking_type_rma_cust_out" />
+        <field name="rma_cust_in_type_id" ref="picking_type_rma_cust_in" />
+        <field name="rma_sup_out_type_id" ref="picking_type_rma_sup_out" />
+        <field name="rma_sup_in_type_id" ref="picking_type_rma_sup_in" />
     </record>
 
     <record id="route_rma_customer" model='stock.location.route'>
         <field name="name">RMA Customer</field>
-        <field name="company_id" eval="0"/>
+        <field name="company_id" eval="0" />
         <field name="sequence">10</field>
-        <field name="product_selectable" eval="False"/>
-        <field name="product_categ_selectable" eval="False"/>
-        <field name="warehouse_selectable" eval="False"/>
-        <field name="rma_selectable" eval="True"/>
+        <field name="product_selectable" eval="False" />
+        <field name="product_categ_selectable" eval="False" />
+        <field name="warehouse_selectable" eval="False" />
+        <field name="rma_selectable" eval="True" />
     </record>
 
     <record id="route_rma_supplier" model='stock.location.route'>
         <field name="name">RMA Supplier</field>
-        <field name="company_id" eval="0"/>
+        <field name="company_id" eval="0" />
         <field name="sequence">10</field>
-        <field name="product_selectable" eval="False"/>
-        <field name="product_categ_selectable" eval="False"/>
-        <field name="warehouse_selectable" eval="False"/>
-        <field name="rma_selectable" eval="True"/>
+        <field name="product_selectable" eval="False" />
+        <field name="product_categ_selectable" eval="False" />
+        <field name="warehouse_selectable" eval="False" />
+        <field name="rma_selectable" eval="True" />
     </record>
 
     <record id="route_rma_dropship" model='stock.location.route'>
         <field name="name">RMA Dropship</field>
-        <field name="company_id" eval="0"/>
+        <field name="company_id" eval="0" />
         <field name="sequence">10</field>
-        <field name="product_selectable" eval="False"/>
-        <field name="product_categ_selectable" eval="False"/>
-        <field name="warehouse_selectable" eval="False"/>
-        <field name="rma_selectable" eval="True"/>
+        <field name="product_selectable" eval="False" />
+        <field name="product_categ_selectable" eval="False" />
+        <field name="warehouse_selectable" eval="False" />
+        <field name="rma_selectable" eval="True" />
     </record>
 
     <record id="rule_rma_customer_in_pull" model="stock.rule">
         <field name="name">Customer → RMA</field>
         <field name="action">pull</field>
-        <field name="warehouse_id" ref="stock.warehouse0"/>
-        <field name="location_src_id" ref="stock.stock_location_customers"/>
-        <field name="location_id" ref="rma.location_rma"/>
+        <field name="warehouse_id" ref="stock.warehouse0" />
+        <field name="location_src_id" ref="stock.stock_location_customers" />
+        <field name="location_id" ref="rma.location_rma" />
         <field name="procure_method">make_to_stock</field>
-        <field name="route_id" ref="rma.route_rma_customer"/>
-        <field name="picking_type_id" ref="rma.picking_type_rma_cust_in"/>
+        <field name="route_id" ref="rma.route_rma_customer" />
+        <field name="picking_type_id" ref="rma.picking_type_rma_cust_in" />
     </record>
 
     <record id="rule_rma_customer_out_pull" model="stock.rule">
         <field name="name">RMA → Customer</field>
         <field name="action">pull</field>
-        <field name="warehouse_id" ref="stock.warehouse0"/>
-        <field name="location_src_id" ref="rma.location_rma"/>
-        <field name="location_id" ref="stock.stock_location_customers"/>
+        <field name="warehouse_id" ref="stock.warehouse0" />
+        <field name="location_src_id" ref="rma.location_rma" />
+        <field name="location_id" ref="stock.stock_location_customers" />
         <field name="procure_method">make_to_stock</field>
-        <field name="route_id" ref="rma.route_rma_customer"/>
-        <field name="picking_type_id" ref="rma.picking_type_rma_cust_out"/>
+        <field name="route_id" ref="rma.route_rma_customer" />
+        <field name="picking_type_id" ref="rma.picking_type_rma_cust_out" />
     </record>
 
     <record id="rule_rma_supplier_out_pull" model="stock.rule">
         <field name="name">RMA → Supplier</field>
         <field name="action">pull</field>
-        <field name="warehouse_id" ref="stock.warehouse0"/>
-        <field name="location_id" ref="stock.stock_location_suppliers"/>
-        <field name="location_src_id" ref="rma.location_rma"/>
+        <field name="warehouse_id" ref="stock.warehouse0" />
+        <field name="location_id" ref="stock.stock_location_suppliers" />
+        <field name="location_src_id" ref="rma.location_rma" />
         <field name="procure_method">make_to_stock</field>
-        <field name="route_id" ref="rma.route_rma_supplier"/>
-        <field name="picking_type_id" ref="rma.picking_type_rma_sup_out"/>
+        <field name="route_id" ref="rma.route_rma_supplier" />
+        <field name="picking_type_id" ref="rma.picking_type_rma_sup_out" />
     </record>
 
     <record id="rule_rma_supplier_in_pull" model="stock.rule">
         <field name="name">Supplier → RMA</field>
         <field name="action">pull</field>
-        <field name="warehouse_id" ref="stock.warehouse0"/>
-        <field name="location_id" ref="rma.location_rma"/>
-        <field name="location_src_id" ref="stock.stock_location_suppliers"/>
+        <field name="warehouse_id" ref="stock.warehouse0" />
+        <field name="location_id" ref="rma.location_rma" />
+        <field name="location_src_id" ref="stock.stock_location_suppliers" />
         <field name="procure_method">make_to_stock</field>
-        <field name="route_id" ref="rma.route_rma_supplier"/>
-        <field name="picking_type_id" ref="rma.picking_type_rma_sup_in"/>
+        <field name="route_id" ref="rma.route_rma_supplier" />
+        <field name="picking_type_id" ref="rma.picking_type_rma_sup_in" />
     </record>
 
     <record id="rule_rma_dropship_return" model="stock.rule">
         <field name="name">Customer → Supplier</field>
         <field name="action">pull</field>
-        <field name="location_id" ref="stock.stock_location_suppliers"/>
-        <field name="location_src_id" ref="stock.stock_location_customers"/>
+        <field name="location_id" ref="stock.stock_location_suppliers" />
+        <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="route_id" ref="rma.route_rma_dropship" />
+        <field
+            name="picking_type_id"
+            ref="rma.picking_type_rma_dropship_return"
+        />
     </record>
 
     <record id="rule_rma_dropship" model="stock.rule">
         <field name="name">Supplier → Customer</field>
         <field name="action">pull</field>
-        <field name="location_id" ref="stock.stock_location_customers"/>
-        <field name="location_src_id" ref="stock.stock_location_suppliers"/>
+        <field name="location_id" ref="stock.stock_location_customers" />
+        <field name="location_src_id" ref="stock.stock_location_suppliers" />
         <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"/>
+        <field name="route_id" ref="rma.route_rma_dropship" />
+        <field name="picking_type_id" ref="rma.picking_type_rma_dropship" />
     </record>
 
 </odoo>
diff --git a/rma/demo/stock_demo.xml b/rma/demo/stock_demo.xml
index 0c22b4df..8149b189 100644
--- a/rma/demo/stock_demo.xml
+++ b/rma/demo/stock_demo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
 
     <!--Sequences-->
@@ -6,57 +6,65 @@
         <field name="name">RMA Customer Sequence out</field>
         <field name="prefix">RMA/CUST/OUT</field>
         <field name="padding">5</field>
-        <field name="company_id" eval="False"/>
+        <field name="company_id" eval="False" />
     </record>
 
     <record id="seq_picking_type_rma_cust_in" model="ir.sequence">
         <field name="name">RMA Customer Sequence in</field>
         <field name="prefix">RMA/CUST/IN</field>
         <field name="padding">5</field>
-        <field name="company_id" eval="False"/>
+        <field name="company_id" eval="False" />
     </record>
 
     <record id="seq_picking_type_rma_sup_out" model="ir.sequence">
         <field name="name">RMA Supplier Sequence out</field>
         <field name="prefix">RMA/SUPP/OUT</field>
         <field name="padding">5</field>
-        <field name="company_id" eval="False"/>
+        <field name="company_id" eval="False" />
     </record>
 
     <record id="seq_picking_type_rma_sup_in" model="ir.sequence">
         <field name="name">RMA Supplier Sequence in</field>
         <field name="prefix">RMA/SUPP/IN</field>
         <field name="padding">5</field>
-        <field name="company_id" eval="False"/>
+        <field name="company_id" eval="False" />
     </record>
 
     <record id="seq_picking_type_rma_dropship" model="ir.sequence">
         <field name="name">RMA Dropship</field>
         <field name="prefix">RMA/DS</field>
         <field name="padding">5</field>
-        <field name="company_id" eval="False"/>
+        <field name="company_id" eval="False" />
     </record>
 
     <!--Dropshipping Types-->
     <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="warehouse_id" eval="False"/>
+        <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="warehouse_id" eval="False" />
         <field name="code">incoming</field>
     </record>
 
     <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="warehouse_id" eval="False"/>
+        <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="warehouse_id" eval="False" />
         <field name="code">incoming</field>
     </record>
 
@@ -64,58 +72,59 @@
     <record id="route_rma_customer" model="stock.location.route">
         <field name="name">RMA Customer</field>
         <field name="sequence">10</field>
-        <field name="product_selectable" eval="False"/>
-        <field name="product_categ_selectable" eval="False"/>
-        <field name="warehouse_selectable" eval="False"/>
-        <field name="rma_selectable" eval="True"/>
+        <field name="product_selectable" eval="False" />
+        <field name="product_categ_selectable" eval="False" />
+        <field name="warehouse_selectable" eval="False" />
+        <field name="rma_selectable" eval="True" />
     </record>
 
     <record id="route_rma_supplier" model="stock.location.route">
         <field name="name">RMA Supplier</field>
         <field name="sequence">10</field>
-        <field name="product_selectable" eval="False"/>
-        <field name="product_categ_selectable" eval="False"/>
-        <field name="warehouse_selectable" eval="False"/>
-        <field name="rma_selectable" eval="True"/>
+        <field name="product_selectable" eval="False" />
+        <field name="product_categ_selectable" eval="False" />
+        <field name="warehouse_selectable" eval="False" />
+        <field name="rma_selectable" eval="True" />
     </record>
 
     <record id="route_rma_dropship" model="stock.location.route">
         <field name="name">RMA Dropship</field>
         <field name="sequence">10</field>
-        <field name="product_selectable" eval="False"/>
-        <field name="product_categ_selectable" eval="False"/>
-        <field name="warehouse_selectable" eval="False"/>
-        <field name="rma_selectable" eval="True"/>
+        <field name="product_selectable" eval="False" />
+        <field name="product_categ_selectable" eval="False" />
+        <field name="warehouse_selectable" eval="False" />
+        <field name="rma_selectable" eval="True" />
     </record>
 
     <!--Dropship rules-->
     <record id="rule_rma_dropship_return" model="stock.rule">
         <field name="name">Customer → Supplier</field>
         <field name="action">pull</field>
-        <field name="warehouse_id" ref="stock.warehouse0"/>
-        <field name="location_id" ref="stock.stock_location_suppliers"/>
-        <field name="location_src_id" ref="stock.stock_location_customers"/>
+        <field name="warehouse_id" ref="stock.warehouse0" />
+        <field name="location_id" ref="stock.stock_location_suppliers" />
+        <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="route_id" ref="rma.route_rma_dropship" />
+        <field
+            name="picking_type_id"
+            ref="rma.picking_type_rma_dropship_return"
+        />
     </record>
 
     <record id="rule_rma_dropship" model="stock.rule">
         <field name="name">Supplier → Customer</field>
         <field name="action">pull</field>
-        <field name="warehouse_id" ref="stock.warehouse0"/>
-        <field name="location_id" ref="stock.stock_location_customers"/>
-        <field name="location_src_id" ref="stock.stock_location_suppliers"/>
+        <field name="warehouse_id" ref="stock.warehouse0" />
+        <field name="location_id" ref="stock.stock_location_customers" />
+        <field name="location_src_id" ref="stock.stock_location_suppliers" />
         <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"/>
+        <field name="route_id" ref="rma.route_rma_dropship" />
+        <field name="picking_type_id" ref="rma.picking_type_rma_dropship" />
     </record>
 
     <!-- Enable the RMA in warehouse0 -->
     <record id="stock.warehouse0" model="stock.warehouse">
-        <field name="rma_in_this_wh" eval="True"/>
+        <field name="rma_in_this_wh" eval="True" />
     </record>
 
 </odoo>
diff --git a/rma/report/rma_report.xml b/rma/report/rma_report.xml
index b2222392..531fb5cb 100644
--- a/rma/report/rma_report.xml
+++ b/rma/report/rma_report.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <data>
         <report
diff --git a/rma/report/rma_report_templates.xml b/rma/report/rma_report_templates.xml
index 87b60d34..d9815000 100644
--- a/rma/report/rma_report_templates.xml
+++ b/rma/report/rma_report_templates.xml
@@ -1,61 +1,92 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <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="oe_structure" />
                 <div class="row">
                     <div class="col-6">
-                        <t t-if="(doc.customer_to_supplier==False and doc.type=='customer') or (doc.supplier_to_customer==False and doc.type=='supplier')">
+                        <t
+                            t-if="(doc.customer_to_supplier==False and doc.type=='customer') or (doc.supplier_to_customer==False and doc.type=='supplier')"
+                        >
                             <strong>Shipping address:</strong>
                             <div class="mt8">
-                                <div 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 t-field="doc.in_warehouse_id.partner_id.vat"/></p>
+                                <div
+                                    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
+                                        t-field="doc.in_warehouse_id.partner_id.vat"
+                                    /></p>
                             </div>
                         </t>
-                        <div t-if="doc.customer_to_supplier and doc.type=='customer'" class="mt8">
+                        <div
+                            t-if="doc.customer_to_supplier and doc.type=='customer'"
+                            class="mt8"
+                        >
                             <strong>Shipping address:</strong>
-                            <div t-field="doc.supplier_address_id"
-                                t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
-                            <p t-if="doc.supplier_address_id.vat">VAT: <span t-field="doc.supplier_address_id.vat"/></p>
+                            <div
+                                t-field="doc.supplier_address_id"
+                                t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'
+                            />
+                            <p t-if="doc.supplier_address_id.vat">VAT: <span
+                                    t-field="doc.supplier_address_id.vat"
+                                /></p>
                         </div>
-                        <div t-if="doc.supplier_to_customer and doc.type=='supplier'" class="mt8">
+                        <div
+                            t-if="doc.supplier_to_customer and doc.type=='supplier'"
+                            class="mt8"
+                        >
                             <strong>Shipping address:</strong>
-                                <div t-field="doc.customer_address_id"
-                                    t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
-                                <p t-if="doc.customer_address_id.vat">VAT: <span t-field="doc.customer_address_id.vat"/></p>
+                                <div
+                                t-field="doc.customer_address_id"
+                                t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'
+                            />
+                                <p t-if="doc.customer_address_id.vat">VAT: <span
+                                    t-field="doc.customer_address_id.vat"
+                                /></p>
                         </div>
                     </div>
                     <div class="col-3 offset-1">
                         <strong t-if="doc.type=='customer'">Customer:</strong>
                         <strong t-if="doc.type=='supplier'">Supplier:</strong>
-                        <div t-field="doc.partner_id"
-                            t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}' />
+                        <div
+                            t-field="doc.partner_id"
+                            t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'
+                        />
                     </div>
                 </div>
 
                 <h2 class="mt32">
-                    <span t-field="doc.name"/>
+                    <span t-field="doc.name" />
                 </h2>
 
                 <div class="row mt32 mb32" id="informations">
                     <div t-if="doc.origin" class="col-3">
                         <strong>Origin Reference:</strong>
-                        <p t-field="doc.origin"/>
+                        <p t-field="doc.origin" />
                     </div>
                     <div t-if="doc.create_date" class="col-3">
                         <strong>Date Ordered:</strong>
-                        <p t-field="doc.create_date"/>
+                        <p t-field="doc.create_date" />
                     </div>
                     <div t-if="doc.requested_by.name" class="col-3">
                         <strong>Contact Person:</strong>
-                        <p t-field="doc.requested_by.name"/>
+                        <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"/>
+                        <p t-field="doc.operation_id.name" />
                     </div>
                 </div>
 
@@ -69,24 +100,30 @@
                    </thead>
                    <tbody>
                         <tr>
-                            <td><span t-field="doc.product_id"/></td>
+                            <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.product_qty" />
+                                <span
+                                    t-field="doc.uom_id"
+                                    groups="uom.group_uom"
+                                />
                             </td>
                             <td class="text-right">
-                                <span t-field="doc.price_unit" t-options='{"widget": "monetary", "display_currency": doc.currency_id}'/>
+                                <span
+                                    t-field="doc.price_unit"
+                                    t-options='{"widget": "monetary", "display_currency": doc.currency_id}'
+                                />
                             </td>
                         </tr>
                     </tbody>
                 </table>
                 <div t-if="doc.description">
                     <strong><p>Description</p></strong>
-                    <span t-field="doc.description"></span>
+                    <span t-field="doc.description" />
                 </div>
                 <div t-if="doc.conditions">
                     <strong><p>Term and conditions</p></strong>
-                    <span t-field="doc.conditions"></span>
+                    <span t-field="doc.conditions" />
                 </div>
             </div>
         </t>
@@ -96,7 +133,10 @@
     <template id="report_rma_order_line">
         <t t-call="web.html_container">
             <t t-foreach="docs" t-as="doc">
-                <t t-call="rma.report_rma_order_line_document" t-lang="doc.partner_id.lang"/>
+                <t
+                    t-call="rma.report_rma_order_line_document"
+                    t-lang="doc.partner_id.lang"
+                />
             </t>
         </t>
     </template>
@@ -104,56 +144,83 @@
 
     <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="oe_structure" />
                 <div class="row">
                     <div class="col-6">
-                        <t t-if="(doc.customer_to_supplier==False and doc.type=='customer') or (doc.supplier_to_customer==False and doc.type=='supplier')">
+                        <t
+                            t-if="(doc.customer_to_supplier==False and doc.type=='customer') or (doc.supplier_to_customer==False and doc.type=='supplier')"
+                        >
                             <strong>Shipping address:</strong>
                             <div class="mt8">
-                                <div 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 t-field="doc.in_warehouse_id.partner_id.vat"/></p>
+                                <div
+                                    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
+                                        t-field="doc.in_warehouse_id.partner_id.vat"
+                                    /></p>
                             </div>
                         </t>
-                        <div t-if="doc.customer_to_supplier and doc.type=='customer'" class="mt8">
+                        <div
+                            t-if="doc.customer_to_supplier and doc.type=='customer'"
+                            class="mt8"
+                        >
                             <strong>Shipping address:</strong>
-                            <div t-field="doc.supplier_address_id"
-                                t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
-                            <p t-if="doc.supplier_address_id.vat">VAT: <span t-field="doc.supplier_address_id.vat"/></p>
+                            <div
+                                t-field="doc.supplier_address_id"
+                                t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'
+                            />
+                            <p t-if="doc.supplier_address_id.vat">VAT: <span
+                                    t-field="doc.supplier_address_id.vat"
+                                /></p>
                         </div>
-                        <div t-if="doc.supplier_to_customer and doc.type=='supplier'" class="mt8">
+                        <div
+                            t-if="doc.supplier_to_customer and doc.type=='supplier'"
+                            class="mt8"
+                        >
                             <strong>Shipping address:</strong>
-                                <div t-field="doc.customer_address_id"
-                                    t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
-                                <p t-if="doc.customer_address_id.vat">VAT: <span t-field="doc.customer_address_id.vat"/></p>
+                                <div
+                                t-field="doc.customer_address_id"
+                                t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'
+                            />
+                                <p t-if="doc.customer_address_id.vat">VAT: <span
+                                    t-field="doc.customer_address_id.vat"
+                                /></p>
                         </div>
                     </div>
                     <div class="col-3 offset-1">
                         <strong t-if="doc.type=='customer'">Customer:</strong>
                         <strong t-if="doc.type=='supplier'">Supplier:</strong>
-                        <div t-field="doc.partner_id"
-                            t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}' />
+                        <div
+                            t-field="doc.partner_id"
+                            t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'
+                        />
                     </div>
                 </div>
 
                 <h2 class="mt32">
-                    <span t-field="doc.name"/>
+                    <span t-field="doc.name" />
                 </h2>
 
                 <div class="row mt32 mb32" id="informations">
                     <div t-if="doc.reference" class="col-3">
                         <strong>Reference:</strong>
-                        <p t-field="doc.reference"/>
+                        <p t-field="doc.reference" />
                     </div>
                     <div t-if="doc.date_rma" class="col-3">
                         <strong>Date Ordered:</strong>
-                        <p t-field="doc.date_rma"/>
+                        <p t-field="doc.date_rma" />
                     </div>
                     <div t-if="doc.requested_by.name" class="col-3">
                         <strong>Contact Person:</strong>
-                        <p t-field="doc.requested_by.name"/>
+                        <p t-field="doc.requested_by.name" />
                     </div>
                 </div>
 
@@ -169,22 +236,25 @@
                    </thead>
                    <tbody>
                         <tr t-foreach="doc.rma_line_ids" t-as="l">
-                            <td><span t-field="l.origin"/></td>
-                            <td><span t-field="l.operation_id.name"/></td>
-                            <td><span t-field="l.product_id"/></td>
+                            <td><span t-field="l.origin" /></td>
+                            <td><span t-field="l.operation_id.name" /></td>
+                            <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.product_qty" />
+                                <span
+                                    t-field="l.uom_id"
+                                    groups="uom.group_uom"
+                                />
                             </td>
                             <td class="text-right">
-                                <span t-field="l.price_unit"/>
+                                <span t-field="l.price_unit" />
                             </td>
                         </tr>
                     </tbody>
                 </table>
                 <div t-if="doc.comment">
                     <strong><p>Additional Information</p></strong>
-                    <span t-field="doc.comment"></span>
+                    <span t-field="doc.comment" />
                 </div>
             </div>
         </t>
@@ -193,7 +263,10 @@
     <template id="report_rma_order">
         <t t-call="web.html_container">
             <t t-foreach="docs" t-as="doc">
-                <t t-call="rma.report_rma_order_document" t-lang="doc.partner_id.lang"/>
+                <t
+                    t-call="rma.report_rma_order_document"
+                    t-lang="doc.partner_id.lang"
+                />
             </t>
         </t>
     </template>
diff --git a/rma/security/rma.xml b/rma/security/rma.xml
index d0ea0ffc..d6de5e04 100644
--- a/rma/security/rma.xml
+++ b/rma/security/rma.xml
@@ -1,72 +1,100 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <odoo>
     <data noupdate="0">
 
         <record model="ir.module.category" id="module_category_rma">
             <field name="name">RMA</field>
-            <field name="parent_id" ref="base.module_category_sales"/>
+            <field name="parent_id" ref="base.module_category_sales" />
             <field name="sequence">30</field>
         </record>
 
         <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="category_id" ref="module_category_rma"/>
+            <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="category_id" ref="module_category_rma"/>
+            <field
+                name="implied_ids"
+                eval="[(4, ref('stock.group_stock_user'))]"
+            />
+            <field name="category_id" ref="module_category_rma" />
         </record>
 
         <record id="group_rma_manager" model="res.groups">
             <field name="name">RMA Manager</field>
-            <field name="implied_ids"
-                   eval="[(4, ref('rma.group_rma_customer_user')),
-                          (4, ref('rma.group_rma_supplier_user'))]"/>
-            <field name="users" eval="[(4, ref('base.user_root'))]"/>
-            <field name="category_id" ref="module_category_rma"/>
+            <field
+                name="implied_ids"
+                eval="[(4, ref('rma.group_rma_customer_user')),
+                          (4, ref('rma.group_rma_supplier_user'))]"
+            />
+            <field name="users" eval="[(4, ref('base.user_root'))]" />
+            <field name="category_id" ref="module_category_rma" />
         </record>
 
         <record id="group_rma_delivery_invoice_address" model="res.groups">
             <field name="name">Addresses in RMA</field>
-            <field name="category_id" ref="module_category_rma"/>
-            <field name="users" eval="[(4, ref('base.user_root'))]"/>
+            <field name="category_id" ref="module_category_rma" />
+            <field name="users" eval="[(4, ref('base.user_root'))]" />
         </record>
 
         <record id="group_rma_groups" model="res.groups">
             <field name="name">RMA Groups</field>
-            <field name="category_id" ref="module_category_rma"/>
+            <field name="category_id" ref="module_category_rma" />
         </record>
 
         <record id="stock.group_stock_manager" model="res.groups">
-            <field name="implied_ids" eval="[(4, ref('group_rma_manager'))]"/>
+            <field name="implied_ids" eval="[(4, ref('group_rma_manager'))]" />
         </record>
 
         <record id="stock.group_stock_user" model="res.groups">
-            <field name="implied_ids"
-                   eval="[(4, ref('group_rma_customer_user')),
-                          (4, ref('group_rma_supplier_user'))]"/>
+            <field
+                name="implied_ids"
+                eval="[(4, ref('group_rma_customer_user')),
+                          (4, ref('group_rma_supplier_user'))]"
+            />
         </record>
 
         <record model="ir.rule" id="rma_order_rule">
           <field name="name">rma order multi-company</field>
-          <field name="model_id" search="[('model','=','rma.order')]" model="ir.model"/>
-          <field name="global" eval="True"/>
-          <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+          <field
+                name="model_id"
+                search="[('model','=','rma.order')]"
+                model="ir.model"
+            />
+          <field name="global" eval="True" />
+          <field
+                name="domain_force"
+            >['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         </record>
         <record model="ir.rule" id="rma_order_line_rule">
           <field name="name">rma order line multi-company</field>
-          <field name="model_id" search="[('model','=','rma.order.line')]" model="ir.model"/>
-          <field name="global" eval="True"/>
-          <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+          <field
+                name="model_id"
+                search="[('model','=','rma.order.line')]"
+                model="ir.model"
+            />
+          <field name="global" eval="True" />
+          <field
+                name="domain_force"
+            >['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         </record>
         <record model="ir.rule" id="rma_operation_rule">
           <field name="name">rma operation multi-company</field>
-          <field name="model_id" search="[('model','=','rma.operation')]" model="ir.model"/>
-          <field name="global" eval="True"/>
-          <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+          <field
+                name="model_id"
+                search="[('model','=','rma.operation')]"
+                model="ir.model"
+            />
+          <field name="global" eval="True" />
+          <field
+                name="domain_force"
+            >['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         </record>
 
     </data>
diff --git a/rma/views/product_view.xml b/rma/views/product_view.xml
index ffb37dcd..368b3e49 100644
--- a/rma/views/product_view.xml
+++ b/rma/views/product_view.xml
@@ -1,19 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <odoo>
     <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">
-                        <field name="rma_approval_policy" groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/>
-                        <field name="rma_customer_operation_id"
-                               groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"
-                               domain="[('type','=','customer')]"/>
-                        <field name="rma_supplier_operation_id"
-                               groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"
-                               domain="[('type','=','supplier')]"/>
+                        <field
+                        name="rma_approval_policy"
+                        groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"
+                    />
+                        <field
+                        name="rma_customer_operation_id"
+                        groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"
+                        domain="[('type','=','customer')]"
+                    />
+                        <field
+                        name="rma_supplier_operation_id"
+                        groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"
+                        domain="[('type','=','supplier')]"
+                    />
                     </group>
                 </field>
         </field>
@@ -22,17 +32,24 @@
     <record id="product_template_form_view" model="ir.ui.view">
         <field name="name">product.template.stock.property.form.inherit</field>
         <field name="model">product.template</field>
-        <field name="inherit_id" ref="product.product_template_form_view"/>
+        <field name="inherit_id" ref="product.product_template_form_view" />
             <field name="arch" type="xml">
                  <group name="inventory" position="inside">
-                    <group name="rma" groups="rma.group_rma_customer_user,rma.group_rma_supplier_user">
-                        <field name="rma_approval_policy"/>
-                        <field name="rma_customer_operation_id"
-                               groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"
-                               domain="[('type','=','customer')]"/>
-                        <field name="rma_supplier_operation_id"
-                               groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"
-                               domain="[('type','=','supplier')]"/>
+                    <group
+                    name="rma"
+                    groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"
+                >
+                        <field name="rma_approval_policy" />
+                        <field
+                        name="rma_customer_operation_id"
+                        groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"
+                        domain="[('type','=','customer')]"
+                    />
+                        <field
+                        name="rma_supplier_operation_id"
+                        groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"
+                        domain="[('type','=','supplier')]"
+                    />
                     </group>
                 </group>
             </field>
diff --git a/rma/views/res_config_settings_views.xml b/rma/views/res_config_settings_views.xml
index 5f20fa52..d3e205c4 100644
--- a/rma/views/res_config_settings_views.xml
+++ b/rma/views/res_config_settings_views.xml
@@ -1,23 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-
 <odoo>
 
     <record id="res_config_settings_view_form" model="ir.ui.view">
         <field name="name">res.config.settings.view.form.inherit.rma</field>
         <field name="model">res.config.settings</field>
-        <field name="priority" eval="10"/>
+        <field name="priority" eval="10" />
         <field name="inherit_id" ref="base.res_config_settings_view_form" />
         <field name="arch" type="xml">
             <xpath expr="//div[hasclass('settings')]" position="inside">
-                <div class="app_settings_block" data-string="RMA" string="RMA" data-key="rma" groups="rma.group_rma_manager">
+                <div
+                    class="app_settings_block"
+                    data-string="RMA"
+                    string="RMA"
+                    data-key="rma"
+                    groups="rma.group_rma_manager"
+                >
                     <h2>Return Merchandise Authorization</h2>
                     <div class="row mt16 o_settings_container">
                         <div class="col-12 col-lg-6 o_setting_box">
                             <div class="o_setting_left_pane">
-                                <field name="group_rma_delivery_address"/>
+                                <field name="group_rma_delivery_address" />
                             </div>
                             <div class="o_setting_right_pane">
-                                <label for="group_rma_delivery_address"/>
+                                <label for="group_rma_delivery_address" />
                                 <div class="text-muted">
                                     Display 3 fields on rma: partner, invoice address, delivery address.
                                 </div>
@@ -25,10 +30,10 @@
                         </div>
                         <div class="col-12 col-lg-6 o_setting_box">
                             <div class="o_setting_left_pane">
-                                <field name="group_rma_lines"/>
+                                <field name="group_rma_lines" />
                             </div>
                             <div class="o_setting_right_pane">
-                                <label for="group_rma_lines"/>
+                                <label for="group_rma_lines" />
                                 <div class="text-muted">
                                     Group RMA lines in one RMA group
                                 </div>
@@ -36,10 +41,10 @@
                         </div>
                         <div class="col-12 col-lg-6 o_setting_box">
                             <div class="o_setting_left_pane">
-                                <field name="module_rma_account"/>
+                                <field name="module_rma_account" />
                             </div>
                             <div class="o_setting_right_pane">
-                                <label for="module_rma_account"/>
+                                <label for="module_rma_account" />
                                 <div class="text-muted">
                                     Enable RMA invoicing
                                 </div>
diff --git a/rma/views/res_partner_view.xml b/rma/views/res_partner_view.xml
index 3c9755f0..fd3e277f 100644
--- a/rma/views/res_partner_view.xml
+++ b/rma/views/res_partner_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <odoo>
 
     <record id="view_partner_form" model="ir.ui.view">
@@ -7,14 +7,19 @@
         <field name="inherit_id" ref="base.view_partner_form" />
         <field name="arch" type="xml">
             <div name="button_box" position="inside">
-                <button type="object"
-                        name="action_open_partner_rma"
-                        class="oe_stat_button"
-                        icon="fa-dropbox"
-                        context="{'res_partner_search_mode': 'customer'}"
-                        groups="rma.group_rma_customer_user,rma.group_rma_supplier_user">
-                            <field name="rma_line_count" widget="statinfo"
-                                   string="RMAs"/>
+                <button
+                    type="object"
+                    name="action_open_partner_rma"
+                    class="oe_stat_button"
+                    icon="fa-dropbox"
+                    context="{'res_partner_search_mode': 'customer'}"
+                    groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"
+                >
+                            <field
+                        name="rma_line_count"
+                        widget="statinfo"
+                        string="RMAs"
+                    />
                 </button>
             </div>
         </field>
diff --git a/rma/views/rma_menu.xml b/rma/views/rma_menu.xml
index 3d5bdf73..4cd225b4 100644
--- a/rma/views/rma_menu.xml
+++ b/rma/views/rma_menu.xml
@@ -6,94 +6,143 @@
         name="RMA"
         groups="rma.group_rma_customer_user,rma.group_rma_supplier_user,rma.group_rma_manager"
         web_icon="rma,static/description/icon.png"
-        sequence="100"/>
+        sequence="100"
+    />
 
     <!-- Customer RMA -->
-    <menuitem id="menu_customer_rma"
+    <menuitem
+        id="menu_customer_rma"
         name="Customer RMA"
         groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"
         sequence="30"
-        parent="menu_rma_root"/>
+        parent="menu_rma_root"
+    />
 
     <menuitem
         id="menu_rma_act_customer"
         sequence="50"
         parent="menu_customer_rma"
         groups="rma.group_rma_groups"
-        action="action_rma_customer"/>
+        action="action_rma_customer"
+    />
 
     <menuitem
         id="menu_rma_line_customer"
         sequence="20"
         parent="menu_customer_rma"
         groups="rma.group_rma_customer_user"
-        action="action_rma_customer_lines"/>
+        action="action_rma_customer_lines"
+    />
 
     <!-- Supplier RMA -->
-    <menuitem id="menu_supplier_rma"
+    <menuitem
+        id="menu_supplier_rma"
         name="Supplier RMA"
         groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"
         sequence="31"
-        parent="menu_rma_root"/>
+        parent="menu_rma_root"
+    />
 
     <menuitem
         id="menu_rma_act_supplier"
         sequence="50"
         parent="menu_supplier_rma"
         groups="rma.group_rma_groups"
-        action="action_rma_supplier"/>
+        action="action_rma_supplier"
+    />
 
     <menuitem
         id="menu_rma_line_supplier"
         sequence="20"
         parent="menu_supplier_rma"
         groups="rma.group_rma_supplier_user"
-        action="action_rma_supplier_lines"/>
+        action="action_rma_supplier_lines"
+    />
 
     <!--    Settings-->
-    <menuitem id="menu_rma_config"
+    <menuitem
+        id="menu_rma_config"
         name="Configuration"
         groups="rma.group_rma_manager"
         sequence="999"
-        parent="menu_rma_root"/>
+        parent="menu_rma_root"
+    />
 
-    <menuitem id="menu_rma_global_settings" name="Settings"
-          parent="rma.menu_rma_config"
-          sequence="1" action="action_rma_config_settings"
-          groups="base.group_system"/>
+    <menuitem
+        id="menu_rma_global_settings"
+        name="Settings"
+        parent="rma.menu_rma_config"
+        sequence="1"
+        action="action_rma_config_settings"
+        groups="base.group_system"
+    />
 
-    <menuitem id="menu_rma_operation_customer"
+    <menuitem
+        id="menu_rma_operation_customer"
         name="Customer Operations"
         groups="rma.group_rma_manager"
         sequence="35"
         parent="rma.menu_rma_config"
-        action="action_rma_operation_customer"/>
+        action="action_rma_operation_customer"
+    />
 
-    <menuitem id="menu_rma_operation_supplier"
+    <menuitem
+        id="menu_rma_operation_supplier"
         name="Supplier Operations"
         groups="rma.group_rma_manager"
         sequence="40"
         parent="rma.menu_rma_config"
-        action="action_rma_operation_supplier"/>
+        action="action_rma_operation_supplier"
+    />
 
     <!-- Master data menus-->
 
-    <menuitem id="menu_rma_rma_control" name="Master Data" parent="menu_rma_root" sequence="50"/>
-    <menuitem id="menu_rma_config_warehouse" name="Warehouse"
-        parent="rma.menu_rma_rma_control" sequence="10"/>
-    <menuitem id="menu_rma_config_stock" name="Products" action="stock.product_template_action_product"
-        parent="rma.menu_rma_config_warehouse" sequence="10"/>
-    <menuitem id="rma_product_product_menu" name="Product Variants" action="stock.stock_product_normal_action"
-        parent="rma.menu_rma_config_warehouse" sequence="20" groups="product.group_product_variant"/>
+    <menuitem
+        id="menu_rma_rma_control"
+        name="Master Data"
+        parent="menu_rma_root"
+        sequence="50"
+    />
+    <menuitem
+        id="menu_rma_config_warehouse"
+        name="Warehouse"
+        parent="rma.menu_rma_rma_control"
+        sequence="10"
+    />
+    <menuitem
+        id="menu_rma_config_stock"
+        name="Products"
+        action="stock.product_template_action_product"
+        parent="rma.menu_rma_config_warehouse"
+        sequence="10"
+    />
+    <menuitem
+        id="rma_product_product_menu"
+        name="Product Variants"
+        action="stock.stock_product_normal_action"
+        parent="rma.menu_rma_config_warehouse"
+        sequence="20"
+        groups="product.group_product_variant"
+    />
 
-    <menuitem id="menu_rma_config_partners" name="Partners"
-        parent="rma.menu_rma_rma_control" sequence="20"/>
-    <menuitem id="rma_res_partner_menu_customer"
+    <menuitem
+        id="menu_rma_config_partners"
+        name="Partners"
+        parent="rma.menu_rma_rma_control"
+        sequence="20"
+    />
+    <menuitem
+        id="rma_res_partner_menu_customer"
         name="Customers"
         parent="rma.menu_rma_config_partners"
         action="base.action_partner_form"
-        sequence="50"/>
-    <menuitem id="rma_res_partner_menu_suppliers" name="Suppliers"
+        sequence="50"
+    />
+    <menuitem
+        id="rma_res_partner_menu_suppliers"
+        name="Suppliers"
         parent="rma.menu_rma_config_partners"
-        action="account.res_partner_action_supplier" sequence="60"/>
+        action="account.res_partner_action_supplier"
+        sequence="60"
+    />
 </odoo>
diff --git a/rma/views/rma_operation_view.xml b/rma/views/rma_operation_view.xml
index 8b98317e..39d992b3 100644
--- a/rma/views/rma_operation_view.xml
+++ b/rma/views/rma_operation_view.xml
@@ -1,15 +1,15 @@
-<?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</field>
         <field name="model">rma.operation</field>
         <field name="arch" type="xml">
             <tree string="RMA Operations">
-                <field name="active" invisible="1"/>
-                <field name="code"/>
-                <field name="name"/>
-                <field name="receipt_policy"/>
-                <field name="delivery_policy"/>
+                <field name="active" invisible="1" />
+                <field name="code" />
+                <field name="name" />
+                <field name="receipt_policy" />
+                <field name="delivery_policy" />
             </tree>
         </field>
     </record>
@@ -21,38 +21,52 @@
             <form string="RMA Operations">
                 <sheet>
                     <div class="oe_button_box" name="button_box">
-                          <button name="toggle_active" type="object"
-                                class="oe_stat_button" icon="fa-archive">
-                              <field name="active" widget="boolean_button"
-                                     options='{"terminology": "archive"}'/>
+                          <button
+                            name="toggle_active"
+                            type="object"
+                            class="oe_stat_button"
+                            icon="fa-archive"
+                        >
+                              <field
+                                name="active"
+                                widget="boolean_button"
+                                options='{"terminology": "archive"}'
+                            />
                           </button>
                     </div>
                     <group colspan="4" col="2">
-                        <group name="description"
-                               string="Description">
-                            <field name="code"/>
-                            <field name="name"/>
-                            <field name="type"/>
-                            <field name="company_id" groups="base.group_multi_company"/>
+                        <group name="description" string="Description">
+                            <field name="code" />
+                            <field name="name" />
+                            <field name="type" />
+                            <field
+                                name="company_id"
+                                groups="base.group_multi_company"
+                            />
                         </group>
-                        <group name="policies"
-                               string="Policies">
-                            <field name="receipt_policy"/>
-                            <field name="delivery_policy"/>
+                        <group name="policies" string="Policies">
+                            <field name="receipt_policy" />
+                            <field name="delivery_policy" />
                         </group>
                         <group name="inbound" string="Inbound">
-                            <field name="in_route_id"/>
-                            <field name="in_warehouse_id"/>
-                            <field name="location_id"
-                                   domain="[('usage', '=', 'internal')]"/>
-                            <field name="customer_to_supplier"
-                                   attrs="{'invisible':[('type', '=', 'supplier')]}"/>
+                            <field name="in_route_id" />
+                            <field name="in_warehouse_id" />
+                            <field
+                                name="location_id"
+                                domain="[('usage', '=', 'internal')]"
+                            />
+                            <field
+                                name="customer_to_supplier"
+                                attrs="{'invisible':[('type', '=', 'supplier')]}"
+                            />
                         </group>
                         <group name="outbound" string="Outbound">
-                            <field name="out_route_id"/>
-                            <field name="out_warehouse_id"/>
-                            <field name="supplier_to_customer"
-                                   attrs="{'invisible':[('type', '=', 'customer')]}"/>
+                            <field name="out_route_id" />
+                            <field name="out_warehouse_id" />
+                            <field
+                                name="supplier_to_customer"
+                                attrs="{'invisible':[('type', '=', 'customer')]}"
+                            />
                         </group>
                     </group>
                 </sheet>
@@ -66,7 +80,7 @@
         <field name="view_mode">tree,form</field>
         <field name="context">{'default_type': "customer"}</field>
         <field name="domain">[('type','=', 'customer')]</field>
-        <field name="view_id" ref="rma_operation_tree"/>
+        <field name="view_id" ref="rma_operation_tree" />
     </record>
 
     <record id="action_rma_operation_supplier" model="ir.actions.act_window">
@@ -75,7 +89,7 @@
         <field name="view_mode">tree,form</field>
         <field name="context">{'default_type': "supplier"}</field>
         <field name="domain">[('type','=', 'supplier')]</field>
-        <field name="view_id" ref="rma_operation_tree"/>
+        <field name="view_id" ref="rma_operation_tree" />
     </record>
 
 </odoo>
diff --git a/rma/views/rma_order_line_view.xml b/rma/views/rma_order_line_view.xml
index fc203ba5..20c4ee4d 100644
--- a/rma/views/rma_order_line_view.xml
+++ b/rma/views/rma_order_line_view.xml
@@ -1,24 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <odoo>
     <data>
         <record id="view_rma_line_tree" model="ir.ui.view">
             <field name="name">rma.order.line.tree</field>
             <field name="model">rma.order.line</field>
             <field name="arch" type="xml">
-                <tree string="RMA Line"
-                      decoration-info="state in ('draft','to_approve')">
-                    <field name="name"/>
-                    <field name="partner_id"/>
-                    <field name="product_id"/>
-                    <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"/>
-                    <field name="supplier_address_id"/>
-                    <field name="uom_id" groups="uom.group_uom"/>
-                    <field name="product_qty"/>
-                    <field name="price_unit"/>
-                    <field name="state"/>
+                <tree
+                    string="RMA Line"
+                    decoration-info="state in ('draft','to_approve')"
+                >
+                    <field name="name" />
+                    <field name="partner_id" />
+                    <field name="product_id" />
+                    <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" />
+                    <field name="supplier_address_id" />
+                    <field name="uom_id" groups="uom.group_uom" />
+                    <field name="product_qty" />
+                    <field name="price_unit" />
+                    <field name="state" />
                 </tree>
             </field>
         </record>
@@ -27,19 +29,24 @@
             <field name="name">rma.order.line.supplier.tree</field>
             <field name="model">rma.order.line</field>
             <field name="arch" type="xml">
-                <tree string="RMA Line"
-                      decoration-info="state in ('draft','to_approve')">
-                    <field name="name"/>
-                    <field name="partner_id"/>
-                    <field name="product_id"/>
-                    <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="uom_id" groups="uom.group_uom"/>
-                    <field name="product_qty"/>
-                    <field name="price_unit"/>
-                    <field name="state"/>
+                <tree
+                    string="RMA Line"
+                    decoration-info="state in ('draft','to_approve')"
+                >
+                    <field name="name" />
+                    <field name="partner_id" />
+                    <field name="product_id" />
+                    <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="uom_id" groups="uom.group_uom" />
+                    <field name="product_qty" />
+                    <field name="price_unit" />
+                    <field name="state" />
                 </tree>
             </field>
         </record>
@@ -50,160 +57,235 @@
             <field name="arch" type="xml">
                 <form string="RMA Line">
                     <header>
-                        <button name="action_rma_to_approve" type="object"
+                        <button
+                            name="action_rma_to_approve"
+                            type="object"
                             string="Request Approval"
                             attrs="{'invisible':[('state', '!=', 'draft')]}"
-                            class="oe_highlight" groups="rma.group_rma_customer_user"/>
-                        <button name="action_rma_draft" type="object"
-                                string="Back to Draft"
-                                attrs="{'invisible':[('state', '=', 'draft')]}" class="oe_highlight"
-                                groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/>
-                        <button name="action_rma_approve" type="object"
-                                string="Approve"
-                                attrs="{'invisible':[('state', '!=', 'to_approve')]}" class="oe_highlight" groups="rma.group_rma_customer_user"/>
-                        <button name="action_rma_done" type="object"
-                                string="Done"
-                                attrs="{'invisible':[('state', 'in', ('done', 'draft'))]}"
-                                groups="rma.group_rma_customer_user"/>
-                        <field name="state" widget="statusbar" nolabel="1"/>
+                            class="oe_highlight"
+                            groups="rma.group_rma_customer_user"
+                        />
+                        <button
+                            name="action_rma_draft"
+                            type="object"
+                            string="Back to Draft"
+                            attrs="{'invisible':[('state', '=', 'draft')]}"
+                            class="oe_highlight"
+                            groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"
+                        />
+                        <button
+                            name="action_rma_approve"
+                            type="object"
+                            string="Approve"
+                            attrs="{'invisible':[('state', '!=', 'to_approve')]}"
+                            class="oe_highlight"
+                            groups="rma.group_rma_customer_user"
+                        />
+                        <button
+                            name="action_rma_done"
+                            type="object"
+                            string="Done"
+                            attrs="{'invisible':[('state', 'in', ('done', 'draft'))]}"
+                            groups="rma.group_rma_customer_user"
+                        />
+                        <field name="state" widget="statusbar" nolabel="1" />
                     </header>
                     <sheet>
                         <div name="button_box" class="oe_button_box">
-                            <button type="object"  name="action_view_in_shipments"
-                                    class="oe_stat_button"
-                                    icon="fa-truck"
-                                    groups="stock.group_stock_user">
-                                <field name="in_shipment_count" widget="statinfo"
-                                       string="Shipments"/>
+                            <button
+                                type="object"
+                                name="action_view_in_shipments"
+                                class="oe_stat_button"
+                                icon="fa-truck"
+                                groups="stock.group_stock_user"
+                            >
+                                <field
+                                    name="in_shipment_count"
+                                    widget="statinfo"
+                                    string="Shipments"
+                                />
                             </button>
-                            <button type="object"  name="action_view_out_shipments"
-                                    class="oe_stat_button"
-                                    icon="fa-truck"
-                                    groups="stock.group_stock_user">
-                                <field name="out_shipment_count" widget="statinfo"
-                                       string="Deliveries"/>
+                            <button
+                                type="object"
+                                name="action_view_out_shipments"
+                                class="oe_stat_button"
+                                icon="fa-truck"
+                                groups="stock.group_stock_user"
+                            >
+                                <field
+                                    name="out_shipment_count"
+                                    widget="statinfo"
+                                    string="Deliveries"
+                                />
                             </button>
-                            <button type="object" name="action_view_rma_lines"
-                                    class="oe_stat_button"
-                                    icon="fa-link"
-                                    groups="stock.group_stock_user">
-                                <field name="rma_line_count" widget="statinfo"
-                                       string="Customer RMA"/>
+                            <button
+                                type="object"
+                                name="action_view_rma_lines"
+                                class="oe_stat_button"
+                                icon="fa-link"
+                                groups="stock.group_stock_user"
+                            >
+                                <field
+                                    name="rma_line_count"
+                                    widget="statinfo"
+                                    string="Customer RMA"
+                                />
                             </button>
                         </div>
                         <div class="oe_title" name="title">
                         <h1>
-                            <field name="name" readonly="1"
-                                   invisible="context.get('hide_title',False)"/>
+                            <field
+                                    name="name"
+                                    readonly="1"
+                                    invisible="context.get('hide_title',False)"
+                                />
                         </h1>
                         </div>
                         <group>
                             <group name="partner">
-                                <field name="partner_id"
+                                <field
+                                    name="partner_id"
                                     context="{'res_partner_search_mode': 'supplier'}"
-                                    string="Supplier"/>
-                                <field name="delivery_address_id"
-                                   domain="['|', ('parent_id', '=', partner_id),('id', '=', partner_id)]"
-                                   context="{'show_address': 1}"
-                                   options="{'always_reload': 1}"
-                                   groups='rma.group_rma_delivery_invoice_address'/>
+                                    string="Supplier"
+                                />
+                                <field
+                                    name="delivery_address_id"
+                                    domain="['|', ('parent_id', '=', partner_id),('id', '=', partner_id)]"
+                                    context="{'show_address': 1}"
+                                    options="{'always_reload': 1}"
+                                    groups='rma.group_rma_delivery_invoice_address'
+                                />
                             </group>
                         </group>
                         <group>
                             <group name="product" string="Product">
-                                <field name="product_id"/>
-                                <newline/>
-                                <field name="product_tracking" invisible="1"/>
-                                <field name="lot_id"
-                                       groups="stock.group_production_lot"
-                                       attrs="{'required': [('product_tracking', 'in', ('serial', 'lot'))]}"
-                                       domain="[('product_id', '=', product_id)]"/>
+                                <field name="product_id" />
+                                <newline />
+                                <field name="product_tracking" invisible="1" />
+                                <field
+                                    name="lot_id"
+                                    groups="stock.group_production_lot"
+                                    attrs="{'required': [('product_tracking', 'in', ('serial', 'lot'))]}"
+                                    domain="[('product_id', '=', product_id)]"
+                                />
                             </group>
                             <group name="product_qty" string="Quantity">
-                                <field name="product_qty"/>
-                                <field name="price_unit"/>
-                                <field name="uom_id" groups="uom.group_uom"/>
+                                <field name="product_qty" />
+                                <field name="price_unit" />
+                                <field name="uom_id" groups="uom.group_uom" />
                             </group>
                         </group>
                         <group name="main_info" string="Origin">
-                            <field name="reference_move_id"
-                                   options="{'no_create': True}"
-                                   domain="[('picking_id.partner_id', '=', partner_id),
+                            <field
+                                name="reference_move_id"
+                                options="{'no_create': True}"
+                                domain="[('picking_id.partner_id', '=', partner_id),
                                             ('location_id.usage', '=', 'supplier'),
-                                            ('state', '=', 'done')]"/>
+                                            ('state', '=', 'done')]"
+                            />
                         </group>
                         <group>
                             <group name="operation" string="Operation">
-                                <field name="operation_id"
-                                       domain="[('type','=','supplier')]"/>
-                                <field name="receipt_policy"/>
-                                <field name="delivery_policy"/>
+                                <field
+                                    name="operation_id"
+                                    domain="[('type','=','supplier')]"
+                                />
+                                <field name="receipt_policy" />
+                                <field name="delivery_policy" />
                             </group>
                             <group name="description" string="Description">
-                                <field name="description" nolabel="1"/>
+                                <field name="description" nolabel="1" />
                             </group>
                             <group name="contact" string="Contact">
-                                <field name="requested_by" readonly="1"/>
-                                <field name="assigned_to"/>
+                                <field name="requested_by" readonly="1" />
+                                <field name="assigned_to" />
                             </group>
                         </group>
                         <notebook>
                             <page name="route" string="Routes">
                                 <group>
                                     <group name="inbound" string="Inbound">
-                                        <field name="in_warehouse_id"/>
-                                        <field name="location_id"
-                                               domain="[('usage', '=', 'internal')]"/>
-                                        <field name="in_route_id" groups="stock.group_adv_location"/>
+                                        <field name="in_warehouse_id" />
+                                        <field
+                                            name="location_id"
+                                            domain="[('usage', '=', 'internal')]"
+                                        />
+                                        <field
+                                            name="in_route_id"
+                                            groups="stock.group_adv_location"
+                                        />
                                     </group>
                                     <group name="outbound" string="Outbound">
-                                        <field name="out_warehouse_id"/>
-                                        <field name="out_route_id" groups="stock.group_adv_location"/>
-                                        <field name="supplier_to_customer"/>
-                                        <field name="customer_address_id"
-                                               context="{'show_address': 1}"
-                                               options="{'always_reload': 1}"
-                                               attrs="{'required':[('supplier_to_customer', '=', True)],
-                                                       'invisible':[('supplier_to_customer', '=', False)]}"/>
+                                        <field name="out_warehouse_id" />
+                                        <field
+                                            name="out_route_id"
+                                            groups="stock.group_adv_location"
+                                        />
+                                        <field name="supplier_to_customer" />
+                                        <field
+                                            name="customer_address_id"
+                                            context="{'show_address': 1}"
+                                            options="{'always_reload': 1}"
+                                            attrs="{'required':[('supplier_to_customer', '=', True)],
+                                                       'invisible':[('supplier_to_customer', '=', False)]}"
+                                        />
                                     </group>
                                 </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>
-                                    <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"/>
-                                            <field name="qty_received"/>
+                                            <field name="qty_to_receive" />
+                                            <field name="qty_incoming" />
+                                            <field name="qty_received" />
                                         </group>
                                         <group name="deliver">
-                                            <field name="qty_to_deliver"/>
-                                            <field name="qty_outgoing"/>
-                                            <field name="qty_delivered"/>
+                                            <field name="qty_to_deliver" />
+                                            <field name="qty_outgoing" />
+                                            <field name="qty_delivered" />
                                         </group>
                                     </group>
                                 </group>
                             </page>
                             <page name="other" string="Other Info">
                                 <group name="general" string="General">
-                                    <field name="conditions"/>
-                                    <field name="rma_id" groups="rma.group_rma_groups"/>
-                                    <field name="origin"/>
+                                    <field name="conditions" />
+                                    <field
+                                        name="rma_id"
+                                        groups="rma.group_rma_groups"
+                                    />
+                                    <field name="origin" />
 
                                 </group>
-                                <group name="company" string="Company"
-                                   groups="base.group_multi_company">
-                                <field name="company_id"/>
+                                <group
+                                    name="company"
+                                    string="Company"
+                                    groups="base.group_multi_company"
+                                >
+                                <field name="company_id" />
                             </group>
                             </page>
                         </notebook>
                     </sheet>
                 <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
-                    <field name="message_ids" widget="mail_thread"/>
+                    <field
+                            name="message_follower_ids"
+                            widget="mail_followers"
+                            groups="base.group_user"
+                        />
+                    <field name="message_ids" widget="mail_thread" />
                 </div>
                 </form>
             </field>
@@ -215,38 +297,66 @@
             <field name="arch" type="xml">
                 <form string="RMA Line">
                     <header>
-                        <button name="action_rma_to_approve" type="object"
+                        <button
+                            name="action_rma_to_approve"
+                            type="object"
                             string="Request Approval"
                             attrs="{'invisible':[('state', '!=', 'draft')]}"
-                            class="oe_highlight" groups="rma.group_rma_customer_user"/>
-                        <button name="action_rma_draft" type="object"
-                                string="Back to Draft"
-                                attrs="{'invisible':[('state', '=', 'draft')]}" class="oe_highlight"
-                                groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/>
-                        <button name="action_rma_approve" type="object"
-                                string="Approve"
-                                attrs="{'invisible':[('state', '!=', 'to_approve')]}" class="oe_highlight" groups="rma.group_rma_customer_user"/>
-                        <button name="action_rma_done" type="object"
-                                string="Done"
-                                attrs="{'invisible':[('state', 'in', ('done', 'draft'))]}"
-                                groups="rma.group_rma_customer_user"/>
-                        <field name="state" widget="statusbar" nolabel="1"/>
+                            class="oe_highlight"
+                            groups="rma.group_rma_customer_user"
+                        />
+                        <button
+                            name="action_rma_draft"
+                            type="object"
+                            string="Back to Draft"
+                            attrs="{'invisible':[('state', '=', 'draft')]}"
+                            class="oe_highlight"
+                            groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"
+                        />
+                        <button
+                            name="action_rma_approve"
+                            type="object"
+                            string="Approve"
+                            attrs="{'invisible':[('state', '!=', 'to_approve')]}"
+                            class="oe_highlight"
+                            groups="rma.group_rma_customer_user"
+                        />
+                        <button
+                            name="action_rma_done"
+                            type="object"
+                            string="Done"
+                            attrs="{'invisible':[('state', 'in', ('done', 'draft'))]}"
+                            groups="rma.group_rma_customer_user"
+                        />
+                        <field name="state" widget="statusbar" nolabel="1" />
                     </header>
                     <sheet>
                         <div name="button_box" class="oe_button_box">
-                            <button type="object"  name="action_view_in_shipments"
-                                    class="oe_stat_button"
-                                    icon="fa-truck"
-                                    groups="stock.group_stock_user">
-                                <field name="in_shipment_count" widget="statinfo"
-                                       string="Shipments"/>
+                            <button
+                                type="object"
+                                name="action_view_in_shipments"
+                                class="oe_stat_button"
+                                icon="fa-truck"
+                                groups="stock.group_stock_user"
+                            >
+                                <field
+                                    name="in_shipment_count"
+                                    widget="statinfo"
+                                    string="Shipments"
+                                />
                             </button>
-                            <button type="object"  name="action_view_out_shipments"
-                                    class="oe_stat_button"
-                                    icon="fa-truck"
-                                    groups="stock.group_stock_user">
-                                <field name="out_shipment_count" widget="statinfo"
-                                       string="Deliveries"/>
+                            <button
+                                type="object"
+                                name="action_view_out_shipments"
+                                class="oe_stat_button"
+                                icon="fa-truck"
+                                groups="stock.group_stock_user"
+                            >
+                                <field
+                                    name="out_shipment_count"
+                                    widget="statinfo"
+                                    string="Deliveries"
+                                />
                             </button>
                             <!--Move this button to rma_account-->
                             <!--<button type="object"  name="action_view_invoice"
@@ -254,129 +364,179 @@
                                     icon="fa-pencil-square-o"
                                     string="Origin Inv">
                             </button>-->
-                            <button type="object" name="action_view_rma_lines"
-                                    class="oe_stat_button"
-                                    icon="fa-link"
-                                    groups="stock.group_stock_user">
-                                <field name="rma_line_count" widget="statinfo"
-                                       string="Supplier RMA"/>
+                            <button
+                                type="object"
+                                name="action_view_rma_lines"
+                                class="oe_stat_button"
+                                icon="fa-link"
+                                groups="stock.group_stock_user"
+                            >
+                                <field
+                                    name="rma_line_count"
+                                    widget="statinfo"
+                                    string="Supplier RMA"
+                                />
                             </button>
                         </div>
                         <div class="oe_title" name="title">
                         <h1>
-                            <field name="name" readonly="1"
-                                   invisible="context.get('hide_title',False)"/>
+                            <field
+                                    name="name"
+                                    readonly="1"
+                                    invisible="context.get('hide_title',False)"
+                                />
                         </h1>
                         </div>
                         <group name="partner">
                             <group name="partner">
-                                <field name="partner_id"
-                                   context="{'res_partner_search_mode': 'customer'}"
-                                   string="Customer"/>
-                                <field name="delivery_address_id"
-                                           domain="['|', ('parent_id', '=', partner_id),
+                                <field
+                                    name="partner_id"
+                                    context="{'res_partner_search_mode': 'customer'}"
+                                    string="Customer"
+                                />
+                                <field
+                                    name="delivery_address_id"
+                                    domain="['|', ('parent_id', '=', partner_id),
                                                          ('id', '=', partner_id)]"
-                                           context="{'show_address': 1}"
-                                           options="{'always_reload': 1}"
-                                           groups='rma.group_rma_delivery_invoice_address'/>
-                                <field name="under_warranty"/>
+                                    context="{'show_address': 1}"
+                                    options="{'always_reload': 1}"
+                                    groups='rma.group_rma_delivery_invoice_address'
+                                />
+                                <field name="under_warranty" />
                             </group>
                         </group>
                         <group>
                             <group name="product" string="Product">
-                                <field name="product_id"/>
-                                <newline/>
-                                <field name="product_tracking" invisible="1"/>
-                                <field name="lot_id"
-                                       groups="stock.group_production_lot"
-                                       attrs="{'required': [('product_tracking', 'in', ('serial', 'lot'))]}"/>
+                                <field name="product_id" />
+                                <newline />
+                                <field name="product_tracking" invisible="1" />
+                                <field
+                                    name="lot_id"
+                                    groups="stock.group_production_lot"
+                                    attrs="{'required': [('product_tracking', 'in', ('serial', 'lot'))]}"
+                                />
                             </group>
                             <group name="product_qty" string="Quantity">
-                                <field name="product_qty"/>
-                                <field name="uom_id" groups="uom.group_uom"/>
-                                <field name="price_unit"/>
+                                <field name="product_qty" />
+                                <field name="uom_id" groups="uom.group_uom" />
+                                <field name="price_unit" />
                             </group>
                         </group>
                         <group name="main_info" string="Origin">
-                            <field name="reference_move_id"
-                                   options="{'no_create': True}"
-                                   domain="[('picking_id.partner_id', '=', partner_id),
+                            <field
+                                name="reference_move_id"
+                                options="{'no_create': True}"
+                                domain="[('picking_id.partner_id', '=', partner_id),
                                             ('location_dest_id.usage', '=', 'customer'),
-                                            ('state', '=', 'done')]"/>
+                                            ('state', '=', 'done')]"
+                            />
                         </group>
                         <group>
                             <group name="operation" string="Operation">
-                                <field name="operation_id" domain="[('type','=','customer')]"/>
-                                <field name="receipt_policy"/>
-                                <field name="delivery_policy"/>
+                                <field
+                                    name="operation_id"
+                                    domain="[('type','=','customer')]"
+                                />
+                                <field name="receipt_policy" />
+                                <field name="delivery_policy" />
                             </group>
                             <group name="description" string="Description">
-                                    <field name="description" nolabel="1"/>
+                                    <field name="description" nolabel="1" />
                             </group>
                         </group>
                         <group>
                             <group name="contact" string="Contact">
-                                <field name="requested_by" readonly="1"/>
-                                <field name="assigned_to"/>
+                                <field name="requested_by" readonly="1" />
+                                <field name="assigned_to" />
                             </group>
                         </group>
                         <notebook>
                             <page name="route" string="Routes">
                                 <group name="inbound" string="Inbound">
-                                    <field name="in_warehouse_id"/>
-                                    <field name="location_id"
-                                           domain="[('usage', '=', 'internal')]"/>
-                                    <field name="in_route_id" groups="stock.group_adv_location"/>
-                                    <field name="customer_to_supplier"/>
-                                    <field name="supplier_address_id"
-                                           context="{'show_address': 1}"
-                                           options="{'always_reload': 1}"
-                                           attrs="{'required':[('customer_to_supplier', '=', True)],
-                                                   'invisible':[('customer_to_supplier', '=', False)]}"/>
+                                    <field name="in_warehouse_id" />
+                                    <field
+                                        name="location_id"
+                                        domain="[('usage', '=', 'internal')]"
+                                    />
+                                    <field
+                                        name="in_route_id"
+                                        groups="stock.group_adv_location"
+                                    />
+                                    <field name="customer_to_supplier" />
+                                    <field
+                                        name="supplier_address_id"
+                                        context="{'show_address': 1}"
+                                        options="{'always_reload': 1}"
+                                        attrs="{'required':[('customer_to_supplier', '=', True)],
+                                                   'invisible':[('customer_to_supplier', '=', False)]}"
+                                    />
                                 </group>
                                 <group name="outbound" string="Outbound">
-                                    <field name="out_warehouse_id"/>
-                                    <field name="out_route_id" groups="stock.group_adv_location"/>
+                                    <field name="out_warehouse_id" />
+                                    <field
+                                        name="out_route_id"
+                                        groups="stock.group_adv_location"
+                                    />
                                 </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"/>
-                                        <field name="qty_received"/>
+                                        <field name="qty_to_receive" />
+                                        <field name="qty_incoming" />
+                                        <field name="qty_received" />
                                     </group>
                                     <group name="deliver">
-                                        <field name="qty_to_deliver"/>
-                                        <field name="qty_outgoing"/>
-                                        <field name="qty_delivered"/>
+                                        <field name="qty_to_deliver" />
+                                        <field name="qty_outgoing" />
+                                        <field name="qty_delivered" />
                                     </group>
-                                    <group name="supplier_rma"
-                                           attrs="{'invisible':[('customer_to_supplier','=',False)]}">
-                                        <field name="qty_to_supplier_rma"/>
-                                        <field name="qty_in_supplier_rma"/>
+                                    <group
+                                        name="supplier_rma"
+                                        attrs="{'invisible':[('customer_to_supplier','=',False)]}"
+                                    >
+                                        <field name="qty_to_supplier_rma" />
+                                        <field name="qty_in_supplier_rma" />
                                     </group>
                                 </group>
                             </page>
                             <page name="other" string="Other Info">
                                 <group name="general" string="General">
-                                    <field name="conditions"/>
-                                    <field name="rma_id" groups="rma.group_rma_groups"/>
-                                    <field name="origin"/>
+                                    <field name="conditions" />
+                                    <field
+                                        name="rma_id"
+                                        groups="rma.group_rma_groups"
+                                    />
+                                    <field name="origin" />
                                 </group>
-                                <group name="company" string="Company"
-                                    groups="base.group_multi_company">
-                                <field name="company_id"/>
+                                <group
+                                    name="company"
+                                    string="Company"
+                                    groups="base.group_multi_company"
+                                >
+                                <field name="company_id" />
                             </group>
                             </page>
                         </notebook>
                     </sheet>
                 <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
-                    <field name="message_ids" widget="mail_thread"/>
+                    <field
+                            name="message_follower_ids"
+                            widget="mail_followers"
+                            groups="base.group_user"
+                        />
+                    <field name="message_ids" widget="mail_thread" />
                 </div>
                 </form>
             </field>
@@ -387,36 +547,79 @@
             <field name="model">rma.order.line</field>
             <field name="arch" type="xml">
                 <search string="Search RMA line">
-                    <field name="name"/>
-                    <field name="rma_id" groups="rma.group_rma_groups"/>
-                    <field name="partner_id"/>
-                    <field name="requested_by"/>
-                    <field name="assigned_to"/>
-                    <field name="product_id"/>
-                    <field name="lot_id"/>
-                    <separator/>
-                    <filter name="assigned_to" domain="[('assigned_to','=',uid)]" help="My RMAs"/>
-                    <separator/>
-                    <group name="stock_quantities" groups="stock.group_stock_user">
-                        <filter name="to_receive" domain="[('state','!=', 'done'),('qty_to_receive','>',0.0)]" help="To Receive"/>
-                        <filter name="to_deliver" domain="[('state','!=', 'done'),('qty_to_deliver','>',0.0)]" help="To Deliver"/>
+                    <field name="name" />
+                    <field name="rma_id" groups="rma.group_rma_groups" />
+                    <field name="partner_id" />
+                    <field name="requested_by" />
+                    <field name="assigned_to" />
+                    <field name="product_id" />
+                    <field name="lot_id" />
+                    <separator />
+                    <filter
+                        name="assigned_to"
+                        domain="[('assigned_to','=',uid)]"
+                        help="My RMAs"
+                    />
+                    <separator />
+                    <group
+                        name="stock_quantities"
+                        groups="stock.group_stock_user"
+                    >
+                        <filter
+                            name="to_receive"
+                            domain="[('state','!=', 'done'),('qty_to_receive','>',0.0)]"
+                            help="To Receive"
+                        />
+                        <filter
+                            name="to_deliver"
+                            domain="[('state','!=', 'done'),('qty_to_deliver','>',0.0)]"
+                            help="To Deliver"
+                        />
                     </group>
                     <group name="rma_supplier_quantities">
-                        <filter name="to_send_to_supplier" domain="[('state','!=', 'done'),('qty_to_supplier_rma','>',0.0)]" help="To Send to Supplier RMA"/>
+                        <filter
+                            name="to_send_to_supplier"
+                            domain="[('state','!=', 'done'),('qty_to_supplier_rma','>',0.0)]"
+                            help="To Send to Supplier RMA"
+                        />
                     </group>
                     <group expand="0" string="Group By">
-                        <filter name="status" string="State" domain="[]"
-                                context="{'group_by':'state'}"/>
-                        <filter name="partner" string="Partner" domain="[]"
-                                context="{'group_by':'partner_id'}"/>
-                        <filter name="operation" string="Operation" domain="[]"
-                                context="{'group_by':'operation_id'}"/>
-                        <filter name="product" string="Product" domain="[]"
-                                context="{'group_by':'product_id'}"/>
-                        <filter name="to_receive" string="To Receive" domain="[('qty_to_receive', '>', 0)]"
-                                context="{'group_by':'partner_id'}"/>
-                        <filter name="to_deliver" string="To Deliver" domain="[('qty_to_deliver', '>', 0)]"
-                                context="{'group_by':'partner_id'}"/>
+                        <filter
+                            name="status"
+                            string="State"
+                            domain="[]"
+                            context="{'group_by':'state'}"
+                        />
+                        <filter
+                            name="partner"
+                            string="Partner"
+                            domain="[]"
+                            context="{'group_by':'partner_id'}"
+                        />
+                        <filter
+                            name="operation"
+                            string="Operation"
+                            domain="[]"
+                            context="{'group_by':'operation_id'}"
+                        />
+                        <filter
+                            name="product"
+                            string="Product"
+                            domain="[]"
+                            context="{'group_by':'product_id'}"
+                        />
+                        <filter
+                            name="to_receive"
+                            string="To Receive"
+                            domain="[('qty_to_receive', '>', 0)]"
+                            context="{'group_by':'partner_id'}"
+                        />
+                        <filter
+                            name="to_deliver"
+                            string="To Deliver"
+                            domain="[('qty_to_deliver', '>', 0)]"
+                            context="{'group_by':'partner_id'}"
+                        />
                     </group>
                </search>
             </field>
@@ -428,31 +631,37 @@
             <field name="domain">[('type','=', 'customer')]</field>
             <field name="context">{"search_default_assigned_to":uid}</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_rma_line_tree"/>
+            <field name="view_id" ref="view_rma_line_tree" />
         </record>
 
         <record id="action_rma_supplier_lines" model="ir.actions.act_window">
             <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_assigned_to":uid, "supplier":1}</field>
+            <field
+                name="context"
+            >{"search_default_assigned_to":uid, "supplier":1}</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_rma_line_supplier_tree"/>
+            <field name="view_id" ref="view_rma_line_supplier_tree" />
         </record>
 
-        <record id="action_rma_line_supplier_tree"
-                model="ir.actions.act_window.view">
-            <field eval="3" name="sequence"/>
+        <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"/>
+            <field name="act_window_id" ref="action_rma_supplier_lines" />
         </record>
 
-        <record id="action_rma_line_supplier_form"
-                model="ir.actions.act_window.view">
-            <field eval="4" name="sequence"/>
+        <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"/>
-            <field name="act_window_id" ref="action_rma_supplier_lines"/>
+            <field name="view_id" ref="view_rma_line_supplier_form" />
+            <field name="act_window_id" ref="action_rma_supplier_lines" />
         </record>
 
     </data>
diff --git a/rma/views/rma_order_view.xml b/rma/views/rma_order_view.xml
index 982908fe..e471e9e9 100644
--- a/rma/views/rma_order_view.xml
+++ b/rma/views/rma_order_view.xml
@@ -1,14 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <odoo>
     <record id="view_rma_tree" model="ir.ui.view">
         <field name="name">rma.order.tree</field>
         <field name="model">rma.order</field>
         <field name="arch" type="xml">
             <tree string="RMA">
-                <field name="name"/>
-                <field name="reference"/>
-                <field name="partner_id" groups="base.group_user" string="Customer"/>
-                <field name="date_rma"/>
+                <field name="name" />
+                <field name="reference" />
+                <field
+                    name="partner_id"
+                    groups="base.group_user"
+                    string="Customer"
+                />
+                <field name="date_rma" />
             </tree>
         </field>
     </record>
@@ -18,11 +22,14 @@
         <field name="model">rma.order</field>
         <field name="arch" type="xml">
             <tree string="RMA">
-                <field name="name"/>
-                <field name="reference"/>
-                <field name="partner_id" groups="base.group_user"
-                       string="Supplier"/>
-                <field name="date_rma"/>
+                <field name="name" />
+                <field name="reference" />
+                <field
+                    name="partner_id"
+                    groups="base.group_user"
+                    string="Supplier"
+                />
+                <field name="date_rma" />
             </tree>
         </field>
     </record>
@@ -32,102 +39,153 @@
         <field name="model">rma.order</field>
         <field name="arch" type="xml">
             <form string="RMA">
-            <header/>
+            <header />
             <sheet name='rma' string="RMA">
                 <div class="oe_button_box" name="button_box">
-                    <button type="object"  name="action_view_in_shipments"
+                    <button
+                            type="object"
+                            name="action_view_in_shipments"
                             class="oe_stat_button"
                             icon="fa-truck"
-                            groups="stock.group_stock_user">
-                        <field name="in_shipment_count" widget="statinfo"
-                               string="Shipments"/>
+                            groups="stock.group_stock_user"
+                        >
+                        <field
+                                name="in_shipment_count"
+                                widget="statinfo"
+                                string="Shipments"
+                            />
                     </button>
-                    <button type="object"  name="action_view_out_shipments"
+                    <button
+                            type="object"
+                            name="action_view_out_shipments"
                             class="oe_stat_button"
                             icon="fa-truck"
-                            groups="stock.group_stock_user">
-                        <field name="out_shipment_count" widget="statinfo"
-                               string="Deliveries"/>
+                            groups="stock.group_stock_user"
+                        >
+                        <field
+                                name="out_shipment_count"
+                                widget="statinfo"
+                                string="Deliveries"
+                            />
                     </button>
-                    <button type="object"  name="action_view_lines"
+                    <button
+                            type="object"
+                            name="action_view_lines"
                             class="oe_stat_button"
                             icon="fa-list"
-                            groups="rma.group_rma_customer_user">
-                        <field name="line_count" widget="statinfo"
-                               string="RMA Lines"/>
+                            groups="rma.group_rma_customer_user"
+                        >
+                        <field
+                                name="line_count"
+                                widget="statinfo"
+                                string="RMA Lines"
+                            />
                     </button>
-                    <button type="object" name="action_view_supplier_lines"
+                    <button
+                            type="object"
+                            name="action_view_supplier_lines"
                             class="oe_stat_button"
                             attrs="{'invisible':[('supplier_line_count', '=', 0)]}"
                             icon="fa-list"
-                            groups="rma.group_rma_supplier_user">
-                        <field name="supplier_line_count" widget="statinfo"
-                               string="Rel. RMA Lines"/>
+                            groups="rma.group_rma_supplier_user"
+                        >
+                        <field
+                                name="supplier_line_count"
+                                widget="statinfo"
+                                string="Rel. RMA Lines"
+                            />
                     </button>
                 </div>
                 <div class="oe_title" name="title">
                     <h1>
-                        <field name="name" readonly="1"/>
+                        <field name="name" readonly="1" />
                     </h1>
                 </div>
                 <group>
                     <group name="info">
-                        <field name="partner_id"
-                               context="{'res_partner_search_mode': 'customer'}"
-                               string="Customer"
-                               colspan="4"
-                        />
-                        <field name="date_rma" attrs="{'readonly':[('state', '!=', 'draft')]}"/>
+                        <field
+                                name="partner_id"
+                                context="{'res_partner_search_mode': 'customer'}"
+                                string="Customer"
+                                colspan="4"
+                            />
+                        <field
+                                name="date_rma"
+                                attrs="{'readonly':[('state', '!=', 'draft')]}"
+                            />
                     </group>
                     <group name="comments">
-                        <field name="comment"/>
-                        <field name="type" readonly="1" invisible="1"/>
+                        <field name="comment" />
+                        <field name="type" readonly="1" invisible="1" />
                     </group>
                 </group>
                 <group>
                     <group name="inbound_route" string="Inbound">
-                        <field name="in_warehouse_id" attrs="{'readonly':[('state', '!=', 'draft')]}"/>
-                        <field name="customer_to_supplier" attrs="{'readonly':[('state', '!=', 'draft')]}"/>
-                        <field name="state" invisible="True"/>
-                        <field name="supplier_address_id"
-                               context="{'show_address': 1}"
-                               options="{'always_reload': 1}"
-                               attrs="{'required':[('customer_to_supplier', '=', True)],
+                        <field
+                                name="in_warehouse_id"
+                                attrs="{'readonly':[('state', '!=', 'draft')]}"
+                            />
+                        <field
+                                name="customer_to_supplier"
+                                attrs="{'readonly':[('state', '!=', 'draft')]}"
+                            />
+                        <field name="state" invisible="True" />
+                        <field
+                                name="supplier_address_id"
+                                context="{'show_address': 1}"
+                                options="{'always_reload': 1}"
+                                attrs="{'required':[('customer_to_supplier', '=', True)],
                                        'invisible':[('customer_to_supplier', '=', False)],
-                                       'readonly':[('state', '!=', 'draft')]}"/>
+                                       'readonly':[('state', '!=', 'draft')]}"
+                            />
                     </group>
                 </group>
                 <group>
                     <group name="contact" string="Contact">
-                        <field name="requested_by" readonly="1"/>
-                        <field name="assigned_to" attrs="{'readonly':[('state', '!=', 'draft')]}"/>
-                        <field name="company_id"
-                               groups="base.group_multi_company"/>
+                        <field name="requested_by" readonly="1" />
+                        <field
+                                name="assigned_to"
+                                attrs="{'readonly':[('state', '!=', 'draft')]}"
+                            />
+                        <field
+                                name="company_id"
+                                groups="base.group_multi_company"
+                            />
                     </group>
                 </group>
                 <notebook colspan="4">
                     <page string="RMA Lines" name="lines">
-                        <field name="rma_line_ids" context="{'default_rma_id': active_id,
+                        <field
+                                name="rma_line_ids"
+                                context="{'default_rma_id': active_id,
                                                              'default_partner_id': partner_id,
-                                                             'hide_title': True}">
+                                                             'hide_title': True}"
+                            >
                             <tree string="RMA Lines" name="lines">
-                                <field name="sequence" widget="handle"/>
-                                <field name="state" invisible="True"/>
-                                <field name="product_id"/>
-                                <field name="lot_id" groups="stock.group_production_lot"/>
-                                <field name="name"/>
-                                <field name="uom_id" groups="uom.group_uom"/>
-                                <field name="operation_id"/>
-                                <field name="product_qty"/>
-                                <field name="price_unit"/>
+                                <field name="sequence" widget="handle" />
+                                <field name="state" invisible="True" />
+                                <field name="product_id" />
+                                <field
+                                        name="lot_id"
+                                        groups="stock.group_production_lot"
+                                    />
+                                <field name="name" />
+                                <field name="uom_id" groups="uom.group_uom" />
+                                <field name="operation_id" />
+                                <field name="product_qty" />
+                                <field name="price_unit" />
                             </tree>
                         </field>
                     </page>
                 </notebook>
             </sheet>
             <div class="oe_chatter">
-                <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
-                <field name="message_ids" widget="mail_thread"/>
+                <field
+                        name="message_follower_ids"
+                        widget="mail_followers"
+                        groups="base.group_user"
+                    />
+                <field name="message_ids" widget="mail_thread" />
             </div>
             </form>
         </field>
@@ -138,100 +196,145 @@
         <field name="model">rma.order</field>
         <field name="arch" type="xml">
             <form string="RMA">
-            <header/>
+            <header />
             <sheet string="RMA">
                 <div class="oe_button_box" name="button_box">
-                    <button type="object"  name="action_view_in_shipments"
+                    <button
+                            type="object"
+                            name="action_view_in_shipments"
                             class="oe_stat_button"
                             icon="fa-truck"
-                            groups="stock.group_stock_user">
-                        <field name="in_shipment_count" widget="statinfo"
-                               string="Shipments"/>
+                            groups="stock.group_stock_user"
+                        >
+                        <field
+                                name="in_shipment_count"
+                                widget="statinfo"
+                                string="Shipments"
+                            />
                     </button>
-                    <button type="object"  name="action_view_out_shipments"
+                    <button
+                            type="object"
+                            name="action_view_out_shipments"
                             class="oe_stat_button"
                             icon="fa-truck"
-                            groups="stock.group_stock_user">
-                        <field name="out_shipment_count" widget="statinfo"
-                               string="Deliveries"/>
+                            groups="stock.group_stock_user"
+                        >
+                        <field
+                                name="out_shipment_count"
+                                widget="statinfo"
+                                string="Deliveries"
+                            />
                     </button>
-                    <button type="object" name="action_view_lines"
+                    <button
+                            type="object"
+                            name="action_view_lines"
                             class="oe_stat_button"
                             icon="fa-list"
-                            groups="rma.group_rma_supplier_user">
-                        <field name="line_count" widget="statinfo"
-                               string="RMA Lines"/>
+                            groups="rma.group_rma_supplier_user"
+                        >
+                        <field
+                                name="line_count"
+                                widget="statinfo"
+                                string="RMA Lines"
+                            />
                     </button>
                 </div>
                 <div class="oe_title" name="title">
                     <h1>
-                        <field name="name" readonly="1"/>
+                        <field name="name" readonly="1" />
                     </h1>
                 </div>
                 <group>
                     <group name="partner">
-                        <field name="state" invisible="1"/>
-                        <field name="partner_id"
-                               context="{'res_partner_search_mode': 'supplier'}"
-                               string="Supplier"
-                               attrs="{'readonly':[('state', '!=', 'draft')]}"/>
-                        <field name="reference"/>
-                        <field name="date_rma" attrs="{'readonly':[('state', '!=', 'draft')]}"/>
+                        <field name="state" invisible="1" />
+                        <field
+                                name="partner_id"
+                                context="{'res_partner_search_mode': 'supplier'}"
+                                string="Supplier"
+                                attrs="{'readonly':[('state', '!=', 'draft')]}"
+                            />
+                        <field name="reference" />
+                        <field
+                                name="date_rma"
+                                attrs="{'readonly':[('state', '!=', 'draft')]}"
+                            />
                     </group>
                     <group>
-                        <field name="comment"/>
-                        <field name="type" readonly="1" invisible="1"/>
+                        <field name="comment" />
+                        <field name="type" readonly="1" invisible="1" />
                     </group>
                 </group>
                 <group name="route">
                     <group name="inbound_route" string="Inbound">
-                        <field name="in_warehouse_id" attrs="{'readonly':[('state', '!=', 'draft')]}"/>
+                        <field
+                                name="in_warehouse_id"
+                                attrs="{'readonly':[('state', '!=', 'draft')]}"
+                            />
                     </group>
                     <group name="outbound_route" string="Outbound">
-                        <field name="supplier_to_customer" attrs="{'readonly':[('state', '!=', 'draft')]}"/>
-                        <field name="customer_address_id"
-                               context="{'show_address': 1}"
-                               options="{'always_reload': 1}"
-                               attrs="{'required':[('supplier_to_customer', '=', True)],
+                        <field
+                                name="supplier_to_customer"
+                                attrs="{'readonly':[('state', '!=', 'draft')]}"
+                            />
+                        <field
+                                name="customer_address_id"
+                                context="{'show_address': 1}"
+                                options="{'always_reload': 1}"
+                                attrs="{'required':[('supplier_to_customer', '=', True)],
                                        'invisible':[('supplier_to_customer', '=', False)],
-                                       'readonly':[('state', '!=', 'draft')]}"/>
+                                       'readonly':[('state', '!=', 'draft')]}"
+                            />
                     </group>
                 </group>
                 <group>
                     <group name="contact" string="Contact">
-                        <field name="requested_by" readonly="1"/>
-                        <field name="assigned_to" attrs="{'readonly':[('state', '!=', 'draft')]}"/>
-                        <field name="company_id"
-                               groups="base.group_multi_company"/>
+                        <field name="requested_by" readonly="1" />
+                        <field
+                                name="assigned_to"
+                                attrs="{'readonly':[('state', '!=', 'draft')]}"
+                            />
+                        <field
+                                name="company_id"
+                                groups="base.group_multi_company"
+                            />
                     </group>
                 </group>
                 <notebook colspan="4">
                     <page string="RMA Lines" name="lines">
-                        <field name="rma_line_ids"
-                               context="{'form_view_ref':'rma.view_rma_line_supplier_form',
+                        <field
+                                name="rma_line_ids"
+                                context="{'form_view_ref':'rma.view_rma_line_supplier_form',
                                          'default_rma_id': active_id,
                                          'default_partner_id': partner_id,
                                          'supplier': 1,
-                                         'hide_title': True}">
+                                         'hide_title': True}"
+                            >
                             <tree string="RMA Lines">
-                                <field name="sequence" widget="handle"/>
-                                <field name="state" invisible="True"/>
-                                <field name="name"/>
-                                <field name="product_id"/>
-                                <field name="lot_id" groups="stock.group_production_lot"/>
-                                <field name="name"/>
-                                <field name="uom_id" groups="uom.group_uom"/>
-                                <field name="operation_id"/>
-                                <field name="product_qty"/>
-                                <field name="origin"/>
+                                <field name="sequence" widget="handle" />
+                                <field name="state" invisible="True" />
+                                <field name="name" />
+                                <field name="product_id" />
+                                <field
+                                        name="lot_id"
+                                        groups="stock.group_production_lot"
+                                    />
+                                <field name="name" />
+                                <field name="uom_id" groups="uom.group_uom" />
+                                <field name="operation_id" />
+                                <field name="product_qty" />
+                                <field name="origin" />
                             </tree>
                         </field>
                     </page>
                 </notebook>
             </sheet>
             <div class="oe_chatter">
-                <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
-                <field name="message_ids" widget="mail_thread"/>
+                <field
+                        name="message_follower_ids"
+                        widget="mail_followers"
+                        groups="base.group_user"
+                    />
+                <field name="message_ids" widget="mail_thread" />
             </div>
             </form>
         </field>
@@ -242,15 +345,23 @@
         <field name="model">rma.order</field>
         <field name="arch" type="xml">
             <search string="Search RMA">
-                <field name="reference"/>
-                <field name="name"/>
-                <field name="partner_id"/>
-                <separator/>
+                <field name="reference" />
+                <field name="name" />
+                <field name="partner_id" />
+                <separator />
                 <group expand="0" string="Group By">
-                    <filter name="partner" string="Partner" domain="[]"
-                            context="{'group_by':'partner_id'}"/>
-                    <filter name="rma_date" string="RMA Date" domain="[]"
-                            context="{'group_by':'date_rma'}"/>
+                    <filter
+                        name="partner"
+                        string="Partner"
+                        domain="[]"
+                        context="{'group_by':'partner_id'}"
+                    />
+                    <filter
+                        name="rma_date"
+                        string="RMA Date"
+                        domain="[]"
+                        context="{'group_by':'date_rma'}"
+                    />
                 </group>
            </search>
         </field>
@@ -262,7 +373,7 @@
         <field name="domain">[('type','=', 'customer')]</field>
         <field name="context">{'customer':1}</field>
         <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="view_rma_tree"/>
+        <field name="view_id" ref="view_rma_tree" />
     </record>
 
     <record id="action_rma_supplier" model="ir.actions.act_window">
@@ -271,22 +382,20 @@
         <field name="domain">[('type','=', 'supplier')]</field>
         <field name="context">{'supplier':1}</field>
         <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="view_rma_supplier_tree"/>
+        <field name="view_id" ref="view_rma_supplier_tree" />
     </record>
 
-    <record id="action_rma_supplier_tree"
-            model="ir.actions.act_window.view">
-        <field eval="1" name="sequence"/>
+    <record id="action_rma_supplier_tree" model="ir.actions.act_window.view">
+        <field eval="1" name="sequence" />
         <field name="view_mode">tree</field>
-        <field name="act_window_id" ref="action_rma_supplier"/>
+        <field name="act_window_id" ref="action_rma_supplier" />
     </record>
 
-    <record id="action_rma_supplier_form"
-            model="ir.actions.act_window.view">
-        <field eval="2" name="sequence"/>
+    <record id="action_rma_supplier_form" model="ir.actions.act_window.view">
+        <field eval="2" name="sequence" />
         <field name="view_mode">form</field>
-        <field name="view_id" ref="view_rma_supplier_form"/>
-        <field name="act_window_id" ref="action_rma_supplier"/>
+        <field name="view_id" ref="view_rma_supplier_form" />
+        <field name="act_window_id" ref="action_rma_supplier" />
     </record>
 
 </odoo>
diff --git a/rma/views/stock_view.xml b/rma/views/stock_view.xml
index e8d4655f..c097ff3c 100644
--- a/rma/views/stock_view.xml
+++ b/rma/views/stock_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <odoo>
     <record id="view_move_form" model="ir.ui.view">
         <field name="name">rma.move.form</field>
@@ -7,19 +7,22 @@
         <field name="arch" type="xml">
             <group name="origin_grp" position="after">
                 <group name="rma">
-                    <field name="rma_line_id"/>
+                    <field name="rma_line_id" />
                 </group>
             </group>
         </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="inherit_id" ref="stock.stock_location_route_form_view" />
         <field name="model">stock.location.route</field>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='warehouse_ids']" position="before">
-                <field name="rma_selectable" string="RMA Order Lines"/>
+                <field name="rma_selectable" string="RMA Order Lines" />
             </xpath>
         </field>
     </record>
diff --git a/rma/views/stock_warehouse.xml b/rma/views/stock_warehouse.xml
index 617e2cab..ebdf941c 100644
--- a/rma/views/stock_warehouse.xml
+++ b/rma/views/stock_warehouse.xml
@@ -1,21 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <odoo>
     <record id="view_warehouse_form" model="ir.ui.view">
         <field name="name">view_warehouse_form</field>
         <field name="model">stock.warehouse</field>
-        <field name="inherit_id" ref="stock.view_warehouse"/>
+        <field name="inherit_id" ref="stock.view_warehouse" />
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='wh_output_stock_loc_id']" position="after">
-                <field name="lot_rma_id"/>
+            <xpath
+                expr="//field[@name='wh_output_stock_loc_id']"
+                position="after"
+            >
+                <field name="lot_rma_id" />
             </xpath>
             <field name="resupply_wh_ids" position="after">
-                <field name="rma_in_this_wh"/>
+                <field name="rma_in_this_wh" />
             </field>
             <xpath expr="//field[@name='out_type_id']" position="after">
-                <field name="rma_cust_in_type_id"/>
-                <field name="rma_cust_out_type_id"/>
-                <field name="rma_sup_in_type_id"/>
-                <field name="rma_sup_out_type_id"/>
+                <field name="rma_cust_in_type_id" />
+                <field name="rma_cust_out_type_id" />
+                <field name="rma_sup_in_type_id" />
+                <field name="rma_sup_out_type_id" />
             </xpath>
         </field>
     </record>
diff --git a/rma/wizards/rma_add_stock_move_view.xml b/rma/wizards/rma_add_stock_move_view.xml
index f7512c4a..53e4f392 100644
--- a/rma/wizards/rma_add_stock_move_view.xml
+++ b/rma/wizards/rma_add_stock_move_view.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0"?>
-
+<?xml version="1.0" ?>
 <odoo>
     <record id="view_rma_add_stock_move_customer" model="ir.ui.view">
         <field name="name">rma.add.stock.move.customer</field>
@@ -7,61 +6,91 @@
         <field name="arch" type="xml">
             <form string="Select Move">
                 <group>
-                    <field name="partner_id"
-                           domain="[('customer','=',True)]"
-                           string="Customer"/>
+                    <field
+                        name="partner_id"
+                        domain="[('customer','=',True)]"
+                        string="Customer"
+                    />
                 </group>
-                <separator string="Select Stock Moves to add"/>
-                <field name="move_ids"
-                       domain="[('picking_id.partner_id', '=', partner_id), ('location_dest_id.usage', '=', 'customer')]">
+                <separator string="Select Stock Moves to add" />
+                <field
+                    name="move_ids"
+                    domain="[('picking_id.partner_id', '=', partner_id), ('location_dest_id.usage', '=', 'customer')]"
+                >
                     <tree>
-                        <field name="product_id"/>
-                        <field name="product_uom_qty"/>
-                        <field name="product_uom" string="Unit of Measure" groups="uom.group_uom"/>
-                        <field name="picking_id"/>
-                        <field name="location_id" groups="stock.group_stock_multi_locations"/>
-                        <field name="location_dest_id" 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_expected" string="Date Expected"/>
-                        <field name="state"/>
+                        <field name="product_id" />
+                        <field name="product_uom_qty" />
+                        <field
+                            name="product_uom"
+                            string="Unit of Measure"
+                            groups="uom.group_uom"
+                        />
+                        <field name="picking_id" />
+                        <field
+                            name="location_id"
+                            groups="stock.group_stock_multi_locations"
+                        />
+                        <field
+                            name="location_dest_id"
+                            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_expected" string="Date Expected" />
+                        <field name="state" />
                     </tree>
                 </field>
                 <footer>
                     <button
-                            string="Confirm"
-                            name="add_lines" type="object"
-                            class="oe_highlight"/>
+                        string="Confirm"
+                        name="add_lines"
+                        type="object"
+                        class="oe_highlight"
+                    />
                     or
-                    <button name="action_cancel"
-                            string="Cancel" class="oe_link" special="cancel"/>
+                    <button
+                        name="action_cancel"
+                        string="Cancel"
+                        class="oe_link"
+                        special="cancel"
+                    />
                 </footer>
             </form>
         </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="view_id" ref="view_rma_add_stock_move_customer" />
+        <field
+            name="groups_id"
+            eval="[(4, ref('rma.group_rma_customer_user'))]"
+        />
     </record>
 
 
     <record id="view_rma_add_stock_move_customer_form" model="ir.ui.view">
         <field name="name">rma.order.form - stock.move wizard</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">
             <xpath expr="//header" position="inside">
-                <button name="%(action_rma_add_stock_move_customer)d"
-                        string="Add From Stock Move"
-                        type="action"/>
+                <button
+                    name="%(action_rma_add_stock_move_customer)d"
+                    string="Add From Stock Move"
+                    type="action"
+                />
             </xpath>
         </field>
     </record>
@@ -72,48 +101,66 @@
         <field name="arch" type="xml">
             <form string="Select Move">
                 <group>
-                    <field name="partner_id"
-                           domain="[('supplier','=',True)]"
-                           string="Supplier"/>
+                    <field
+                        name="partner_id"
+                        domain="[('supplier','=',True)]"
+                        string="Supplier"
+                    />
                 </group>
-                <separator string="Select Stock Moves to add"/>
-                <field name="move_ids"
-                       domain="[('picking_id.partner_id', '=', partner_id), ('location_id.usage', '=', 'supplier')]"/>
+                <separator string="Select Stock Moves to add" />
+                <field
+                    name="move_ids"
+                    domain="[('picking_id.partner_id', '=', partner_id), ('location_id.usage', '=', 'supplier')]"
+                />
                 <footer>
                     <button
-                            string="Confirm"
-                            name="add_lines" type="object"
-                            class="oe_highlight"/>
+                        string="Confirm"
+                        name="add_lines"
+                        type="object"
+                        class="oe_highlight"
+                    />
                     or
-                    <button name="action_cancel"
-                            string="Cancel" class="oe_link" special="cancel"/>
+                    <button
+                        name="action_cancel"
+                        string="Cancel"
+                        class="oe_link"
+                        special="cancel"
+                    />
                 </footer>
             </form>
         </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="view_id" ref="view_rma_add_stock_move_supplier" />
+        <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"/>
+        <field name="inherit_id" ref="rma.view_rma_supplier_form" />
         <field name="arch" type="xml">
             <xpath expr="//header" position="inside">
-                <button name="%(action_rma_add_stock_move_supplier)d"
-                        string="Add From Stock Move"
-                        type="action"/>
+                <button
+                    name="%(action_rma_add_stock_move_supplier)d"
+                    string="Add From Stock Move"
+                    type="action"
+                />
             </xpath>
         </field>
     </record>
diff --git a/rma/wizards/rma_make_picking_view.xml b/rma/wizards/rma_make_picking_view.xml
index b9aee580..63cefc0b 100644
--- a/rma/wizards/rma_make_picking_view.xml
+++ b/rma/wizards/rma_make_picking_view.xml
@@ -1,29 +1,34 @@
-<?xml version="1.0"?>
-
+<?xml version="1.0" ?>
 <odoo>
     <record id="view_rma_picking" model="ir.ui.view">
         <field name="name">rma_picking</field>
         <field name="model">rma_make_picking.wizard</field>
         <field name="arch" type="xml">
             <form string="Select lines for picking" name="lines">
-                <separator string="Select lines for picking"/>
+                <separator string="Select lines for picking" />
                 <field name="item_ids">
                     <tree string="RMA Lines" editable="bottom" create="false">
-                        <field name="rma_id" groups="rma.group_rma_groups"/>
-                        <field name="product_id"/>
-                        <field name="product_qty"/>
-                        <field name="uom_id" groups="uom.group_uom"/>
-                        <field name="qty_to_receive" readonly="0"/>
+                        <field name="rma_id" groups="rma.group_rma_groups" />
+                        <field name="product_id" />
+                        <field name="product_qty" />
+                        <field name="uom_id" groups="uom.group_uom" />
+                        <field name="qty_to_receive" readonly="0" />
                     </tree>
                 </field>
                 <footer>
                     <button
-                            string="Confirm"
-                            name="action_create_picking" type="object"
-                            class="oe_highlight"/>
+                        string="Confirm"
+                        name="action_create_picking"
+                        type="object"
+                        class="oe_highlight"
+                    />
                     or
-                    <button name="action_cancel"
-                            string="Cancel" class="oe_link" special="cancel"/>
+                    <button
+                        name="action_cancel"
+                        string="Cancel"
+                        class="oe_link"
+                        special="cancel"
+                    />
                 </footer>
             </form>
         </field>
@@ -34,24 +39,30 @@
         <field name="model">rma_make_picking.wizard</field>
         <field name="arch" type="xml">
             <form string="Select lines for picking" name="lines">
-                <separator string="Select lines for picking"/>
+                <separator string="Select lines for picking" />
                 <field name="item_ids">
                     <tree string="RMA Lines" editable="bottom" create="false">
-                        <field name="rma_id" groups="rma.group_rma_groups"/>
-                        <field name="product_id"/>
-                        <field name="product_qty"/>
-                        <field name="uom_id" groups="uom.group_uom"/>
-                        <field name="qty_to_deliver" readonly="0"/>
+                        <field name="rma_id" groups="rma.group_rma_groups" />
+                        <field name="product_id" />
+                        <field name="product_qty" />
+                        <field name="uom_id" groups="uom.group_uom" />
+                        <field name="qty_to_deliver" readonly="0" />
                     </tree>
                 </field>
                 <footer>
                     <button
-                            string="Confirm"
-                            name="action_create_picking" type="object"
-                            class="oe_highlight"/>
+                        string="Confirm"
+                        name="action_create_picking"
+                        type="object"
+                        class="oe_highlight"
+                    />
                     or
-                    <button name="action_cancel"
-                            string="Cancel" class="oe_link" special="cancel"/>
+                    <button
+                        name="action_cancel"
+                        string="Cancel"
+                        class="oe_link"
+                        special="cancel"
+                    />
                 </footer>
             </form>
         </field>
@@ -63,10 +74,10 @@
         <field name="res_model">rma_make_picking.wizard</field>
         <field name="view_mode">form</field>
         <field name="target">new</field>
-        <field name="view_id" ref="view_rma_picking"/>
-        <field name="groups_id" eval="[(4, ref('stock.group_stock_user'))]"/>
+        <field name="view_id" ref="view_rma_picking" />
+        <field name="groups_id" eval="[(4, ref('stock.group_stock_user'))]" />
         <field name="context">{'picking_type': 'incoming'}</field>
-        <field name="binding_model_id" ref="rma.model_rma_order_line"/>
+        <field name="binding_model_id" ref="rma.model_rma_order_line" />
     </record>
 
     <record id="action_rma_picking_out" model="ir.actions.act_window">
@@ -75,24 +86,32 @@
         <field name="res_model">rma_make_picking.wizard</field>
         <field name="view_mode">form</field>
         <field name="target">new</field>
-        <field name="view_id" ref="view_rma_picking_out"/>
-        <field name="groups_id" eval="[(4, ref('stock.group_stock_user'))]"/>
+        <field name="view_id" ref="view_rma_picking_out" />
+        <field name="groups_id" eval="[(4, ref('stock.group_stock_user'))]" />
         <field name="context">{'picking_type': 'outgoing'}</field>
-        <field name="binding_model_id" ref="rma.model_rma_order_line"/>
+        <field name="binding_model_id" ref="rma.model_rma_order_line" />
     </record>
 
     <record id="view_rma_line_button_form" model="ir.ui.view">
         <field name="name">rma.order.line.form</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">
             <header position="inside">
-                <button name="%(action_rma_picking_in)d" states="approved"
-                        string="Create Incoming Shipment" class="oe_highlight"
-                        type="action"/>
-                <button name="%(action_rma_picking_out)d" states="approved"
-                        string="Create Delivery" class="oe_highlight"
-                        type="action"/>
+                <button
+                    name="%(action_rma_picking_in)d"
+                    states="approved"
+                    string="Create Incoming Shipment"
+                    class="oe_highlight"
+                    type="action"
+                />
+                <button
+                    name="%(action_rma_picking_out)d"
+                    states="approved"
+                    string="Create Delivery"
+                    class="oe_highlight"
+                    type="action"
+                />
             </header>
         </field>
     </record>
@@ -100,15 +119,23 @@
     <record id="view_rma_line_supplier_button_form" model="ir.ui.view">
         <field name="name">rma.order.line.supplier.form</field>
         <field name="model">rma.order.line</field>
-        <field name="inherit_id" ref="rma.view_rma_line_supplier_form"/>
+        <field name="inherit_id" ref="rma.view_rma_line_supplier_form" />
         <field name="arch" type="xml">
             <header position="inside">
-                <button name="%(action_rma_picking_in)d" states="approved"
-                        string="Create Incoming Shipment" class="oe_highlight"
-                        type="action"/>
-                <button name="%(action_rma_picking_out)d" states="approved"
-                        string="Create Delivery" class="oe_highlight"
-                        type="action"/>
+                <button
+                    name="%(action_rma_picking_in)d"
+                    states="approved"
+                    string="Create Incoming Shipment"
+                    class="oe_highlight"
+                    type="action"
+                />
+                <button
+                    name="%(action_rma_picking_out)d"
+                    states="approved"
+                    string="Create Delivery"
+                    class="oe_highlight"
+                    type="action"
+                />
             </header>
         </field>
     </record>
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 bc9cc547..cbba885c 100644
--- a/rma/wizards/rma_order_line_make_supplier_rma_view.xml
+++ b/rma/wizards/rma_order_line_make_supplier_rma_view.xml
@@ -1,74 +1,87 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <!-- Copyright 2016 ForgeFlow
      License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
 <odoo>
-    <record id="view_rma_order_line_make_supplier_rma"
-            model="ir.ui.view">
+    <record id="view_rma_order_line_make_supplier_rma" model="ir.ui.view">
         <field name="name">RMA Line Make Supplier RMA</field>
         <field name="model">rma.order.line.make.supplier.rma</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
              <form string="Create Supplier RMA">
-                 <separator string="Existing Supplier RMA to update:"/>
-                 <newline/>
+                 <separator string="Existing Supplier RMA to update:" />
+                 <newline />
                  <group>
-                    <field name="supplier_rma_id" domain="[('partner_id', '=', partner_id)]"/>
+                    <field
+                        name="supplier_rma_id"
+                        domain="[('partner_id', '=', partner_id)]"
+                    />
                  </group>
-                 <newline/>
-                 <separator
-                         string="New RMA details:"/>
-                 <newline/>
+                 <newline />
+                 <separator string="New RMA details:" />
+                 <newline />
                  <group>
-                     <field name="partner_id"/>
+                     <field name="partner_id" />
                  </group>
-                 <newline/>
+                 <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="name"/>
-                              <field name="operation_id"/>
-                              <field name="product_qty"/>
-                              <field name="uom_id"
-                                     groups="uom.group_uom"/>
+                          <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" />
+                              <field name="product_qty" />
+                              <field name="uom_id" groups="uom.group_uom" />
                           </tree>
                      </field>
                  </group>
-                 <newline/>
+                 <newline />
                  <footer colspan="2">
-                     <button name="make_supplier_rma"
-                             string="Create/Update Supplier RMA"
-                             type="object"
-                             class="oe_highlight"/>
-                     <button special="cancel" string="Cancel" class="oe_link"/>
+                     <button
+                        name="make_supplier_rma"
+                        string="Create/Update Supplier RMA"
+                        type="object"
+                        class="oe_highlight"
+                    />
+                     <button special="cancel" string="Cancel" class="oe_link" />
                  </footer>
             </form>
         </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>
         <field name="view_mode">form</field>
-        <field name="view_id" ref="view_rma_order_line_make_supplier_rma"/>
+        <field name="view_id" ref="view_rma_order_line_make_supplier_rma" />
         <field name="target">new</field>
-        <field name="binding_model_id" ref="rma.model_rma_order_line"/>
+        <field name="binding_model_id" ref="rma.model_rma_order_line" />
     </record>
 
     <record id="view_rma_line_supplier_rma_button_form" model="ir.ui.view">
     <field name="name">rma.order.line.supplier.rma.form</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">
         <header position="inside">
-            <button name="%(action_rma_order_line_make_supplier_rma)d"
+            <button
+                    name="%(action_rma_order_line_make_supplier_rma)d"
                     states="approved"
-                    string="Create Supplier RMA" class="oe_highlight"
-                    type="action"/>
+                    string="Create Supplier RMA"
+                    class="oe_highlight"
+                    type="action"
+                />
         </header>
     </field>
     </record>