From 3b29008aef50504860214ce6a9973f1a6be33abe Mon Sep 17 00:00:00 2001
From: "Rvo (Open ERP)" <rvo@tinyerp.co.in>
Date: Thu, 18 Feb 2010 15:37:31 +0530
Subject: [ADD]:added constraints on phases when date_start or date_end field
 modified,changed interval_min_get method of resource

bzr revid: rvo@tinyerp.co.in-20100218100731-cng5emi7udnf0fdf
---
 addons/project_long_term/wizard/compute_phases_date.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'addons/project_long_term/wizard')

diff --git a/addons/project_long_term/wizard/compute_phases_date.py b/addons/project_long_term/wizard/compute_phases_date.py
index 2d4cf9fd70e..7778de6bfb0 100644
--- a/addons/project_long_term/wizard/compute_phases_date.py
+++ b/addons/project_long_term/wizard/compute_phases_date.py
@@ -175,7 +175,6 @@ class wizard_compute_phases(wizard.interface):
 
         def phase_schedule(cr,uid,phase,start_date,avg_hour = 0.0):
            if phase:
-
                 #    To get resources and the duration for the phase
                 resources_list = resource_list(cr,uid,phase)
                 if not avg_hour:
@@ -211,9 +210,8 @@ class wizard_compute_phases(wizard.interface):
                     end_date = e_date
 
                 #    Writing the dates back
-                phase_pool.write(cr,uid,[phase.id],{'date_start':start_date,'date_end':end_date})
+                phase_pool.write(cr,uid,[phase.id],{'date_start':start_date.strftime('%Y-%m-%d %H:%M:%S'),'date_end':end_date.strftime('%Y-%m-%d %H:%M:%S')})
                 date_start = end_date
-
                 #    Recursive calling the next phases till all the phases are scheduled
                 for phase in phase.next_phase_ids:
                    phase_schedule(cr,uid,phase,date_start)
-- 
cgit v1.2.3


From 53b12ce0303b35162b0a127e906b73bde6b90989 Mon Sep 17 00:00:00 2001
From: "Rvo (Open ERP)" <rvo@tinyerp.co.in>
Date: Thu, 18 Feb 2010 18:47:03 +0530
Subject: removed print statement

bzr revid: rvo@tinyerp.co.in-20100218131703-kofy55mbudtwgjtn
---
 addons/project_long_term/wizard/compute_phases_date.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'addons/project_long_term/wizard')

diff --git a/addons/project_long_term/wizard/compute_phases_date.py b/addons/project_long_term/wizard/compute_phases_date.py
index 7778de6bfb0..8cd3b59c2db 100644
--- a/addons/project_long_term/wizard/compute_phases_date.py
+++ b/addons/project_long_term/wizard/compute_phases_date.py
@@ -195,7 +195,6 @@ class wizard_compute_phases(wizard.interface):
                         resource = reduce(operator.or_,resources_list)
 
                 project = BalancedProject(Project)
-                print 'Project Phase Start & End:::',project.phase.name,project.phase.booked_resource,project.phase.start.to_datetime(),project.phase.end.to_datetime()
                 s_date = project.phase.start.to_datetime()
                 e_date = project.phase.end.to_datetime()
 
-- 
cgit v1.2.3


From eabe16de50d796e35a8c6cfe9b17cfba163cc6b6 Mon Sep 17 00:00:00 2001
From: "Rvo (Open ERP)" <rvo@tinyerp.co.in>
Date: Fri, 19 Feb 2010 15:58:28 +0530
Subject: minor changes

bzr revid: rvo@tinyerp.co.in-20100219102828-hrehhv0aacv8conw
---
 .../wizard/compute_phases_date.py                  | 32 ++++++++++------------
 1 file changed, 14 insertions(+), 18 deletions(-)

(limited to 'addons/project_long_term/wizard')

diff --git a/addons/project_long_term/wizard/compute_phases_date.py b/addons/project_long_term/wizard/compute_phases_date.py
index 8cd3b59c2db..ff31fec1251 100644
--- a/addons/project_long_term/wizard/compute_phases_date.py
+++ b/addons/project_long_term/wizard/compute_phases_date.py
@@ -61,15 +61,13 @@ def leaves_resource(cr,uid,id):
         resource_leaves_pool = pool.get('resource.calendar.leaves')
         resource_leave_ids = resource_leaves_pool.search(cr,uid,[('resource_id','=',id)])
         leaves = []
