[FIX] stock move

bzr revid: fp@tinyerp.com-20100625223440-tihf5geum4exzfd4
This commit is contained in:
Fabien Pinckaers 2010-06-26 00:34:40 +02:00
parent a2175919f1
commit a9c2f1f7c5
2 changed files with 21 additions and 5 deletions

View File

@ -1005,6 +1005,18 @@ class stock_picking(osv.osv):
}, context=context)
return res
def test_done(self, cr, uid, ids, context={}):
ok = False
for pick in self.browse(cr, uid, ids, context=context):
if not pick.move_lines:
return True
for move in pick.move_lines:
if move.state not in ('cancel','done'):
return False
if move.state=='done':
ok = True
return ok
def test_cancel(self, cr, uid, ids, context={}):
""" Test whether the move lines are canceled or not.
@return: True or False
@ -1832,11 +1844,10 @@ class stock_move(osv.osv):
for id in ids:
wf_service.trg_trigger(uid, 'stock.move', id, cr)
# We should remove this
#picking_obj = self.pool.get('stock.picking')
#for pick in picking_obj.browse(cr, uid, picking_ids):
# if len([(move.state in ('done','cancelled')) for move in pick.move_lines]) == len(pick.move_lines):
# picking_obj.action_done(cr, uid, [pick.id])
picking_obj = self.pool.get('stock.picking')
wf_service = netsvc.LocalService("workflow")
for pick_id in picking_ids:
wf_service.trg_write(uid, 'stock.picking', pick_id, cr)
for (id,name) in picking_obj.name_get(cr, uid, picking_ids):
message = _('Document') + " '" + name + "' "+ _("is processed")

View File

@ -67,6 +67,11 @@
<field name="act_to" ref="act_assigned"/>
<field name="condition">test_assigned()</field>
</record>
<record id="trans_assigned_move_done" model="workflow.transition">
<field name="act_from" ref="act_assigned"/>
<field name="act_to" ref="act_move"/>
<field name="condition">test_done()</field>
</record>
<record id="trans_assigned_move" model="workflow.transition">
<field name="act_from" ref="act_assigned"/>
<field name="act_to" ref="act_move"/>