From 8fe05513cdc415c1978f6fb8e0bfacf9f54e2528 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 15 Jun 2012 17:33:22 +0530
Subject: [PATCH] [IMP] account: remove cancel button from wizard.

bzr revid: tpa@tinyerp.com-20120615120322-06saydlh5yhipkh6
---
 .../account_automatic_reconcile_view.xml      |  6 +--
 .../wizard/account_change_currency_view.xml   |  3 +-
 addons/account/wizard/account_chart_view.xml  |  3 +-
 .../wizard/account_fiscalyear_close_state.xml | 17 ++++-----
 .../wizard/account_fiscalyear_close_view.xml  |  3 +-
 .../wizard/account_invoice_refund_view.xml    |  3 +-
 .../wizard/account_invoice_state_view.xml     | 26 ++++++-------
 .../wizard/account_journal_select_view.xml    | 13 +++----
 .../account_move_bank_reconcile_view.xml      |  3 +-
 ...ccount_move_line_reconcile_select_view.xml |  3 +-
 .../wizard/account_move_line_select_view.xml  |  3 +-
 ...ount_move_line_unreconcile_select_view.xml |  3 +-
 .../account_open_closed_fiscalyear_view.xml   |  3 +-
 .../wizard/account_period_close_view.xml      |  3 +-
 ...account_reconcile_partner_process_view.xml |  3 +-
 .../account/wizard/account_reconcile_view.xml | 10 ++---
 ...count_report_aged_partner_balance_view.xml |  3 +-
 .../wizard/account_report_common_view.xml     |  3 +-
 .../wizard/account_state_open_view.xml        |  3 +-
 .../account_subscription_generate_view.xml    |  4 +-
 .../account/wizard/account_tax_chart_view.xml |  3 +-
 .../wizard/account_unreconcile_view.xml       |  6 +--
 .../account/wizard/account_use_model_view.xml | 24 ++++++------
 .../wizard/account_validate_move_view.xml     | 38 +++++++++----------
 addons/account/wizard/account_vat_view.xml    |  3 +-
 25 files changed, 79 insertions(+), 113 deletions(-)

diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index b8e719acc35..aa71d2125d0 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -9,8 +9,7 @@
              <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
                     <header>
-                        <button name="reconcile" string="Reconcile" type="object" icon="terp-stock_effects-object-colorize"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="reconcile" string="Reconcile" type="object" icon="terp-stock_effects-object-colorize" class="oe_form_button_active_flow"/>
                     </header>
                     <separator string="Reconciliation"/>
                     <label string="For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, OpenERP makes its own search for entries to reconcile in a series of accounts. It finds entries for each partner where the amounts correspond."/>
@@ -53,9 +52,6 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Reconciliation Result" version="7.0">
-                    <header>
-                        <button special="cancel" string="Ok" icon="terp-dialog-close" default_focus="1"/>
-                    </header>
                     <group>
                         <field name="reconciled"/>
                         <field name="unreconciled"/>
diff --git a/addons/account/wizard/account_change_currency_view.xml b/addons/account/wizard/account_change_currency_view.xml
index 3d942ef0097..724f275c92c 100644
--- a/addons/account/wizard/account_change_currency_view.xml
+++ b/addons/account/wizard/account_change_currency_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Invoice Currency" version="7.0">
                     <header>
-                        <button name="change_currency" string="Change Currency" type="object" icon="terp-stock_effects-object-colorize"/>
-                        <button special="cancel" string="Cancel"  icon="gtk-cancel"/>
+                        <button name="change_currency" string="Change Currency" type="object" icon="terp-stock_effects-object-colorize" class="oe_form_button_active_flow"/>
                     </header>
                     <group string="This wizard will change the currency of the invoice">
                         <field name="currency_id"/>
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index 1ae294c3c0a..cbbcb13b27c 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Account charts" version="7.0">
                     <header>
-                        <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_chart_open_window" type="object"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_chart_open_window" type="object" class="oe_form_button_active_flow"/>
                     </header>
                     <group colspan="4">
                         <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/>
diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml
index e141b4fc911..45a34044dcb 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.xml
+++ b/addons/account/wizard/account_fiscalyear_close_state.xml
@@ -7,15 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Close states of Fiscal year and periods" version="7.0">
-                <header>
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    <button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object"/>
-                </header>
-                <separator string="Close states of Fiscal year and periods"/>
-                <label string ="If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive "/>
-                <group>
-                    <field name="fy_id"  domain="[('state','=','draft')]"/>
-                </group>
+	                <header>
+	                    <button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object" class="oe_form_button_active_flow"/>
+	                </header>
+	                <separator string="Close states of Fiscal year and periods"/>
+	                <label string ="If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive "/>
+	                <group>
+	                    <field name="fy_id"  domain="[('state','=','draft')]"/>
+	                </group>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index aa34fefd128..97d39d34650 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Generate Fiscal Year Opening Entries" version="7.0">
                     <header>
