From 7b40023158912d0db757f6a52eaaf6f20e332b0e Mon Sep 17 00:00:00 2001 From: jam-openerp Date: Tue, 11 Jan 2011 10:54:23 +0530 Subject: [FIX-BUG] project_long_term - lp:701070 lp bug: https://launchpad.net/bugs/701070 fixed bzr revid: jam@tinyerp.com-20110111052423-ot4hx1b4rj5gtvoy --- addons/project_long_term/project_long_term.py | 7 +++++-- 1 file changed, 5 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 fc4151d855f..bd0f34ddcc3 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -517,8 +517,11 @@ def Project_%d(): # Allocating Memory for the required Project and Pahses and Resources exec(func_str) Project = eval('Project_%d' % project.id) - project = Task.BalancedProject(Project) - + project = None + try: + project = Task.BalancedProject(Project) + except : + raise osv.except_osv(_('Error !'),_('Invalid resource allocation, Phase Scheduling is not possible.\nPlease check project member resource.')) for phase_id in phase_ids: act_phase = phase_pool.browse(cr, uid, phase_id, context=context) resources = act_phase.resource_ids -- cgit v1.2.3 From 0a62db776f2894763c7fbd0a257cc052a785c227 Mon Sep 17 00:00:00 2001 From: jam-openerp Date: Tue, 11 Jan 2011 11:18:01 +0530 Subject: [FIX] project_long_term - buildbot-trunk-dev-addons1 build:595-test bzr revid: jam@tinyerp.com-20110111054801-xn9s7t653vosdrdy --- addons/project_long_term/project_long_term.py | 20 ++------------------ 1 file changed, 2 insertions(+), 18 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 bd0f34ddcc3..a795dd76dee 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -19,15 +19,10 @@ # ############################################################################## -from datetime import datetime, timedelta -from dateutil.relativedelta import relativedelta +from datetime import datetime from tools.translate import _ from osv import fields, osv from resource.faces import task as Task -import operator -from new import classobj -import types -import new class project_phase(osv.osv): _name = "project.phase" @@ -219,9 +214,7 @@ class project_phase(osv.osv): if context is None: context = {} phase_ids = [] - resource_pool = self.pool.get('resource.resource') data_pool = self.pool.get('ir.model.data') - resource_allocation_pool = self.pool.get('project.resource.allocation') uom_pool = self.pool.get('product.uom') task_pool = self.pool.get('project.task') data_model, day_uom_id = data_pool.get_object_reference(cr, uid, 'product', 'uom_day') @@ -304,9 +297,6 @@ class project_phase(osv.osv): ids = [ids] task_pool = self.pool.get('project.task') resource_pool = self.pool.get('resource.resource') - data_pool = self.pool.get('ir.model.data') - resource_allocation_pool = self.pool.get('project.resource.allocation') - for phase in self.browse(cr, uid, ids, context=context): project = phase.project_id calendar_id = project.resource_calendar_id and project.resource_calendar_id.id or False @@ -448,7 +438,6 @@ class project(osv.osv): resource_pool = self.pool.get('resource.resource') data_pool = self.pool.get('ir.model.data') resource_allocation_pool = self.pool.get('project.resource.allocation') - uom_pool = self.pool.get('product.uom') data_model, day_uom_id = data_pool.get_object_reference(cr, uid, 'product', 'uom_day') for project in self.browse(cr, uid, ids, context=context): @@ -561,7 +550,7 @@ def Project_%d(): #TODO: DO Resource allocation and compute availability def compute_allocation(self, rc, uid, ids, start_date, end_date, context=None): if context == None: - contex = {} + context = {} allocation = {} return allocation @@ -576,8 +565,6 @@ def Project_%d(): task_pool = self.pool.get('project.task') resource_pool = self.pool.get('resource.resource') data_pool = self.pool.get('ir.model.data') - resource_allocation_pool = self.pool.get('project.resource.allocation') - uom_pool = self.pool.get('product.uom') data_model, day_uom_id = data_pool.get_object_reference(cr, uid, 'product', 'uom_day') for project in self.browse(cr, uid, ids, context=context): @@ -687,9 +674,6 @@ class project_task(osv.osv): def generate_task(self, cr, uid, task_id, parent=False, flag=False, context=None): if context is None: context = {} - phase_pool = self.pool.get('project.phase') - resource_pool = self.pool.get('resource.resource') - resource_allocation_pool = self.pool.get('project.resource.allocation') task = self.browse(cr, uid, task_id, context=context) duration = str(task.planned_hours )+ 'H' str_resource = False -- cgit v1.2.3