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

bzr revid: tpa@tinyerp.com-20120615114621-w1cl66qygdfrkt7p
---
 addons/account/account_view.xml                                | 3 +--
 .../project/wizard/account_analytic_balance_report_view.xml    | 3 +--
 addons/account/project/wizard/account_analytic_chart_view.xml  | 3 +--
 .../account_analytic_cost_ledger_for_journal_report_view.xml   | 3 +--
 .../project/wizard/account_analytic_cost_ledger_view.xml       | 3 +--
 .../wizard/account_analytic_inverted_balance_report.xml        | 3 +--
 .../project/wizard/account_analytic_journal_report_view.xml    | 3 +--
 .../project/wizard/project_account_analytic_line_view.xml      | 3 +--
 addons/account/res_config_view.xml                             | 3 +--
 9 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 274a8993dc4..f32fe82b26b 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1983,8 +1983,7 @@
             <field name="arch" type="xml">
                 <form string="Create Account" version="7.0">
                     <header>
-                        <button icon="gtk-ok" name="action_create" string="Add" type="object"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" name="action_cancel" type="object"/>
+                        <button icon="gtk-ok" name="action_create" string="Add" type="object" class="oe_form_button_active_flow"/>
                     </header>
                     <separator col="4" colspan="4" string="Create an Account Based on this Template"/>
                     <field name="cparent_id"/>
diff --git a/addons/account/project/wizard/account_analytic_balance_report_view.xml b/addons/account/project/wizard/account_analytic_balance_report_view.xml
index 59c4095bb22..a7018ddc9c1 100644
--- a/addons/account/project/wizard/account_analytic_balance_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_balance_report_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
             <form string="Select Period" version="7.0">
                 <header>
-                    <button name="check_report" string="Print" type="object" icon="gtk-print"/>
-                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
                 </header>
                 <group col="4">
                     <field name="date1"/>
diff --git a/addons/account/project/wizard/account_analytic_chart_view.xml b/addons/account/project/wizard/account_analytic_chart_view.xml
index 8e2351b63e9..af33b3b102e 100644
--- a/addons/account/project/wizard/account_analytic_chart_view.xml
+++ b/addons/account/project/wizard/account_analytic_chart_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Analytic Account Charts" version="7.0">
                     <header>
-                        <button name="analytic_account_chart_open_window" string="Open Charts" type="object" icon="gtk-ok"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="analytic_account_chart_open_window" string="Open Charts" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
                     </header>
                     <group string="Select the Period for Analysis" col="4">
                         <field name="from_date"/>
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
index a9c868a6ac8..3713fa8d4c0 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Select period" version="7.0">
                     <header>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                        <button name="check_report" string="Print" type="object" icon="gtk-print"/>
+                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
                     </header>
                     <group string="Cost Ledger for Period" col="4">
                         <field name="date1"/>
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_view.xml b/addons/account/project/wizard/account_analytic_cost_ledger_view.xml
index 29948e7b5c0..d8346ffec21 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_view.xml
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
             <form string="Select Period" version="7.0">
                 <header>
-                     <button name="check_report" string="Print" type="object" icon="gtk-print"/>
-                     <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                     <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
                 </header>
                 <group col="4">
                     <field name="date1"/>
diff --git a/addons/account/project/wizard/account_analytic_inverted_balance_report.xml b/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
index 5020a1859a6..9c196f8bd83 100644
--- a/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
+++ b/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Select Period" version="7.0">
                     <header>
-                        <button name="check_report" string="Print" type="object" icon="gtk-print"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
                     </header>
                     <group col="4">
                         <field name="date1"/>
diff --git a/addons/account/project/wizard/account_analytic_journal_report_view.xml b/addons/account/project/wizard/account_analytic_journal_report_view.xml
index d6c36aae990..ecf61ee6903 100644
--- a/addons/account/project/wizard/account_analytic_journal_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_journal_report_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Select Period" version="7.0">
                     <header>
-                        <button name="check_report" string="Print" type="object" icon="gtk-print"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
                     </header>
                     <group col="4">
                         <field name="date1"/>
