[USA] add cancel button

bzr revid: rma@tinyerp.com-20120627141917-bs9bg2j3dasy9n1y

diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml
index 6b69f91..ef2bd95 100644 (file)
--- a/addons/import_google/wizard/import_google_data_view.xml
+++ b/addons/import_google/wizard/import_google_data_view.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
                 <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_highlight_on_dirty"  />
+                        <button name="import_google" string="_Import Contacts" type="object" class="oe_highlight_on_dirty"  />
+                        or 
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group colspan="4" col="4" width="430">
                        <field name="group_name" colspan="4"/>
@@ -34,7 +36,9 @@
             <field name="arch" type="xml">
                 <form string="Import Google Calendar Events" version="7.0">
                     <header>
-                        <button name="import_google" string="_Import Events" type="object" icon="terp-calendar" class="oe_highlight_on_dirty"  />
+                        <button name="import_google" string="_Import Events" type="object" class="oe_highlight_on_dirty"  />
+                        or 
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group colspan="4" col="4" width="320">
                        <field name="calendar_name" />

diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml
index c6e7ce1..c6239e7 100644 (file)
--- a/addons/import_sugarcrm/import_sugarcrm_view.xml
+++ b/addons/import_sugarcrm/import_sugarcrm_view.xml
@@ -10,8 +10,11 @@
       <field name="arch" type="xml">
         <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_highlight_on_dirty"  />
-                 <button name="import_all" string="_Import" type="object" icon="terp-camera_test" class="oe_highlight_on_dirty"  />
+                 <button name="import_from_scheduler_all" string="_Schedule Recurrent Imports" type="object" class="oe_highlight_on_dirty"  />
+                 or
+                 <button name="import_all" string="_Import" type="object" class="oe_highlight_on_dirty"  />
+                 or
+                 <button string="Cancel" class="oe_link" special="cancel" />
           </header>
           <group col="8" >
             <group colspan="2" col="2" width="200">

diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index 80d13e6..a478d04 100644 (file)
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -9,7 +9,9 @@
                 <form string="Configure Knowledge" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" type="object" name="cancel"/>
+                        or 
+                        <button string="Cancel" type="object" name="cancel" class="oe_link"/>
+
                     </header>
                     <sheet>
                         <group>

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 1cfb711..1235306 100644 (file)
--- 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,7 +9,9 @@
             <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" class="oe_highlight_on_dirty"  />
+                        <button name="create_xml" string="Create XML" type="object" default_focus="1" class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <group string="Declare Periodical VAT">

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 bb8ca72..f60c47d 100644 (file)
--- a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
+++ b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
@@ -8,7 +8,9 @@
       <field name="arch" type="xml">
         <form string="Partner VAT Listing" version="7.0">
           <header>
-            <button name="get_partner" string="View Customers" type="object" icon="terp-partner" class="oe_highlight_on_dirty"  />
+            <button name="get_partner" string="View Customers" type="object"  class="oe_highlight_on_dirty"  />
+            or 
+            <button string="Cancel" class="oe_link" special="cancel" />
           </header>
           <group>
             <label string="This wizard will create an XML file for VAT details and total invoiced amounts per partner." colspan="4"/>
@@ -66,7 +68,9 @@
       <field name="arch" type="xml">
         <form string="XML File has been Created." version="7.0">
             <header>
-                <button name="print_vatlist" string="Print" type="object"  icon="gtk-print" class="oe_highlight_on_dirty"  />
+                <button name="print_vatlist" string="Print" type="object" class="oe_highlight_on_dirty"  />
+                or 
+                <button string="Cancel" class="oe_link" special="cancel" />
             </header>
             <separator string="XML File has been Created." colspan="4"/>
             <label string="Save the File with '.xml' extension." colspan="4" nolabel="1"/>

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 d0c694b..e416b28 100644 (file)
--- a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
@@ -9,8 +9,11 @@
             <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" class="oe_highlight_on_dirty"  />