-        if resource_leave_ids:
-            res_leaves = resource_leaves_pool.read(cr,uid,resource_leave_ids,['date_from','date_to'])
-            for leave in range(len(res_leaves)):
-                    dt_start = datetime.datetime.strptime(res_leaves[leave]['date_from'],'%Y-%m-%d %H:%M:%S')
-                    dt_end = datetime.datetime.strptime(res_leaves[leave]['date_to'],'%Y-%m-%d %H:%M:%S')
-                    no = dt_end - dt_start
-                    leave_days = no.days + 1
-            [leaves.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(leave_days))]
-            leaves.sort()
+        res_leaves = resource_leaves_pool.read(cr,uid,resource_leave_ids,['date_from','date_to'])
+        for leave in range(len(res_leaves)):
+                dt_start = datetime.datetime.strptime(res_leaves[leave]['date_from'],'%Y-%m-%d %H:%M:%S')
+                dt_end = datetime.datetime.strptime(res_leaves[leave]['date_to'],'%Y-%m-%d %H:%M:%S')
+                no = dt_end - dt_start
+                [leaves.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(no.days + 1))]
+                leaves.sort()
         return leaves
 
 def resource_list(cr,uid,obj):
@@ -162,14 +160,12 @@ class wizard_compute_phases(wizard.interface):
 
 #     If project working calendar has any leaves
             resource_leave_ids = resource_leaves_pool.search(cr,uid,[('calendar_id','=',calendar_id)])
-            if resource_leave_ids:
-                res_leaves = resource_leaves_pool.read(cr,uid,resource_leave_ids,['date_from','date_to'])
-                for leave in range(len(res_leaves)):
-                    dt_start = datetime.datetime.strptime(res_leaves[leave]['date_from'],'%Y-%m-%d %H:%M:%S')
-                    dt_end = datetime.datetime.strptime(res_leaves[leave]['date_to'],'%Y-%m-%d %H:%M:%S')
-                    no = dt_end - dt_start
-                    leave_days = no.days + 1
-                [leaves.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(leave_days))]
+            res_leaves = resource_leaves_pool.read(cr,uid,resource_leave_ids,['date_from','date_to'])
+            for leave in range(len(res_leaves)):
+                dt_start = datetime.datetime.strptime(res_leaves[leave]['date_from'],'%Y-%m-%d %H:%M:%S')
+                dt_end = datetime.datetime.strptime(res_leaves[leave]['date_to'],'%Y-%m-%d %H:%M:%S')
+                no = dt_end - dt_start
+                [leaves.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(no.days + 1))]
                 leaves.sort()
 
 
@@ -184,7 +180,7 @@ class wizard_compute_phases(wizard.interface):
                 #    Creating a new project for each phase
                 def Project():
                     start = start_date
-
+                    minimum_time_unit = 1
                     #    If project has working calendar else the default one would be considered
                     if wktime_cal:
                         working_days = wktime_cal
-- 
cgit v1.2.3


From fa1c5bbc858416da58a80fb8632da86a405efbe6 Mon Sep 17 00:00:00 2001
From: "Rvo (Open ERP)" <rvo@tinyerp.co.in>
Date: Fri, 26 Feb 2010 16:48:14 +0530
Subject: [IMP]:changes in project_long_term,improved view and scheduling of
 tasks and phases

bzr revid: rvo@tinyerp.co.in-20100226111814-kiapc4zs7parfl8i
---
 addons/project_long_term/wizard/__init__.py        |   1 +
 .../wizard/compute_phases_date.py                  | 240 +++++++--------------
 2 files changed, 75 insertions(+), 166 deletions(-)

(limited to 'addons/project_long_term/wizard')

