[MERGE] lp:~openerp-commiter/openobject-addons/trunk-wiz-remove-btn-project-aja

bzr revid: jam@tinyerp.com-20120619072526-s8va6idl0onrf7ll

9 files changed, 8 insertions, 19 deletions

diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml
index 5b966c6ca2c..2a7cb5f3224 100644
--- a/addons/product/wizard/product_price_view.xml
+++ b/addons/product/wizard/product_price_view.xml
@@ -11,8 +11,7 @@
               <field name="arch" type="xml">
                 <form string="Price List" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Close"/>
-                        <button name="print_report" string="Print"  type="object"  icon="gtk-print"/>
+                        <button name="print_report" string="Print"  type="object"  icon="gtk-print" class="oe_form_button_active_flow"/>
                     </header>
                     <group string="Calculate Product Price per Unit Based on Pricelist Version.">
                         <field name="price_list" widget="selection"/>
diff --git a/addons/product_margin/wizard/product_margin_view.xml b/addons/product_margin/wizard/product_margin_view.xml
index 69ff481ce95..ea99cc13b49 100644
--- a/addons/product_margin/wizard/product_margin_view.xml
+++ b/addons/product_margin/wizard/product_margin_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Properties categories" version="7.0">
                     <header>
-                        <button name="action_open_window" string="Open Margins" type="object" icon="gtk-execute"/>
-                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                        <button name="action_open_window" string="Open Margins" type="object" icon="gtk-execute" class="oe_form_button_active_flow"/>
                     </header>
                     <group col="4" string="General Information">
                         <field name="from_date" />
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 9d1e19a7c81..ea032228b3d 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Project" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_form_button_active_flow"/>
                     </header>
                     <sheet>
                         <group col="4">
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index 9ed920eb534..79b13c9e258 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Project Task Delegate" version="7.0">
                     <header>
-                        <button icon="gtk-ok" name="delegate" string="_Delegate" type="object"/>
-                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                        <button icon="gtk-ok" name="delegate" string="_Delegate" type="object" class="oe_form_button_active_flow"/>
                     </header>
                     <group>
                         <group>
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
index 4a452bca3ab..80e2847b508 100644
--- a/addons/project/wizard/project_task_reevaluate_view.xml
+++ b/addons/project/wizard/project_task_reevaluate_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Reevaluate Task" version="7.0">
                     <header>
-                        <button icon="gtk-apply" name="compute_hours" string="_Evaluate" type="object" default_focus="1"/>
-                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                        <button icon="gtk-apply" name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_form_button_active_flow"/>
                     </header>
                     <separator string="Reevaluation Task"/>
                     <group>
diff --git a/addons/project_gtd/wizard/project_gtd_empty_view.xml b/addons/project_gtd/wizard/project_gtd_empty_view.xml
index 9beb118cdcc..e166d997226 100644
--- a/addons/project_gtd/wizard/project_gtd_empty_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_empty_view.xml
@@ -8,9 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Empty Timebox" version="7.0">
-                    <header>
-                        <button icon="gtk-ok" special="cancel" string="_Ok" colspan="1"/><label colspan="1"/>
-                    </header>
                     <label string="Timebox Empty Process Completed Successfully." />
                 </form>
             </field>
diff --git a/addons/project_gtd/wizard/project_gtd_fill_view.xml b/addons/project_gtd/wizard/project_gtd_fill_view.xml
index 6a38ccdb6a6..7fc3282064a 100644
--- a/addons/project_gtd/wizard/project_gtd_fill_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_fill_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Plannify Timebox" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
-                        <button name="process" icon="gtk-ok" string="Add to Timebox" type="object" />
+                        <button name="process" icon="gtk-ok" string="Add to Timebox" type="object" class="oe_form_button_active_flow"/>
                     </header>
                       <group col="4">
                           <field name="timebox_id" widget="selection"/>
diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index bf2c51e41e6..7aae5f8567e 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                   <form string="Schedule Phases" version="7.0">
                       <header>
-                          <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object"/>
-                          <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                          <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object" class="oe_form_button_active_flow"/>
                       </header>
                       <group string="Schedule Phases">
                           <field name="target_project"/>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index ac30a3aa6d9..5b5de0ed072 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                  <form string="Schedule Tasks" version="7.0">
                      <header>
-                         <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/>
-                         <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                         <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object" class="oe_form_button_active_flow"/>
                      </header>
                      <group>
                          <field name="project_id"/>