pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]Merge with lp:~openerp-dev/openobject-addons/trunk-stock_picking_usability

Browse Source 
bzr revid: mma@tinyerp.com-20120327095605-8oz6ktbfi0ixgdt7
This commit is contained in:
Mayur Maheshwari (OpenERP)
2012-03-27 15:26:05 +05:30
parent 6dda8d891b 4f61360c4f
commit 93ea83ff99
1 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock/stock.py
+41 -26
View File
@@ -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