[REF] stock: some code cleanup

bzr revid: qdp-launchpad@openerp.com-20120515082143-mvesmu2qhgpz20tp
This commit is contained in:
Quentin (OpenERP)
2012-05-15 10:21:43 +02:00
parent a48f04a8c3
commit 9ca5ec4f23
2 changed files with 4 additions and 4 deletions
+3 -3
View File
@@ -2119,11 +2119,11 @@ class stock_move(osv.osv):
return True
if context is None:
context = {}
pickings = []
pickings = set()
for move in self.browse(cr, uid, ids, context=context):
if move.state in ('confirmed', 'waiting', 'assigned', 'draft'):
if move.picking_id:
pickings += [move.picking_id.id]
pickings.add(move.picking_id.id)
if move.move_dest_id and move.move_dest_id.state == 'waiting':
self.write(cr, uid, [move.move_dest_id.id], {'state': 'assigned'})
if context.get('call_unlink',False) and move.move_dest_id.picking_id:
@@ -2131,7 +2131,7 @@ class stock_move(osv.osv):
wf_service.trg_write(uid, 'stock.picking', move.move_dest_id.picking_id.id, cr)
self.write(cr, uid, ids, {'state': 'cancel', 'move_dest_id': False})
if not context.get('call_unlink',False):
for pick in self.pool.get('stock.picking').browse(cr, uid, pickings, context=context):
for pick in self.pool.get('stock.picking').browse(cr, uid, list(pickings), context=context):
if all(move.state == 'cancel' for move in pick.move_lines):
self.pool.get('stock.picking').write(cr, uid, [pick.id], {'state': 'cancel'})
+1 -1
View File
@@ -81,7 +81,7 @@ class stock_partial_picking(osv.osv_memory):
type = context.get('active_model','').split('.')[-1]
if type:
doc = etree.XML(res['arch'])
for node in doc.xpath("//group/button[@name='do_partial']"):
for node in doc.xpath("//button[@name='do_partial']"):
if type == 'in':
node.set('string', _('_Receive'))
elif type == 'out':