summaryrefslogtreecommitdiff
path: root/addons/project_long_term/project_long_term.py
diff options
context:
space:
mode:
authorjas <jas@tinyerp.com>2010-10-13 15:18:41 +0530
committerjas <jas@tinyerp.com>2010-10-13 15:18:41 +0530
commit0ec23b5a256c7f2f59c1253859cf4daedbd8e45c (patch)
treec0604245857b116fdb137b509b89877f825ac8c4 /addons/project_long_term/project_long_term.py
parent2648dff04dd9d5a0ebababc0af9cc5e156cfc27b (diff)
parentdb43747c75a0ef22c3a383456071c52d41bc17eb (diff)
[MERGE] : merged with trunk-dev-addons2
bzr revid: jas@tinyerp.com-20101013094841-6xfjrw6xcc5sdoxd
Diffstat (limited to 'addons/project_long_term/project_long_term.py')
-rw-r--r--addons/project_long_term/project_long_term.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 2caf36766b0..0c31c485753 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -92,7 +92,7 @@ class project_phase(osv.osv):
model_data_id = model_data_obj._get_id(cr, uid, 'product', 'uom_hour')
return model_data_obj.read(cr, uid, [model_data_id], ['res_id'])[0]['res_id']
- def _compute(self, cr, uid, ids, context=None):
+ def _compute(self, cr, uid, ids,field_name, arg, context=None):
res = {}
if not ids:
return res
@@ -100,9 +100,7 @@ class project_phase(osv.osv):
tot = 0.0
for task in phase.task_ids:
tot += task.planned_hours
- res[phase.id] = {
- 'total_hours' : tot
- }
+ res[phase.id] = tot
return res
_columns = {