-                        <button icon="gtk-execute" string="Create" name="data_save" type="object"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-execute" string="Create" name="data_save" type="object" class="oe_form_button_active_flow"/>
                     </header>
                     <separator string="Generate Fiscal Year Opening Entries"/>
                     <label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones."/>
diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml
index aec13d4ca72..4aa4aa51c45 100644
--- a/addons/account/wizard/account_invoice_refund_view.xml
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Credit Note" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button string='Refund' icon="gtk-execute" name="invoice_refund" type="object"/>
+                        <button string='Refund' icon="gtk-execute" name="invoice_refund" type="object" class="oe_form_button_active_flow"/>
                     </header>
                     <separator string="Credit Note Options"/>
                     <group col="4">
diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
index d95889a6558..82141bd2161 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -6,13 +6,12 @@
             <field name="model">account.invoice.confirm</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Confirm Draft Invoices" version="7.0">
-                <separator string="Confirm Draft Invoices" colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Close"/>
-                        <button icon="terp-camera_test" string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1"/>
-                   </group>
-            </form>
+	            <form string="Confirm Draft Invoices" version="7.0">
+	                <header>
+	                    <button icon="terp-camera_test" string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_form_button_active_flow"/>
+	                </header>
+	                <separator string="Confirm Draft Invoices" colspan="4"/>
+	            </form>
             </field>
         </record>
 
@@ -27,13 +26,12 @@
             <field name="model">account.invoice.cancel</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Cancel Selected Invoices" version="7.0">
-                <separator string="Cancel Selected Invoices" colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/>
-                        <button icon="terp-dialog-close" special="cancel" string="Close"/>
-                   </group>
-            </form>
+	            <form string="Cancel Selected Invoices" version="7.0">
+	                <header>
+	                    <button icon="gtk-cancel" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_form_button_active_flow"/>
+	                </header>
+	                <separator string="Cancel Selected Invoices" colspan="4"/>
+	            </form>
             </field>
         </record>
 
diff --git a/addons/account/wizard/account_journal_select_view.xml b/addons/account/wizard/account_journal_select_view.xml
index 036cd3b2f8a..7e3c06f067c 100644
--- a/addons/account/wizard/account_journal_select_view.xml
+++ b/addons/account/wizard/account_journal_select_view.xml
@@ -7,13 +7,12 @@
             <field name="model">account.journal.select</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Journal Select" version="7.0">
-                <header>
-                    <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object"/>
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                </header>
-                <label string="Are you sure you want to open Journal Entries?"/>
-            </form>
+	            <form string="Journal Select" version="7.0">
+	                <header>
+	                    <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object" class="oe_form_button_active_flow"/>
+	                </header>
+	                <label string="Are you sure you want to open Journal Entries?"/>
+	            </form>
             </field>
         </record>
 
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
index d5d83699666..7f00d66efae 100644
--- a/addons/account/wizard/account_move_bank_reconcile_view.xml
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Bank reconciliation" version="7.0">
                     <header>
-                        <button icon="terp-gtk-go-back-rtl" string="Open for Bank Reconciliation" name="action_open_window" type="object"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open for Bank Reconciliation" name="action_open_window" type="object" class="oe_form_button_active_flow"/>
                     </header>
                     <group>
                         <field name="journal_id"/>
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index 559c021a0ff..f12ce2da4bb 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
                     <header>
-                        <button icon="terp-gtk-go-back-rtl" string="Open for Reconciliation" name="action_open_window" type="object" />
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                        <button icon="terp-gtk-go-back-rtl" string="Open for Reconciliation" name="action_open_window" type="object" class="oe_form_button_active_flow"/>
                     </header>
                     <group>
                          <field name="account_id"/>
diff --git a/addons/account/wizard/account_move_line_select_view.xml b/addons/account/wizard/account_move_line_select_view.xml
index 6ce685431fe..7b5897685d0 100644
--- a/addons/account/wizard/account_move_line_select_view.xml
+++ b/addons/account/wizard/account_move_line_select_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Account Select" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="open_window" type="object" default_focus="1"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="open_window" type="object" default_focus="1" class="oe_form_button_active_flow"/>
                     </header>
                     <label string="Are you sure you want to open Account move line entries!"/>
                </form>
diff --git a/addons/account/wizard/account_move_line_unreconcile_select_view.xml b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
index 9123e7b826e..9f5132da6e7 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Unreconciliation" version="7.0">
                     <header>
