diff options
| author | P. Christeas <p_christ@hol.gr> | 2010-09-01 11:37:17 +0530 |
|---|---|---|
| committer | Harry (OpenERP) <hmo@tinyerp.com> | 2010-09-01 11:37:17 +0530 |
| commit | 30189fb7e8cf7f0020dd697c25b58de7800e7706 (patch) | |
| tree | e079bf344a12df9f59292b832935ab74bd440f9e /addons/project_long_term/wizard/project_schedule_tasks.py | |
| parent | e08ada743251bcc15b5c4ef6ada289fcf85bfa59 (diff) | |
[FIX] project_long_term: Fix yaml tests, specify resourceusers and
If a user is not associated with a resource of the project, compute his
task/phase as if no user had been specified.
bzr revid: hmo@tinyerp.com-20100901060717-o2lfueq3boatc4h7
Diffstat (limited to 'addons/project_long_term/wizard/project_schedule_tasks.py')
| -rw-r--r-- | addons/project_long_term/wizard/project_schedule_tasks.py | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/addons/project_long_term/wizard/project_schedule_tasks.py b/addons/project_long_term/wizard/project_schedule_tasks.py index 5931451081b..c64e800c9c6 100644 --- a/addons/project_long_term/wizard/project_schedule_tasks.py +++ b/addons/project_long_term/wizard/project_schedule_tasks.py @@ -73,8 +73,6 @@ class project_schedule_task(osv.osv_memory): return resource_objs def compute_date(self, cr, uid, context=None): - if context is None: - context = {} """ Schedule the tasks according to resource available and priority. """ @@ -84,7 +82,8 @@ class project_schedule_task(osv.osv_memory): user_obj = self.pool.get('res.users') if context is None: - context = {} + # It makes no sense to continue on empty context + return { 'warning': _("You must select some project phase to compute on")} if not 'active_id' in context: return {} @@ -135,15 +134,18 @@ class project_schedule_task(osv.osv_memory): hours = str(each_task.planned_hours )+ 'H' if each_task.priority in priority_dict.keys(): priorty = priority_dict[each_task.priority] + resc = False if each_task.user_id: - for resrce in resources: + for resrce in resources: if resrce.__name__ == each_task.user_id.name: - task = create_tasks(i, hours, priorty, resrce) - else: - task = create_tasks(i, hours, priorty) + resc = resrce + break + + task = create_tasks(i, hours, priorty, resc) i += 1 project = BalancedProject(Project) + loop_no = 0 # Write back the computed dates for t in project: @@ -160,6 +162,8 @@ class project_schedule_task(osv.osv_memory): }, context=ctx) loop_no += 1 + else: + return {"warning": _("No tasks to compute for this phase") } return {} project_schedule_task() |