-                        <button name="preview" string="_Preview" type="object" icon="gtk-print"  class="oe_highlight_on_dirty"  />
+                        <button name="create_xml" string="Create _XML" type="object" class="oe_highlight_on_dirty"  />
+                        or
+                        <button name="preview" string="_Preview" type="object" class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <separator string="Intracom VAT Declaration"/>

diff --git a/addons/l10n_ch/wizard/bvr_import_view.xml b/addons/l10n_ch/wizard/bvr_import_view.xml
index 37858e7..66b45f4 100644 (file)
--- a/addons/l10n_ch/wizard/bvr_import_view.xml
+++ b/addons/l10n_ch/wizard/bvr_import_view.xml
@@ -9,7 +9,9 @@
             <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" class="oe_highlight_on_dirty"  />
+                        <button name="import_bvr" string="Import" type="object" colspan="2" class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </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 1f8237d..d5ee2a9 100644 (file)
--- a/addons/l10n_ch/wizard/create_dta_view.xml
+++ b/addons/l10n_ch/wizard/create_dta_view.xml
@@ -9,7 +9,9 @@
             <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" class="oe_highlight_on_dirty"  />
+                        <button name="create_dta" string="Create DTA" type="object" colspan="2" class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <field name="dta_file"/>

diff --git a/addons/l10n_fr/wizard/fr_report_bilan_view.xml b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
index acff098..f816f92 100644 (file)
--- a/addons/l10n_fr/wizard/fr_report_bilan_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
@@ -9,7 +9,9 @@
             <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" class="oe_highlight_on_dirty"  />
+                        <button name="print_bilan_report" string="Print" type="object" class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                    </header>
                    <group>
                         <field name="fiscalyear_id"/>

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 c23376d..fe0418c 100644 (file)
--- a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string='Compte de resultat' version="7.0">
                     <header>
-                        <button name="print_cdr_report" string="Print" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                        <button name="print_cdr_report" string="Print" type="object" class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <field name="fiscalyear_id"/>

diff --git a/addons/l10n_lu/wizard/print_vat_view.xml b/addons/l10n_lu/wizard/print_vat_view.xml
index 2d4c437..695394d 100644 (file)
--- a/addons/l10n_lu/wizard/print_vat_view.xml
+++ b/addons/l10n_lu/wizard/print_vat_view.xml
@@ -8,7 +8,9 @@
             <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" class="oe_highlight_on_dirty"  />
+                        <button name="print_vat_declaration_report" string="Print Tax Statements" type="object" class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                    </header>
                    <group col="4">
                        <field name="tax_code_id" widget="selection"/>

diff --git a/addons/lunch/wizard/lunch_cashbox_clean_view.xml b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
index 25db235..98dea7a 100644 (file)
--- a/addons/lunch/wizard/lunch_cashbox_clean_view.xml
+++ b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
@@ -11,7 +11,9 @@
             <field name="arch" type="xml">
                 <form string="Reset cashbox" version="7.0">
                     <header>
-                        <button  icon="gtk-ok" name="set_to_zero" string="Set to Zero" type="object" class="oe_highlight_on_dirty"  />
+                        <button name="set_to_zero" string="Set to Zero" type="object" class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <label string="Are you sure you want to reset this cashbox ?"/>

diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
index 8001c1b..ec8f04c 100644 (file)
--- a/addons/lunch/wizard/lunch_order_cancel_view.xml
+++ b/addons/lunch/wizard/lunch_order_cancel_view.xml
@@ -11,7 +11,9 @@
             <field name="arch" type="xml">
                 <form string="Cancel Order" version="7.0">
                     <header>
-                        <button  icon="gtk-ok" name="cancel" string="Yes" type="object" class="oe_highlight_on_dirty"  />
+                        <button  name="cancel" string="Yes" type="object" class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group col="4" >
                         <label string="Are you sure you want to cancel this order ?"/>

diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml
index 7a9610e..ae70a5d 100644 (file)
--- a/addons/lunch/wizard/lunch_order_confirm_view.xml
+++ b/addons/lunch/wizard/lunch_order_confirm_view.xml
@@ -11,7 +11,9 @@
             <field name="arch" type="xml">
                 <form string="Confirm" version="7.0">
                     <header>
-                        <button  icon="gtk-ok" name="confirm" string="Confirm Order" type="object" class="oe_highlight_on_dirty"  />
+                        <button name="confirm" string="Confirm Order" type="object" class="oe_highlight_on_dirty"  />
+                        or 
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group col="4">
                          <separator string="Orders Confirmation" colspan="4"/>

diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index bc7ddf2..19df1db 100644 (file)
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
                 <form string="Compose Email" version="7.0">
                     <header>
-                        <button icon="gtk-ok" name="send_mail" string="Send" type="object" class="oe_highlight_on_dirty"  />
+                        <button name="send_mail" string="Send" type="object" class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group col="6" colspan="4">
                         <field name="model" invisible="1"/>

diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml
index 83053af..92e653f 100644 (file)
--- a/addons/marketing/res_config_view.xml
+++ b/addons/marketing/res_config_view.xml
@@ -9,7 +9,9 @@
                 <form string="Configure Marketing" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" type="object" name="cancel"/>
+                        or
+                        <button string="Cancel" type="object" name="cancel" class="oe_link"/>
+
                     </header>
                     <group string="Campaigns">
                         <field name="module_marketing_campaign"/>

diff --git a/addons/membership/wizard/membership_invoice_view.xml b/addons/membership/wizard/membership_invoice_view.xml
index 43ce600..b64a8d0 100644 (file)
--- a/addons/membership/wizard/membership_invoice_view.xml
+++ b/addons/membership/wizard/membership_invoice_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Membership Invoice" version="7.0">
                     <header>
-                        <button  icon="gtk-apply" string="Join" name="membership_invoice" type="object" class="oe_highlight_on_dirty"  />
+                        <button string="Join" name="membership_invoice" type="object" class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <field name="product_id" domain="[('membership','=',True)]" widget="selection" on_change="onchange_product(product_id)"/>

diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index da12434..d5b7147 100644 (file)
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -9,7 +9,8 @@
                 <form string="Configure Manufacturing" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" type="object" name="cancel"/>
+                        or
+                        <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <sheet>
                         <group string="Manufacturing Order">

diff --git a/addons/mrp/wizard/change_production_qty_view.xml b/addons/mrp/wizard/change_production_qty_view.xml
index 1b99ea5..4bc5233 100644 (file)
--- a/addons/mrp/wizard/change_production_qty_view.xml
+++ b/addons/mrp/wizard/change_production_qty_view.xml
@@ -12,7 +12,9 @@
                 <form string="Change Product Qty" version="7.0">
                     <header>
                         <button name="change_prod_qty" string="Approve"
-                            colspan="1" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                            colspan="1" type="object" class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />    
                     </header>
                     <group>
                         <separator string="Change Quantity" colspan="4"/>

diff --git a/addons/mrp/wizard/mrp_price_view.xml b/addons/mrp/wizard/mrp_price_view.xml
index aa6f9b7..be74357 100644 (file)
--- a/addons/mrp/wizard/mrp_price_view.xml
+++ b/addons/mrp/wizard/mrp_price_view.xml
@@ -12,7 +12,9 @@
                 <form string="Product Cost Structure" version="7.0">
                     <header>
                             <button name="print_report" string="Print"
-                            colspan="1" type="object" icon="gtk-print" class="oe_highlight_on_dirty"   />
+                            colspan="1" type="object" class="oe_highlight_on_dirty"   />
+                            or
+                            <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <separator colspan="4" string="Print Cost Structure of Product." />

