From 8173762fa4cfea3f87b97984bf1865671e195ae4 Mon Sep 17 00:00:00 2001
From: "Rvo (Open ERP)" <rvo@tinyerp.co.in>
Date: Wed, 10 Feb 2010 16:28:27 +0530
Subject: [PATCH] [IMP]:Changes in tasks and phases according to working
 calendar of project

bzr revid: rvo@tinyerp.co.in-20100210105827-5hofq1ageft6s2hm
---
 addons/project/wizard/compute_tasks_date.py            | 7 +++----
 addons/project_long_term/wizard/compute_phases_date.py | 8 +++++---
 addons/resource/faces/task.py                          | 2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/project/wizard/compute_tasks_date.py b/addons/project/wizard/compute_tasks_date.py
index b9991fbe448..2abd7411135 100644
--- a/addons/project/wizard/compute_tasks_date.py
+++ b/addons/project/wizard/compute_tasks_date.py
@@ -154,7 +154,7 @@ class wizard_compute_tasks(wizard.interface):
             for no in range(len(resource)):
                 leaves = []
                 resource_id = resource_pool.search(cr,uid,[('user_id','=',resource[no].id)])
-                if resource_id:
+                if resource_id and wktime_cal:
             #   Getting list of leaves for specific resource
                     leaves = leaves_resource(cr,uid,resource_id)
                 resource_objs.append(classobj(str(resource[no].name),(Resource,),{'__doc__':resource[no].name,'__name__':resource[no].name,'vacation':tuple(leaves)}))
@@ -184,12 +184,11 @@ class wizard_compute_tasks(wizard.interface):
 
 #    Creating the project with all the tasks and resources
             def Project():
-                resource = reduce(operator.or_,resource_objs)
                 title = project.name
                 start = date_start
-
+                resource = reduce(operator.or_,resource_objs)
 #    If project has calendar
-                if wktime_cal or leaves:
+                if wktime_cal:
                         working_days = wktime_cal
                         vacation = tuple(leaves)
 
diff --git a/addons/project_long_term/wizard/compute_phases_date.py b/addons/project_long_term/wizard/compute_phases_date.py
index f713942708b..2d4cf9fd70e 100644
--- a/addons/project_long_term/wizard/compute_phases_date.py
+++ b/addons/project_long_term/wizard/compute_phases_date.py
@@ -79,13 +79,15 @@ def resource_list(cr,uid,obj):
         resource_pool = pool.get('resource.resource')
         resources = obj.resource_ids
         resource_objs = []
+        leaves = []
+        calendar_id = obj.project_id.resource_calendar_id
         for no in range(len(resources)):
             resource_id = resource_pool.search(cr,uid,[('id','=',resources[no].resource_id.id)])
-            if resource_id:
+            if resource_id and calendar_id:
             #   Getting list of leaves for specific resource
                 leaves = leaves_resource(cr,uid,resource_id)
             #   Creating the faces.Resource object with resource specific efficiency and vacation
-                resource_objs.append(classobj(str(resources[no].resource_id.name),(Resource,),{'__doc__':resources[no].resource_id.name,'__name__':resources[no].resource_id.name,'efficiency':resources[no].useability/100,'vacation':tuple(leaves)}))
+            resource_objs.append(classobj(str(resources[no].resource_id.name),(Resource,),{'__doc__':resources[no].resource_id.name,'__name__':resources[no].resource_id.name,'efficiency':resources[no].useability/100,'vacation':tuple(leaves)}))
         return resource_objs
 
 class wizard_compute_phases(wizard.interface):
@@ -185,7 +187,7 @@ class wizard_compute_phases(wizard.interface):
                     start = start_date
 
                     #    If project has working calendar else the default one would be considered
-                    if wktime_cal or leaves:
+                    if wktime_cal:
                         working_days = wktime_cal
                         vacation = tuple(leaves)
 
diff --git a/addons/resource/faces/task.py b/addons/resource/faces/task.py
index 6fdb28db3f6..e737c333c7c 100755
--- a/addons/resource/faces/task.py
+++ b/addons/resource/faces/task.py
@@ -1941,7 +1941,7 @@ class Task(object):
 
         func.task_func = instrumented # will be used in the gui
         self._function = instrumented
-        self.name = name
+        self.name = func.func_name
         self.up = parent
         self.children = []
         self._sources = {} # all tasks, I am linked to