-                        <button icon="terp-gtk-go-back-rtl" string="Open for Unreconciliation" name="action_open_window" type="object" />
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                        <button icon="terp-gtk-go-back-rtl" string="Open for Unreconciliation" name="action_open_window" type="object" class="oe_form_button_active_flow"/>
                     </header>
                     <group>
                         <field name="account_id"/>
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index a4e338f3b9e..d6599d257ca 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Choose Fiscal Year " version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object" class="oe_form_button_active_flow"/>
                     </header>
                     <group>
                         <field name="fyear_id" domain="[('state','=','draft')]"/>
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
index 6bf54e07945..f088fb648d3 100644
--- a/addons/account/wizard/account_period_close_view.xml
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Close Period" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button  icon="terp-gtk-go-back-rtl" string="Close Period" name="data_save" type="object"/>
+                        <button  icon="terp-gtk-go-back-rtl" string="Close Period" name="data_save" type="object" class="oe_form_button_active_flow"/>
                     </header>
                     <separator string="Are you sure?" colspan="4"/>
                     <group>
diff --git a/addons/account/wizard/account_reconcile_partner_process_view.xml b/addons/account/wizard/account_reconcile_partner_process_view.xml
index 2648c3439bf..8f8c11ed65e 100644
--- a/addons/account/wizard/account_reconcile_partner_process_view.xml
+++ b/addons/account/wizard/account_reconcile_partner_process_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Partner Reconciliation" version="7.0">
                     <header>
-                        <button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" />
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" class="oe_form_button_active_flow"/>
                     </header>
                     <group col="4">
                         <field name="next_partner_id"/>
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index 959c4ceddcf..84bed269d84 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -9,10 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}"/>
-                        <button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
-                        <button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
+                        <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_form_button_active_flow"/>
                     </header>
                     <group col="4" string="Reconciliation Transactions">
                         <field name="trans_nbr"/>
@@ -51,8 +50,7 @@
             <field name="arch" type="xml">
                 <form string="Information addendum" version="7.0">
                     <header>
-                        <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1" class="oe_form_button_active_flow"/>
                     </header>
                     <group string="Write-Off Move" col="4">
                         <field name="journal_id"/>
diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml
index d6cde8599e0..dc6542b8feb 100644
--- a/addons/account/wizard/account_report_aged_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml
@@ -10,8 +10,7 @@
             <field name="arch" type="xml">
                 <form string="Report Options" version="7.0">
                     <header>
-                        <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" colspan="2"/>
+                        <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1" class="oe_form_button_active_flow"/>
                     </header>
                     <separator string="Aged Partner Balance"/>
                     <label string="Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. "/>
diff --git a/addons/account/wizard/account_report_common_view.xml b/addons/account/wizard/account_report_common_view.xml
index 425f5d3bbbc..01561f61f55 100644
--- a/addons/account/wizard/account_report_common_view.xml
+++ b/addons/account/wizard/account_report_common_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
             <form string="Report Options" version="7.0">
                 <header>
-                    <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1" />
-                    <button icon="gtk-cancel" special="cancel" string="Cancel" colspan="2"/>
+                    <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1" class="oe_form_button_active_flow"/>
                 </header>
                 <label string=""/>  <!-- binding for inherited views -->
                 <group col="4">
diff --git a/addons/account/wizard/account_state_open_view.xml b/addons/account/wizard/account_state_open_view.xml
index 5ea33021926..9034b5372f4 100644
--- a/addons/account/wizard/account_state_open_view.xml
+++ b/addons/account/wizard/account_state_open_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Open Invoice" version="7.0">
                     <header>
-                        <button name="change_inv_state" string="Yes" type="object" icon="terp-camera_test"/>
-                        <button special="cancel" string="No"  icon="terp-gtk-stop"/>
+                        <button name="change_inv_state" string="Yes" type="object" icon="terp-camera_test" class="oe_form_button_active_flow"/>
                     </header>
                     <label string="Are you sure you want to open this invoice ?"/>
                     <label string="(Invoice should be unreconciled if you want to open it)"/>
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index bf848bb3776..42661c00362 100644
--- a/addons/account/wizard/account_subscription_generate_view.xml
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -9,9 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Subscription Compute" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
-                        <button icon="gtk-execute" string="Generate Entries"
-                            name="action_generate" type="object" />
+                        <button icon="gtk-execute" string="Generate Entries" name="action_generate" type="object" class="oe_form_button_active_flow"/>
                     </header>
                     <separator string="Generate Entries before:"/>
                     <label string ="Automatically generate entries based on what has been entered in the  system before a specific date."/>
diff --git a/addons/account/wizard/account_tax_chart_view.xml b/addons/account/wizard/account_tax_chart_view.xml
index 309af53ca17..eb27df6d22c 100644
--- a/addons/account/wizard/account_tax_chart_view.xml
+++ b/addons/account/wizard/account_tax_chart_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Account tax charts" version="7.0">
                     <header>
