diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
index 45e62abe..e69bfe47 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -163,9 +163,6 @@ class TestRma(common.SavepointCase):
 
         rma_id.partner_id.action_open_partner_rma()
         rma_id.partner_id._compute_rma_line_count()
-        # approve the RMA
-#        rma_id.action_rma_to_approve()
-#        rma_id.action_rma_approve()
         return rma_id
 
     @classmethod
diff --git a/rma/views/rma_operation_view.xml b/rma/views/rma_operation_view.xml
index 5de6a550..ba8f9be7 100755
--- a/rma/views/rma_operation_view.xml
+++ b/rma/views/rma_operation_view.xml
@@ -1,90 +1,88 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data>
-        <record id="rma_operation_tree" model="ir.ui.view">
-            <field name="name">rma.operation.tree</field>
-            <field name="model">rma.operation</field>
-            <field name="arch" type="xml">
-                <tree string="RMA Operations">
-                    <field name="active" invisible="1"/>
-                    <field name="code"/>
-                    <field name="name"/>
-                    <field name="receipt_policy"/>
-                    <field name="delivery_policy"/>
-                </tree>
-            </field>
-        </record>
+    <record id="rma_operation_tree" model="ir.ui.view">
+        <field name="name">rma.operation.tree</field>
+        <field name="model">rma.operation</field>
+        <field name="arch" type="xml">
+            <tree string="RMA Operations">
+                <field name="active" invisible="1"/>
+                <field name="code"/>
+                <field name="name"/>
+                <field name="receipt_policy"/>
+                <field name="delivery_policy"/>
+            </tree>
+        </field>
+    </record>
 
-        <record id="rma_operation_form" model="ir.ui.view">
-            <field name="name">rma.operation.form</field>
-            <field name="model">rma.operation</field>
-            <field name="arch" type="xml">
-                <form string="RMA Operations">
-                    <group colspan="4" col="2">
-                        <group name="description"
-                               string="Description">
-                            <field name="code"/>
-                            <field name="name"/>
-                            <field name="type"/>
-                            <field name="active"/>
-                        </group>
-                        <group name="policies"
-                               string="Policies">
-                            <field name="receipt_policy"/>
-                            <field name="delivery_policy"/>
-                        </group>
-                        <group name="inbound" string="Inbound">
-                            <field name="in_route_id"/>
-                            <field name="in_warehouse_id"/>
-                            <field name="location_id"
-                                domain="[('usage', '=', 'internal')]"/>
-                            <field name="customer_to_supplier"
-                                   attrs="{'invisible':[('type', '=', 'supplier')]}"/>
-                        </group>
-                        <group name="outbound" string="Outbound">
-                            <field name="out_route_id"/>
-                            <field name="out_warehouse_id"/>
-                            <field name="supplier_to_customer"
-                                   attrs="{'invisible':[('type', '=', 'customer')]}"/>
-                        </group>
+    <record id="rma_operation_form" model="ir.ui.view">
+        <field name="name">rma.operation.form</field>
+        <field name="model">rma.operation</field>
+        <field name="arch" type="xml">
+            <form string="RMA Operations">
+                <group colspan="4" col="2">
+                    <group name="description"
+                           string="Description">
+                        <field name="code"/>
+                        <field name="name"/>
+                        <field name="type"/>
+                        <field name="active"/>
                     </group>
-                </form>
-            </field>
-        </record>
+                    <group name="policies"
+                           string="Policies">
+                        <field name="receipt_policy"/>
+                        <field name="delivery_policy"/>
+                    </group>
+                    <group name="inbound" string="Inbound">
+                        <field name="in_route_id"/>
+                        <field name="in_warehouse_id"/>
+                        <field name="location_id"
+                            domain="[('usage', '=', 'internal')]"/>
+                        <field name="customer_to_supplier"
+                               attrs="{'invisible':[('type', '=', 'supplier')]}"/>
+                    </group>
+                    <group name="outbound" string="Outbound">
+                        <field name="out_route_id"/>
+                        <field name="out_warehouse_id"/>
+                        <field name="supplier_to_customer"
+                               attrs="{'invisible':[('type', '=', 'customer')]}"/>
+                    </group>
+                </group>
+            </form>
+        </field>
+    </record>
 
-        <record id="action_rma_operation_customer" model="ir.actions.act_window">
-            <field name="name">Customer Operations</field>
-            <field name="res_model">rma.operation</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context">{'default_type': "customer"}</field>
-            <field name="domain">[('type','=', 'customer')]</field>
-            <field name="view_id" ref="rma_operation_tree"/>
-        </record>
+    <record id="action_rma_operation_customer" model="ir.actions.act_window">
+        <field name="name">Customer Operations</field>
+        <field name="res_model">rma.operation</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="context">{'default_type': "customer"}</field>
+        <field name="domain">[('type','=', 'customer')]</field>
+        <field name="view_id" ref="rma_operation_tree"/>
+    </record>
 
-        <record id="action_rma_operation_supplier" model="ir.actions.act_window">
-            <field name="name">Supplier Operations</field>
-            <field name="res_model">rma.operation</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context">{'default_type': "supplier"}</field>
-            <field name="domain">[('type','=', 'supplier')]</field>
-            <field name="view_id" ref="rma_operation_tree"/>
-        </record>
+    <record id="action_rma_operation_supplier" model="ir.actions.act_window">
+        <field name="name">Supplier Operations</field>
+        <field name="res_model">rma.operation</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="context">{'default_type': "supplier"}</field>
+        <field name="domain">[('type','=', 'supplier')]</field>
+        <field name="view_id" ref="rma_operation_tree"/>
+    </record>
 
-        <menuitem id="menu_rma_operation_customer"
-            name="Customer Operations"
-            groups="rma.group_rma_manager"
-            sequence="35"
-            parent="rma.menu_rma_config"
-            action="action_rma_operation_customer"/>
+    <menuitem id="menu_rma_operation_customer"
+        name="Customer Operations"
+        groups="rma.group_rma_manager"
+        sequence="35"
+        parent="rma.menu_rma_config"
+        action="action_rma_operation_customer"/>
 
-        <menuitem id="menu_rma_operation_supplier"
-            name="Supplier Operations"
-            groups="rma.group_rma_manager"
-            sequence="40"
-            parent="rma.menu_rma_config"
-            action="action_rma_operation_supplier"/>
+    <menuitem id="menu_rma_operation_supplier"
+        name="Supplier Operations"
+        groups="rma.group_rma_manager"
+        sequence="40"
+        parent="rma.menu_rma_config"
+        action="action_rma_operation_supplier"/>
 
-    </data>
 </odoo>
diff --git a/rma/wizards/rma_order_line_make_supplier_rma_view.xml b/rma/wizards/rma_order_line_make_supplier_rma_view.xml
index 25ad8e38..3fff3c39 100755
--- a/rma/wizards/rma_order_line_make_supplier_rma_view.xml
+++ b/rma/wizards/rma_order_line_make_supplier_rma_view.xml
@@ -37,13 +37,13 @@
                      </field>
                  </group>
                  <newline/>
-                 <group colspan="2">
+                 <footer colspan="2">
                      <button name="make_supplier_rma"
                              string="Create/Update Supplier RMA"
                              type="object"
                              class="oe_highlight"/>
                      <button special="cancel" string="Cancel" class="oe_link"/>
-                 </group>
+                 </footer>
             </form>
         </field>
     </record>