odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[REF] sale: refactored the picked_rate function of the sale.order 

bzr revid: qdp-launchpad@tinyerp.com-20110131141629-ei4zorjxez5ch4cl
This commit is contained in:
qdp-launchpad@tinyerp.com 2011-01-31 15:16:29 +01:00
parent b65880f075
commit 42c1d73c40
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
addons/sale/sale.py
View File

@ -92,10 +92,11 @@ class sale_order(osv.osv):
if not ids:
return {}
res = {}
tmp = {}
for id in ids:
res[id] = [0.0, 0.0]
tmp[id] = {'picked': 0.0, 'total': 0.0}
cr.execute('''SELECT
p.sale_id, sum(m.product_qty), mp.state as mp_state, m.state as state, p.type as tp
p.sale_id as sale_order_id, sum(m.product_qty) as nbr, mp.state as procurement_state, m.state as move_state, p.type as picking_type
FROM
stock_move m
LEFT JOIN
@ -105,27 +106,24 @@ class sale_order(osv.osv):
WHERE
p.sale_id IN %s GROUP BY m.state, mp.state, p.sale_id, p.type''', (tuple(ids),))
for oid, nbr, state, move_state, type_pick in cr.fetchall():
if state == 'cancel':
for item in cr.dictfetchall():
if item['move_state'] == 'cancel':
continue
res[oid][1] += nbr or 0.0
if state == 'done' or move_state == 'done':
res[oid][0] += nbr or 0.0
if type_pick == 'in':#this is a returned picking
res[oid][1] -= 2*nbr or 0.0 # Deducting the return picking qty
if state == 'done' or move_state == 'done':
nbr += nbr
res[oid][0] -= nbr or 0.0
for r in res:
if not res[r][1]:
res[r] = 0.0
if item['picking_type'] == 'in':#this is a returned picking
tmp[item['sale_order_id']]['total'] -= item['nbr'] or 0.0 # Deducting the return picking qty
if item['procurement_state'] == 'done' or item['move_state'] == 'done':
tmp[item['sale_order_id']]['picked'] -= item['nbr'] or 0.0
else:
res[r] = 100.0 * res[r][0] / res[r][1]
tmp[item['sale_order_id']]['total'] += item['nbr'] or 0.0
if item['procurement_state'] == 'done' or item['move_state'] == 'done':
tmp[item['sale_order_id']]['picked'] += item['nbr'] or 0.0
for order in self.browse(cr, uid, ids, context=context):
if order.shipped:
res[order.id] = 100.0
else:
res[order.id] = tmp[order.id]['total'] and (100.0 * tmp[order.id]['picked'] / tmp[order.id]['total']) or 0.0
return res
def _invoiced_rate(self, cursor, user, ids, name, arg, context=None):