Twinkle (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-wiz-remove-btn-stock-tch into
lp:~openerp-dev/openobject-addons/trunk-wiz-remove-btn.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-wiz-remove-btn-stock-tch/+merge/110520
Stock Module:
Remove cancel button from wizard and added active class flow on button.
Kindly Review this.
Thank you.
TCH.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-wiz-remove-btn-stock-tch/+merge/110520
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-wiz-remove-btn.
=== modified file 'procurement/wizard/make_procurement_view.xml'
--- procurement/wizard/make_procurement_view.xml 2012-06-09 15:19:20 +0000
+++ procurement/wizard/make_procurement_view.xml 2012-06-15 13:09:37 +0000
@@ -11,8 +11,7 @@
<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" />
- <button icon='gtk-cancel' special="cancel" string="Cancel" />
+ <button name="make_procurement" string="Ask New Products" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
<group col="4" string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders.">
<field name="product_id" on_change="onchange_product_id(product_id)"/>
=== modified file 'procurement/wizard/mrp_procurement_view.xml'
--- procurement/wizard/mrp_procurement_view.xml 2012-06-09 15:19:20 +0000
+++ procurement/wizard/mrp_procurement_view.xml 2012-06-15 13:09:37 +0000
@@ -12,8 +12,7 @@
<form string="Parameters" version="7.0">
<header>
<button name="procure_calculation" string="Compute Procurements"
- type="object" icon="gtk-ok" />
- <button icon='gtk-cancel' special="cancel" string="Cancel" />
+ type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
<label string="This wizard will schedule procurements."/>
</form>
=== modified file 'procurement/wizard/orderpoint_procurement_view.xml'
--- procurement/wizard/orderpoint_procurement_view.xml 2012-06-09 15:19:20 +0000
+++ procurement/wizard/orderpoint_procurement_view.xml 2012-06-15 13:09:37 +0000
@@ -11,8 +11,7 @@
<field name="arch" type="xml">
<form string="Parameters" version="7.0">
<header>
- <button name="procure_calculation" string="Compute Stock" type="object" icon="gtk-ok" />
- <button icon='gtk-cancel' special="cancel" string="Cancel" />
+ <button name="procure_calculation" string="Compute Stock" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
<label string="Wizard checks all the stock minimum rules and generate procurement order."/>
<group col="2">
=== modified file 'procurement/wizard/schedulers_all_view.xml'
--- procurement/wizard/schedulers_all_view.xml 2012-06-09 15:19:20 +0000
+++ procurement/wizard/schedulers_all_view.xml 2012-06-15 13:09:37 +0000
@@ -11,8 +11,7 @@
<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" />
- <button icon='gtk-cancel' special="cancel" string="Cancel" />
+ <button name="procure_calculation" string="Compute Schedulers" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</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"/>
=== modified file 'stock/res_config_view.xml'
--- stock/res_config_view.xml 2012-06-09 21:56:28 +0000
+++ stock/res_config_view.xml 2012-06-15 13:09:37 +0000
@@ -9,8 +9,7 @@
<field name="arch" type="xml">
<form string="Configure Warehouse" 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">
=== modified file 'stock/wizard/stock_change_product_qty_view.xml'
--- stock/wizard/stock_change_product_qty_view.xml 2012-06-09 22:28:49 +0000
+++ stock/wizard/stock_change_product_qty_view.xml 2012-06-15 13:09:37 +0000
@@ -8,8 +8,7 @@
<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"/>
- <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+ <button name="change_product_qty" string="_Apply" type="object" icon="gtk-apply" class="oe_form_button_active_flow"/>
</header>
<group string="Select Quantity">
<field name="new_quantity" />
=== modified file 'stock/wizard/stock_change_standard_price_view.xml'
--- stock/wizard/stock_change_standard_price_view.xml 2012-06-09 22:28:49 +0000
+++ stock/wizard/stock_change_standard_price_view.xml 2012-06-15 13:09:37 +0000
@@ -8,8 +8,7 @@
<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"/>
- <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+ <button name="change_price" string="_Apply" type="object" icon="gtk-apply" class="oe_form_button_active_flow"/>
</header>
<separator string="Change Price"/>
<group>
=== modified file 'stock/wizard/stock_fill_inventory_view.xml'
--- stock/wizard/stock_fill_inventory_view.xml 2012-06-09 21:56:28 +0000
+++ stock/wizard/stock_fill_inventory_view.xml 2012-06-15 13:09:37 +0000
@@ -8,8 +8,7 @@
<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"/>
- <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
+ <button name="fill_inventory" string="Fill Inventory" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
<separator string="Import current product inventory from the following location"/>
<group>
=== modified file 'stock/wizard/stock_inventory_line_split_view.xml'
--- stock/wizard/stock_inventory_line_split_view.xml 2012-06-09 21:56:28 +0000
+++ stock/wizard/stock_inventory_line_split_view.xml 2012-06-15 13:09:37 +0000
@@ -8,8 +8,7 @@
<field name="arch" type="xml">
<form string="Split in Lots" version="7.0">
<header>
- <button icon='gtk-cancel' special="cancel" string="Cancel" />
- <button name="split_lot" string="Ok" type="object" icon="gtk-ok" />
+ <button name="split_lot" string="Ok" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
<group>
<field name="product_id" colspan="4" readonly="1"/>
=== modified file 'stock/wizard/stock_inventory_merge_view.xml'
--- stock/wizard/stock_inventory_merge_view.xml 2012-06-09 22:28:49 +0000
+++ stock/wizard/stock_inventory_merge_view.xml 2012-06-15 13:09:37 +0000
@@ -9,8 +9,7 @@
<field name="arch" type="xml">
<form string="Merge Inventories" version="7.0">
<header>
- <button name="do_merge" string="Yes" type="object" icon="gtk-apply"/>
- <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
+ <button name="do_merge" string="Yes" type="object" icon="gtk-apply" class="oe_form_button_active_flow"/>
</header>
<separator string="Merge Inventories" />
<label string="Do you want to merge theses inventories?"/>
=== modified file 'stock/wizard/stock_invoice_onshipping_view.xml'
--- stock/wizard/stock_invoice_onshipping_view.xml 2012-06-09 21:56:28 +0000
+++ stock/wizard/stock_invoice_onshipping_view.xml 2012-06-15 13:09:37 +0000
@@ -8,8 +8,7 @@
<field name="arch" type="xml">
<form string="Create invoice" version="7.0">
<header>
- <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
- <button name="open_invoice" string="Create" type="object" icon="terp-gtk-go-back-rtl"/>
+ <button name="open_invoice" string="Create" type="object" icon="terp-gtk-go-back-rtl" class="oe_form_button_active_flow"/>
</header>
<group string="Create Invoice">
<field name="journal_id"/>
=== modified file 'stock/wizard/stock_location_product_view.xml'
--- stock/wizard/stock_location_product_view.xml 2012-06-09 21:56:28 +0000
+++ stock/wizard/stock_location_product_view.xml 2012-06-15 13:09:37 +0000
@@ -8,8 +8,7 @@
<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"/>
- <button special="cancel" string="_Cancel" icon="gtk-cancel" />
+ <button name="action_open_window" string="Open Product" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
<separator string="Stock Location Analysis"/>
<group>
=== modified file 'stock/wizard/stock_move_view.xml'
--- stock/wizard/stock_move_view.xml 2012-06-09 22:28:49 +0000
+++ stock/wizard/stock_move_view.xml 2012-06-15 13:09:37 +0000
@@ -10,8 +10,7 @@
<field name="arch" type="xml">
<form string="Consume Move" version="7.0">
<header>
- <button icon='gtk-cancel' special="cancel" string="Cancel" />
- <button name="do_move_consume" string="Ok" type="object" icon="gtk-ok" />
+ <button name="do_move_consume" string="Ok" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
<separator string="Consume Products"/>
<div>
@@ -43,8 +42,7 @@
<field name="arch" type="xml">
<form string="Scrap Move" version="7.0">
<header>
- <button icon='gtk-cancel' special="cancel" string="Cancel" />
- <button name="move_scrap" string="Ok" type="object" icon="gtk-ok" />
+ <button name="move_scrap" string="Ok" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
<separator string="Scrap Products"/>
<group>
@@ -76,8 +74,7 @@
<field name="arch" type="xml">
<form string="Split in Lots" version="7.0">
<header>
- <button icon='gtk-cancel' special="cancel" string="Cancel" />
- <button name="split_lot" string="Ok" type="object" icon="gtk-ok" />
+ <button name="split_lot" string="Ok" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
<group>
<field name="product_id" readonly="1"/>
=== modified file 'stock/wizard/stock_partial_move_view.xml'
--- stock/wizard/stock_partial_move_view.xml 2012-06-09 22:28:49 +0000
+++ stock/wizard/stock_partial_move_view.xml 2012-06-15 13:09:37 +0000
@@ -22,8 +22,7 @@
<field name="arch" type="xml">
<form version="7.0">
<header>
- <button name="do_partial" string="_Validate" type="object" icon="gtk-go-forward" />
- <button icon='gtk-cancel' special="cancel" string="_Cancel" />
+ <button name="do_partial" string="_Validate" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
</header>
<separator string="Products"/>
<field name="move_ids"/>
=== modified file 'stock/wizard/stock_partial_picking_view.xml'
--- stock/wizard/stock_partial_picking_view.xml 2012-06-10 08:35:15 +0000
+++ stock/wizard/stock_partial_picking_view.xml 2012-06-15 13:09:37 +0000
@@ -17,8 +17,7 @@
<field name="arch" type="xml">
<form version="7.0">
<header>
- <button name="do_partial" string="_Transfer" type="object" icon="gtk-go-forward" />
- <button icon='gtk-cancel' special="cancel" string="_Cancel" />
+ <button name="do_partial" string="_Transfer" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
<field name="hide_tracking" invisible="1"/>
</header>
<separator string="Transfer Products" name="product_separator"/>
=== modified file 'stock/wizard/stock_return_picking_view.xml'
--- stock/wizard/stock_return_picking_view.xml 2012-06-09 22:28:49 +0000
+++ stock/wizard/stock_return_picking_view.xml 2012-06-15 13:09:37 +0000
@@ -60,8 +60,7 @@
<field name="arch" type="xml">
<form string="Return lines" version="7.0">
<header>
- <button name="create_returns" string="Return" type="object" icon="gtk-apply" />
- <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+ <button name="create_returns" string="Return" type="object" icon="gtk-apply" class="oe_form_button_active_flow"/>
</header>
<label string="Provide the quantities of the returned products."/>
<group>
=== modified file 'stock/wizard/stock_splitinto_view.xml'
--- stock/wizard/stock_splitinto_view.xml 2012-06-09 21:56:28 +0000
+++ stock/wizard/stock_splitinto_view.xml 2012-06-15 13:09:37 +0000
@@ -8,8 +8,7 @@
<field name="arch" type="xml">
<form string="Split Move" version="7.0">
<header>
- <button icon='gtk-cancel' special="cancel" string="_Cancel" />
- <button name="split" string="Ok" type="object" icon="gtk-ok" />
+ <button name="split" string="Ok" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
<separator string="Quantity to Leave in the Current Pack"/>
<group>
=== modified file 'stock_planning/wizard/stock_planning_create_periods_view.xml'
--- stock_planning/wizard/stock_planning_create_periods_view.xml 2012-06-09 22:28:49 +0000
+++ stock_planning/wizard/stock_planning_create_periods_view.xml 2012-06-15 13:09:37 +0000
@@ -10,8 +10,7 @@
<field name="arch" type="xml">
<form string="Stock Periods" version="7.0">
<header>
- <button string="Cancel" special="cancel" icon="gtk-cancel"/>
- <button name="create_stock_periods" icon="gtk-dnd" string="Create Daily Periods" type="object"/>
+ <button name="create_stock_periods" icon="gtk-dnd" string="Create Daily Periods" type="object" class="oe_form_button_active_flow"/>
<button name="create_stock_periods" icon="gtk-dnd" string="Create Weekly Periods" type="object" context="{'interval': 6, 'name': 'Weekly'}"/>
<button name="create_stock_periods" icon="gtk-dnd" string="Create Monthly Periods" type="object" context="{'interval': 1, 'name': 'Monthly'}"/>
</header>
=== modified file 'stock_planning/wizard/stock_planning_createlines_view.xml'
--- stock_planning/wizard/stock_planning_createlines_view.xml 2012-06-09 22:28:49 +0000
+++ stock_planning/wizard/stock_planning_createlines_view.xml 2012-06-15 13:09:37 +0000
@@ -9,8 +9,7 @@
<field name="arch" type="xml">
<form string="Create Stock Planning Lines" version="7.0">
<header>
- <button icon="gtk-cancel" special="cancel" string="Close"/>
- <button icon="gtk-ok" name="create_planning" string="Create" type="object"/>
+ <button icon="gtk-ok" name="create_planning" string="Create" type="object" class="oe_form_button_active_flow"/>
</header>
<group col="4">
<field name="period_id" widget="selection"/>
=== modified file 'stock_planning/wizard/stock_planning_forecast_view.xml'
--- stock_planning/wizard/stock_planning_forecast_view.xml 2012-06-09 22:28:49 +0000
+++ stock_planning/wizard/stock_planning_forecast_view.xml 2012-06-15 13:09:37 +0000
@@ -10,8 +10,7 @@
<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" />
- <button icon="gtk-cancel" special="cancel" string="Close"/>
+ <button icon="gtk-execute" name="create_forecast" string="Create" type="object" class="oe_form_button_active_flow"/>
</header>
<group col="4">
<field name="period_id"/>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
