From fad2397c06320d6ecbffff73343ada079869e91b Mon Sep 17 00:00:00 2001 From: "GPA(OpenERP)" <> Date: Thu, 10 Dec 2009 16:42:04 +0530 Subject: [PATCH] [FIX] Stock : force_assign won't create duplicate entries lp bug: https://launchpad.net/bugs/460924 fixed bzr revid: jvo@tinyerp.com-20091210111204-bvqsqj0gsiqsttqt --- addons/stock/stock.py | 4 ++-- addons/stock/wizard/wizard_partial_picking.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 2745532e31e..e77070a1756 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -509,8 +509,8 @@ class stock_picking(osv.osv): def force_assign(self, cr, uid, ids, *args): wf_service = netsvc.LocalService("workflow") for pick in self.browse(cr, uid, ids): -# move_ids = [x.id for x in pick.move_lines if x.state == 'confirmed'] - move_ids = [x.id for x in pick.move_lines] + move_ids = [x.id for x in pick.move_lines if x.state in ['confirmed','auto']] +# move_ids = [x.id for x in pick.move_lines] self.pool.get('stock.move').force_assign(cr, uid, move_ids) wf_service.trg_write(uid, 'stock.picking', pick.id, cr) return True diff --git a/addons/stock/wizard/wizard_partial_picking.py b/addons/stock/wizard/wizard_partial_picking.py index 38424f52852..45b9134c966 100644 --- a/addons/stock/wizard/wizard_partial_picking.py +++ b/addons/stock/wizard/wizard_partial_picking.py @@ -59,6 +59,8 @@ def _get_moves(self, cr, uid, data, context): _moves_arch_lst = ['', '
'] for m in pick.move_lines: + if m.state in ('done', 'cancel'): + continue quantity = m.product_qty if m.state<>'assigned': quantity = 0