-                        <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_tax_chart_open_window" type="object" />
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                        <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_tax_chart_open_window" type="object" class="oe_form_button_active_flow"/>
                     </header>
                     <group>
                         <field name="period_id"/>
diff --git a/addons/account/wizard/account_unreconcile_view.xml b/addons/account/wizard/account_unreconcile_view.xml
index 0d9bb1a466f..3f15b67f59a 100644
--- a/addons/account/wizard/account_unreconcile_view.xml
+++ b/addons/account/wizard/account_unreconcile_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
             <form string="Unreconciliation" version="7.0">
                 <header>
-                    <button icon="gtk-ok" string="Unreconcile" name="trans_unrec" type="object" default_focus="1"/>
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    <button icon="gtk-ok" string="Unreconcile" name="trans_unrec" type="object" default_focus="1" class="oe_form_button_active_flow"/>
                 </header>
                 <separator string="Unreconciliate Transactions"/>
                 <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"/>
@@ -43,8 +42,7 @@
             <field name="arch" type="xml">
             <form string="Unreconciliation" version="7.0">
                 <header>
-                    <button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1"/>
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    <button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1" class="oe_form_button_active_flow"/>
                 </header>
                 <separator string="Unreconciliation Transactions"/>
                 <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index 682236a0610..a6ef4b9ede2 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -7,17 +7,16 @@
             <field name="model">account.use.model</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Create Entries From Models" version="7.0">
-                <header>
-                    <button icon="gtk-execute" string="Create Entries" name="create_entries" type="object"/>
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                </header>
-                <separator string="This wizard will create recurring accounting entries"/>
-                <label string="Create manual recurring entries in a chosen journal."/>
-                <group>
-                    <field name="model"/>
-                </group>
-            </form>
+	            <form string="Create Entries From Models" version="7.0">
+	                <header>
+	                    <button icon="gtk-execute" string="Create Entries" name="create_entries" type="object" class="oe_form_button_active_flow"/>
+	                </header>
+	                <separator string="This wizard will create recurring accounting entries"/>
+	                <label string="Create manual recurring entries in a chosen journal."/>
+	                <group>
+	                    <field name="model"/>
+	                </group>
+	            </form>
             </field>
         </record>
 
@@ -40,8 +39,7 @@
             <field name="arch" type="xml">
                 <form string="Use Model" version="7.0">
                     <header>
-                        <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1' class="oe_form_button_active_flow"/>
                     </header>
                     <label string = "Are you sure you want to create entries?"/>
                </form>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 2ee826fe1f7..6f10f9ad693 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -8,18 +8,17 @@
             <field name="model">validate.account.move</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Post Journal Entries" version="7.0">
-                <header>
-                    <button icon="terp-camera_test" string="Approve" name="validate_move" type="object"/>
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                </header>
-                <separator string="Post Journal Entries of a Journal"/>
-                <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore."/>
-                <group>
-                    <field name="journal_id"/>
-                    <field name="period_id"/>
-                </group>
-               </form>
+	            <form string="Post Journal Entries" version="7.0">
+	                <header>
+	                    <button icon="terp-camera_test" string="Approve" name="validate_move" type="object" class="oe_form_button_active_flow"/>
+	                </header>
+	                <separator string="Post Journal Entries of a Journal"/>
+	                <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore."/>
+	                <group>
+	                    <field name="journal_id"/>
+	                    <field name="period_id"/>
+	                </group>
+	            </form>
             </field>
         </record>
 
@@ -46,14 +45,13 @@
             <field name="model">validate.account.move.lines</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Post Journal Entries" version="7.0">
-                <header>
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    <button icon="terp-camera_test" string="Approve" name="validate_move_lines" type="object" default_focus="1"/>
-                </header>
-                <separator string="Post Journal Entries"/>
-                <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore." colspan="2"/>
-            </form>
+	            <form string="Post Journal Entries" version="7.0">
+	                <header>
+	                    <button icon="terp-camera_test" string="Approve" name="validate_move_lines" type="object" default_focus="1" class="oe_form_button_active_flow"/>
+	                </header>
+	                <separator string="Post Journal Entries"/>
+	                <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore." colspan="2"/>
+	            </form>
             </field>
         </record>
 
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index a54da1aaad6..a2108e43968 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
             <form string="Taxes Report" version="7.0">
                 <header>
-                    <button name="create_vat" string="Print Tax Statement" type="object" icon="gtk-ok"/>
-                    <button icon='gtk-cancel' special="cancel"  string="Cancel" />
+                    <button name="create_vat" string="Print Tax Statement" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
                 </header>
                 <label colspan="4" string="This menu prints a VAT declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
                 <group string="Taxes Report" col="4">