[FIX] [6.0] sale.order picked_rate is wrong
lp bug: https://launchpad.net/bugs/725028 fixed bzr revid: skh@tinyerp.com-20110414120245-dj62d5fy3tk4ss8y
This commit is contained in:
parent
aa64cc2737
commit
c415283e80
|
@ -328,7 +328,6 @@ class task(osv.osv):
|
|||
|
||||
# Compute: effective_hours, total_hours, progress
|
||||
def _hours_get(self, cr, uid, ids, field_names, args, context=None):
|
||||
|
||||
res = {}
|
||||
cr.execute("SELECT task_id, COALESCE(SUM(hours),0) FROM project_task_work WHERE task_id IN %s GROUP BY task_id",(tuple(ids),))
|
||||
hours = dict(cr.fetchall())
|
||||
|
@ -340,7 +339,6 @@ class task(osv.osv):
|
|||
res[task.id]['progress'] = round(min(100.0 * hours.get(task.id, 0.0) / res[task.id]['total_hours'], 99.99),2)
|
||||
if task.state in ('done','cancelled'):
|
||||
res[task.id]['progress'] = 100.0
|
||||
|
||||
return res
|
||||
|
||||
|
||||
|
|
|
@ -45,7 +45,6 @@ class project_task(osv.osv):
|
|||
res = super(project_task, self).do_cancel(cr, uid, ids, *args, **kwargs)
|
||||
self._validate_subflows(cr, uid, ids)
|
||||
return res
|
||||
|
||||
|
||||
project_task()
|
||||
|
||||
|
@ -56,6 +55,4 @@ class product_product(osv.osv):
|
|||
}
|
||||
product_product()
|
||||
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
Loading…
Reference in New Issue