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

[FIX] typo

Browse Source 
bzr revid: fp@openerp.com-20130728172717-5czhagzuzvafggz9
This commit is contained in:
Fabien Pinckaers
2013-07-28 19:27:17 +02:00
parent ff20c92091
commit b63b7d4404
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock/stock.py
+14 -14
View File
@@ -398,22 +398,22 @@ class stock_picking(osv.osv):
return super(stock_picking, self).create(cr, user, vals, context)
# The state of a picking depends on the state of its related stock.move
# done, draft, cancel: all lines are done / draft / cancel
# confirmed, auto, assigned depends on move_type (all at once or direct)
def _get_state(self, cr, uid, ids, field_name, arg, context=None):
res = {}
for pick in self.browse(cr, uid, ids, context=context):
states = [x.state for x in pick.move_lines]
res[pick.id] = 'draft'
if not 'draft' in states:
if 'confirmed' in states:
res[pick.id] = 'confirmed'
elif 'waiting' in states:
res[pick.id] = 'auto'
elif 'assigned' in states:
res[pick.id] = 'assigned'
elif 'done' in states:
res[pick.id] = 'done'
if all([x == 'cancel' for x in states]):
res[pick.id] = 'cancel'
for state in ('cancel','draft','done'):
if all([x.state == state for x in pick.move_lines]):
res[pick.id] = state
order = {'confirmed':0, 'auto':1, 'assigned':2}
order_inv = dict(zip(order.values(),order.keys()))
lst = [order[x.state] for x in pick.move_lines if x not in ('cancel','draft','done')]
if pick.move_lines == 'one':
res[pick.id] = order_inv(min(lst))
else:
res[pick.id] = order_inv(max(lst))
return res
def _get_pickings(self, cr, uid, ids, context=None):
@@ -438,7 +438,7 @@ class stock_picking(osv.osv):
#'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."),
'note': fields.text('Notes', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
'move_type': fields.selection([('direct', 'Partial'), ('one', 'All at once')], 'Delivery Method', required=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="It specifies goods to be deliver partially or all at once"),
'state': fields.function(_get_state, type="selection", store = {'stock.move': (_get_pickings, ['state'], 20)}, selection = [
'state': fields.function(_get_state, type="selection", store = {'stock.picking': (lambda x: x, ['move_type', 'move_lines'], 20), 'stock.move': (_get_pickings, ['state'], 20)}, selection = [
('draft', 'Draft'),
('cancel', 'Cancelled'),
('auto', 'Waiting Another Operation'),