diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 47ff616b548..775aebfaa8f 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -913,7 +913,7 @@ class purchase_order_line(osv.osv):
 
         # - determine product_qty and date_planned based on seller info
         if not date_order:
-            date_order = fields.date.context_today(cr,uid,context=context)
+            date_order = fields.date.context_today(self,cr,uid,context=context)
 
         qty = qty or 1.0
         supplierinfo = False
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index c45503faa36..5cae606ae0c 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Purchases" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_form_button_active_flow"/>
                     </header>
                     <sheet>
                     <group col="4">
diff --git a/addons/purchase/wizard/purchase_line_invoice_view.xml b/addons/purchase/wizard/purchase_line_invoice_view.xml
index 40f081076f6..da4db680da1 100644
--- a/addons/purchase/wizard/purchase_line_invoice_view.xml
+++ b/addons/purchase/wizard/purchase_line_invoice_view.xml
@@ -11,10 +11,11 @@
             <field name="arch" type="xml">
                 <form string="Select an Open Sale Order" version="7.0">
                     <header>
-                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
-                        <button name="makeInvoices" string="Confirm" type="object" icon="gtk-ok" />
+                        <button name="makeInvoices" string="Confirm" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
                     </header>
-                    <label string="Do you want to generate the supplier invoices?"/>
+                    <group>
+                        <label string="Do you want to generate the supplier invoices?"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase/wizard/purchase_order_group_view.xml b/addons/purchase/wizard/purchase_order_group_view.xml
index 50c75668068..25117249f9a 100644
--- a/addons/purchase/wizard/purchase_order_group_view.xml
+++ b/addons/purchase/wizard/purchase_order_group_view.xml
@@ -8,11 +8,11 @@
             <field name="arch" type="xml">
                <form string="Merge orders" version="7.0">
                     <header>
-                        <button name="merge_orders" string="Merge orders" type="object" icon="gtk-convert"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="merge_orders" string="Merge orders" type="object" icon="gtk-convert" class="oe_form_button_active_flow"/>
                     </header>
-                    <separator string="Are you sure you want to merge these orders?"/>
-                    <label string="
+                    <group>
+                        <separator string="Are you sure you want to merge these orders?"/>
+                        <label string="
 Please note that: &#10; &#10;
 Orders will only be merged if: &#10;
 * Purchase Orders are in draft &#10;
@@ -21,6 +21,8 @@ Orders will only be merged if: &#10;
 Lines will only be merged if: &#10;
 * Order lines are exactly the same except for the product,quantity and unit &#10;
 " colspan="4"/>
+                    </group>
+                    
                 </form>
             </field>
         </record>
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
index 62d9e605600..a640ec37444 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Purchase Requisition" version="7.0">
                     <header>
-                        <button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
-                        <button icon="gtk-ok" name="create_order" string="Create Quotation" type="object"/>
+                        <button icon="gtk-ok" name="create_order" string="Create Quotation" type="object" class="oe_form_button_active_flow"/>
                     </header>
                     <group>
                         <field name="partner_id"/>