diff --git a/rma_purchase/models/rma_order_line.py b/rma_purchase/models/rma_order_line.py
index dde77b39..5403d012 100644
--- a/rma_purchase/models/rma_order_line.py
+++ b/rma_purchase/models/rma_order_line.py
@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 # © 2017 Eficent Business and IT Consulting Services S.L.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
-from openerp import api, fields, models
+from openerp import api, fields, models, _
+from openerp.exceptions import ValidationError
 from openerp.addons import decimal_precision as dp
 
 
@@ -36,19 +37,93 @@ class RmaOrderLine(models.Model):
             rec.qty_purchased = rec._get_rma_purchased_qty()
 
     purchase_count = fields.Integer(
-        compute='_compute_purchase_count', string='# of Purchases')
+        compute='_compute_purchase_count', string='# of Purchases',
+    )
     purchase_order_line_id = fields.Many2one(
-        comodel_name='purchase.order.line', string='Origin Purchase Line',
-        ondelete='restrict')
+        comodel_name='purchase.order.line', string='Originating Purchase Line',
+        ondelete='restrict',
+        readonly=True, states={'draft': [('readonly', False)]},
+    )
     purchase_order_line_ids = fields.Many2many(
         comodel_name='purchase.order.line',
         relation='purchase_line_rma_line_rel',
         column1='rma_order_line_id', column2='purchase_order_line_id',
-        string='Purchase Order Lines', compute='_get_purchase_order_lines')
+        string='Purchase Order Lines', compute='_get_purchase_order_lines',
+    )
     qty_purchased = fields.Float(
         string='Qty Purchased', copy=False,
         digits=dp.get_precision('Product Unit of Measure'),
-        readonly=True, compute='_compute_qty_purchased', store=True)
+        readonly=True, compute='_compute_qty_purchased', store=True,
+    )
+
+    @api.multi
+    def _prepare_rma_line_from_po_line(self, line):
+        self.ensure_one()
+        if not self.type:
+            self.type = self._get_default_type()
+        if self.type == 'customer':
+            operation = line.product_id.rma_customer_operation_id or \
+                line.product_id.categ_id.rma_customer_operation_id
+        else:
+            operation = line.product_id.rma_supplier_operation_id or \
+                line.product_id.categ_id.rma_supplier_operation_id
+        if not operation:
+            operation = self.env['rma.operation'].search(
+                [('type', '=', self.type)], limit=1)
+            if not operation:
+                raise ValidationError(_("Please define an operation first"))
+
+        if not operation.in_route_id or not operation.out_route_id:
+            route = self.env['stock.location.route'].search(
+                [('rma_selectable', '=', True)], limit=1)
+            if not route:
+                raise ValidationError(_("Please define a rma route."))
+
+        if not operation.in_warehouse_id or not operation.out_warehouse_id:
+            warehouse = self.env['stock.warehouse'].search(
+                [('company_id', '=', self.company_id.id),
+                 ('lot_rma_id', '!=', False)], limit=1)
+            if not warehouse:
+                raise ValidationError(_(
+                    "Please define a warehouse with a default rma location."))
+
+        data = {
+            'product_id': line.product_id.id,
+            'origin': line.order_id.name,
+            'uom_id': line.product_uom.id,
+            'operation_id': operation.id,
+            'product_qty': line.product_qty,
+            'price_unit': line.currency_id.compute(
+                line.price_unit, line.currency_id, round=False),
+            'in_route_id': operation.in_route_id.id or route,
+            'out_route_id': operation.out_route_id.id or route,
+            'receipt_policy': operation.receipt_policy,
+            'location_id': (operation.location_id.id or
+                            operation.in_warehouse_id.lot_rma_id.id or
+                            warehouse.lot_rma_id.id),
+            'refund_policy': operation.refund_policy,
+            'delivery_policy': operation.delivery_policy,
+            'in_warehouse_id': operation.in_warehouse_id.id or warehouse.id,
+            'out_warehouse_id': operation.out_warehouse_id.id or warehouse.id,
+        }
+        return data
+
+    @api.onchange('purchase_order_line_id')
+    def _onchange_purchase_order_line_id(self):
+        if not self.purchase_order_line_id:
+            return
+        data = self._prepare_rma_line_from_po_line(
+            self.purchase_order_line_id)
+        self.update(data)
+        self._remove_other_data_origin('purchase_order_line_id')
+
+    @api.multi
+    def _remove_other_data_origin(self, exception):
+        res = super(RmaOrderLine, self)._remove_other_data_origin(exception)
+        if not exception == 'purchase_order_line_id':
+            self.purchase_order_line_id = False
+        return res
+
 
     @api.multi
     def action_view_purchase_order(self):
diff --git a/rma_purchase/views/rma_order_line_view.xml b/rma_purchase/views/rma_order_line_view.xml
index 690a5bc6..a33da379 100644
--- a/rma_purchase/views/rma_order_line_view.xml
+++ b/rma_purchase/views/rma_order_line_view.xml
@@ -15,6 +15,11 @@
                                string="Purchase Orders"/>
                 </button>
             </div>
+            <group name="main_info" position="inside">
+                <field name="purchase_order_line_id"
+                       options="{'no_create': True}"
+                       domain="[('order_id.partner_id', '=', partner_id)]"/>
+            </group>
             <group name="quantities" position="inside">
                 <group>
                     <field name="qty_purchased"/>
diff --git a/rma_purchase/wizards/rma_add_purchase.xml b/rma_purchase/wizards/rma_add_purchase.xml
index f131f7e6..ee6c4a3b 100644
--- a/rma_purchase/wizards/rma_add_purchase.xml
+++ b/rma_purchase/wizards/rma_add_purchase.xml
@@ -64,12 +64,11 @@
         <field name="model">rma.order</field>
         <field name="inherit_id" ref="rma.view_rma_supplier_form"/>
         <field name="arch" type="xml">
-            <button name="action_rma_done" position="after">
+            <xpath expr="//header" position="inside">
                 <button name="%(action_rma_add_purchase)d"
                         string="Add From Purchase Order"
-                        type="action"
-                        states="draft,to_approve"/>
-            </button>
+                        type="action"/>
+            </xpath>
         </field>
     </record>