diff --git a/addons/account/project/wizard/project_account_analytic_line_view.xml b/addons/account/project/wizard/project_account_analytic_line_view.xml
index 08ef0e8e9b6..9d36b439d50 100644
--- a/addons/account/project/wizard/project_account_analytic_line_view.xml
+++ b/addons/account/project/wizard/project_account_analytic_line_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="View Account Analytic Lines" 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"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object" class="oe_form_button_active_flow"/>
                     </header>
                     <group col="4">
                         <field name="from_date"/>
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 24c7887bdfe..2a97c027eb4 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -17,8 +17,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Accounting" 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>
                     <group col="4">
                         <field name="has_default_company" invisible="1" />

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 02/18] [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">

From 87343de7896f0c63f32e3243331a2479e14051dc Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 15 Jun 2012 17:41:41 +0530
Subject: [PATCH 03/18] [IMP] account_analytic_plans: remove cancel button from
 wizard.

bzr revid: tpa@tinyerp.com-20120615121141-rplvv0eqkv9egql5
---
 .../wizard/account_crossovered_analytic_view.xml            | 3 +--
 .../wizard/analytic_plan_create_model_view.xml              | 6 +-----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
index 4138fe79582..2fd918c20ac 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
             <form string="Crossovered Analytic" version="7.0">
                 <header>
-                    <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
-                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                    <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
                 </header>
                 <group col="4">
                     <field name="date1"/>
diff --git a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
index fd7c03e058e..0c4f446e322 100644
--- a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
+++ b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
             <form string="Distribution Model Saved" version="7.0">
                 <header>
-                    <button string="Ok" icon='gtk-execute' type="object" name="activate" default_focus="1"/>
-                    <button special="cancel" string="Cancel" icon='gtk-ok' />
+                    <button string="Ok" icon='gtk-execute' type="object" name="activate" default_focus="1" class="oe_form_button_active_flow"/>
                 </header>
                 <label string="Save This Distribution as a Model"/>
             </form>
@@ -22,9 +21,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Distribution Model Saved" version="7.0">
-                <header>
-                    <button special="cancel" string="Ok" icon='gtk-ok'/>
-                </header>
                 <label string="This distribution model has been saved.You will be able to reuse it later."/>
             </form>
             </field>

From 6401cef582f1464e72ffd3e50958309bea9d14ba Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 15 Jun 2012 17:43:46 +0530
Subject: [PATCH 04/18] [IMP] account_asset,account_bank_statement_extensions:
 remove cancel button from wizard.

bzr revid: tpa@tinyerp.com-20120615121346-mzayk2ihz6ip6zg0
---
 .../wizard/account_asset_change_duration_view.xml              | 3 +--
 addons/account_asset/wizard/wizard_asset_compute_view.xml      | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/account_asset/wizard/account_asset_change_duration_view.xml b/addons/account_asset/wizard/account_asset_change_duration_view.xml
index a68d28ac653..0016f2bc33b 100644
--- a/addons/account_asset/wizard/account_asset_change_duration_view.xml
+++ b/addons/account_asset/wizard/account_asset_change_duration_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Modify Asset" version="7.0">
                     <header>
-                        <button name="modify" string="Modify" type="object" icon="terp-camera_test"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="modify" string="Modify" type="object" icon="terp-camera_test" class="oe_form_button_active_flow"/>
                     </header>
                     <group string="Asset Durations to Modify" col="4">
                         <field name="name" colspan="4"/>
diff --git a/addons/account_asset/wizard/wizard_asset_compute_view.xml b/addons/account_asset/wizard/wizard_asset_compute_view.xml
index 5d2bc39a751..8055ab68a42 100644
--- a/addons/account_asset/wizard/wizard_asset_compute_view.xml
+++ b/addons/account_asset/wizard/wizard_asset_compute_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Compute Asset" version="7.0">
                     <header>
-                        <button icon="gtk-execute" string="Compute" name="asset_compute" type="object"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-execute" string="Compute" name="asset_compute" type="object" class="oe_form_button_active_flow"/>
                     </header>
                     <separator string="Post Depreciation Lines"/>
                     <label string="This wizard will post the depreciation lines of running assets that belong to the selected period."/>

From 4d32748eacd3cb8d102a064e353d82da3f271677 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 15 Jun 2012 17:45:48 +0530
Subject: [PATCH 05/18] [IMP] account_budget: remove cancel button from wizard.

bzr revid: tpa@tinyerp.com-20120615121548-ppmqs3k8slwg7eru
---
 addons/account_budget/wizard/account_budget_analytic_view.xml  | 3 +--
 .../wizard/account_budget_crossovered_report_view.xml          | 3 +--
 .../wizard/account_budget_crossovered_summary_report_view.xml  | 3 +--
 addons/account_budget/wizard/account_budget_report_view.xml    | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/addons/account_budget/wizard/account_budget_analytic_view.xml b/addons/account_budget/wizard/account_budget_analytic_view.xml
index a3ca1d8c1b6..9820d5c0b6c 100644
--- a/addons/account_budget/wizard/account_budget_analytic_view.xml
+++ b/addons/account_budget/wizard/account_budget_analytic_view.xml
@@ -9,8 +9,7 @@
              <field name="arch" type="xml">
                  <form string="Select Dates Period" version="7.0">
                      <header>
-                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_form_button_active_flow"/>
                      </header>
                      <group string="This wizard is used to print budget" col="4">
                          <field name="date_from"/>
diff --git a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
index f572109b1fd..62700068362 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
@@ -9,8 +9,7 @@
              <field name="arch" type="xml">
                  <form string="Select Dates Period" version="7.0">
                      <header>
-                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
-                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_form_button_active_flow"/>
                      </header>
                     <group string="This wizard is used to print budget" col="4">
                         <field name="date_from"/>
diff --git a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
index ab4f75c2729..ceb66a50488 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
@@ -9,8 +9,7 @@
              <field name="arch" type="xml">
                  <form string="Select Dates Period" version="7.0">
                      <header>
-                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
-                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_form_button_active_flow"/>
                      </header>
                     <group string="This wizard is used to print summary of budgets">
                         <field name="date_from"/>
diff --git a/addons/account_budget/wizard/account_budget_report_view.xml b/addons/account_budget/wizard/account_budget_report_view.xml
index aba258663b7..c5dd0dab7cf 100644
--- a/addons/account_budget/wizard/account_budget_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_report_view.xml
@@ -9,8 +9,7 @@
         <field name="arch" type="xml">
           <form string="Select Dates Period" version="7.0">
               <header>
-                  <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
-                  <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                  <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_form_button_active_flow"/>
               </header>
               <group string="Print Budgets" col="4">
                   <field name="date_from"/>

From 043eb2b0c0f3063fb52338eb6d82ab1f24a4aa59 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 15 Jun 2012 17:47:13 +0530
Subject: [PATCH 06/18] [IMP] account_coda: remove cancel button from wizard.

bzr revid: tpa@tinyerp.com-20120615121713-ben8p8igsfb11s2p
---
 addons/account_coda/account_coda_wizard.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/account_coda/account_coda_wizard.xml b/addons/account_coda/account_coda_wizard.xml
index 91ba355ba65..d41230642ac 100644
--- a/addons/account_coda/account_coda_wizard.xml
+++ b/addons/account_coda/account_coda_wizard.xml
@@ -10,8 +10,7 @@
       <field name="arch" type="xml">
         <form string="Import CODA File" version="7.0">
             <header>
-                <button name="coda_parsing" string="_Import" type="object" icon="gtk-ok"/>
-                <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                <button name="coda_parsing" string="_Import" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
             </header>
             <group col="2" string="Select Your File :">
                 <field name="coda_data" filename="coda_fname"/>
@@ -29,9 +28,8 @@
       <field name="arch" type="xml">
         <form string="Import CODA File" version="7.0">
           <header>
-              <button name="action_open_coda_statements" string="View CODA Bank Statement(s)" type="object" icon="gtk-apply"/>
-              <button name="action_open_bank_statements" string="View Bank Statement(s)" type="object" icon="gtk-apply"/>
-              <button special="cancel" string="Close" icon="gtk-cancel"/>
+              <button name="action_open_coda_statements" string="View CODA Bank Statement(s)" type="object" icon="gtk-apply" class="oe_form_button_active_flow"/>
+              <button name="action_open_bank_statements" string="View Bank Statement(s)" type="object" icon="gtk-apply" class="oe_form_button_active_flow"/>
           </header>
           <group string="Results :">
               <field name="note" nolabel="1" colspan="2"/>

From 4b924204875f292ec20524f78c78a128e2198756 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 15 Jun 2012 17:48:59 +0530
Subject: [PATCH 07/18] [IMP] account_followup: remove cancel button from
 wizard.

bzr revid: tpa@tinyerp.com-20120615121859-ni2fniemus7xmdoj
---
 .../wizard/account_followup_print_view.xml            | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index 8a592f01ac2..b79cd10d05c 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
             <form string="Send followups" version="7.0">
                 <header>
-                    <button name="do_continue" string="Continue" colspan="1" type="object" icon="gtk-ok"/>
-                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                    <button name="do_continue" string="Continue" colspan="1" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
                 </header>
                 <separator string="Send Follow-Ups"/>
                 <label string ="This feature allows you to send reminders to partners with pending invoices. You can send them the default message for unpaid invoices or manually enter a message should you need to remind them of a specific information."/>
@@ -76,9 +75,8 @@
             <field name="arch" type="xml">
             <form string="Send followups" version="7.0">
                 <header>
-                    <button name="do_mail" string="Send Mails" colspan="1" type="object" icon="gtk-execute"/>
-                    <button name="do_print" string="Print Follow Ups" colspan="1" type="object" icon="gtk-print"/>
-                    <button special="cancel" string="Cancel" icon='gtk-cancel'/>
+                    <button name="do_mail" string="Send Mails" colspan="1" type="object" icon="gtk-execute" class="oe_form_button_active_flow"/>
+                    <button name="do_print" string="Print Follow Ups" colspan="1" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
                 </header>
                 <notebook>
                     <page string="Partner Selection">
@@ -115,9 +113,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Summary" version="7.0">
-                <header>
-                    <button special="cancel" string="Ok" icon='gtk-cancel'/>
-                </header>
                 <separator string="Summary"/>
                 <field name="summary"/>
             </form>

From 9038d78735c8a61ab3c062a2ddfe74e0df6e11ac Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 15 Jun 2012 17:49:42 +0530
Subject: [PATCH 08/18] [IMP] account_layout: remove cancel button from wizard.

bzr revid: tpa@tinyerp.com-20120615121942-bo1qkbk9difu08ko
---
 .../wizard/account_invoice_special_message.xml                 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/account_invoice_layout/wizard/account_invoice_special_message.xml b/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
index 1ddef75e05b..941580e2862 100644
--- a/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
+++ b/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Select Message" version="7.0">
                     <header>
-                        <button name="check_report" string="Print" type="object" icon="gtk-print"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
                     </header>
                     <group>
                         <field name="message"/>

From 697f66abb1bb7fd278cb2563cfdc6d7a480c18b9 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 15 Jun 2012 17:51:15 +0530
Subject: [PATCH 09/18] [IMP] account_payment: remove cancel button from
 wizard.

bzr revid: tpa@tinyerp.com-20120615122115-i3qvh07sq0kwiyb2
---
 .../wizard/account_payment_create_order_view.xml            | 6 ++----
 addons/account_payment/wizard/account_payment_pay_view.xml  | 3 +--
 .../wizard/account_payment_populate_statement_view.xml      | 3 +--
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/addons/account_payment/wizard/account_payment_create_order_view.xml b/addons/account_payment/wizard/account_payment_create_order_view.xml
index 9e4bf416f5e..e451787c3f6 100644
--- a/addons/account_payment/wizard/account_payment_create_order_view.xml
+++ b/addons/account_payment/wizard/account_payment_create_order_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
             <form string="Search Payment lines" version="7.0">
                 <header>
-                    <button name="search_entries" string="Search" colspan="1" type="object" icon="gtk-execute"/>
-                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                    <button name="search_entries" string="Search" colspan="1" type="object" icon="gtk-execute" class="oe_form_button_active_flow"/>
                 </header>
                 <group>
                     <field name="duedate" />
@@ -26,8 +25,7 @@
             <field name="arch" type="xml">
                 <form string="Search Payment lines" version="7.0">
                     <header>
-                        <button name="create_payment" string="_Add to payment order" colspan="1" type="object" icon="gtk-execute"/>
-                        <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                        <button name="create_payment" string="_Add to payment order" colspan="1" type="object" icon="gtk-execute" class="oe_form_button_active_flow"/>
                     </header>
                     <separator string="Entries"/>
                     <field name="entries"/>
diff --git a/addons/account_payment/wizard/account_payment_pay_view.xml b/addons/account_payment/wizard/account_payment_pay_view.xml
index ef95d419427..7fcc4f9eabc 100644
--- a/addons/account_payment/wizard/account_payment_pay_view.xml
+++ b/addons/account_payment/wizard/account_payment_pay_view.xml
@@ -9,8 +9,7 @@
              <field name="arch" type="xml">
                 <form string="Make Payment" version="7.0">
                     <header>
-                        <button name="launch_wizard" string="Yes" type="object" icon="gtk-ok" default_focus="1"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="launch_wizard" string="Yes" type="object" icon="gtk-ok" default_focus="1" class="oe_form_button_active_flow"/>
                     </header>
                     <separator string="Are you sure you want to make payment?"/>
                 </form>
diff --git a/addons/account_payment/wizard/account_payment_populate_statement_view.xml b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
index afcaf82be3a..4b2bd93a2e9 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement_view.xml
+++ b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
@@ -9,8 +9,7 @@
              <field name="arch" type="xml">
                 <form string="Populate Statement:" version="7.0">
                     <header>
-                        <button name="populate_statement" string="ADD" type="object" icon="gtk-ok"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="populate_statement" string="ADD" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
                     </header>
                     <field name="lines"/>
                 </form>

From 3acfd51f803e5585984f7219decdea31539d80b9 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 15 Jun 2012 17:56:08 +0530
Subject: [PATCH 10/18] [IMP] account_voucher: remove cancel button from
 wizard.

bzr revid: tpa@tinyerp.com-20120615122608-vhpmfdoz5y2gs5d7
---
 .../account_statement_from_invoice_view.xml   | 20 ++++++++-----------
 .../account_voucher_unreconcile_view.xml      |  3 +--
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
index 1c0c00bd662..68053de9f34 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
+++ b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
@@ -6,17 +6,15 @@
             <field name="model">account.statement.from.invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Import Invoices in Statement">
+                <form string="Import Invoices in Statement" version="7.0">
+                    <header>
+                        <button icon="terp-gtk-go-back-rtl" string="Go" name="search_invoices" type="object" class="oe_form_button_active_flow"/>
+                    </header>
                     <group colspan="4" >
                         <field name="date"/>
                         <newline/>
                         <field name="journal_ids"  domain="[('type','in',['sale','purchase','cash'])]"/>
                     </group>
-                    <group colspan="4" col="6">
-                        <label string ="" colspan="2"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="terp-gtk-go-back-rtl" string="Go" name="search_invoices" type="object"/>
-                   </group>
                </form>
             </field>
         </record>
@@ -35,16 +33,14 @@
             <field name="model">account.statement.from.invoice.lines</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Import Entries">
+                <form string="Import Entries" version="7.0">
+                    <header>
+                        <button icon="gtk-execute" string="Ok" name="populate_statement" type="object" class="oe_form_button_active_flow"/>
+                    </header>
                     <group colspan="4" expand="1">
                         <separator string="Payable and Receivables" colspan="4"/>
                         <field height="300" width="700" name="line_ids" colspan="4" nolabel="1" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('reconcile_partial_id','=',False), ('state', '=', 'valid')]"/>
                     </group>
