From e13ceb2f65dc21f7f78ed8d8c8b6e7697737c7b1 Mon Sep 17 00:00:00 2001 From: "Purnendu Singh (OpenERP)" Date: Tue, 27 Mar 2012 11:46:43 +0530 Subject: [PATCH 1/2] [IMP] stock: improve the code to fix the problem of state display sequence in webclient bzr revid: psi@tinyerp.com-20120327061643-z8ubwkdcywj3sacp --- addons/stock/stock.py | 67 ++++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 26 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 59233f25957..9bb8e7afb83 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -707,22 +707,29 @@ class stock_picking(osv.osv): elif type == 'out': report['string'] = _('Delivery Slip') report['name'] = report['string'] - for field in res['fields']: # To update the states label according to shipping type if field == 'state': - _state = dict(PICK_STATE) - if type == 'in': - _state['assigned'] = _('Ready to Receive') - _state['done'] = _('Received') - elif type == 'internal': - _state['assigned'] = _('Ready to Transfer') - _state['done'] = _('Transferred') - elif type == 'out': - _state['assigned'] = _('Ready to Deliver') - _state['done'] = _('Delivered') - res['fields']['state']['selection'] = list(_state.items()) - res['fields']['state']['help'] = self._tooltip_picking_state(_state) + _state = [] + for key, value in PICK_STATE: + if type == 'in': + if key == 'assigned': + value = 'Ready to Receive' + elif key == 'done': + value = 'Received' + elif type == 'internal': + if key == 'assigned': + value = 'Ready to Transfer' + elif key == 'done': + value = 'Transferred' + elif type == 'out': + if key == 'assigned': + value = 'Ready to Deliver' + elif key == 'done': + value = 'Delivered' + _state.append((key,value)) + res['fields']['state']['selection'] = _state + res['fields']['state']['help'] = self._tooltip_picking_state(dict(_state)) # To update the fields tooltips according to shipping type if field == 'address_id': _tooltip = '' @@ -1729,20 +1736,28 @@ class stock_move(osv.osv): for node in doc.xpath("//group/button[@string='Process Now']"): node.set('string', _('Deliver')) for field in res['fields']: - # To update the states label according to the containing shipping type +# # To update the states label according to the containing shipping type if field == 'state': - _state = dict(MOVE_STATE) - if type == 'in': - _state['assigned'] = _('Ready to Receive') - _state['done'] = _('Received') - elif type == 'internal': - _state['assigned'] = _('Ready to Transfer') - _state['done'] = _('Transferred') - elif type == 'out': - _state['assigned'] = _('Ready to Deliver') - _state['done'] = _('Delivered') - res['fields']['state']['selection'] = list(_state.items()) - res['fields']['state']['help'] = self._tooltip_move_state(_state) + _state = [] + for key, value in MOVE_STATE: + if type == 'in': + if key == 'assigned': + value = 'Ready to Receive' + elif key == 'done': + value = 'Received' + elif type == 'internal': + if key == 'assigned': + value = 'Ready to Transfer' + elif key == 'done': + value = 'Transferred' + elif type == 'out': + if key == 'assigned': + value = 'Ready to Deliver' + elif key == 'done': + value = 'Delivered' + _state.append((key,value)) + res['fields']['state']['selection'] = _state + res['fields']['state']['help'] = self._tooltip_move_state(dict(_state)) res['arch'] = etree.tostring(doc) return res From 4f61360c4f766faf3579531c91b145c8a431c79e Mon Sep 17 00:00:00 2001 From: "Purnendu Singh (OpenERP)" Date: Tue, 27 Mar 2012 12:14:32 +0530 Subject: [PATCH 2/2] [IMP] stock: Improve for translation bzr revid: psi@tinyerp.com-20120327064432-7bdsr2z8yymhdv3f --- addons/stock/stock.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 9bb8e7afb83..8473c31a103 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -714,19 +714,19 @@ class stock_picking(osv.osv): for key, value in PICK_STATE: if type == 'in': if key == 'assigned': - value = 'Ready to Receive' + value = _('Ready to Receive') elif key == 'done': - value = 'Received' + value = _('Received') elif type == 'internal': if key == 'assigned': - value = 'Ready to Transfer' + value = _('Ready to Transfer') elif key == 'done': - value = 'Transferred' + value = _('Transferred') elif type == 'out': if key == 'assigned': - value = 'Ready to Deliver' + value = _('Ready to Deliver') elif key == 'done': - value = 'Delivered' + value = _('Delivered') _state.append((key,value)) res['fields']['state']['selection'] = _state res['fields']['state']['help'] = self._tooltip_picking_state(dict(_state)) @@ -1742,19 +1742,19 @@ class stock_move(osv.osv): for key, value in MOVE_STATE: if type == 'in': if key == 'assigned': - value = 'Ready to Receive' + value = _('Ready to Receive') elif key == 'done': - value = 'Received' + value = _('Received') elif type == 'internal': if key == 'assigned': - value = 'Ready to Transfer' + value = _('Ready to Transfer') elif key == 'done': - value = 'Transferred' + value = _('Transferred') elif type == 'out': if key == 'assigned': - value = 'Ready to Deliver' + value = _('Ready to Deliver') elif key == 'done': - value = 'Delivered' + value = _('Delivered') _state.append((key,value)) res['fields']['state']['selection'] = _state res['fields']['state']['help'] = self._tooltip_move_state(dict(_state))