diff --git a/addons/mrp/wizard/mrp_product_produce_view.xml b/addons/mrp/wizard/mrp_product_produce_view.xml
index a8c9c29..b1fa6be 100644 (file)
--- a/addons/mrp/wizard/mrp_product_produce_view.xml
+++ b/addons/mrp/wizard/mrp_product_produce_view.xml
@@ -13,7 +13,9 @@
                 <form string="Produce" version="7.0">
                     <header>
                         <button name="do_produce" string="Confirm"
-                            colspan="1" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                            colspan="1" type="object" class="oe_highlight_on_dirty"  />
+                            or
+                            <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <separator string="Produce" colspan="4"/>

diff --git a/addons/mrp/wizard/mrp_workcenter_load_view.xml b/addons/mrp/wizard/mrp_workcenter_load_view.xml
index 6faa9e0..0fbc080 100644 (file)
--- a/addons/mrp/wizard/mrp_workcenter_load_view.xml
+++ b/addons/mrp/wizard/mrp_workcenter_load_view.xml
@@ -12,7 +12,9 @@
                 <form string="Select time unit" version="7.0">
                     <header>
                         <button name="print_report" string="Print"
-                            colspan="1" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
+                            colspan="1" type="object" class="oe_highlight_on_dirty"  />
+                            or 
+                            <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <sheet layout="auto">

diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/cancel_repair.py
index 40388d8..33a0c1a 100644 (file)
--- a/addons/mrp_repair/wizard/cancel_repair.py
+++ b/addons/mrp_repair/wizard/cancel_repair.py
@@ -71,7 +71,9 @@ class repair_cancel(osv.osv_memory):
         if not repair_order.invoiced:
             res['arch'] = """ <form string="Cancel Repair" colspan="4">
                               <header>
-                                <button name="cancel_repair" string="_Yes" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"/>
+                                <button name="cancel_repair" string="_Yes" type="object"  class="oe_highlight_on_dirty"/>
+                                or
+                                <button string="Cancel" class="oe_link" special="cancel" />
                               </header>
                             <group col="2" colspan="2">
                                 <label string="Do you want to continue?" colspan="4"/>

diff --git a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
index eb05fa3..592b9f8 100644 (file)
--- a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
@@ -11,7 +11,9 @@
             <field name="arch" type="xml">
                 <form string="Cancel Repair Order" version="7.0">
                     <header>
-                        <button name="cancel_repair" string="Yes" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"   />
+                        <button name="cancel_repair" string="Yes" type="object" class="oe_highlight_on_dirty"   />
+                        or 
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <newline/>
                     <group>

diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
index f18002f..b7e0feb 100644 (file)
--- a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
@@ -11,7 +11,9 @@
             <field name="arch" type="xml">
             <form string="Create invoices" version="7.0">
                 <header>
-                    <button name="make_invoices" string="Create Invoice" type="object" icon="terp-gtk-go-back-rtl" class="oe_highlight_on_dirty"  />
+                    <button name="make_invoices" string="Create Invoice" type="object"  class="oe_highlight_on_dirty"  />
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
                 </header>
                 <group string="Do you really want to create the invoice(s)?">
                     <field name="group"/>

diff --git a/addons/point_of_sale/wizard/pos_box_entries.xml b/addons/point_of_sale/wizard/pos_box_entries.xml
index 9402d50..15d04c8 100644 (file)
--- a/addons/point_of_sale/wizard/pos_box_entries.xml
+++ b/addons/point_of_sale/wizard/pos_box_entries.xml
@@ -10,7 +10,9 @@
             <field name="arch" type="xml">
                 <form string="Put Money" version="7.0">
                     <header>
-                        <button name="get_in" string="Put Money" type="object" icon="gtk-apply" class="oe_highlight_on_dirty"   />
+                        <button name="get_in" string="Put Money" type="object" class="oe_highlight_on_dirty"   />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <separator string="Fill in this form if you put money in the cash register:"/>

diff --git a/addons/point_of_sale/wizard/pos_box_out.xml b/addons/point_of_sale/wizard/pos_box_out.xml
index 91a55a1..c23be79 100644 (file)
--- a/addons/point_of_sale/wizard/pos_box_out.xml
+++ b/addons/point_of_sale/wizard/pos_box_out.xml
@@ -10,7 +10,9 @@
             <field name="arch" type="xml">
                 <form string="Output Operation" version="7.0">
                     <header>
-                        <button name="get_out" string="Take Money" type="object" icon="gtk-apply" class="oe_highlight_on_dirty"   />
+                        <button name="get_out" string="Take Money" type="object" class="oe_highlight_on_dirty"   />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group col="4" string="Describe why you take money from the cash register:">
                         <field name="name"/>

diff --git a/addons/point_of_sale/wizard/pos_close_statement.xml b/addons/point_of_sale/wizard/pos_close_statement.xml
index b7c6d10..2bdb633 100644 (file)
--- a/addons/point_of_sale/wizard/pos_close_statement.xml
+++ b/addons/point_of_sale/wizard/pos_close_statement.xml
@@ -11,9 +11,12 @@
                 <form string="Close Cash Registers" version="7.0">
                     <header>
                         <button name="close_statement" string="Yes"
-                             type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
-                        <button icon='gtk-stop' type="object" name="cancel_wizard"
+                             type="object" class="oe_highlight_on_dirty"  />
+                        or
+                        <button type="object" name="cancel_wizard"
                             string="No" invisible="not context.get('cancel_action')" class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />    
                     </header>
                     <separator string="Do you want to close your cash registers?"/>
                     <label string="OpenERP will close all cash registers he can close automatically without validation. He will also open all cash registers for which you have to control the ending balance before closing manually."/>

diff --git a/addons/point_of_sale/wizard/pos_confirm.xml b/addons/point_of_sale/wizard/pos_confirm.xml
index 85b27f7..acc9d9e 100644 (file)
--- a/addons/point_of_sale/wizard/pos_confirm.xml
+++ b/addons/point_of_sale/wizard/pos_confirm.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Post All Orders" version="7.0">
                     <header>
-                        <button name="action_confirm" string="Generate Entries" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                        <button name="action_confirm" string="Generate Entries" type="object"  class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <separator string="Generate Journal Entries"/>
                     <label string="Generate all sale journal entries for non invoiced orders linked to a closed cash register or statement."/>

diff --git a/addons/point_of_sale/wizard/pos_details.xml b/addons/point_of_sale/wizard/pos_details.xml
index aeeaf27..f4371b7 100644 (file)
--- a/addons/point_of_sale/wizard/pos_details.xml
+++ b/addons/point_of_sale/wizard/pos_details.xml
@@ -11,7 +11,9 @@
                 <form string="POS Details" version="7.0">
                     <header>
                             <button name="print_report" string="Print Report"
-                                    colspan="1" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
+                                    colspan="1" type="object" class="oe_highlight_on_dirty"  />
+                                    or
+                                    <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group col="4" string="Dates">
                         <field name="date_start"/>

diff --git a/addons/point_of_sale/wizard/pos_discount.xml b/addons/point_of_sale/wizard/pos_discount.xml
index 4c4b4a3..126d7b8 100644 (file)
--- a/addons/point_of_sale/wizard/pos_discount.xml
+++ b/addons/point_of_sale/wizard/pos_discount.xml
@@ -10,7 +10,9 @@
             <field name="arch" type="xml">
                 <form string="Apply Discount" version="7.0">
                     <header>
-                        <button name="apply_discount" string="Apply Discount" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                        <button name="apply_discount" string="Apply Discount" type="object" class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <field name="discount"/>

diff --git a/addons/point_of_sale/wizard/pos_open_statement.xml b/addons/point_of_sale/wizard/pos_open_statement.xml
index 3ec352a..a79f013 100644 (file)
--- a/addons/point_of_sale/wizard/pos_open_statement.xml
+++ b/addons/point_of_sale/wizard/pos_open_statement.xml
@@ -11,7 +11,9 @@
                 <form string="Open Statements" version="7.0">
                     <header>
                          <button name="open_statement" string="Open Registers"
-                             type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                             type="object" class="oe_highlight_on_dirty"  />
+                             or
+                             <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <separator string="Do you want to open cash registers?"/>
                     <label string="The system will open all cash registers, so that you can start recording payments. We suggest you to control the opening balance of each register, using their CashBox tab."/>

diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml
index 67c4c7d..0513595 100644 (file)
--- a/addons/point_of_sale/wizard/pos_payment.xml
+++ b/addons/point_of_sale/wizard/pos_payment.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
             <form string="Add payment :" version="7.0">
                 <header>
-                    <button name="check" string="Make Payment" colspan="1" type="object" icon="gtk-apply" class="oe_highlight_on_dirty"  />
+                    <button name="check" string="Make Payment" colspan="1" type="object"  class="oe_highlight_on_dirty"  />
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
                 </header>
                 <group col="4">
                     <field name="journal"/>

diff --git a/addons/point_of_sale/wizard/pos_payment_report.xml b/addons/point_of_sale/wizard/pos_payment_report.xml
index d07500a..144fa05 100644 (file)
--- a/addons/point_of_sale/wizard/pos_payment_report.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report.xml
@@ -10,7 +10,9 @@
             <field name="arch" type="xml">
                 <form string="Payment Report" version="7.0">
                     <header>
-                        <button name="print_report" string="Print Report" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
+                        <button name="print_report" string="Print Report" type="object" class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                 </form>
             </field>

diff --git a/addons/point_of_sale/wizard/pos_payment_report_user.xml b/addons/point_of_sale/wizard/pos_payment_report_user.xml
index 03a7bdf..cda28d1 100644 (file)
--- a/addons/point_of_sale/wizard/pos_payment_report_user.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report_user.xml
@@ -10,7 +10,9 @@
             <field name="arch" type="xml">
                 <form string="Pyament Report " version="7.0">
                     <header>
-                        <button name="print_report" string="Print Report" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
+                        <button name="print_report" string="Print Report" type="object" class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                 </form>
             </field>

diff --git a/addons/point_of_sale/wizard/pos_receipt_view.xml b/addons/point_of_sale/wizard/pos_receipt_view.xml
index 171c41b..0400b13 100644 (file)
--- a/addons/point_of_sale/wizard/pos_receipt_view.xml
+++ b/addons/point_of_sale/wizard/pos_receipt_view.xml
@@ -11,7 +11,9 @@
               <field name="arch" type="xml">
                 <form string="Receipt :" version="7.0">
                     <header>
-                      <button name="print_report" string="Print Receipt" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
+                      <button name="print_report" string="Print Receipt" type="object" class="oe_highlight_on_dirty"  />
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel" />  
                     </header>
                     <group>
                         <label string="Print the Receipt of the Sale"/>

diff --git a/addons/point_of_sale/wizard/pos_return_view.xml b/addons/point_of_sale/wizard/pos_return_view.xml
index df56fb5..9531e58 100644 (file)
--- a/addons/point_of_sale/wizard/pos_return_view.xml
+++ b/addons/point_of_sale/wizard/pos_return_view.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
                 <form string="Return lines" version="7.0">
                     <header>
-                        <button icon='gtk-ok' name= "create_returns" string="Return Products" type="object" class="oe_highlight_on_dirty"  />
+                        <button name= "create_returns" string="Return Products" type="object" class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                  </form>
             </field>

diff --git a/addons/portal/wizard/portal_wizard_view.xml b/addons/portal/wizard/portal_wizard_view.xml
index 37e3598..7b954bf 100644 (file)
--- a/addons/portal/wizard/portal_wizard_view.xml
+++ b/addons/portal/wizard/portal_wizard_view.xml
@@ -19,7 +19,9 @@
                 <form string="Add Portal Access" version="7.0">
                     <header>
                         <button string="Send Invitations"
-                            name="action_create" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                            name="action_create" type="object" class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />    
                     </header>
                     <group col="4">
                         <field name="portal_id" widget="selection"/>

diff --git a/addons/procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml
index ea2f461..c114fd7 100644 (file)
--- a/addons/procurement/wizard/make_procurement_view.xml
+++ b/addons/procurement/wizard/make_procurement_view.xml
@@ -11,7 +11,9 @@
             <field name="arch" type="xml">
                 <form string="Procurement Request" version="7.0">
                     <header>
-                        <button name="make_procurement" string="Ask New Products" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                        <button name="make_procurement" string="Ask New Products" type="object"  class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group col="4" string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders."/>
                      <group>

diff --git a/addons/procurement/wizard/mrp_procurement_view.xml b/addons/procurement/wizard/mrp_procurement_view.xml
index cc23b6b..8c69dc2 100644 (file)
--- a/addons/procurement/wizard/mrp_procurement_view.xml
+++ b/addons/procurement/wizard/mrp_procurement_view.xml
@@ -12,7 +12,9 @@
                 <form string="Parameters" version="7.0">
                     <header>
                         <button name="procure_calculation" string="Compute Procurements"
-                            type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                            type="object" class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />    
                     </header>
                     <group>
                         <label string="This wizard will schedule procurements."/>

diff --git a/addons/procurement/wizard/orderpoint_procurement_view.xml b/addons/procurement/wizard/orderpoint_procurement_view.xml
index 5e179b0..7fd04f8 100644 (file)
--- a/addons/procurement/wizard/orderpoint_procurement_view.xml
+++ b/addons/procurement/wizard/orderpoint_procurement_view.xml
@@ -11,7 +11,9 @@
             <field name="arch" type="xml">
                 <form string="Parameters" version="7.0">
                     <header>
-                        <button name="procure_calculation" string="Compute Stock" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                        <button name="procure_calculation" string="Compute Stock" type="object"  class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <label string="Wizard checks all the stock minimum rules and generate procurement order."/>

diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index 1a20fe2..fc961fc 100644 (file)
--- a/addons/procurement/wizard/schedulers_all_view.xml
+++ b/addons/procurement/wizard/schedulers_all_view.xml
@@ -11,7 +11,9 @@
             <field name="arch" type="xml">
                 <form string="Scheduler Parameters" version="7.0">
                     <header>
-                        <button name="procure_calculation" string="Compute Schedulers" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                        <button name="procure_calculation" string="Compute Schedulers" type="object"  class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group string="This wizard allows you to run all procurement, production and/or purchase orders that should be processed based on their configuration. By default, the scheduler is launched automatically every night by OpenERP. You can use this menu to force it to be launched now. Note that it runs in the background, you may have to wait for a few minutes until it has finished computing.">
                         <field name="automatic"/>

diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml
index 612a5d8..dded6db 100644 (file)
--- a/addons/product/wizard/product_price_view.xml
+++ b/addons/product/wizard/product_price_view.xml
@@ -11,7 +11,9 @@
               <field name="arch" type="xml">
                 <form string="Price List" version="7.0">
                     <header>
-                        <button name="print_report" string="Print"  type="object"  icon="gtk-print" class="oe_highlight_on_dirty"  />
+                        <button name="print_report" string="Print"  type="object" class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </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 e64eee9..e47fb28 100644 (file)
--- a/addons/product_margin/wizard/product_margin_view.xml
+++ b/addons/product_margin/wizard/product_margin_view.xml
@@ -8,7 +8,9 @@
             <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" class="oe_highlight_on_dirty"  />
+                        <button name="action_open_window" string="Open Margins" type="object"  class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group col="4" string="General Information">
                         <field name="from_date" />