-                    <group colspan="4" col="6">
-                        <label string ="" colspan="2"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-execute" string="Ok" name="populate_statement" type="object"/>
-                   </group>
                </form>
             </field>
         </record>
diff --git a/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml b/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
index 38600a385ab..be2d68736f5 100644
--- a/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
+++ b/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
              <form string="Unreconciliation" version="7.0">
                 <header>
-                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                    <button name="trans_unrec" default_focus="1" string="Unreconcile" type="object" icon="gtk-ok"/>
+                    <button name="trans_unrec" default_focus="1" string="Unreconcile" type="object" icon="gtk-ok" 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"/>

From 721a2d927fa0b2032644d1bfb23c51f3c0b68e56 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 15 Jun 2012 18:03:48 +0530
Subject: [PATCH 11/18] [IMP] import_google: remove cancel button from wizard.

bzr revid: tpa@tinyerp.com-20120615123348-0dy0c8hv1x6khxsl
---
 .../wizard/google_import_message_view.xml     |  3 ---
 .../wizard/import_google_data_view.xml        | 24 +++++++------------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/addons/import_google/wizard/google_import_message_view.xml b/addons/import_google/wizard/google_import_message_view.xml
index 215de9ba59c..250239ea10c 100644
--- a/addons/import_google/wizard/google_import_message_view.xml
+++ b/addons/import_google/wizard/google_import_message_view.xml
@@ -8,9 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Google Data" version="7.0">
-                    <header>
-                        <button  icon="gtk-ok" special="cancel" string="_Ok"/>
-                    </header>
                     <group>
                         <field name='name'/>
                     </group>
diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml
index 7df067a643b..35ccedb0931 100644
--- a/addons/import_google/wizard/import_google_data_view.xml
+++ b/addons/import_google/wizard/import_google_data_view.xml
@@ -6,7 +6,10 @@
             <field name="model">synchronize.google.import</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Import contacts from a google account">
+                <form string="Import contacts from a google account" version="7.0">
+                    <header>
+                        <button name="import_google" string="_Import Contacts" type="object" icon="terp-personal+" class="oe_form_button_active_flow"/>
+                    </header>
                     <group colspan="4" col="4" width="430">
                        <field name="group_name" colspan="4"/>
                        <separator string="Import Options" colspan="4"/>
@@ -18,13 +21,6 @@
                             <field name="supplier"  colspan="4"/>
                        </group>
                     </group>
-                    <separator string="" colspan="4"/>
-                    <group colspan="4" col="4">
-                        <group colspan="2" col="2">
-                            <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
-                            <button name="import_google" string="_Import Contacts" type="object" icon="terp-personal+"/>
-                        </group>
-                    </group>
                 </form>
             </field>
         </record>
@@ -36,17 +32,13 @@
             <field name="model">synchronize.google.import</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Import Google Calendar Events">
+                <form string="Import Google Calendar Events" version="7.0">
+                    <header>
+                        <button name="import_google" string="_Import Events" type="object" icon="terp-calendar" class="oe_form_button_active_flow"/>
+                    </header>
                     <group colspan="4" col="4" width="320">
                        <field name="calendar_name" />
                     </group>