diff --git a/addons/project_long_term/wizard/__init__.py b/addons/project_long_term/wizard/__init__.py
index a38c9720ebc..236fc2892a3 100644
--- a/addons/project_long_term/wizard/__init__.py
+++ b/addons/project_long_term/wizard/__init__.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import compute_phases_date
+import schedule_tasks
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/project_long_term/wizard/compute_phases_date.py b/addons/project_long_term/wizard/compute_phases_date.py
index ff31fec1251..d8ffeaf340c 100644
--- a/addons/project_long_term/wizard/compute_phases_date.py
+++ b/addons/project_long_term/wizard/compute_phases_date.py
@@ -25,17 +25,17 @@ from tools.translate import _
 import datetime
 from resource.faces import *
 from new import classobj
-import operator
+import project.project_resource as proj
 
 compute_form = """<?xml version="1.0" ?>
 <form string="Compute Scheduling of Phases">
 
-    <field name="phase_id" colspan="4"/>
+    <field name="project_id" colspan="4"/>
 
 </form>"""
 
 compute_fields = {
-    'phase_id': {'string':'Phase', 'type':'many2one', 'relation': 'project.phase', 'required':'True'},
+    'project_id': {'string':'Project', 'type':'many2one', 'relation': 'project.project'},
 
 }
 
@@ -44,181 +44,89 @@ success_msg = """<?xml version="1.0" ?>
     <label string="Phase Scheduling completed successfully."/>
 </form>"""
 
-def timeformat_convert(cr, uid, time_string, context={}):
-#    Function to convert input time string:: 8.5 to output time string 8:30
-
-        split_list = str(time_string).split('.')
-        hour_part = split_list[0]
-        mins_part = split_list[1]
-        round_mins  = int(round(float(mins_part) * 60,-2))
-        converted_string = hour_part + ':' + str(round_mins)[0:2]
-        return converted_string
-
-def leaves_resource(cr,uid,id):
-#    To get the leaves for the resource_ids working on phase
+def phase_schedule(cr,uid,phase,start_date,calendar_id=False):
+       pool = pooler.get_pool(cr.dbname)
+       phase_pool = pool.get('project.phase')
+       resource_pool = pool.get('resource.resource')
+       uom_pool = pool.get('product.uom')
+       wktime_cal = []
+       resource_cal = False
+       phase_resource = False
+       if phase:
+            resource_id = resource_pool.search(cr,uid,[('user_id','=',phase.responsible_id.id)])
+            if resource_id:
+                resource_obj = resource_pool.browse(cr,uid,resource_id)[0]
+                leaves = proj.leaves_resource(cr,uid,calendar_id or False ,resource_id,resource_obj.calendar_id.id)
+                phase_resource = classobj(str(resource_obj.name),(Resource,),{'__doc__':resource_obj.name,'__name__':resource_obj.name,'vacation':tuple(leaves),'efficiency':resource_obj.time_efficiency})
+            default_uom_id = uom_pool.search(cr,uid,[('name','=','Hour')])[0]
+            avg_hours = uom_pool._compute_qty(cr, uid, phase.product_uom.id, phase.duration,default_uom_id)
+            duration = str(avg_hours) + 'H'
+
+            #    Creating a new project for each phase
+            def Project():
+                start = start_date
+                minimum_time_unit = 1
+                resource = phase_resource
+                #    If project has working calendar else the default one would be considered
+                if calendar_id:
+                    working_days = proj.compute_working_calendar(cr,uid,calendar_id)
+                    vacation = tuple(proj.leaves_resource(cr,uid,calendar_id))
+
+                def phase():
+                    effort = duration
+
+            project = BalancedProject(Project)
+            s_date = project.phase.start.to_datetime()
+            e_date = project.phase.end.to_datetime()
+
+            #    According to constraints on date start and date end on phase recalculation done
+            if phase.constraint_date_start and str(s_date) < phase.constraint_date_start:
+                start_date = datetime.datetime.strptime(phase.constraint_date_start,'%Y-%m-%d %H:%M:%S')
+            else:
+                start_date = s_date
+            if phase.constraint_date_end and str(e_date) > phase.constraint_date_end:
+                end_date= datetime.datetime.strptime(phase.constraint_date_end,'%Y-%m-%d %H:%M:%S')
+                date_start = phase.constraint_date_end[:-3]
+            else:
+                end_date = e_date
+                date_start = end_date
 
