diff --git a/rma_sale/__init__.py b/rma_sale/__init__.py
index 4105ff51..44815ecb 100644
--- a/rma_sale/__init__.py
+++ b/rma_sale/__init__.py
@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# © 2017 Eficent Business and IT Consulting Services S.L.
+# Copyright 2017 Eficent Business and IT Consulting Services S.L.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
 from . import models
 from . import wizards
diff --git a/rma_sale/__manifest__.py b/rma_sale/__manifest__.py
index ae8c06ba..19cee716 100644
--- a/rma_sale/__manifest__.py
+++ b/rma_sale/__manifest__.py
@@ -1,10 +1,9 @@
-# -*- coding: utf-8 -*-
-# © 2017 Eficent Business and IT Consulting Services S.L.
+# Copyright 2017 Eficent Business and IT Consulting Services S.L.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
 
 {
     'name': 'RMA Sale',
-    'version': '10.0.2.0.0',
+    'version': '11.0.1.0.0',
     'license': 'LGPL-3',
     'category': 'RMA',
     'summary': 'Links RMA with Sales Orders',
diff --git a/rma_sale/models/__init__.py b/rma_sale/models/__init__.py
index 0ec7edb9..6108253c 100644
--- a/rma_sale/models/__init__.py
+++ b/rma_sale/models/__init__.py
@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# © 2017 Eficent Business and IT Consulting Services S.L.
+# Copyright 2017 Eficent Business and IT Consulting Services S.L.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
 from . import sale_order_line
 from . import rma_order_line
diff --git a/rma_sale/models/rma_operation.py b/rma_sale/models/rma_operation.py
index 8f2ed4e5..14e086f8 100644
--- a/rma_sale/models/rma_operation.py
+++ b/rma_sale/models/rma_operation.py
@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# © 2017 Eficent Business and IT Consulting Services S.L.
+# Copyright 2017 Eficent Business and IT Consulting Services S.L.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
 from odoo import fields, models
 
diff --git a/rma_sale/models/rma_order.py b/rma_sale/models/rma_order.py
index 952bcbcc..db4d6a7a 100644
--- a/rma_sale/models/rma_order.py
+++ b/rma_sale/models/rma_order.py
@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# © 2017 Eficent Business and IT Consulting Services S.L.
+# Copyright 2017 Eficent Business and IT Consulting Services S.L.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
 from odoo import api, fields, models
 
diff --git a/rma_sale/models/rma_order_line.py b/rma_sale/models/rma_order_line.py
index ef72c913..078e57e1 100644
--- a/rma_sale/models/rma_order_line.py
+++ b/rma_sale/models/rma_order_line.py
@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# © 2017 Eficent Business and IT Consulting Services S.L.
+# Copyright 2017 Eficent Business and IT Consulting Services S.L.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
 from odoo import api, fields, models, _
 from odoo.exceptions import ValidationError
diff --git a/rma_sale/models/sale_order_line.py b/rma_sale/models/sale_order_line.py
index 2b8c1551..645fc4fa 100644
--- a/rma_sale/models/sale_order_line.py
+++ b/rma_sale/models/sale_order_line.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-# © 2017 Eficent Business and IT Consulting Services S.L.
+# Copyright 2017 Eficent Business and IT Consulting Services S.L.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
-
 from odoo import api, fields, models
 
 
diff --git a/rma_sale/tests/__init__.py b/rma_sale/tests/__init__.py
index 83ee6fd7..fae781a4 100644
--- a/rma_sale/tests/__init__.py
+++ b/rma_sale/tests/__init__.py
@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# © 2017 Eficent Business and IT Consulting Services S.L.
+# Copyright 2017 Eficent Business and IT Consulting Services S.L.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
 
 from . import test_rma_sale
diff --git a/rma_sale/tests/test_rma_sale.py b/rma_sale/tests/test_rma_sale.py
index e4389bae..5cc3096d 100644
--- a/rma_sale/tests/test_rma_sale.py
+++ b/rma_sale/tests/test_rma_sale.py
@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-18 Eficent Business and IT Consulting Services S.L.
+# Copyright 2017 Eficent Business and IT Consulting Services S.L.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
 
 from openerp.tests import common
diff --git a/rma_sale/wizards/__init__.py b/rma_sale/wizards/__init__.py
index 40e8ecb8..631e0330 100644
--- a/rma_sale/wizards/__init__.py
+++ b/rma_sale/wizards/__init__.py
@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# © 2017 Eficent Business and IT Consulting Services S.L.
+# Copyright 2017 Eficent Business and IT Consulting Services S.L.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
 
 from . import rma_order_line_make_sale_order
diff --git a/rma_sale/wizards/rma_add_sale.py b/rma_sale/wizards/rma_add_sale.py
index de4ce988..0946b082 100644
--- a/rma_sale/wizards/rma_add_sale.py
+++ b/rma_sale/wizards/rma_add_sale.py
@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# © 2017 Eficent Business and IT Consulting Services S.L.
+# Copyright 2017 Eficent Business and IT Consulting Services S.L.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
 
 from odoo import _, api, fields, models
diff --git a/rma_sale/wizards/rma_make_picking.py b/rma_sale/wizards/rma_make_picking.py
index 85ec2f71..32011807 100644
--- a/rma_sale/wizards/rma_make_picking.py
+++ b/rma_sale/wizards/rma_make_picking.py
@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# © 2017 Eficent Business and IT Consulting Services S.L.
+# Copyright 2017 Eficent Business and IT Consulting Services S.L.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
 from odoo import api, fields, models
 
diff --git a/rma_sale/wizards/rma_order_line_make_sale_order.py b/rma_sale/wizards/rma_order_line_make_sale_order.py
index cb958eb4..b16760c2 100644
--- a/rma_sale/wizards/rma_order_line_make_sale_order.py
+++ b/rma_sale/wizards/rma_order_line_make_sale_order.py
@@ -1,6 +1,5 @@
-# -*- coding: utf-8 -*-
-# Copyright 2016 Eficent Business and IT Consulting Services S.L.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0).
+# Copyright 2017 Eficent Business and IT Consulting Services S.L.
+# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
 
 import odoo.addons.decimal_precision as dp
 from odoo import _, api, exceptions, fields, models
@@ -129,20 +128,18 @@ class RmaLineMakeSaleOrderItem(models.TransientModel):
     _description = "RMA Line Make Sale Order Item"
 
     wiz_id = fields.Many2one(
-        comodel_name='rma.order.line.make.sale.order', string='Wizard',
-        required=True, readonly=True)
+        comodel_name='rma.order.line.make.sale.order', string='Wizard')
     line_id = fields.Many2one(
-        comodel_name='rma.order.line', string='RMA Line', required=True)
+        comodel_name='rma.order.line', string='RMA Line')
     rma_id = fields.Many2one(
-        comodel_name='rma.order', related='line_id.rma_id',
-        string='RMA Order', readonly=True)
+        comodel_name='rma.order', related='line_id.rma_id')
     product_id = fields.Many2one(
         comodel_name='product.product', string='Product')
