From 7300add4a7d90f8d4fae3a897dd8add4902f6751 Mon Sep 17 00:00:00 2001 From: "Rvo (Open ERP)" Date: Thu, 18 Feb 2010 18:43:18 +0530 Subject: [PATCH] [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 +++++++++++++++++++-- addons/project/wizard/compute_tasks_date.py | 2 +- 2 files changed, 62 insertions(+), 5 deletions(-) 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): diff --git a/addons/project/wizard/compute_tasks_date.py b/addons/project/wizard/compute_tasks_date.py index 5dc7c9ae007..c44fb902e87 100644 --- a/addons/project/wizard/compute_tasks_date.py +++ b/addons/project/wizard/compute_tasks_date.py @@ -216,7 +216,7 @@ class wizard_compute_tasks(wizard.interface): project_pool.write(cr,uid,[project_id],{'date':e_date}) else: user_id = user_pool.search(cr,uid,[('name','=',t.booked_resource[0].__name__)]) - task_pool.write(cr,uid,[task_obj[loop_no-1].id],{'date_start':s_date,'date_deadline':e_date,'user_id':user_id[0]}) + task_pool.write(cr,uid,[task_obj[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]}) loop_no +=1 return {}