-        pool = pooler.get_pool(cr.dbname)
-        resource_leaves_pool = pool.get('resource.calendar.leaves')
-        resource_leave_ids = resource_leaves_pool.search(cr,uid,[('resource_id','=',id)])
-        leaves = []
-        res_leaves = resource_leaves_pool.read(cr,uid,resource_leave_ids,['date_from','date_to'])
-        for leave in range(len(res_leaves)):
-                dt_start = datetime.datetime.strptime(res_leaves[leave]['date_from'],'%Y-%m-%d %H:%M:%S')
-                dt_end = datetime.datetime.strptime(res_leaves[leave]['date_to'],'%Y-%m-%d %H:%M:%S')
-                no = dt_end - dt_start
-                [leaves.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(no.days + 1))]
-                leaves.sort()
-        return leaves
-
-def resource_list(cr,uid,obj):
-#    To get the resource_ids working on phase
+            #    Writing the dates back
+            phase_pool.write(cr,uid,[phase.id],{'date_start':start_date.strftime('%Y-%m-%d %H:%M:%S'),'date_end':end_date.strftime('%Y-%m-%d %H:%M:%S')},context={'scheduler':True})
 
-        pool = pooler.get_pool(cr.dbname)
-        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 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)}))
-        return resource_objs
+            #    Recursive calling the next phases till all the phases are scheduled
+            for phase in phase.next_phase_ids:
+               if phase.state in ['draft','open','pending']:
+                   phase_schedule(cr,uid,phase,date_start,phase.project_id.resource_calendar_id.id or False)
+               else:
+                   continue
 