-                    <separator string="" colspan="4"/>
-                    <group colspan="4" col="4">
-                        <group colspan="2" col="2">
-                            <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
-                            <button name="import_google" string="_Import Events" type="object" icon="terp-calendar"/>
-                        </group>
-                    </group>
                 </form>
             </field>
         </record>

From caf3fe43448d6c773a68c0f89f5cc3c426a035f6 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 15 Jun 2012 18:07:27 +0530
Subject: [PATCH 12/18] [IMP] import_sugercrm: remove cancel button from
 wizard.

bzr revid: tpa@tinyerp.com-20120615123727-0rct9w99cywwxwdo
---
 addons/import_sugarcrm/import_sugarcrm_view.xml  | 16 +++++-----------
 .../wizard/import_message_view.xml               | 10 ++++------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml
index b960d66f1b1..7365b19cd5f 100644
--- a/addons/import_sugarcrm/import_sugarcrm_view.xml
+++ b/addons/import_sugarcrm/import_sugarcrm_view.xml
@@ -8,7 +8,11 @@
       <field name="model">import.sugarcrm</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="Import Data From SugarCRM">
+        <form string="Import Data From SugarCRM" version="7.0">
+          <header>
+	          <button name="import_from_scheduler_all" string="_Schedule Recurrent Imports" type="object" icon="gtk-execute" class="oe_form_button_active_flow"/>
+	          <button name="import_all" string="_Import" type="object" icon="terp-camera_test" class="oe_form_button_active_flow"/>
+          </header>
           <group col="8" >
             <group colspan="2" col="2" width="200">
               <label colspan="2"  string="Import your data from SugarCRM :"/>
