From a79aa3bd287e509bfa0e5013d1565bfb614ed513 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 24 Feb 2010 19:46:21 +0100 Subject: [PATCH] [IMP] Made button icons consistent in stock wizards: gtk-cancel on cancel and gtk-apply for action confirmation bzr revid: odo@openerp.com-20100224184621-1iunc8wocwgnjari --- addons/stock/wizard/inventory_merge.py | 4 ++-- addons/stock/wizard/inventory_merge_zero.py | 4 ++-- addons/stock/wizard/wizard_inventory.py | 2 +- addons/stock/wizard/wizard_invoice_onshipping.py | 4 ++-- addons/stock/wizard/wizard_location_product.py | 2 +- addons/stock/wizard/wizard_partial_move.py | 4 ++-- addons/stock/wizard/wizard_partial_picking.py | 4 ++-- addons/stock/wizard/wizard_picking_make.py | 2 +- addons/stock/wizard/wizard_return.py | 2 +- addons/stock/wizard/wizard_split_inventory_lots.py | 2 +- addons/stock/wizard/wizard_split_lot_line.py | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/addons/stock/wizard/inventory_merge.py b/addons/stock/wizard/inventory_merge.py index 784aa21d550..7be8eb2b3e3 100644 --- a/addons/stock/wizard/inventory_merge.py +++ b/addons/stock/wizard/inventory_merge.py @@ -82,8 +82,8 @@ class merge_inventory(wizard.interface): 'result' : {'type' : 'form', 'arch' : _form, 'fields' : {}, - 'state' : [('end', 'Cancel'), - ('merge', 'Yes') ]} + 'state' : [('end', 'Cancel', 'gtk-cancel'), + ('merge', 'Yes', 'gtk-apply', True) ]} }, 'merge' : { 'actions' : [], diff --git a/addons/stock/wizard/inventory_merge_zero.py b/addons/stock/wizard/inventory_merge_zero.py index 1da7b5e2a61..3aa2b1e9fd9 100644 --- a/addons/stock/wizard/inventory_merge_zero.py +++ b/addons/stock/wizard/inventory_merge_zero.py @@ -78,8 +78,8 @@ class merge_inventory(wizard.interface): 'result' : {'type' : 'form', 'arch' : _form, 'fields' : _inventory_fields, - 'state' : [('end', 'Cancel'), - ('merge', 'Set to Zero') ]} + 'state' : [('end', 'Cancel', 'gtk-cancel'), + ('merge', 'Set to Zero', 'gtk-apply', True) ]} }, 'merge' : { 'actions' : [], diff --git a/addons/stock/wizard/wizard_inventory.py b/addons/stock/wizard/wizard_inventory.py index 19f24f4ab1d..42345353866 100644 --- a/addons/stock/wizard/wizard_inventory.py +++ b/addons/stock/wizard/wizard_inventory.py @@ -97,7 +97,7 @@ class fill_inventory(wizard.interface): 'result' : {'type' : 'form', 'arch' : inventory_form, 'fields' : inventory_fields, - 'state' : [('end', 'Cancel'),('fill_inventory', 'Fill Inventory') ]} + 'state' : [('end', 'Cancel', 'gtk-cancel'),('fill_inventory', 'Fill Inventory', 'gtk-apply', True) ]} }, 'fill_inventory' : { 'actions' : [], diff --git a/addons/stock/wizard/wizard_invoice_onshipping.py b/addons/stock/wizard/wizard_invoice_onshipping.py index 6ebb4b75142..22cdbc97e70 100644 --- a/addons/stock/wizard/wizard_invoice_onshipping.py +++ b/addons/stock/wizard/wizard_invoice_onshipping.py @@ -145,8 +145,8 @@ class make_invoice_onshipping(wizard.interface): 'arch': invoice_form, 'fields': invoice_fields, 'state': [ - ('end', 'Cancel'), - ('create_invoice', 'Create invoice') + ('end', 'Cancel', 'gtk-cancel'), + ('create_invoice', 'Create invoice', 'gtk-apply', True) ] } }, diff --git a/addons/stock/wizard/wizard_location_product.py b/addons/stock/wizard/wizard_location_product.py index 873f1b7a6a5..c423c426832 100755 --- a/addons/stock/wizard/wizard_location_product.py +++ b/addons/stock/wizard/wizard_location_product.py @@ -65,7 +65,7 @@ class product_by_location(wizard.interface): states = { 'init': { 'actions': [], - 'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, 'state': [('end', 'Cancel','gtk-cancel'),('open', 'Open Products','gtk-ok')]} + 'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, 'state': [('end', 'Cancel', 'gtk-cancel'),('open', 'Open Products', 'gtk-apply', True)]} }, 'open': { 'actions': [], diff --git a/addons/stock/wizard/wizard_partial_move.py b/addons/stock/wizard/wizard_partial_move.py index dd75407e2d4..928d96461c8 100644 --- a/addons/stock/wizard/wizard_partial_move.py +++ b/addons/stock/wizard/wizard_partial_move.py @@ -193,8 +193,8 @@ class partial_move(wizard.interface): 'actions': [ _get_moves ], 'result': {'type': 'form', 'arch': _moves_arch, 'fields': _moves_fields, 'state' : ( - ('end', 'Cancel'), - ('split', 'Partial') + ('end', 'Cancel', 'gtk-cancel'), + ('split', 'Partial', 'gtk-apply', True) ) }, }, diff --git a/addons/stock/wizard/wizard_partial_picking.py b/addons/stock/wizard/wizard_partial_picking.py index 389d6b8f5b6..bb0c72dff02 100644 --- a/addons/stock/wizard/wizard_partial_picking.py +++ b/addons/stock/wizard/wizard_partial_picking.py @@ -224,8 +224,8 @@ class partial_picking(wizard.interface): 'actions': [ _get_moves ], 'result': {'type': 'form', 'arch': _moves_arch, 'fields': _moves_fields, 'state' : ( - ('end', 'Cancel'), - ('split', 'Make Picking') + ('end', 'Cancel', 'gtk-cancel'), + ('split', 'Make Picking', 'gtk-apply', True) ) }, }, diff --git a/addons/stock/wizard/wizard_picking_make.py b/addons/stock/wizard/wizard_picking_make.py index e57439e9186..df4c9f63e8d 100644 --- a/addons/stock/wizard/wizard_picking_make.py +++ b/addons/stock/wizard/wizard_picking_make.py @@ -71,7 +71,7 @@ class stock_picking_make(wizard.interface): 'fields': FIELDS, 'state': [ ('end', 'Cancel', 'gtk-cancel'), - ('make', 'Ok', 'gtk-ok', True) + ('make', 'Ok', 'gtk-apply', True) ], }, }, diff --git a/addons/stock/wizard/wizard_return.py b/addons/stock/wizard/wizard_return.py index 3b2d812670f..a681f19cf9b 100644 --- a/addons/stock/wizard/wizard_return.py +++ b/addons/stock/wizard/wizard_return.py @@ -143,7 +143,7 @@ class wizard_return_picking(wizard.interface): states={ 'init':{ 'actions':[_get_returns], - 'result':{'type':'form', 'arch':arch, 'fields':fields, 'state':[('end','Cancel'),('return','Return')]} + 'result':{'type':'form', 'arch':arch, 'fields':fields, 'state':[('end','Cancel','gtk-cancel'),('return','Return','gtk-apply',True)]} }, 'return':{ 'actions':[], diff --git a/addons/stock/wizard/wizard_split_inventory_lots.py b/addons/stock/wizard/wizard_split_inventory_lots.py index 138419f45eb..92963f0b145 100644 --- a/addons/stock/wizard/wizard_split_inventory_lots.py +++ b/addons/stock/wizard/wizard_split_inventory_lots.py @@ -87,7 +87,7 @@ class wizard_split_inventory_lots(wizard.interface): states = { 'init': { 'actions': [_check_production_lot], - 'result': {'type': 'form', 'arch': inv_form, 'fields': inv_fields, 'state': [('end', 'Cancel', 'gtk-cancel'), ('split', 'Ok', 'gtk-ok')]}, + 'result': {'type': 'form', 'arch': inv_form, 'fields': inv_fields, 'state': [('end', 'Cancel', 'gtk-cancel'), ('split', 'Ok', 'gtk-apply', True)]}, }, 'split': { 'actions': [_split_lines], diff --git a/addons/stock/wizard/wizard_split_lot_line.py b/addons/stock/wizard/wizard_split_lot_line.py index 15c3790494e..6c05d9a48cc 100644 --- a/addons/stock/wizard/wizard_split_lot_line.py +++ b/addons/stock/wizard/wizard_split_lot_line.py @@ -66,7 +66,7 @@ class wizard_split_move(wizard.interface): states = { 'init': { 'actions': [_get_moves], - 'result': {'type':'form', 'arch':arch, 'fields':fields, 'state':[('end','Cancel'),('split','Split')]} + 'result': {'type':'form', 'arch':arch, 'fields':fields, 'state':[('end','Cancel','gtk-cancel'),('split','Split','gtk-apply',True)]} }, 'split': { 'actions': [_split_lines],