diff options
| author | Sbh (OpenERP) <sbh@tinyerp.com> | 2011-01-17 18:15:14 +0530 |
|---|---|---|
| committer | Sbh (OpenERP) <sbh@tinyerp.com> | 2011-01-17 18:15:14 +0530 |
| commit | 14235e6de3b7cd35ff0fae1738c6b37c3e1a56ec (patch) | |
| tree | 22a6fba29d03647e6cb9ffa811a4041ec3b84d1a /addons/project_long_term/project_long_term.py | |
| parent | 2e445afbc044f1734aea631c7bcfa6b5458d2c2e (diff) | |
| parent | 008fb8b7f2188f4419a594d09257a650cd02c332 (diff) | |
[MERGE] Merge project and caladav improverment
bzr revid: sbh@tinyerp.com-20110117124514-q13c62rmhby7zvqr
Diffstat (limited to 'addons/project_long_term/project_long_term.py')
| -rw-r--r-- | addons/project_long_term/project_long_term.py | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index a795dd76dee..0e605ed4331 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -364,7 +364,12 @@ def Phase_%d(): # Allocating Memory for the required Project and Pahses and Resources exec(func_str) Phase = eval('Phase_%d' % phase.id) - phase = Task.BalancedProject(Phase) + phase = None + try: + phase = Task.BalancedProject(Phase) + except : + raise osv.except_osv(_('Error !'),_('Phase Scheduling is not possible.\nProject should have the Start date and member for scheduling.')) + for task_id in task_ids: task = eval("phase.Task_%d" % task_id) @@ -510,7 +515,8 @@ def Project_%d(): try: project = Task.BalancedProject(Project) except : - raise osv.except_osv(_('Error !'),_('Invalid resource allocation, Phase Scheduling is not possible.\nPlease check project member resource.')) + raise osv.except_osv(_('Error !'),_('Phase Scheduling is not possible.\nProject should have the Start date and member for scheduling.')) + for phase_id in phase_ids: act_phase = phase_pool.browse(cr, uid, phase_id, context=context) resources = act_phase.resource_ids @@ -573,7 +579,10 @@ def Project_%d(): #Creating resources using the member of the Project u_ids = [i.id for i in project.members] resource_objs = resource_pool.generate_resources(cr, uid, u_ids, calendar_id, context=context) - start_date = datetime.strftime((datetime.strptime(start_date, "%Y-%m-%d")), "%Y-%m-%d") + try: + start_date = datetime.strftime((datetime.strptime(start_date, "%Y-%m-%d")), "%Y-%m-%d") + except: + raise osv.except_osv(_('Error !'),_('Task Scheduling is not possible.\nProject should have the Start date for scheduling.')) func_str = '' start = start_date minimum_time_unit = 1 @@ -634,7 +643,12 @@ 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 !'),_('Phase Scheduling is not possible.\nProject should have the Start date and member for scheduling.')) + for task_id in task_ids: task = eval("project.Task_%d" % task_id) start_date = task.start.to_datetime() |