@@ -70,16 +74,6 @@
                 <separator string="Multi Instance Management" colspan="4"/>
                 <field name="instance_name" colspan="4"/>
               </group>
-
-              <separator string="" colspan="4" />
-              <group colspan="4" col="6">
-                <label string="" colspan="2"/>
-                <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
-                <button name="import_from_scheduler_all" string="_Schedule Recurrent Imports"
-                        type="object" icon="gtk-execute" />
-                <button name="import_all" string="_Import"
-                        type="object" icon="terp-camera_test"/>
-              </group>
             </group>
           </group>
         </form>
diff --git a/addons/import_sugarcrm/wizard/import_message_view.xml b/addons/import_sugarcrm/wizard/import_message_view.xml
index 581d862e408..6f1f3fad3c1 100644
--- a/addons/import_sugarcrm/wizard/import_message_view.xml
+++ b/addons/import_sugarcrm/wizard/import_message_view.xml
@@ -8,13 +8,11 @@
             <field name="model">import.message</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Import Message">
-                   <label colspan="4" nolabel="1" string="Data are importing, the process is running in the background, an email will be sent to the given email address if it was defined."/> 
-                   <separator string="" colspan="4" />
-                   <button  icon="gtk-ok" special="cancel" string="_Ok"/>
+                <form string="Import Message" version="7.0">
+                   <label colspan="4" nolabel="1" string="Data are importing, the process is running in the background, an email will be sent to the given email address if it was defined."/>
                 </form>
             </field>
         </record>
-        
+
     </data>
-</openerp>        
\ No newline at end of file
+</openerp>
\ No newline at end of file

From 54c9c5207763a84f6a41099dfceb310e88263e5b Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 15 Jun 2012 18:09:07 +0530
Subject: [PATCH 13/18] [IMP] knowledge: remove cancel button from wizard.

bzr revid: tpa@tinyerp.com-20120615123907-o7zji17qxj78fjax
---
 addons/knowledge/res_config_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index 2e5e6785438..31f2417df72 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Knowledge" 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 layout="auto">
                         <separator string="Wiki" colspan="4"/>

From f13e03d069a9fbe00b18603b816ce328c1510d7d Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 15 Jun 2012 18:15:39 +0530
Subject: [PATCH 14/18] [IMP] l10n_be: remove cancel button from wizard.

bzr revid: tpa@tinyerp.com-20120615124539-55r02ml2yycgxcro
---
 .../l10n_be_account_vat_declaration_view.xml  |  6 +-----
 .../wizard/l10n_be_partner_vat_listing.xml    | 20 ++++++++-----------
 .../l10n_be/wizard/l10n_be_vat_intra_view.xml |  8 ++------
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
index 9b3a48725b9..5322aa9eb7b 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Periodical VAT Declaration" version="7.0">
                     <header>
-                        <button icon="gtk-execute"  name="create_xml" string="Create XML" type="object" default_focus="1" />
-                        <button special="cancel" string="Close" icon="gtk-cancel"/>
+                        <button icon="gtk-execute"  name="create_xml" string="Create XML" type="object" default_focus="1" class="oe_form_button_active_flow"/>
                     </header>
                     <group>
                         <group string="Declare Periodical VAT">
@@ -35,9 +34,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Save xml" version="7.0">
-                    <header>
-                        <button special="cancel" string="Ok" icon="gtk-ok"/>
-                    </header>
                     <label string="Save the File with '.xml' extension."/>
                     <field name="name"/>
                     <field name="file_save" readonly="True" filename="name"/>
diff --git a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
index ad7ca50cdac..99b1badd1ac 100644
--- a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
+++ b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
@@ -6,17 +6,15 @@
       <field name="model">partner.vat</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="Partner VAT Listing">