-    name = fields.Char(string='Description', required=True, readonly=True)
+    name = fields.Char(string='Description')
     product_qty = fields.Float(
         string='Quantity to sell', digits=dp.get_precision('Product UoS'))
     product_uom_id = fields.Many2one(
-        comodel_name='product.uom', string='UoM', readonly=True)
+        comodel_name='product.uom', string='UoM')
     out_warehouse_id = fields.Many2one(
         comodel_name='stock.warehouse', string='Outbound Warehouse')
     free_of_charge = fields.Boolean(string='Free of Charge')
diff --git a/rma_sale/wizards/rma_order_line_make_sale_order_view.xml b/rma_sale/wizards/rma_order_line_make_sale_order_view.xml
index 395e6275..308e6e7c 100644
--- a/rma_sale/wizards/rma_order_line_make_sale_order_view.xml
+++ b/rma_sale/wizards/rma_order_line_make_sale_order_view.xml
@@ -13,8 +13,8 @@
                      <newline/>
                      <group>
                         <field name="sale_order_id"
-                            domain="[('partner_id','=',partner_id)]"
-                            context="{'partner_id': partner_id}"/>/>
+                            domain="[('partner_id','=', partner_id)]"
+                            context="{'partner_id': partner_id}"/>
                      </group>
                      <newline/>
                      <separator
@@ -38,13 +38,12 @@
                               </tree>
                          </field>
                      </group>
-                     <newline/>
-                     <group colspan="2">
+                     <footer colspan="2">
                          <button name="make_sale_order"
                                  string="Create Sales Quotation" type="object"
                                  class="oe_highlight"/>
                          <button special="cancel" string="Cancel" class="oe_link"/>
-                     </group>
+                     </footer>
                 </form>
             </field>
         </record>
@@ -60,16 +59,6 @@
             <field name="target">new</field>
         </record>
 
-        <record model="ir.values" id="rma_order_line_make_sale_order">
-            <field name="model_id" ref="model_rma_order_line" />
-            <field name="name">Create RFQ</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value"
-                   eval="'ir.actions.act_window,' + str(ref('action_rma_order_line_make_sale_order'))" />
-            <field name="key">action</field>
-            <field name="model">rma.order.line</field>
-        </record>
-   
     </data>
 </openerp>
 
diff --git a/rma_sale/wizards/rma_refund.py b/rma_sale/wizards/rma_refund.py
index 7ab7d032..2240b3f9 100644
--- a/rma_sale/wizards/rma_refund.py
+++ b/rma_sale/wizards/rma_refund.py
@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# © 2017 Eficent Business and IT Consulting Services S.L.
+# Copyright 2017 Eficent Business and IT Consulting Services S.L.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
 from odoo import api, fields, models