From 7300add4a7d90f8d4fae3a897dd8add4902f6751 Mon Sep 17 00:00:00 2001 From: "Rvo (Open ERP)" Date: Thu, 18 Feb 2010 18:43:18 +0530 Subject: [ADD]:added constraints on parent_ids and child_ids of tasks when date_start and date_end fields modified,improved on_change method on tasks bzr revid: rvo@tinyerp.co.in-20100218131318-mu80ki61iuazu06c --- addons/project/project.py | 65 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 61 insertions(+), 4 deletions(-) (limited to 'addons/project/project.py') diff --git a/addons/project/project.py b/addons/project/project.py index a57f782ef10..b2490a4eab7 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -259,13 +259,16 @@ class task(osv.osv): result = {} for res in self.browse(cr, uid, ids): if date_start and planned: + dt_start = mx.DateTime.strptime(date_start,'%Y-%m-%d %H:%M:%S') resource_id = self.pool.get('resource.resource').search(cr,uid,[('user_id','=',res.user_id.id)]) if resource_id: resource_obj = self.pool.get('resource.resource').browse(cr,uid,resource_id)[0] - d = mx.DateTime.strptime(date_start,'%Y-%m-%d %H:%M:%S') - hrs = (planned)/(occupation_rate) - work_times = self.pool.get('resource.calendar').interval_get(cr, uid, resource_obj.calendar_id.id or False, d, hrs or 0.0, resource_obj.id) - result['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S') + hrs = planned/(occupation_rate * resource_obj.time_efficiency) + work_times = self.pool.get('resource.calendar').interval_get(cr, uid, resource_obj.calendar_id.id or False, dt_start, hrs or 0.0, resource_obj.id) + else: + hrs = planned / occupation_rate + work_times = self.pool.get('resource.calendar').interval_get(cr, uid, res.project_id.resource_calendar_id .id or False, dt_start, hrs or 0.0) + result['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S') result['remaining_hours'] = planned-effective return {'value':result} @@ -472,6 +475,60 @@ class task(osv.osv): self.write(cr, uid, typ.id, {'type': index and types[index-1] or False}) return True + def constraint_date_start(self,cr,uid,task,date_end,context=None): + # Recursive call for all previous tasks if change in date_start < older time + + resource_cal_pool = self.pool.get('resource.calendar') + calendar_id = task.project_id.resource_calendar_id.id + hours = task.remaining_hours / task.occupation_rate + work_time = resource_cal_pool.interval_min_get(cr, uid, calendar_id or False, date_end, hours or 0.0) + dt_start = work_time[0][0].strftime('%Y-%m-%d %H:%M:%S') + self.write(cr,uid,[task.id],{'date_start':dt_start,'date_end':date_end.strftime('%Y-%m-%d %H:%M:%S')}) + + def constraint_date_end(self,cr,uid,task,date_start,context=None): + # Recursive call for all next tasks if change in date_end > older time + + resource_cal_pool = self.pool.get('resource.calendar') + calendar_id = task.project_id.resource_calendar_id.id + hours = task.remaining_hours / task.occupation_rate + work_time = resource_cal_pool.interval_get(cr, uid, calendar_id or False, date_start, hours or 0.0) + dt_end = work_time[-1][1].strftime('%Y-%m-%d %H:%M:%S') + self.write(cr,uid,[task.id],{'date_start':date_start.strftime('%Y-%m-%d %H:%M:%S'),'date_end':dt_end}) + + def write(self, cr, uid, ids, vals,context=None): + tasks = self.browse(cr,uid,ids[0]) + resource_cal_pool = self.pool.get('resource.calendar') + calendar_id = tasks.project_id.resource_calendar_id.id + + if not context: + context = {} +# write method changes the date_start and date_end +#for previous and next tasks respectively based on valid condition + + if vals.get('date_start'): + if vals['date_start'] < tasks.date_start: + dt_start = mx.DateTime.strptime(vals['date_start'],'%Y-%m-%d %H:%M:%S') + hrs = tasks.remaining_hours / tasks.occupation_rate + work_times = resource_cal_pool.interval_get(cr, uid, calendar_id or False, dt_start, hrs or 0.0) + vals['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S') + super(task, self).write(cr, uid, ids, vals, context=context) + + for prv_task in tasks.parent_ids: + self.constraint_date_start(cr,uid,prv_task,dt_start) + + if vals.get('date_end'): + if vals['date_end'] > tasks.date_end: + dt_end = mx.DateTime.strptime(vals['date_end'],'%Y-%m-%d %H:%M:%S') + hrs = tasks.remaining_hours / tasks.occupation_rate + work_times = resource_cal_pool.interval_min_get(cr, uid, calendar_id or False, dt_end, hrs or 0.0) + vals['date_start'] = work_times[0][0].strftime('%Y-%m-%d %H:%M:%S') + super(task, self).write(cr, uid, ids, vals, context=context) + + for next_task in tasks.child_ids: + self.constraint_date_end(cr,uid,next_task,dt_end) + return super(task, self).write(cr, uid, ids, vals, context=context) + + task() class project_work(osv.osv): -- cgit v1.2.3 From eabe16de50d796e35a8c6cfe9b17cfba163cc6b6 Mon Sep 17 00:00:00 2001 From: "Rvo (Open ERP)" Date: Fri, 19 Feb 2010 15:58:28 +0530 Subject: minor changes bzr revid: rvo@tinyerp.co.in-20100219102828-hrehhv0aacv8conw --- addons/project/project.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/project/project.py') diff --git a/addons/project/project.py b/addons/project/project.py index 841a688272c..85af339160a 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -265,7 +265,7 @@ class task(osv.osv): if resource_id: resource_obj = self.pool.get('resource.resource').browse(cr,uid,resource_id)[0] hrs = planned/(occupation_rate * resource_obj.time_efficiency) - work_times = self.pool.get('resource.calendar').interval_get(cr, uid, resource_obj.calendar_id.id or False, dt_start, hrs or 0.0, resource_obj.id) + work_times = self.pool.get('resource.calendar').interval_get(cr, uid, resource_obj.calendar_id.id or False, dt_start, hrs or 0.0, resource_obj) else: hrs = planned / occupation_rate work_times = self.pool.get('resource.calendar').interval_get(cr, uid, res.project_id.resource_calendar_id .id or False, dt_start, hrs or 0.0) -- cgit v1.2.3 From 512fce7d0729fd45ba000f918a6409ed49153a11 Mon Sep 17 00:00:00 2001 From: "Rvo (Open ERP)" Date: Fri, 26 Feb 2010 16:45:19 +0530 Subject: [IMP]:changes in project module,improved scheduling wizard bzr revid: rvo@tinyerp.co.in-20100226111519-38fiawt3qnz71tvs --- addons/project/project.py | 72 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 49 insertions(+), 23 deletions(-) (limited to 'addons/project/project.py') diff --git a/addons/project/project.py b/addons/project/project.py index 85af339160a..d130c48a6bb 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -256,20 +256,23 @@ class task(osv.osv): res[task.id]['delay_hours'] = res[task.id]['total_hours'] - task.planned_hours return res - def onchange_planned(self, cr, uid, ids, planned=0.0, effective=0.0, date_start=None,occupation_rate=0.0): + def onchange_planned(self, cr, uid, ids, project, user_id = False,planned=0.0, effective=0.0,date_start=None,occupation_rate=0.0): result = {} - for res in self.browse(cr, uid, ids): - if date_start and planned: - dt_start = mx.DateTime.strptime(date_start,'%Y-%m-%d %H:%M:%S') - resource_id = self.pool.get('resource.resource').search(cr,uid,[('user_id','=',res.user_id.id)]) - if resource_id: - resource_obj = self.pool.get('resource.resource').browse(cr,uid,resource_id)[0] - hrs = planned/(occupation_rate * resource_obj.time_efficiency) - work_times = self.pool.get('resource.calendar').interval_get(cr, uid, resource_obj.calendar_id.id or False, dt_start, hrs or 0.0, resource_obj) - else: - hrs = planned / occupation_rate - work_times = self.pool.get('resource.calendar').interval_get(cr, uid, res.project_id.resource_calendar_id .id or False, dt_start, hrs or 0.0) - result['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S') + if date_start: + resource_pool = self.pool.get('resource.resource') + project_pool = self.pool.get('project.project') + resource_calendar = self.pool.get('resource.calendar') + dt_start = mx.DateTime.strptime(date_start,'%Y-%m-%d %H:%M:%S') + resource_id = resource_pool.search(cr,uid,[('user_id','=',user_id)]) + if resource_id: + resource_obj = resource_pool.browse(cr,uid,resource_id)[0] + hrs = planned/(float(occupation_rate) * resource_obj.time_efficiency) + calendar_id = resource_obj.calendar_id.id + else: + hrs = float(planned / occupation_rate) + calendar_id = project_pool.browse(cr,uid,project).resource_calendar_id .id + work_times = resource_calendar.interval_get(cr, uid, calendar_id or False, dt_start, hrs or 0.0,resource_id or False) + result['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S') result['remaining_hours'] = planned-effective return {'value':result} @@ -480,9 +483,15 @@ class task(osv.osv): # Recursive call for all previous tasks if change in date_start < older time resource_cal_pool = self.pool.get('resource.calendar') + resource_pool = self.pool.get('resource.resource') calendar_id = task.project_id.resource_calendar_id.id hours = task.remaining_hours / task.occupation_rate - work_time = resource_cal_pool.interval_min_get(cr, uid, calendar_id or False, date_end, hours or 0.0) + resource_id = resource_pool.search(cr,uid,[('user_id','=',task.user_id.id)]) + if resource_id: + resource_obj = resource_pool.browse(cr,uid,resource_id[0]) + calendar_id = resource_obj.calendar_id.id + hours = task.planned_hours/(float(task.occupation_rate) * resource_obj.time_efficiency) + work_time = resource_cal_pool.interval_min_get(cr, uid, calendar_id or False, date_end, hours or 0.0,resource_id or False) dt_start = work_time[0][0].strftime('%Y-%m-%d %H:%M:%S') self.write(cr,uid,[task.id],{'date_start':dt_start,'date_end':date_end.strftime('%Y-%m-%d %H:%M:%S')}) @@ -490,27 +499,45 @@ class task(osv.osv): # Recursive call for all next tasks if change in date_end > older time resource_cal_pool = self.pool.get('resource.calendar') + resource_pool = self.pool.get('resource.resource') calendar_id = task.project_id.resource_calendar_id.id hours = task.remaining_hours / task.occupation_rate - work_time = resource_cal_pool.interval_get(cr, uid, calendar_id or False, date_start, hours or 0.0) + resource_id = resource_pool.search(cr,uid,[('user_id','=',task.user_id.id)]) + if resource_id: + resource_obj = resource_pool.browse(cr,uid,resource_id[0]) + calendar_id = resource_obj.calendar_id.id + hours = task.planned_hours/(float(task.occupation_rate) * resource_obj.time_efficiency) + work_time = resource_cal_pool.interval_get(cr, uid, calendar_id or False, date_start, hours or 0.0,resource_id or False) dt_end = work_time[-1][1].strftime('%Y-%m-%d %H:%M:%S') self.write(cr,uid,[task.id],{'date_start':date_start.strftime('%Y-%m-%d %H:%M:%S'),'date_end':dt_end}) def write(self, cr, uid, ids, vals,context=None): + + if not context: + context = {} + + if context.get('scheduler',False): + return super(task, self).write(cr, uid, ids, vals, context=context) + +# if the task is performed by a resource then its calendar and efficiency also taken +# otherwise the project's working calendar considered tasks = self.browse(cr,uid,ids[0]) resource_cal_pool = self.pool.get('resource.calendar') + resource_pool = self.pool.get('resource.resource') calendar_id = tasks.project_id.resource_calendar_id.id + hrs = tasks.remaining_hours / tasks.occupation_rate + resource_id = resource_pool.search(cr,uid,[('user_id','=',tasks.user_id.id)]) + if resource_id: + resource_obj = resource_pool.browse(cr,uid,resource_id[0]) + calendar_id = resource_obj.calendar_id.id + hrs = tasks.planned_hours/(float(tasks.occupation_rate) * resource_obj.time_efficiency) - if not context: - context = {} # write method changes the date_start and date_end -#for previous and next tasks respectively based on valid condition - +# for previous and next tasks respectively based on valid condition if vals.get('date_start'): if vals['date_start'] < tasks.date_start: dt_start = mx.DateTime.strptime(vals['date_start'],'%Y-%m-%d %H:%M:%S') - hrs = tasks.remaining_hours / tasks.occupation_rate - work_times = resource_cal_pool.interval_get(cr, uid, calendar_id or False, dt_start, hrs or 0.0) + work_times = resource_cal_pool.interval_get(cr, uid, calendar_id or False, dt_start, hrs or 0.0,resource_id or False) vals['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S') super(task, self).write(cr, uid, ids, vals, context=context) @@ -521,7 +548,7 @@ class task(osv.osv): if vals['date_end'] > tasks.date_end: dt_end = mx.DateTime.strptime(vals['date_end'],'%Y-%m-%d %H:%M:%S') hrs = tasks.remaining_hours / tasks.occupation_rate - work_times = resource_cal_pool.interval_min_get(cr, uid, calendar_id or False, dt_end, hrs or 0.0) + work_times = resource_cal_pool.interval_min_get(cr, uid, calendar_id or False, dt_end, hrs or 0.0,resource_id or False) vals['date_start'] = work_times[0][0].strftime('%Y-%m-%d %H:%M:%S') super(task, self).write(cr, uid, ids, vals, context=context) @@ -529,7 +556,6 @@ class task(osv.osv): self.constraint_date_end(cr,uid,next_task,dt_end) return super(task, self).write(cr, uid, ids, vals, context=context) - task() class project_work(osv.osv): -- cgit v1.2.3