+        <form string="Partner VAT Listing" version="7.0">
+          <header>
+            <button name="get_partner" string="View Customers" type="object" icon="terp-partner" class="oe_form_button_active_flow"/>
+          </header>
           <label string="This wizard will create an XML file for VAT details and total invoiced amounts per partner." colspan="4"/>
           <newline/>
           <field name="year"/>
           <newline/>
           <field name="limit_amount"/>
-          <separator colspan="4"/>
-          <group colspan="4">
-            <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-            <button colspan="1" name="get_partner" string="View Customers" type="object" icon="terp-partner"/>
-          </group>
         </form>
       </field>
     </record>
@@ -64,16 +62,14 @@
       <field name="type">form</field>
       <field name="priority" eval="1"/>
       <field name="arch" type="xml">
-        <form string="XML File has been Created.">
+        <form string="XML File has been Created." version="7.0">
+            <header>
+                <button name="print_vatlist" string="Print" type="object"  icon="gtk-print" class="oe_form_button_active_flow"/>
+            </header>
             <separator string="XML File has been Created." colspan="4"/>
             <label string="Save the File with '.xml' extension." colspan="4" nolabel="1"/>
             <field name="name"/><newline/>
             <field name="file_save"/>
-            <separator colspan="4"/>
-          <group colspan="4">
-            <button colspan="2" special="cancel" string="Close" icon="gtk-cancel"/>
-            <button colspan="2" name="print_vatlist" string="Print" type="object"  icon="gtk-print"/>
-          </group>
         </form>
       </field>
     </record>
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
index c851fa0e559..33e2590eac7 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
@@ -9,9 +9,8 @@
             <field name="arch" type="xml">
                 <form string="Partner VAT intra" version="7.0">
                     <header>
-                        <button name="create_xml" string="Create _XML" type="object" icon="gtk-execute"/>
-                        <button name="preview" string="_Preview" type="object" icon="gtk-print"/>
-                        <button special="cancel" string="_Close" icon="gtk-cancel"/>
+                        <button name="create_xml" string="Create _XML" type="object" icon="gtk-execute" class="oe_form_button_active_flow"/>
+                        <button name="preview" string="_Preview" type="object" icon="gtk-print"  class="oe_form_button_active_flow"/>
                     </header>
                     <separator string="Intracom VAT Declaration"/>
                     <notebook colspan="4">
@@ -40,9 +39,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Save XML" version="7.0">
-                    <header>
-                        <button special="cancel" string="Close" icon="gtk-cancel" colspan="4"/>
-                    </header>
                     <separator string="Note: "/>
                     <label string="Save the File with '.xml' extension."/>
                     <field name="name"/>

From 35e7e588780d7e4836377606aff5112696c8bb93 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 15 Jun 2012 18:17:25 +0530
Subject: [PATCH 15/18] [IMP] l10n_ch: remove cancel button from wizard.

bzr revid: tpa@tinyerp.com-20120615124725-wyy08nn6bf3aslnp
---
 addons/l10n_ch/wizard/bvr_import_view.xml | 3 +--
 addons/l10n_ch/wizard/create_dta_view.xml | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/l10n_ch/wizard/bvr_import_view.xml b/addons/l10n_ch/wizard/bvr_import_view.xml
index 6625aaef9cd..9dff2ca79db 100644
--- a/addons/l10n_ch/wizard/bvr_import_view.xml
+++ b/addons/l10n_ch/wizard/bvr_import_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="BVR Import" version="7.0">
                     <header>
-                        <button name="import_bvr" string="Import" type="object" icon="gtk-ok" colspan="2"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"  colspan="2"/>
+                        <button name="import_bvr" string="Import" type="object" icon="gtk-ok" colspan="2" class="oe_form_button_active_flow"/>
                     </header>
                     <group>
                         <field name="file"/>
diff --git a/addons/l10n_ch/wizard/create_dta_view.xml b/addons/l10n_ch/wizard/create_dta_view.xml
index 005b491cc8f..dd1f816f947 100644
--- a/addons/l10n_ch/wizard/create_dta_view.xml
+++ b/addons/l10n_ch/wizard/create_dta_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="DTA file creation - Results" version="7.0">
                     <header>
-                        <button name="create_dta" string="Create DTA" type="object" icon="gtk-execute" colspan="2"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"  colspan="2"/>
+                        <button name="create_dta" string="Create DTA" type="object" icon="gtk-execute" colspan="2" class="oe_form_button_active_flow"/>
                     </header>
                     <group>
                         <field name="dta_file"/>

From 94ea048bdc92c63e900ed1e90a1f91f8fe5fef4b Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 15 Jun 2012 18:18:30 +0530
Subject: [PATCH 16/18] [IMP] l10n_fr: remove cancel button from wizard.

