[IMP]: Improve changes related task 1847

bzr revid: ksa@tinyerp.co.in-20101210112624-gxuc6rhbogexugvg
This commit is contained in:
ksa (Open ERP) 2010-12-10 16:56:24 +05:30
parent 75f00ad2d8
commit 5183ffc5f6
1 changed files with 13 additions and 12 deletions

View File

@ -239,19 +239,20 @@ class procurement_order(osv.osv):
if qty <= 0:
continue
if op.product_id.type not in ('consu'):
if op.procurement_draft_ids:
# Check draft procurement related to this order point
pro_ids = map(lambda x:x.id, op.procurement_draft_ids or [])
cr.execute('select id, product_qty from procurement_order where id in %s order by product_qty desc', (tuple(pro_ids), ))
procure_datas = cr.dictfetchall()
to_generate = qty
for proc_data in procure_datas:
if to_generate >= proc_data['product_qty']:
wf_service.trg_validate(uid, 'procurement.order', proc_data['id'], 'button_confirm', cr)
procurement_obj.write(cr, uid, [proc_data['id']], {'origin': op.name}, context=context)
to_generate -= proc_data['product_qty']
if not to_generate:
break
qty = to_generate
pro_ids = map(lambda x:x.id, op.procurement_draft_ids or [])
cr.execute('select id, product_qty from procurement_order where id in %s order by product_qty desc', (tuple(pro_ids), ))
procure_datas = cr.dictfetchall()
to_generate = qty
for proc_data in procure_datas:
if to_generate >= proc_data['product_qty']:
wf_service.trg_validate(uid, 'procurement.order', proc_data['id'], 'button_confirm', cr)
procurement_obj.write(cr, uid, [proc_data['id']], {'origin': op.name}, context=context)
to_generate -= proc_data['product_qty']
if not to_generate:
break
qty = to_generate
if qty:
proc_id = procurement_obj.create(cr, uid, {