From 7a2cc710fef49fdec6ec3a9f0a896f563619db8f Mon Sep 17 00:00:00 2001 From: "JMA (OpenERP)" Date: Mon, 10 May 2010 16:30:27 +0530 Subject: [PATCH] [FIX] Sale : progressbar for picking should be set when SO is picked 100%(including its procurement is done) bzr revid: jma@tinyerp.com-20100510110027-8brfub6n5s9arhx0 --- addons/sale/sale.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 718f29f12d7..021381f3461 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -106,17 +106,19 @@ class sale_order(osv.osv): for id in ids: res[id] = [0.0, 0.0] cr.execute('''SELECT - p.sale_id,sum(m.product_qty), m.state + p.sale_id,sum(m.product_qty), mp.state as mp_state FROM stock_move m LEFT JOIN stock_picking p on (p.id=m.picking_id) + LEFT JOIN + mrp_procurement mp on (mp.move_id=m.id) WHERE - p.sale_id = ANY(%s) GROUP BY m.state, p.sale_id''',(ids,)) - for oid, nbr, state in cr.fetchall(): - if state == 'cancel': + p.sale_id = ANY(%s) GROUP BY mp.state, p.sale_id''') + for oid, nbr, mp_state in cr.fetchall(): + if mp_state == 'cancel': continue - if state == 'done': + if mp_state == 'done': res[oid][0] += nbr or 0.0 res[oid][1] += nbr or 0.0 else: