[FIX] stock*, button cancel

bzr revid: jam@tinyerp.com-20120627133635-t2a6kkg4fxxxvksv

diff --git a/addons/stock/wizard/stock_change_product_qty_view.xml b/addons/stock/wizard/stock_change_product_qty_view.xml
index 4e34d7c..a7f45ed 100644 (file)
--- a/addons/stock/wizard/stock_change_product_qty_view.xml
+++ b/addons/stock/wizard/stock_change_product_qty_view.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
                 <form string="Change Product Quantity" version="7.0">
                     <header>
-                        <button name="change_product_qty" string="_Apply" type="object" icon="gtk-apply" class="oe_highlight_on_dirty"  />
+                        <button name="change_product_qty" string="_Apply" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group string="Select Quantity">
                         <field name="new_quantity" />

diff --git a/addons/stock/wizard/stock_change_standard_price_view.xml b/addons/stock/wizard/stock_change_standard_price_view.xml
index f753e27..e1850a1 100644 (file)
--- a/addons/stock/wizard/stock_change_standard_price_view.xml
+++ b/addons/stock/wizard/stock_change_standard_price_view.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
               <form string="Change Standard Price" version="7.0">
                   <header>
-                      <button name="change_price" string="_Apply" type="object" icon="gtk-apply" class="oe_highlight_on_dirty"  />
+                      <button name="change_price" string="_Apply" type="object" class="oe_highlight_on_dirty"/>
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel" />
                   </header>
                   <separator string="Change Price"/>
                   <group>

diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
index 861d88e..5ec5a29 100644 (file)
--- a/addons/stock/wizard/stock_fill_inventory_view.xml
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
               <form string="Import Inventory" version="7.0">
                   <header>
-                      <button name="fill_inventory" string="Fill Inventory" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                      <button name="fill_inventory" string="Fill Inventory" type="object" class="oe_highlight_on_dirty"/>
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel" />
                   </header>
                   <separator string="Import current product inventory from the following location"/>
                   <group>

diff --git a/addons/stock/wizard/stock_inventory_line_split_view.xml b/addons/stock/wizard/stock_inventory_line_split_view.xml
index c353eba..cd4f425 100644 (file)
--- a/addons/stock/wizard/stock_inventory_line_split_view.xml
+++ b/addons/stock/wizard/stock_inventory_line_split_view.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
                 <form string="Split in Lots" version="7.0">
                     <header>
-                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                        <button name="split_lot" string="Ok" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <field name="product_id" colspan="4" readonly="1"/>

diff --git a/addons/stock/wizard/stock_inventory_merge_view.xml b/addons/stock/wizard/stock_inventory_merge_view.xml
index d2d5430..2ffd4a6 100644 (file)
--- a/addons/stock/wizard/stock_inventory_merge_view.xml
+++ b/addons/stock/wizard/stock_inventory_merge_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Merge Inventories" version="7.0">
                     <header>
-                        <button name="do_merge" string="Yes" type="object" icon="gtk-apply" class="oe_highlight_on_dirty"  />
+                        <button name="do_merge" string="Yes" type="object" icon="gtk-apply" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <separator string="Merge Inventories" />

diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index ce22070..3889ce1 100644 (file)
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
               <form string="Create invoice" version="7.0">
                   <header>
-                      <button name="open_invoice" string="Create" type="object" icon="terp-gtk-go-back-rtl" class="oe_highlight_on_dirty"  />
+                      <button name="open_invoice" string="Create" type="object" class="oe_highlight_on_dirty"/>
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel"/>
                   </header>
                   <group string="Create Invoice">
                       <field name="journal_id"/>

diff --git a/addons/stock/wizard/stock_location_product_view.xml b/addons/stock/wizard/stock_location_product_view.xml
index dd20db9..250ceac 100644 (file)
--- a/addons/stock/wizard/stock_location_product_view.xml
+++ b/addons/stock/wizard/stock_location_product_view.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
                <form string="View Stock of Products" version="7.0">
                     <header>
-                        <button name="action_open_window" string="Open Product" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                        <button name="action_open_window" string="Open Product" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <separator string="Stock Location Analysis"/>

diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index ea357a3..c58efea 100644 (file)
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -10,7 +10,9 @@
             <field name="arch" type="xml">
                 <form string="Consume Move" version="7.0">
                     <header>
-                        <button name="do_move_consume" string="Ok" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                        <button name="do_move_consume" string="Ok" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <separator string="Consume Products"/>

diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml
index 6fd6d24..fcb20ea 100644 (file)
--- a/addons/stock/wizard/stock_partial_move_view.xml
+++ b/addons/stock/wizard/stock_partial_move_view.xml
@@ -22,7 +22,9 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                     <header>
-                        <button name="do_partial" string="_Validate" type="object" icon="gtk-go-forward" class="oe_highlight_on_dirty"  />
+                        <button name="do_partial" string="_Validate" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <separator string="Products"/>

diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index 35beb16..676d3bd 100644 (file)
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -17,7 +17,9 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                     <header>
-                        <button name="do_partial" string="_Transfer" type="object" icon="gtk-go-forward" class="oe_highlight_on_dirty"  />
+                        <button name="do_partial" string="_Transfer" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <field name="hide_tracking" invisible="1"/>

diff --git a/addons/stock/wizard/stock_return_picking_view.xml b/addons/stock/wizard/stock_return_picking_view.xml
index 7a15a7b..03ba533 100644 (file)
--- a/addons/stock/wizard/stock_return_picking_view.xml
+++ b/addons/stock/wizard/stock_return_picking_view.xml
@@ -60,7 +60,9 @@
             <field name="arch" type="xml">
                 <form string="Return lines" version="7.0">
                     <header>
-                        <button name="create_returns" string="Return" type="object" icon="gtk-apply" class="oe_highlight_on_dirty"  />
+                        <button name="create_returns" string="Return" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <label string="Provide the quantities of the returned products."/>

diff --git a/addons/stock/wizard/stock_splitinto_view.xml b/addons/stock/wizard/stock_splitinto_view.xml
index b05f19c..d159eb8 100644 (file)
--- a/addons/stock/wizard/stock_splitinto_view.xml
+++ b/addons/stock/wizard/stock_splitinto_view.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
             <form string="Split Move" version="7.0">
                 <header>
-                    <button name="split" string="Ok" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                    <button name="split" string="Ok" type="object" class="oe_highlight_on_dirty" />
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
                 </header>
                 <separator string="Quantity to Leave in the Current Pack"/>
                 <group>

diff --git a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
index 2b0f2b6..9ec317e 100644 (file)
--- a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
@@ -10,9 +10,13 @@
             <field name="arch" type="xml">
                 <form string="Stock Periods" version="7.0">
                     <header>
-                        <button name="create_stock_periods" icon="gtk-dnd" string="Create Daily Periods" type="object" class="oe_highlight_on_dirty"  />
-                        <button name="create_stock_periods" icon="gtk-dnd"  string="Create Weekly Periods" type="object" context="{'interval': 6, 'name': 'Weekly'}" class="oe_highlight_on_dirty"  />
-                        <button name="create_stock_periods" icon="gtk-dnd" string="Create Monthly Periods" type="object" context="{'interval': 1, 'name': 'Monthly'}" class="oe_highlight_on_dirty"  />
+                        <button name="create_stock_periods" string="Create Daily Periods" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button name="create_stock_periods" string="Create Weekly Periods" type="object" context="{'interval': 6, 'name': 'Weekly'}" class="oe_highlight_on_dirty"/>
+                        or
+                        <button name="create_stock_periods" string="Create Monthly Periods" type="object" context="{'interval': 1, 'name': 'Monthly'}" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group col="4">
                         <field name="date_start"/>

diff --git a/addons/stock_planning/wizard/stock_planning_createlines_view.xml b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
index 5d3948e..f6b94e0 100644 (file)
--- a/addons/stock_planning/wizard/stock_planning_createlines_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Create Stock Planning Lines" version="7.0">
                     <header>
-                        <button icon="gtk-ok" name="create_planning" string="Create" type="object" class="oe_highlight_on_dirty"  />
+                        <button name="create_planning" string="Create" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group col="4">
                         <field name="period_id" widget="selection"/>

diff --git a/addons/stock_planning/wizard/stock_planning_forecast_view.xml b/addons/stock_planning/wizard/stock_planning_forecast_view.xml
index 200c3c2..bdee165 100644 (file)
--- a/addons/stock_planning/wizard/stock_planning_forecast_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_forecast_view.xml
@@ -10,7 +10,9 @@
             <field name="arch" type="xml">
                 <form string="Create Forecasts Lines" version="7.0">
                     <header>
-                        <button icon="gtk-execute" name="create_forecast" string="Create" type="object" class="oe_highlight_on_dirty"  />
+                        <button name="create_forecast" string="Create" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group col="4">
                         <field name="period_id"/>