+#
 class wizard_compute_phases(wizard.interface):
 
     def _compute_date(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
         project_pool = pool.get('project.project')
         phase_pool = pool.get('project.phase')
-        resource_pool = pool.get('resource.resource')
-        resource_leaves_pool = pool.get('resource.calendar.leaves')
-        resource_week_pool = pool.get('resource.calendar.week')
-        avg_hr = 0.0
-        wktime_cal = []
-        leaves = []
-        phase_id = data['form']['phase_id']
-        phase = phase_pool.browse(cr,uid,phase_id)
-        calendar_id = phase.project_id.resource_calendar_id.id
-
-#     If project has a working calendar then that would be used otherwise
-#     the default faces calendar would  be used
-        if calendar_id:
-            time_range = "8:00-8:00"
-            non_working = ""
-            wk = {"0":"mon","1":"tue","2":"wed","3":"thu","4":"fri","5":"sat","6":"sun"}
-            wk_days = {}
-            wk_time = {}
-            wktime_list = []
-            hours = []
-            hr = 0
-            week_ids = resource_week_pool.search(cr,uid,[('calendar_id','=',calendar_id)])
-            week_obj = resource_week_pool.read(cr,uid,week_ids,['dayofweek','hour_from','hour_to'])
-
-#     Converting time formats into appropriate format required
-#     and creating a list like [('mon', '8:00-12:00'), ('mon', '13:00-18:00')]
-            for week in week_obj:
-                res_str = ""
-                if wk.has_key(week['dayofweek']):
-                    day = wk[week['dayofweek']]
-                    wk_days[week['dayofweek']] = wk[week['dayofweek']]
-
-                hour_from_str = timeformat_convert(cr,uid,week['hour_from'])
-                hour_to_str = timeformat_convert(cr,uid,week['hour_to'])
-                res_str = hour_from_str + '-' + hour_to_str
-                hours.append(week['hour_from'])
-                hours.append(week['hour_to'])
-                wktime_list.append((day,res_str))
-
-#     Converting it to format like [('mon', '8:00-12:00', '13:00-18:00')]
-            for item in wktime_list:
-                if wk_time.has_key(item[0]):
-                    wk_time[item[0]].append(item[1])
-                else:
-                    wk_time[item[0]] = [item[0]]
-                    wk_time[item[0]].append(item[1])
-
-            for k,v in wk_time.items():
-                wktime_cal.append(tuple(v))
-
-            for hour in range(len(hours)):
-                if hour%2 ==0:
-                    hr += float(hours[hour+1]) - float(hours[hour])
-            avg_hr = hr/len(wktime_cal)
-
-#     For non working days adding [('tue,wed,fri,sat,sun', '8:00-8:00')]
-            for k,v in wk_days.items():
-                if wk.has_key(k):
-                    wk.pop(k)
-            for v in wk.itervalues():
-                non_working += v + ','
-            if non_working:
-                wktime_cal.append((non_working[:-1],time_range))
-
-#     If project working calendar has any leaves
-            resource_leave_ids = resource_leaves_pool.search(cr,uid,[('calendar_id','=',calendar_id)])
-            res_leaves = resource_leaves_pool.read(cr,uid,resource_leave_ids,['date_from','date_to'])
-            for leave in range(len(res_leaves)):
-                dt_start = datetime.datetime.strptime(res_leaves[leave]['date_from'],'%Y-%m-%d %H:%M:%S')
-                dt_end = datetime.datetime.strptime(res_leaves[leave]['date_to'],'%Y-%m-%d %H:%M:%S')
-                no = dt_end - dt_start
-                [leaves.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(no.days + 1))]
-                leaves.sort()
-
-
-        def phase_schedule(cr,uid,phase,start_date,avg_hour = 0.0):
-           if phase:
-                #    To get resources and the duration for the phase
-                resources_list = resource_list(cr,uid,phase)
-                if not avg_hour:
-                    avg_hour = 8.0
-                man_days = str(phase.duration * avg_hour) + 'H'
-
-                #    Creating a new project for each phase
-                def Project():
-                    start = start_date
-                    minimum_time_unit = 1
-                    #    If project has working calendar else the default one would be considered
-                    if wktime_cal:
-                        working_days = wktime_cal
-                        vacation = tuple(leaves)
-
-                    def phase():
-                        effort = man_days
-                        resource = reduce(operator.or_,resources_list)
-
-                project = BalancedProject(Project)
-                s_date = project.phase.start.to_datetime()
-                e_date = project.phase.end.to_datetime()
-
-                #    According to constraints on date start and date end on phase recalculation done
-                if phase.constraint_date_start and str(s_date) < phase.constraint_date_start:
-                    start_date = phase.constraint_date_start
-                else:
-                    start_date = s_date
-                if phase.constraint_date_end and str(e_date) > phase.constraint_date_end:
-                    end_date = phase.constraint_date_end[:-3]
-                else:
-                    end_date = e_date
-
-                #    Writing the dates back
-                phase_pool.write(cr,uid,[phase.id],{'date_start':start_date.strftime('%Y-%m-%d %H:%M:%S'),'date_end':end_date.strftime('%Y-%m-%d %H:%M:%S')})
-                date_start = end_date
-                #    Recursive calling the next phases till all the phases are scheduled
-                for phase in phase.next_phase_ids:
-                   phase_schedule(cr,uid,phase,date_start)
-
-        #    Phase Scheduling starts from here with the call to phase_schedule method
-        start_dt = datetime.datetime.strftime((datetime.datetime.strptime(phase.project_id.date_start,"%Y-%m-%d")),"%Y-%m-%d %H:%M")
-        if avg_hr:
-            phase_schedule(cr,uid,phase,start_dt,avg_hr)
+
+        # if project mentioned
+        if data['form']['project_id']:
+            project_id = project_pool.browse(cr,uid,data['form']['project_id'])
+            phase_ids = phase_pool.search(cr,uid,[('project_id','=',project_id.id),('state','in',['draft','open','pending']),('previous_phase_ids','=',False)])
+
+        # else all the draft,open,pending states phases taken
         else:
-            phase_schedule(cr,uid,phase,start_dt)
+            phase_ids = phase_pool.search(cr,uid,[('state','in',['draft','open','pending']),('previous_phase_ids','=',False)])
+
+        phase_ids.sort()
+        phase_objs = phase_pool.browse(cr,uid,phase_ids)
+        for phase in phase_objs:
+            start_dt = datetime.datetime.strftime((datetime.datetime.strptime(phase.date_start,"%Y-%m-%d %H:%M:%S")),"%Y-%m-%d %H:%M")
+            calendar_id = phase.project_id.resource_calendar_id.id
+            phase_schedule(cr,uid,phase,start_dt,calendar_id or False)
 
         return {}
