diff options
| author | Mustufa Rangwala <mra@mra-laptop> | 2010-06-14 10:15:10 +0530 |
|---|---|---|
| committer | Mustufa Rangwala <mra@mra-laptop> | 2010-06-14 10:15:10 +0530 |
| commit | e2c0ba196ef00b6f84b3c07933eed63a0d0c69e6 (patch) | |
| tree | 5fa4f8bed20ec67015840d162db346b11d430e59 /addons/project_long_term/wizard | |
| parent | 38c2a2ba3ccb26db56470b64ecc9d872a8fa58d2 (diff) | |
| parent | 30b9d3269c2c316311b52ec837bb6f58278e1d26 (diff) | |
[MERGE] merge with trunk
bzr revid: mra@mra-laptop-20100614044510-iffai5yviiknzqfa
Diffstat (limited to 'addons/project_long_term/wizard')
| -rw-r--r-- | addons/project_long_term/wizard/project_compute_tasks.py | 4 | ||||
| -rw-r--r-- | addons/project_long_term/wizard/project_schedule_tasks.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/project_long_term/wizard/project_compute_tasks.py b/addons/project_long_term/wizard/project_compute_tasks.py index af5ceaea676..bd569abf90e 100644 --- a/addons/project_long_term/wizard/project_compute_tasks.py +++ b/addons/project_long_term/wizard/project_compute_tasks.py @@ -108,7 +108,7 @@ class project_compute_tasks(osv.osv_memory): # Dynamic Creation of tasks i = 0 for each_task in tasks: - hours = str(each_task.planned_hours / each_task.occupation_rate)+ 'H' + hours = str(each_task.planned_hours )+ 'H' if each_task.priority in priority_dict.keys(): priorty = priority_dict[each_task.priority] if each_task.user_id: @@ -139,4 +139,4 @@ class project_compute_tasks(osv.osv_memory): return {} project_compute_tasks() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project_long_term/wizard/project_schedule_tasks.py b/addons/project_long_term/wizard/project_schedule_tasks.py index 3e01c25e975..78ad2166698 100644 --- a/addons/project_long_term/wizard/project_schedule_tasks.py +++ b/addons/project_long_term/wizard/project_schedule_tasks.py @@ -127,7 +127,7 @@ class project_schedule_task(osv.osv_memory): # Dynamic creation of tasks i = 0 for each_task in tasks: - hours = str(each_task.planned_hours / each_task.occupation_rate)+ 'H' + hours = str(each_task.planned_hours )+ 'H' if each_task.priority in priority_dict.keys(): priorty = priority_dict[each_task.priority] if each_task.user_id: |