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

[MERGE] lp:909782 (project_mrp: fix error with sale order without a line) 

bzr revid: rco@openerp.com-20120208093832-njvqpexm2nb2pqkt
This commit is contained in:
Raphael Collet 2012-02-08 10:38:32 +01:00
parent f0a31577dd 84a351424c
commit a6f129ae57
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/project_mrp/project_mrp.py
View File

@ -96,11 +96,12 @@ class sale_order(osv.osv):
res_sale[item['sale_id']]['number_of_done'] += item['total']
for sale in self.browse(cr, uid, ids, context=context):
res_sale[sale.id]['number_of_stockable'] -= res_sale[sale.id]['total_no_task']
#adjust previously percentage because now we must also count the product of type service
res[sale.id] = res[sale.id] * float(res_sale[sale.id]['number_of_stockable']) / (res_sale[sale.id]['number_of_stockable'] + res_sale[sale.id]['total_no_task'])
#add the task
res[sale.id] += res_sale[sale.id]['number_of_done'] * 100 / (res_sale[sale.id]['number_of_stockable'] + res_sale[sale.id]['total_no_task'])
if 'number_of_stockable' in res_sale[sale.id]:
res_sale[sale.id]['number_of_stockable'] -= res_sale[sale.id]['total_no_task']
#adjust previously percentage because now we must also count the product of type service
res[sale.id] = res[sale.id] * float(res_sale[sale.id]['number_of_stockable']) / (res_sale[sale.id]['number_of_stockable'] + res_sale[sale.id]['total_no_task'])
#add the task
res[sale.id] += res_sale[sale.id]['number_of_done'] * 100 / (res_sale[sale.id]['number_of_stockable'] + res_sale[sale.id]['total_no_task'])
return res
_columns = {