+
     states = {
         'init': {
             'actions': [],
-- 
cgit v1.2.3


From 106d56a63fbde77c0b60126ab08d584f63dc2457 Mon Sep 17 00:00:00 2001
From: "Rvo (Open ERP)" <rvo@tinyerp.co.in>
Date: Fri, 26 Feb 2010 16:57:54 +0530
Subject: [ADD]:workflow,scheduler button for tasks on project.phase

bzr revid: rvo@tinyerp.co.in-20100226112754-d07gn4yksp9rxhlc
---
 addons/project_long_term/wizard/schedule_tasks.py | 134 ++++++++++++++++++++++
 1 file changed, 134 insertions(+)
 create mode 100644 addons/project_long_term/wizard/schedule_tasks.py

(limited to 'addons/project_long_term/wizard')

diff --git a/addons/project_long_term/wizard/schedule_tasks.py b/addons/project_long_term/wizard/schedule_tasks.py
new file mode 100644
index 00000000000..e530cf72fac
--- /dev/null
+++ b/addons/project_long_term/wizard/schedule_tasks.py
@@ -0,0 +1,134 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import wizard
+import pooler
+from tools.translate import _
+import datetime
+from resource.faces import *
+from new import classobj
+import operator
+import time
+import project.project_resource as proj
+
+
+success_msg = """<?xml version="1.0" ?>
+<form string="Compute Scheduling of Tasks">
+    <label string="Task Scheduling completed successfully."/>
+</form>"""
+
+def resource_list(cr,uid,phase):
+#    To create resources which are the Project Members
+
+        resource_objs = []
+        for resource in phase.resource_ids:
+            res = resource.resource_id
+            leaves = []
+            resource_eff = res.time_efficiency
+            resource_cal = res.calendar_id.id
+            wktime_cal = proj.compute_working_calendar(cr,uid,resource_cal)
+            leaves = proj.leaves_resource(cr,uid,phase.project_id.resource_calendar_id.id or False ,res.id,resource_cal)
+            resource_objs.append(classobj(str(res.user_id.name),(Resource,),{'__doc__':res.user_id.name,'__name__':res.user_id.name,'vacation':tuple(leaves),'efficiency':resource_eff}))
+        return resource_objs
+
+
+class wizard_schedule_task(wizard.interface):
+
+
+    def _compute_date(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        phase_pool = pool.get('project.phase')
+        task_pool = pool.get('project.task')
+        user_pool = pool.get('res.users')
+        phase = phase_pool.browse(cr,uid,data['id'])
+        task_ids = map(lambda x:x.id,(filter(lambda x:x.state in ['open','draft','pending'] ,phase.task_ids)))
+        task_ids.sort()
+        tasks = task_pool.browse(cr,uid,task_ids)
+
+        if task_ids:
+            wktime_cal = []
+            date_start = datetime.datetime.strftime(datetime.datetime.strptime(phase.date_start,"%Y-%m-%d %H:%M:%S"),"%Y-%m-%d %H:%M")
+            calendar_id = phase.project_id.resource_calendar_id.id
+            resource_objs = resource_list(cr,uid,phase)
+            priority_dict = {'0':1000,'1':800,'2':500,'3':300,'4':100}
+
+#     To create dynamic no of tasks with the resource specified
+            def tasks_resource(j,eff,priorty = 500,obj=False):
+                def task():
+                    """
+                    task is a dynamic method!
+                    """
+                    effort = eff
+                    if obj:
+                        resource = obj
+                    priority = priorty
+                task.__doc__ = "TaskNO%d" %j
+                task.__name__ = "task%d" %j
+                return task
+
+#    Creating the project with all the tasks and resources
+            def Project():
+                title = "Test Project"
+                start = date_start
+                resource = reduce(operator.or_,resource_objs)
+                minimum_time_unit = 1
+
+#    If project has calendar
+                if calendar_id:
+                    working_days = proj.compute_working_calendar(cr,uid,calendar_id)
+                    vacation = tuple(proj.leaves_resource(cr,uid,calendar_id))
+
+#    Dynamic Creation of tasks
+                i = 0
+                for each_task in tasks:
+                    hours = str(each_task.planned_hours / each_task.occupation_rate)+ 'H'
+                    if each_task.priority in priority_dict.keys():
+                        priorty = priority_dict[each_task.priority]
+                    if each_task.user_id:
+                       for resource_object in resource_objs:
+                            if resource_object.__name__ == each_task.user_id.name:
+                               task = tasks_resource(i,hours,priorty,resource_object)
+                    else:
+                        task = tasks_resource(i,hours,priorty)
+                    i += 1
+
+            project = BalancedProject(Project)
+            loop_no = 0
+            for t in project:
+                s_date = t.start.to_datetime()
+                e_date = t.end.to_datetime()
+                if loop_no > 0:
+                    user_id = user_pool.search(cr,uid,[('name','=',t.booked_resource[0].__name__)])
+                    task_pool.write(cr,uid,[tasks[loop_no-1].id],{'date_start':s_date.strftime('%Y-%m-%d %H:%M:%S'),'date_deadline':e_date.strftime('%Y-%m-%d %H:%M:%S'),'user_id':user_id[0]},context={'scheduler':True})
+                loop_no +=1
+
+        return {}
+
+    states = {
+        'init': {
+            'actions': [_compute_date],
+            'result': {'type':'form','arch':success_msg,'fields':{}, 'state':[('end', 'Ok')]},
+        }
+    }
+wizard_schedule_task('phase.schedule.tasks')
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-- 
cgit v1.2.3


From 1adcb50ea377a8847e50b4cd6c6c85e6ed8a67c8 Mon Sep 17 00:00:00 2001
From: "Rvo (Open ERP)" <rvo@tinyerp.co.in>
Date: Fri, 26 Feb 2010 17:56:17 +0530
Subject: [IMP]:improved the date start working for phase,tasks scheduling

bzr revid: rvo@tinyerp.co.in-20100226122617-l6jvjmckgjqf3chg
---
 addons/project_long_term/wizard/compute_phases_date.py |  5 ++++-
 addons/project_long_term/wizard/schedule_tasks.py      | 12 +++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'addons/project_long_term/wizard')

diff --git a/addons/project_long_term/wizard/compute_phases_date.py b/addons/project_long_term/wizard/compute_phases_date.py
index d8ffeaf340c..1fe0286b6a5 100644
--- a/addons/project_long_term/wizard/compute_phases_date.py
+++ b/addons/project_long_term/wizard/compute_phases_date.py
@@ -121,7 +121,10 @@ class wizard_compute_phases(wizard.interface):
         phase_ids.sort()
         phase_objs = phase_pool.browse(cr,uid,phase_ids)
         for phase in phase_objs:
-            start_dt = datetime.datetime.strftime((datetime.datetime.strptime(phase.date_start,"%Y-%m-%d %H:%M:%S")),"%Y-%m-%d %H:%M")
+            start_date = phase.project_id.date_start
+            if not phase.project_id.date_start:
+                start_date = datetime.datetime.now().strftime("%Y-%m-%d")
+            start_dt = datetime.datetime.strftime((datetime.datetime.strptime(start_date,"%Y-%m-%d")),"%Y-%m-%d %H:%M")
             calendar_id = phase.project_id.resource_calendar_id.id
             phase_schedule(cr,uid,phase,start_dt,calendar_id or False)
 
diff --git a/addons/project_long_term/wizard/schedule_tasks.py b/addons/project_long_term/wizard/schedule_tasks.py
index e530cf72fac..8b188a8cc28 100644
--- a/addons/project_long_term/wizard/schedule_tasks.py
+++ b/addons/project_long_term/wizard/schedule_tasks.py
@@ -60,12 +60,18 @@ class wizard_schedule_task(wizard.interface):
         user_pool = pool.get('res.users')
         phase = phase_pool.browse(cr,uid,data['id'])
         task_ids = map(lambda x:x.id,(filter(lambda x:x.state in ['open','draft','pending'] ,phase.task_ids)))
-        task_ids.sort()
-        tasks = task_pool.browse(cr,uid,task_ids)
 
         if task_ids:
+            task_ids.sort()
+            tasks = task_pool.browse(cr,uid,task_ids)
             wktime_cal = []
-            date_start = datetime.datetime.strftime(datetime.datetime.strptime(phase.date_start,"%Y-%m-%d %H:%M:%S"),"%Y-%m-%d %H:%M")
+            start_date = str(phase.date_start)[:-9]
+            if not phase.date_start:
+                if not phase.project_id.date_start:
+                    start_date = datetime.datetime.now().strftime("%Y-%m-%d")
+                else:
+                    start_date = phase.project_id.date_start
+            date_start = datetime.datetime.strftime(datetime.datetime.strptime(start_date,"%Y-%m-%d"),"%Y-%m-%d %H:%M")
             calendar_id = phase.project_id.resource_calendar_id.id
             resource_objs = resource_list(cr,uid,phase)
             priority_dict = {'0':1000,'1':800,'2':500,'3':300,'4':100}
-- 
cgit v1.2.3


From 64b2f5447f44dee314230597eafd7059ab23d3c1 Mon Sep 17 00:00:00 2001
From: "Rvo (Open ERP)" <rvo@tinyerp.co.in>
Date: Fri, 26 Feb 2010 18:17:40 +0530
Subject: code improvement

bzr revid: rvo@tinyerp.co.in-20100226124740-etg40tjvsettean8
---
 addons/project_long_term/wizard/compute_phases_date.py | 1 -
 addons/project_long_term/wizard/schedule_tasks.py      | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'addons/project_long_term/wizard')

diff --git a/addons/project_long_term/wizard/compute_phases_date.py b/addons/project_long_term/wizard/compute_phases_date.py
index 1fe0286b6a5..4a2054e4ff6 100644
--- a/addons/project_long_term/wizard/compute_phases_date.py
+++ b/addons/project_long_term/wizard/compute_phases_date.py
@@ -127,7 +127,6 @@ class wizard_compute_phases(wizard.interface):
             start_dt = datetime.datetime.strftime((datetime.datetime.strptime(start_date,"%Y-%m-%d")),"%Y-%m-%d %H:%M")
             calendar_id = phase.project_id.resource_calendar_id.id
             phase_schedule(cr,uid,phase,start_dt,calendar_id or False)
-
         return {}
 
     states = {
diff --git a/addons/project_long_term/wizard/schedule_tasks.py b/addons/project_long_term/wizard/schedule_tasks.py
index 8b188a8cc28..ea30718d616 100644
--- a/addons/project_long_term/wizard/schedule_tasks.py
+++ b/addons/project_long_term/wizard/schedule_tasks.py
@@ -29,7 +29,6 @@ import operator
 import time
 import project.project_resource as proj
 
-
 success_msg = """<?xml version="1.0" ?>
 <form string="Compute Scheduling of Tasks">
     <label string="Task Scheduling completed successfully."/>
@@ -49,10 +48,8 @@ def resource_list(cr,uid,phase):
             resource_objs.append(classobj(str(res.user_id.name),(Resource,),{'__doc__':res.user_id.name,'__name__':res.user_id.name,'vacation':tuple(leaves),'efficiency':resource_eff}))
         return resource_objs
 
-
 class wizard_schedule_task(wizard.interface):
 
-
     def _compute_date(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
         phase_pool = pool.get('project.phase')
@@ -116,6 +113,7 @@ class wizard_schedule_task(wizard.interface):
                         task = tasks_resource(i,hours,priorty)
                     i += 1
 
+#    Writing back the dates
             project = BalancedProject(Project)
             loop_no = 0
             for t in project:
@@ -125,7 +123,6 @@ class wizard_schedule_task(wizard.interface):
                     user_id = user_pool.search(cr,uid,[('name','=',t.booked_resource[0].__name__)])
                     task_pool.write(cr,uid,[tasks[loop_no-1].id],{'date_start':s_date.strftime('%Y-%m-%d %H:%M:%S'),'date_deadline':e_date.strftime('%Y-%m-%d %H:%M:%S'),'user_id':user_id[0]},context={'scheduler':True})
                 loop_no +=1
-
         return {}
 
     states = {
-- 
cgit v1.2.3