From c767e71683c0a5032ca6969d759e8773384d2255 Mon Sep 17 00:00:00 2001 From: "mra (Open ERP)" Date: Mon, 15 Mar 2010 15:23:48 +0530 Subject: [RENAME] project_long_term: Rename all files bzr revid: mra@tinyerp.com-20100315095348-00v3a6vt2wja0idh --- addons/project_long_term/project_long_term.py | 361 ++++++++++++++++++++++++++ 1 file changed, 361 insertions(+) create mode 100644 addons/project_long_term/project_long_term.py (limited to 'addons/project_long_term/project_long_term.py') diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py new file mode 100644 index 00000000000..48129f40bb8 --- /dev/null +++ b/addons/project_long_term/project_long_term.py @@ -0,0 +1,361 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). +# +# 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 . +# +############################################################################## +from lxml import etree +import mx.DateTime +import time + +from tools.translate import _ +from osv import fields, osv + +class project_phase(osv.osv): + _name = "project.phase" + _description = "Project Phase" + + def _check_recursion(self, cr, uid, ids, context={}): + data_phase = self.browse(cr, uid, ids[0], context=context) + prev_ids = data_phase.previous_phase_ids + next_ids = data_phase.next_phase_ids + # it should nither be in prev_ids nor in next_ids + if (data_phase in prev_ids) or (data_phase in next_ids): + return False + ids = [id for id in prev_ids if id in next_ids] + # both prev_ids and next_ids must be unique + if ids: + return False + # unrelated project + prev_ids = [rec.id for rec in prev_ids] + next_ids = [rec.id for rec in next_ids] + # iter prev_ids + while prev_ids: + cr.execute('select distinct prv_phase_id from project_phase_rel where next_phase_id in ('+','.join(map(str, prev_ids))+')') + prv_phase_ids = filter(None, map(lambda x: x[0], cr.fetchall())) + if data_phase.id in prv_phase_ids: + return False + ids = [id for id in prv_phase_ids if id in next_ids] + if ids: + return False + prev_ids = prv_phase_ids + # iter next_ids + while next_ids: + cr.execute('select distinct next_phase_id from project_phase_rel where prv_phase_id in ('+','.join(map(str, next_ids))+')') + next_phase_ids = filter(None, map(lambda x: x[0], cr.fetchall())) + if data_phase.id in next_phase_ids: + return False + ids = [id for id in next_phase_ids if id in prev_ids] + if ids: + return False + next_ids = next_phase_ids + return True + + def _check_dates(self, cr, uid, ids, context={}): + phase = self.read(cr, uid, ids[0], ['date_start', 'date_end'], context=context) + if phase['date_start'] and phase['date_end'] and phase['date_start'] > phase['date_end']: + return False + return True + + def _check_constraint_start(self, cr, uid, ids, context={}): + phase = self.read(cr, uid, ids[0], ['date_start', 'constraint_date_start'], context=context) + if phase['date_start'] and phase['constraint_date_start'] and phase['date_start'] < phase['constraint_date_start']: + return False + return True + + def _check_constraint_end(self, cr, uid, ids, context={}): + phase = self.read(cr, uid, ids[0], ['date_end', 'constraint_date_end'], context=context) + if phase['date_end'] and phase['constraint_date_end'] and phase['date_end'] > phase['constraint_date_end']: + return False + return True + + _columns = { + 'name': fields.char("Phase Name", size=64, required=True), + 'date_start': fields.datetime('Starting Date'), + 'date_end': fields.datetime('End Date'), + 'constraint_date_start': fields.datetime('Start Date', help='force the phase to start after this date'), + 'constraint_date_end': fields.datetime('End Date', help='force the phase to finish before this date'), + 'project_id': fields.many2one('project.project', 'Project', required=True), + 'next_phase_ids': fields.many2many('project.phase', 'project_phase_rel', 'prv_phase_id', 'next_phase_id', 'Next Phases'), + 'previous_phase_ids': fields.many2many('project.phase', 'project_phase_rel', 'next_phase_id', 'prv_phase_id', 'Previous Phases'), + 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of phases."), + 'duration': fields.float('Duration', required=True), + 'product_uom': fields.many2one('product.uom', 'Duration UoM', required=True, help="UoM (Unit of Measure) is the unit of measurement for Duration"), + 'task_ids': fields.one2many('project.task', 'phase_id', "Project Tasks"), + 'resource_ids': fields.one2many('project.resource.allocation', 'phase_id', "Project Resources"), + 'responsible_id':fields.many2one('res.users', 'Responsible'), + 'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True, + help='If the phase is created the state \'Draft\'.\n If the phase is started, the state becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' state.\ + \n If the phase is over, the states is set to \'Done\'.') + } + _defaults = { + 'responsible_id': lambda obj,cr,uid,context: uid, + 'date_start': lambda *a: time.strftime('%Y-%m-%d'), + 'state': lambda *a: 'draft', + 'sequence': lambda *a: 10, + } + _order = "name" + _constraints = [ + (_check_recursion,'Error ! Loops In Phases Not Allowed',['next_phase_ids', 'previous_phase_ids']), + (_check_dates, 'Error! Phase start-date must be lower then Phase end-date.', ['date_start', 'date_end']), + (_check_constraint_start, 'Error! Phase must start-after Constraint Start Date.', ['date_start', 'constraint_date_start']), + (_check_constraint_end, 'Error! Phase must end-before Constraint End Date.', ['date_end', 'constraint_date_end']), + ] + + def onchange_project(self, cr, uid, ids, project, context={}): + result = {} + project_obj = self.pool.get('project.project') + if project: + project_id = project_obj.browse(cr, uid, project, context=context) + if project_id.date_start: + result['date_start'] = mx.DateTime.strptime(project_id.date_start, "%Y-%m-%d").strftime('%Y-%m-%d %H:%M:%S') + return {'value': result} + return {'value': {'date_start': []}} + + def _check_date_start(self, cr, uid, phase, date_end, context={}): + """ + Check And Compute date_end of phase if change in date_start < older time. + """ + uom_obj = self.pool.get('product.uom') + resource_obj = self.pool.get('resource.resource') + cal_obj = self.pool.get('resource.calendar') + calendar_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False + resource_id = resource_obj.search(cr, uid, [('user_id', '=', phase.responsible_id.id)]) + if resource_id: + cal_id = resource_obj.browse(cr, uid, resource_id[0], context=context).calendar_id.id + if cal_id: + calendar_id = cal_id + default_uom_id = uom_obj.search(cr, uid, [('name', '=', 'Hour')], context=context)[0] + avg_hours = uom_obj._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id) + work_times = cal_obj.interval_min_get(cr, uid, calendar_id, date_end, avg_hours or 0.0, resource_id and resource_id[0] or False) + dt_start = work_times[0][0].strftime('%Y-%m-%d %H:%M:%S') + self.write(cr, uid, [phase.id], {'date_start': dt_start, 'date_end': date_end.strftime('%Y-%m-%d %H:%M:%S')}, context=context) + + def _check_date_end(self, cr, uid, phase, date_start, context={}): + """ + Check And Compute date_end of phase if change in date_end > older time. + """ + uom_obj = self.pool.get('product.uom') + resource_obj = self.pool.get('resource.resource') + cal_obj = self.pool.get('resource.calendar') + calendar_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False + resource_id = resource_obj.search(cr, uid, [('user_id', '=', phase.responsible_id.id)], context=context) + if resource_id: + cal_id = resource_obj.browse(cr, uid, resource_id[0], context=context).calendar_id.id + if cal_id: + calendar_id = cal_id + default_uom_id = uom_obj.search(cr, uid, [('name', '=', 'Hour')], context=context)[0] + avg_hours = uom_obj._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id) + work_times = cal_obj.interval_get(cr, uid, calendar_id, date_start, avg_hours or 0.0, resource_id and resource_id[0] or False) + dt_end = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S') + self.write(cr, uid, [phase.id], {'date_start': date_start.strftime('%Y-%m-%d %H:%M:%S'), 'date_end': dt_end}, context=context) + + def write(self, cr, uid, ids, vals, context={}): + resource_calendar_obj = self.pool.get('resource.calendar') + resource_obj = self.pool.get('resource.resource') + uom_obj = self.pool.get('product.uom') + if not context: + context = {} + if context.get('scheduler',False): + return super(project_phase, self).write(cr, uid, ids, vals, context=context) + # Consider calendar and efficiency if the phase is performed by a resource + # otherwise consider the project's working calendar + phase = self.browse(cr, uid, ids[0], context=context) + calendar_id = phase.project_id.resource_calendar_id.id + resource_id = resource_obj.search(cr, uid, [('user_id', '=', phase.responsible_id.id)],context=context) + if resource_id: + cal_id = resource_obj.browse(cr, uid, resource_id[0], context=context).calendar_id.id + if cal_id: + calendar_id = cal_id + default_uom_id = uom_obj.search(cr, uid, [('name', '=', 'Hour')])[0] + avg_hours = uom_obj._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id) + + # Change the date_start and date_end + # for previous and next phases respectively based on valid condition + if vals.get('date_start', False) and vals['date_start'] < phase.date_start: + dt_start = mx.DateTime.strptime(vals['date_start'],'%Y-%m-%d %H:%M:%S') + work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id or False, dt_start, avg_hours or 0.0, resource_id and resource_id[0] or False) + vals['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S') + for prv_phase in phase.previous_phase_ids: + self._check_date_start(cr, uid, prv_phase, dt_start, context=context) + if vals.get('date_end', False) and vals['date_end'] > phase.date_end: + dt_end = mx.DateTime.strptime(vals['date_end'],'%Y-%m-%d %H:%M:%S') + work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id or False, dt_end, avg_hours or 0.0, resource_id and resource_id[0] or False) + vals['date_start'] = work_times[0][0].strftime('%Y-%m-%d %H:%M:%S') + for next_phase in phase.next_phase_ids: + self._check_date_end(cr, uid, next_phase, dt_end, context=context) + return super(project_phase, self).write(cr, uid, ids, vals, context=context) + + def set_draft(self, cr, uid, ids, *args): + self.write(cr, uid, ids, {'state': 'draft'}) + return True + + def set_open(self, cr, uid, ids, *args): + self.write(cr, uid, ids, {'state': 'open'}) + return True + + def set_pending(self, cr, uid, ids,*args): + self.write(cr, uid, ids, {'state': 'pending'}) + return True + + def set_cancel(self, cr, uid, ids, *args): + self.write(cr, uid, ids, {'state': 'cancelled'}) + return True + + def set_done(self, cr, uid, ids, *args): + self.write(cr, uid, ids, {'state': 'done'}) + return True + +project_phase() + +class project_resource_allocation(osv.osv): + _name = 'project.resource.allocation' + _description = 'Project Resource Allocation' + _rec_name = 'resource_id' + _columns = { + 'resource_id': fields.many2one('resource.resource', 'Resource', required=True), + 'phase_id': fields.many2one('project.phase', 'Project Phase', required=True), + 'useability': fields.float('Useability', help="Useability of this ressource for this project phase in percentage (=50%)"), + } + _defaults = { + 'useability': lambda *a: 100, + } + +project_resource_allocation() + +class project(osv.osv): + _inherit = "project.project" + _description = "Project" + _columns = { + 'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"), + 'resource_calendar_id': fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report"), + } + +project() + +class task(osv.osv): + _inherit = "project.task" + _description = "Task" + _columns = { + 'phase_id': fields.many2one('project.phase', 'Project Phase'), + 'occupation_rate': fields.float('Occupation Rate', help='The occupation rate fields indicates how much of his time a user is working on a task. A 100% occupation rate means the user works full time on the tasks. The ending date of a task is computed like this: Starting Date + Duration / Occupation Rate.'), + 'planned_hours': fields.float('Planned Hours', required=True, help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'), + } + _defaults = { + 'occupation_rate':lambda *a: '1' + } + + 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 = {} + resource_obj = self.pool.get('resource.resource') + project_pool = self.pool.get('project.project') + resource_calendar = self.pool.get('resource.calendar') + if date_start: + hrs = float(planned / float(occupation_rate)) + calendar_id = project_pool.browse(cr, uid, project).resource_calendar_id.id + dt_start = mx.DateTime.strptime(date_start, '%Y-%m-%d %H:%M:%S') + resource_id = resource_obj.search(cr, uid, [('user_id','=',user_id)]) + if resource_id: + resource = resource_obj.browse(cr, uid, resource_id)[0] + hrs = planned / (float(occupation_rate) * resource.time_efficiency) + if resource.calendar_id.id: + calendar_id = 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} + + def _check_date_start(self, cr, uid, task, date_end, context={}): + """ + Check And Compute date_end of task if change in date_start < older time. + """ + resource_calendar_obj = self.pool.get('resource.calendar') + resource_obj = self.pool.get('resource.resource') + calendar_id = task.project_id.resource_calendar_id.id + hours = task.planned_hours / task.occupation_rate + resource_id = resource_obj.search(cr, uid, [('user_id', '=', task.user_id.id)], context=context) + if resource_id: + resource = resource_obj.browse(cr, uid, resource_id[0], context=context) + if resource.calendar_id.id: + calendar_id = resource.calendar_id.id + hours = task.planned_hours / (float(task.occupation_rate) * resource.time_efficiency) + work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id or False, date_end, hours or 0.0, resource_id or False) + dt_start = work_times[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 _check_date_end(self, cr, uid, task, date_start, context={}): + """ + Check And Compute date_end of task if change in date_end > older time. + """ + resource_calendar_obj = self.pool.get('resource.calendar') + resource_obj = self.pool.get('resource.resource') + calendar_id = task.project_id.resource_calendar_id.id + hours = task.planned_hours / task.occupation_rate + resource_id = resource_obj.search(cr,uid,[('user_id', '=', task.user_id.id)], context=context) + if resource_id: + resource = resource_obj.browse(cr, uid, resource_id[0], context=context) + if resource.calendar_id.id: + calendar_id = resource.calendar_id.id + hours = task.planned_hours / (float(task.occupation_rate) * resource.time_efficiency) + work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id or False, date_start, hours or 0.0, resource.id or False) + dt_end = work_times[-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}, context=context) + + def write(self, cr, uid, ids, vals, context={}): + resource_calendar_obj = self.pool.get('resource.calendar') + resource_obj = self.pool.get('resource.resource') + if not context: + context = {} + if context.get('scheduler',False): + return super(task, self).write(cr, uid, ids, vals, context=context) + + # Consider calendar and efficiency if the task is performed by a resource + # otherwise consider the project's working calendar + task_id = ids + if isinstance(ids, list): + task_id = ids[0] + task_rec = self.browse(cr, uid, task_id, context=context) + calendar_id = task_rec.project_id.resource_calendar_id.id + hrs = task_rec.planned_hours / task_rec.occupation_rate + resource_id = resource_obj.search(cr, uid, [('user_id', '=', task_rec.user_id.id)], context=context) + if resource_id: + resource = resource_obj.browse(cr, uid, resource_id[0], context=context) + if resource.calendar_id.id: + calendar_id = resource.calendar_id.id + hrs = task_rec.planned_hours / (float(task_rec.occupation_rate) * resource.time_efficiency) + + # Change the date_start and date_end + # for previous and next tasks respectively based on valid condition + if vals.get('date_start', False) and vals['date_start'] < task_rec.date_start: + dt_start = mx.DateTime.strptime(vals['date_start'], '%Y-%m-%d %H:%M:%S') + work_times = resource_calendar_obj.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) + for prv_task in task_rec.parent_ids: + self._check_date_start(cr, uid, prv_task, dt_start) + if vals.get('date_end', False) and vals['date_end'] > task_rec.date_end: + dt_end = mx.DateTime.strptime(vals['date_end'], '%Y-%m-%d %H:%M:%S') + work_times = resource_calendar_obj.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) + for next_task in task_rec.child_ids: + self._check_date_end(cr, uid, next_task, dt_end) + + return super(task, self).write(cr, uid, ids, vals, context=context) + +task() +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file -- cgit v1.2.3 From 4f7ece5e75b7cb0dbd730fbb9f4a5119c5d7d7b2 Mon Sep 17 00:00:00 2001 From: "mra (Open ERP)" Date: Tue, 16 Mar 2010 15:00:14 +0530 Subject: [IMP] project_long_term: improve the code bzr revid: mra@tinyerp.com-20100316093014-m1t1z0nb8j05s8x9 --- addons/project_long_term/project_long_term.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'addons/project_long_term/project_long_term.py') diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 48129f40bb8..ea11df9f9bd 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -136,7 +136,9 @@ class project_phase(osv.osv): calendar_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False resource_id = resource_obj.search(cr, uid, [('user_id', '=', phase.responsible_id.id)]) if resource_id: - cal_id = resource_obj.browse(cr, uid, resource_id[0], context=context).calendar_id.id +# cal_id = resource_obj.browse(cr, uid, resource_id[0], context=context).calendar_id.id + res = resource_obj.read(cr, uid, resource_id[0], ['calendar_id'], context=context)[0] + cal_id = res.get('calendar_id', False) and res.get('calendar_id')[0] or False if cal_id: calendar_id = cal_id default_uom_id = uom_obj.search(cr, uid, [('name', '=', 'Hour')], context=context)[0] @@ -155,7 +157,9 @@ class project_phase(osv.osv): calendar_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False resource_id = resource_obj.search(cr, uid, [('user_id', '=', phase.responsible_id.id)], context=context) if resource_id: - cal_id = resource_obj.browse(cr, uid, resource_id[0], context=context).calendar_id.id +# cal_id = resource_obj.browse(cr, uid, resource_id[0], context=context).calendar_id.id + res = resource_obj.read(cr, uid, resource_id[0], ['calendar_id'], context=context)[0] + cal_id = res.get('calendar_id', False) and res.get('calendar_id')[0] or False if cal_id: calendar_id = cal_id default_uom_id = uom_obj.search(cr, uid, [('name', '=', 'Hour')], context=context)[0] -- cgit v1.2.3 From 6b1e33084627d46a4a27e189f133e2873971e438 Mon Sep 17 00:00:00 2001 From: "mra (Open ERP)" Date: Tue, 16 Mar 2010 15:11:40 +0530 Subject: [IMP] project_long_term: clean bzr revid: mra@tinyerp.com-20100316094140-imcm84fndhikqzqj --- addons/project_long_term/project_long_term.py | 28 +++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'addons/project_long_term/project_long_term.py') diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index ea11df9f9bd..684fbcc776a 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -179,7 +179,7 @@ class project_phase(osv.osv): # Consider calendar and efficiency if the phase is performed by a resource # otherwise consider the project's working calendar phase = self.browse(cr, uid, ids[0], context=context) - calendar_id = phase.project_id.resource_calendar_id.id + calendar_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False resource_id = resource_obj.search(cr, uid, [('user_id', '=', phase.responsible_id.id)],context=context) if resource_id: cal_id = resource_obj.browse(cr, uid, resource_id[0], context=context).calendar_id.id @@ -192,13 +192,13 @@ class project_phase(osv.osv): # for previous and next phases respectively based on valid condition if vals.get('date_start', False) and vals['date_start'] < phase.date_start: dt_start = mx.DateTime.strptime(vals['date_start'],'%Y-%m-%d %H:%M:%S') - work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id or False, dt_start, avg_hours or 0.0, resource_id and resource_id[0] or False) + work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id, dt_start, avg_hours or 0.0, resource_id and resource_id[0] or False) vals['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S') for prv_phase in phase.previous_phase_ids: self._check_date_start(cr, uid, prv_phase, dt_start, context=context) if vals.get('date_end', False) and vals['date_end'] > phase.date_end: dt_end = mx.DateTime.strptime(vals['date_end'],'%Y-%m-%d %H:%M:%S') - work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id or False, dt_end, avg_hours or 0.0, resource_id and resource_id[0] or False) + work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id, dt_end, avg_hours or 0.0, resource_id and resource_id[0] or False) vals['date_start'] = work_times[0][0].strftime('%Y-%m-%d %H:%M:%S') for next_phase in phase.next_phase_ids: self._check_date_end(cr, uid, next_phase, dt_end, context=context) @@ -278,7 +278,7 @@ class task(osv.osv): hrs = planned / (float(occupation_rate) * resource.time_efficiency) if resource.calendar_id.id: calendar_id = 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) + work_times = resource_calendar.interval_get(cr, uid, calendar_id, 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} @@ -289,15 +289,15 @@ class task(osv.osv): """ resource_calendar_obj = self.pool.get('resource.calendar') resource_obj = self.pool.get('resource.resource') - calendar_id = task.project_id.resource_calendar_id.id + calendar_id = task.project_id.resource_calendar_id and task.project_id.resource_calendar_id.id or False hours = task.planned_hours / task.occupation_rate resource_id = resource_obj.search(cr, uid, [('user_id', '=', task.user_id.id)], context=context) if resource_id: resource = resource_obj.browse(cr, uid, resource_id[0], context=context) if resource.calendar_id.id: - calendar_id = resource.calendar_id.id + calendar_id = resource.calendar_id and resource.calendar_id.id or False hours = task.planned_hours / (float(task.occupation_rate) * resource.time_efficiency) - work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id or False, date_end, hours or 0.0, resource_id or False) + work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id, date_end, hours or 0.0, resource_id or False) dt_start = work_times[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')}) @@ -307,15 +307,15 @@ class task(osv.osv): """ resource_calendar_obj = self.pool.get('resource.calendar') resource_obj = self.pool.get('resource.resource') - calendar_id = task.project_id.resource_calendar_id.id + calendar_id = task.project_id.resource_calendar_id and task.project_id.resource_calendar_id.id or False hours = task.planned_hours / task.occupation_rate resource_id = resource_obj.search(cr,uid,[('user_id', '=', task.user_id.id)], context=context) if resource_id: resource = resource_obj.browse(cr, uid, resource_id[0], context=context) if resource.calendar_id.id: - calendar_id = resource.calendar_id.id + calendar_id = resource.calendar_id and resource.calendar_id.id or False hours = task.planned_hours / (float(task.occupation_rate) * resource.time_efficiency) - work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id or False, date_start, hours or 0.0, resource.id or False) + work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id, date_start, hours or 0.0, resource.id or False) dt_end = work_times[-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}, context=context) @@ -333,27 +333,27 @@ class task(osv.osv): if isinstance(ids, list): task_id = ids[0] task_rec = self.browse(cr, uid, task_id, context=context) - calendar_id = task_rec.project_id.resource_calendar_id.id + calendar_id = task_rec.project_id.resource_calendar_id and task_rec.project_id.resource_calendar_id.id or False hrs = task_rec.planned_hours / task_rec.occupation_rate resource_id = resource_obj.search(cr, uid, [('user_id', '=', task_rec.user_id.id)], context=context) if resource_id: resource = resource_obj.browse(cr, uid, resource_id[0], context=context) if resource.calendar_id.id: - calendar_id = resource.calendar_id.id + calendar_id = resource.calendar_id and resource.calendar_id.id or False hrs = task_rec.planned_hours / (float(task_rec.occupation_rate) * resource.time_efficiency) # Change the date_start and date_end # for previous and next tasks respectively based on valid condition if vals.get('date_start', False) and vals['date_start'] < task_rec.date_start: dt_start = mx.DateTime.strptime(vals['date_start'], '%Y-%m-%d %H:%M:%S') - work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id or False, dt_start, hrs or 0.0, resource.id or False) + work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id, 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) for prv_task in task_rec.parent_ids: self._check_date_start(cr, uid, prv_task, dt_start) if vals.get('date_end', False) and vals['date_end'] > task_rec.date_end: dt_end = mx.DateTime.strptime(vals['date_end'], '%Y-%m-%d %H:%M:%S') - work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id or False, dt_end, hrs or 0.0, resource.id or False) + work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id, 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) for next_task in task_rec.child_ids: -- cgit v1.2.3 From 838fc7e85c800559d850362cb3607cd43caa0444 Mon Sep 17 00:00:00 2001 From: "mra (Open ERP)" Date: Wed, 17 Mar 2010 12:45:53 +0530 Subject: [IMP] project_long_term: Bug fixes and clean [IMP] project: if the task description is not available it will take task name to send mail to partner on Done button bzr revid: mra@tinyerp.com-20100317071553-3ydcpes6z8f52744 --- addons/project_long_term/project_long_term.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'addons/project_long_term/project_long_term.py') diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 684fbcc776a..f0e2a78282f 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -265,20 +265,24 @@ class task(osv.osv): 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 = {} + resource = False resource_obj = self.pool.get('resource.resource') project_pool = self.pool.get('project.project') resource_calendar = self.pool.get('resource.calendar') + if not project: + return {'value' : result} if date_start: hrs = float(planned / float(occupation_rate)) calendar_id = project_pool.browse(cr, uid, project).resource_calendar_id.id dt_start = mx.DateTime.strptime(date_start, '%Y-%m-%d %H:%M:%S') resource_id = resource_obj.search(cr, uid, [('user_id','=',user_id)]) if resource_id: - resource = resource_obj.browse(cr, uid, resource_id)[0] - hrs = planned / (float(occupation_rate) * resource.time_efficiency) - if resource.calendar_id.id: - calendar_id = resource.calendar_id.id - work_times = resource_calendar.interval_get(cr, uid, calendar_id, dt_start, hrs or 0.0, resource.id or False) + resource_data = resource_obj.browse(cr, uid, resource_id)[0] + resource = resource_data.id + hrs = planned / (float(occupation_rate) * resource_data.time_efficiency) + if resource_data.calendar_id.id: + calendar_id = resource_data.calendar_id.id + work_times = resource_calendar.interval_get(cr, uid, calendar_id, dt_start, hrs or 0.0, resource or False) result['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S') result['remaining_hours'] = planned - effective return {'value' : result} -- cgit v1.2.3 From 38d6ac1db2682a5f241e50820292261cd58f1030 Mon Sep 17 00:00:00 2001 From: "mra (Open ERP)" Date: Mon, 22 Mar 2010 18:46:12 +0530 Subject: [FIX] project_long_term bzr revid: mra@tinyerp.com-20100322131612-dd0zute6p9mqwtu5 --- addons/project_long_term/project_long_term.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/project_long_term/project_long_term.py') diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index f0e2a78282f..46aedb09d77 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -301,7 +301,7 @@ class task(osv.osv): if resource.calendar_id.id: calendar_id = resource.calendar_id and resource.calendar_id.id or False hours = task.planned_hours / (float(task.occupation_rate) * resource.time_efficiency) - work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id, date_end, hours or 0.0, resource_id or False) + work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id, date_end, hours or 0.0, resource_id and resource_id[0] or False) dt_start = work_times[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')}) @@ -319,7 +319,7 @@ class task(osv.osv): if resource.calendar_id.id: calendar_id = resource.calendar_id and resource.calendar_id.id or False hours = task.planned_hours / (float(task.occupation_rate) * resource.time_efficiency) - work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id, date_start, hours or 0.0, resource.id or False) + work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id, date_start, hours or 0.0, resource_id and resource_id[0] or False) dt_end = work_times[-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}, context=context) -- cgit v1.2.3 From 717d62066f9193665ec3a54cb50f999a06c4e10e Mon Sep 17 00:00:00 2001 From: "mra (Open ERP)" Date: Mon, 22 Mar 2010 18:58:36 +0530 Subject: [FIX] project_long_term: Small error fix bzr revid: mra@tinyerp.com-20100322132836-nihxqrvcbs79pkwb --- addons/project_long_term/project_long_term.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'addons/project_long_term/project_long_term.py') diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 46aedb09d77..0ac0f902220 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -193,13 +193,15 @@ class project_phase(osv.osv): if vals.get('date_start', False) and vals['date_start'] < phase.date_start: dt_start = mx.DateTime.strptime(vals['date_start'],'%Y-%m-%d %H:%M:%S') work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id, dt_start, avg_hours or 0.0, resource_id and resource_id[0] or False) - vals['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S') + if work_times: + vals['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S') for prv_phase in phase.previous_phase_ids: self._check_date_start(cr, uid, prv_phase, dt_start, context=context) if vals.get('date_end', False) and vals['date_end'] > phase.date_end: dt_end = mx.DateTime.strptime(vals['date_end'],'%Y-%m-%d %H:%M:%S') work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id, dt_end, avg_hours or 0.0, resource_id and resource_id[0] or False) - vals['date_start'] = work_times[0][0].strftime('%Y-%m-%d %H:%M:%S') + if work_times: + vals['date_start'] = work_times[0][0].strftime('%Y-%m-%d %H:%M:%S') for next_phase in phase.next_phase_ids: self._check_date_end(cr, uid, next_phase, dt_end, context=context) return super(project_phase, self).write(cr, uid, ids, vals, context=context) @@ -283,7 +285,8 @@ class task(osv.osv): if resource_data.calendar_id.id: calendar_id = resource_data.calendar_id.id work_times = resource_calendar.interval_get(cr, uid, calendar_id, dt_start, hrs or 0.0, resource or False) - result['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S') + if work_times: + result['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S') result['remaining_hours'] = planned - effective return {'value' : result} @@ -351,15 +354,15 @@ class task(osv.osv): if vals.get('date_start', False) and vals['date_start'] < task_rec.date_start: dt_start = mx.DateTime.strptime(vals['date_start'], '%Y-%m-%d %H:%M:%S') work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id, 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) + if work_times: + vals['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S') for prv_task in task_rec.parent_ids: self._check_date_start(cr, uid, prv_task, dt_start) if vals.get('date_end', False) and vals['date_end'] > task_rec.date_end: dt_end = mx.DateTime.strptime(vals['date_end'], '%Y-%m-%d %H:%M:%S') work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id, 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) + if work_times: + vals['date_start'] = work_times[0][0].strftime('%Y-%m-%d %H:%M:%S') for next_task in task_rec.child_ids: self._check_date_end(cr, uid, next_task, dt_end) -- cgit v1.2.3