diff --git a/rma_account/demo/rma_operation.xml b/rma_account/demo/rma_operation.xml
index a312d6db..be6fd118 100644
--- a/rma_account/demo/rma_operation.xml
+++ b/rma_account/demo/rma_operation.xml
@@ -17,6 +17,7 @@
         <field name="delivery_policy">no</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"/>
     </record>
 
     <record id="rma_operation_supplier_refund" model="rma.operation">
@@ -26,6 +27,7 @@
         <field name="receipt_policy">no</field>
         <field name="delivery_policy">no</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"/>
     </record>
 
diff --git a/rma_account/models/rma_order_line.py b/rma_account/models/rma_order_line.py
index 3230c1a7..81789c18 100644
--- a/rma_account/models/rma_order_line.py
+++ b/rma_account/models/rma_order_line.py
@@ -177,9 +177,8 @@ class RmaOrderLine(models.Model):
     @api.onchange('operation_id')
     def _onchange_operation_id(self):
         result = super(RmaOrderLine, self)._onchange_operation_id()
-        if not self.operation_id:
-            return result
-        self.refund_policy = self.operation_id.refund_policy
+        if self.operation_id:
+            self.refund_policy = self.operation_id.refund_policy or 'no'
         return result
 
     @api.multi
diff --git a/rma_account/views/rma_order_line_view.xml b/rma_account/views/rma_order_line_view.xml
index 50b1b344..166b9c16 100644
--- a/rma_account/views/rma_order_line_view.xml
+++ b/rma_account/views/rma_order_line_view.xml
@@ -49,13 +49,18 @@
             <field name="inherit_id" ref="rma.view_rma_line_form"/>
             <field name="arch" type="xml">
                 <button name="action_view_out_shipments" position="after">
-                     <button type="object"  name="action_view_refunds"
-                                class="oe_stat_button"
-                                icon="fa-pencil-square-o"
-                                groups="account.group_account_user">
-                            <field name="refund_count" widget="statinfo"
-                                   string="Refunds"/>
-                        </button>
+                    <button type="object"  name="action_view_invoice"
+                                    class="oe_stat_button"
+                                    icon="fa-pencil-square-o"
+                                    string="Origin Inv">
+                    </button>
+                    <button type="object"  name="action_view_refunds"
+                            class="oe_stat_button"
+                            icon="fa-pencil-square-o"
+                            groups="account.group_account_user">
+                        <field name="refund_count" widget="statinfo"
+                               string="Refunds"/>
+                    </button>
                 </button>
                 <group name="main_info" position="inside">
                     <field name="invoice_line_id"
diff --git a/rma_account/wizards/rma_refund.py b/rma_account/wizards/rma_refund.py
index 1efb7b6e..d0b1ad76 100644
--- a/rma_account/wizards/rma_refund.py
+++ b/rma_account/wizards/rma_refund.py
@@ -19,16 +19,17 @@ class RmaRefund(models.TransientModel):
 
     @api.returns('rma.order.line')
     def _prepare_item(self, line):
-        values = {'product_id': line.product_id.id,
-                  'name': line.name,
-                  'product_qty': line.product_qty,
-                  'uom_id': line.uom_id.id,
-                  'qty_to_refund': line.qty_to_refund,
-                  'refund_policy': line.refund_policy,
-                  'invoice_address_id': line.invoice_address_id.id,
-                  'line_id': line.id,
-                  'rma_id': line.rma_id.id,
-                  'wiz_id': self.env.context['active_id']}
+        values = {
+            'product_id': line.product_id.id,
+            'name': line.name,
+            'product_qty': line.product_qty,
+            'uom_id': line.uom_id.id,
+            'qty_to_refund': line.qty_to_refund,
+            'refund_policy': line.refund_policy,
+            'invoice_address_id': line.invoice_address_id.id,
+            'line_id': line.id,
+            'rma_id': line.rma_id.id,
+        }
         return values
 
     @api.model