diff --git a/rma_sale/models/rma_order_line.py b/rma_sale/models/rma_order_line.py
index f344ffee..da30c3b0 100644
--- a/rma_sale/models/rma_order_line.py
+++ b/rma_sale/models/rma_order_line.py
@@ -66,6 +66,28 @@ class RmaOrderLine(models.Model):
     sales_count = fields.Integer(
         compute=_compute_sales_count, string='# of Sales')
 
+    @api.onchange('product_id', 'partner_id')
+    def _onchange_product_id(self):
+        """Domain for sale_line_id is computed here to make it dynamic."""
+        res = super(RmaOrderLine, self)._onchange_product_id()
+        if not res.get('domain'):
+            res['domain'] = {}
+        domain = [
+            '|',
+            ('order_id.partner_id', '=', self.partner_id.id),
+            ('order_id.partner_id', 'child_of', self.partner_id.id)]
+        if self.product_id:
+            domain.append(('product_id', '=', self.product_id.id))
+        res['domain']['sale_line_id'] = domain
+        return res
+
+    @api.onchange('operation_id')
+    def _onchange_operation_id(self):
+        res = super(RmaOrderLine, self)._onchange_operation_id()
+        if self.operation_id:
+            self.sale_policy = self.operation_id.sale_policy or 'no'
+        return res
+
     @api.multi
     def _prepare_rma_line_from_sale_order_line(self, line):
         self.ensure_one()
diff --git a/rma_sale/views/rma_order_line_view.xml b/rma_sale/views/rma_order_line_view.xml
index d3d4199f..c82596de 100644
--- a/rma_sale/views/rma_order_line_view.xml
+++ b/rma_sale/views/rma_order_line_view.xml
@@ -18,11 +18,7 @@
                 </div>
                 <group name="main_info" position="inside">
                     <field name="sale_line_id"
-                           context="{'rma': True}"
-                           options="{'no_create': True}"
-                           domain="['|',
-                                    ('order_id.partner_id', '=', partner_id),
-                                    ('order_id.partner_id', 'child_of', partner_id)]"/>
+                           options="{'no_create': True}"/>
                 </group>
                 <group name="quantities" position="inside">
                     <group>
@@ -31,7 +27,7 @@
                     </group>
                 </group>
                 <field name="delivery_policy" position="after">
-                    <field name="sale_type"/>
+                    <field name="sale_policy"/>
                 </field>
                 <field name="origin" position="after">
                     <field name="sale_id"
@@ -66,7 +62,7 @@
                     </group>
                 </group>
                 <field name="delivery_policy" position="after">
-                    <field name="sale_type"/>
+                    <field name="sale_policy"/>
                 </field>
                 <notebook position="inside">
                     <page name="sale" string="Sale Lines">