diff --git a/rma/models/rma_order.py b/rma/models/rma_order.py
index 8061dea5..ae1afc4d 100644
--- a/rma/models/rma_order.py
+++ b/rma/models/rma_order.py
@@ -179,8 +179,8 @@ class RmaOrder(models.Model):
     def _get_valid_lines(self):
         """:return: A recordset of rma lines.
         """
-        for rec in self:
-            return rec.rma_line_ids
+        self.ensure_one()
+        return self.rma_line_ids
 
     @api.multi
     def action_view_lines(self):
@@ -192,8 +192,7 @@ class RmaOrder(models.Model):
         lines = self._get_valid_lines()
         # choose the view_mode accordingly
         if len(lines) != 1:
-            result['domain'] = "[('id', 'in', " + \
-                               str(lines.ids) + ")]"
+            result['domain'] = [('id', 'in', lines.ids)]
         elif len(lines) == 1:
             if self.type == 'customer':
                 res = self.env.ref('rma.view_rma_line_form', False)
diff --git a/rma/views/rma_order_line_view.xml b/rma/views/rma_order_line_view.xml
index 3b9399a8..edabd55f 100644
--- a/rma/views/rma_order_line_view.xml
+++ b/rma/views/rma_order_line_view.xml
@@ -49,8 +49,8 @@
             <field name="model">rma.order.line</field>
             <field name="arch" type="xml">
                 <form string="RMA Line" create="0">
+                    <header/>
                     <sheet>
-                        <header/>
                         <div name="button_box" class="oe_button_box">
                             <button type="object"  name="action_view_in_shipments"
                                     class="oe_stat_button"
@@ -172,8 +172,8 @@
             <field name="model">rma.order.line</field>
             <field name="arch" type="xml">
                 <form string="Rma Line" create="0">
+                    <header/>
                     <sheet>
-                        <header/>
                         <div name="button_box" class="oe_button_box">
                             <button type="object"  name="action_view_in_shipments"
                                     class="oe_stat_button"
diff --git a/rma/wizards/rma_add_stock_move_view.xml b/rma/wizards/rma_add_stock_move_view.xml
index 92df5654..58870e2b 100644
--- a/rma/wizards/rma_add_stock_move_view.xml
+++ b/rma/wizards/rma_add_stock_move_view.xml
@@ -57,7 +57,7 @@
 
 
     <record id="view_rma_add_stock_move_customer_form" model="ir.ui.view">
-        <field name="name">rma.order.line.form</field>
+        <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="arch" type="xml">
@@ -112,7 +112,7 @@
 
     <record id="view_rma_add_stock_move_button_supplier_form"
             model="ir.ui.view">
-        <field name="name">rma.order.line.supplier.form</field>
+        <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="arch" type="xml">