diff options
| author | ksa (Open ERP) <ksa@tinyerp.co.in> | 2011-02-17 10:51:11 +0530 |
|---|---|---|
| committer | ksa (Open ERP) <ksa@tinyerp.co.in> | 2011-02-17 10:51:11 +0530 |
| commit | 19030ec02cb614f5b5b5f0168f2af0dbee4828e7 (patch) | |
| tree | 3db4f139f96b74c78c1856b8b15b906316e7ef38 /addons/project_long_term | |
| parent | 88bcdbd41d7147b02791895427a0a968cd985197 (diff) | |
| parent | 828ad75636b88806137509309f8fbef050f53bd0 (diff) | |
[MERGE]: Merge with lp:openobject-trunk-dev-addons2
bzr revid: ksa@tinyerp.co.in-20110217052111-lt9dztgezvcxgvwj
Diffstat (limited to 'addons/project_long_term')
| -rw-r--r-- | addons/project_long_term/wizard/project_compute_phases.py | 10 | ||||
| -rw-r--r-- | addons/project_long_term/wizard/project_compute_tasks.py | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py index b074f3c93e9..c07f1ae81be 100644 --- a/addons/project_long_term/wizard/project_compute_phases.py +++ b/addons/project_long_term/wizard/project_compute_phases.py @@ -45,12 +45,12 @@ class project_compute_phases(osv.osv_memory): Compute the phases for scheduling. """ project_pool = self.pool.get('project.project') - data = self.browse(cr, uid, ids, context=context)[0] - if not data.project_id and data.target_project == 'one': + data = self.read(cr, uid, ids, [], context=context)[0] + if not data['project_id'] and data['target_project'] == 'one': raise osv.except_osv(_('Error!'), _('Please Specify Project to be schedule')) - if data.project_id: # If project mentioned find its phases - project_ids = [data.project_id.id] + if data['project_id']: # If project mentioned find its phases + project_ids = [data['project_id']] else: # Else take all the draft,open,pending states phases project_ids = project_pool.search(cr, uid, [], context=context) @@ -69,7 +69,7 @@ class project_compute_phases(osv.osv_memory): id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id'] result = act_obj.read(cr, uid, [id], context=context)[0] result['target'] = 'current' - result['context'] = {"search_default_project_id":data.project_id.id or False, "default_project_id":data.project_id.id or False, "search_default_responsible_id":uid, "search_default_current": 1} + result['context'] = {"search_default_project_id":data['project_id'], "default_project_id":data['project_id'], "search_default_responsible_id":uid, "search_default_current": 1} return result project_compute_phases() diff --git a/addons/project_long_term/wizard/project_compute_tasks.py b/addons/project_long_term/wizard/project_compute_tasks.py index d5cc4eb5991..658350a27d2 100644 --- a/addons/project_long_term/wizard/project_compute_tasks.py +++ b/addons/project_long_term/wizard/project_compute_tasks.py @@ -37,8 +37,8 @@ class project_compute_tasks(osv.osv_memory): if context is None: context = {} context['compute_by'] = 'project' - data = self.browse(cr, uid, ids)[0] - project_id = data.project_id.id + data = self.read(cr, uid, ids, [])[0] + project_id = data['project_id'] project_pool.schedule_tasks(cr, uid, [project_id], context=context) return self._open_task_list(cr, uid, data, context=context) |