bzr revid: tpa@tinyerp.com-20120615124830-0je973ggok65k8dm
---
 addons/l10n_fr/wizard/fr_report_bilan_view.xml             | 3 +--
 addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/l10n_fr/wizard/fr_report_bilan_view.xml b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
index 1f059c69049..493f51b700f 100644
--- a/addons/l10n_fr/wizard/fr_report_bilan_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Bilan Report" version="7.0">
                    <header>
-                        <button name="print_bilan_report" string="Print" type="object" icon="gtk-ok"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="print_bilan_report" string="Print" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
                    </header>
                    <field name="fiscalyear_id"/>
                  </form>
diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
index 58ad0d8333e..84610b5df42 100644
--- a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string='Compte de resultat' version="7.0">
                     <header>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                        <button name="print_cdr_report" string="Print" type="object" icon="gtk-ok"/>
+                        <button name="print_cdr_report" string="Print" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
                     </header>
                     <field name="fiscalyear_id"/>
                  </form>

From 5f86d6a0aa2d03179c622a1fa06f30a7cd63b993 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 15 Jun 2012 18:19:05 +0530
Subject: [PATCH 17/18] [IMP] l10n_lu: remove cancel button from wizard.

bzr revid: tpa@tinyerp.com-20120615124905-ue7iu6i6a7p1hm21
---
 addons/l10n_lu/wizard/print_vat_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/l10n_lu/wizard/print_vat_view.xml b/addons/l10n_lu/wizard/print_vat_view.xml
index 47e9a4ca3f7..33526abf6bc 100644
--- a/addons/l10n_lu/wizard/print_vat_view.xml
+++ b/addons/l10n_lu/wizard/print_vat_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Print Tax Statements" version="7.0">
                    <header>
-                        <button name="print_vat_declaration_report" string="Print Tax Statements" type="object" icon="gtk-ok"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="print_vat_declaration_report" string="Print Tax Statements" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
                    </header>
                    <group col="4">
                        <field name="tax_code_id" widget="selection"/>

From c61b4e3c0b1e3e83132702ad8faf6317e7beb6f7 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 18 Jun 2012 12:30:33 +0530
Subject: [PATCH 18/18] [IMP] remove cancel button from wizard and improved
 view.

bzr revid: tpa@tinyerp.com-20120618070033-yth8u6ivgbuo67z2
---
 addons/account/wizard/account_move_journal.py             | 8 +++-----
 .../wizard/confirm_statement_line_wizard.xml              | 3 +--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index 8c7a62a2281..3ecd73c1180 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -103,13 +103,11 @@ class account_move_journal(osv.osv_memory):
                 period_string = _("Period: %s") % tools.ustr(period)
     
             separator_string = _("Open Journal Items !")
-            cancel_string = _("Cancel")
             open_string = _("Open")
             view = """<?xml version="1.0" encoding="utf-8"?>
-            <form string="Standard entries">
+            <form string="Standard entries" version="7.0">
                 <header>
-                    <button icon="terp-gtk-go-back-rtl" string="%s" name="action_open_window" default_focus="1" type="object"/>
-                    <button icon="gtk-cancel" special="cancel" string="%s"/>
+                    <button icon="terp-gtk-go-back-rtl" string="%s" name="action_open_window" default_focus="1" type="object" class="oe_form_button_active_flow"/>
                 </header>
                 <group string="%s" colspan="4">
                     <field name="target_move" />
@@ -119,7 +117,7 @@ class account_move_journal(osv.osv_memory):
                     <newline/>
                     <label width="300" string="%s"/>
                 </group>
-            </form>""" % (open_string, cancel_string, separator_string, journal_string, period_string)
+            </form>""" % (open_string, separator_string, journal_string, period_string)
     
             view = etree.fromstring(view.encode('utf8'))
             xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context)
diff --git a/addons/account_bank_statement_extensions/wizard/confirm_statement_line_wizard.xml b/addons/account_bank_statement_extensions/wizard/confirm_statement_line_wizard.xml
index 0171c265395..3f3e96f1c34 100644
--- a/addons/account_bank_statement_extensions/wizard/confirm_statement_line_wizard.xml
+++ b/addons/account_bank_statement_extensions/wizard/confirm_statement_line_wizard.xml
@@ -11,8 +11,7 @@
       <field name="arch" type="xml">
         <form string="Confirm selected statement lines" version="7.0">
             <header>
-                <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                <button icon="gtk-execute" string="Confirm Lines" name="confirm_lines" type="object"/>
+                <button icon="gtk-execute" string="Confirm Lines" name="confirm_lines" type="object" class="oe_form_button_active_flow"/>
             </header>
             <label string="Are you sure you want to confirm the selected Bank Statement lines ?"/>
             <label string="Confirmed lines cannot be changed anymore."/>