=== modified file 'sale/sale.py' --- sale/sale.py 2010-03-23 10:19:47 +0000 +++ sale/sale.py 2010-03-30 14:06:46 +0000 @@ -95,18 +95,20 @@ 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), m.state ,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 in ('''+','.join(map(str, ids))+''') - GROUP BY m.state, p.sale_id''') - for oid, nbr, state in cr.fetchall(): - if state == 'cancel': + GROUP BY m.state, p.sale_id, mp.state''') + 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: