diff options
| author | Sbh (OpenERP) <sbh@tinyerp.com> | 2010-12-31 10:29:26 +0530 |
|---|---|---|
| committer | Sbh (OpenERP) <sbh@tinyerp.com> | 2010-12-31 10:29:26 +0530 |
| commit | a329a57bdde3ca4006a1fea853c2cde49b90aa40 (patch) | |
| tree | 7ca3a5b3ff097185d5e275a195012c2df1141941 /addons/project_long_term/wizard | |
| parent | acf9c6417981c09f7a7f12fe5423705c542e623f (diff) | |
| parent | f8c4b4e72ffea7448648cb1b5e4e5576c9cfa970 (diff) | |
[MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20101230131110-8l42t3b4hituf7aj
bzr revid: sbh@tinyerp.com-20101231045926-gqkspd1jgoglv2qj
Diffstat (limited to 'addons/project_long_term/wizard')
| -rw-r--r-- | addons/project_long_term/wizard/project_compute_phases.py | 5 | ||||
| -rw-r--r-- | addons/project_long_term/wizard/project_compute_tasks.py | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py index 351297384fd..c07f1ae81be 100644 --- a/addons/project_long_term/wizard/project_compute_phases.py +++ b/addons/project_long_term/wizard/project_compute_phases.py @@ -65,10 +65,11 @@ class project_compute_phases(osv.osv_memory): context = {} mod_obj = self.pool.get('ir.model.data') act_obj = self.pool.get('ir.actions.act_window') - result = mod_obj._get_id(cr, uid, 'project_long_term', 'act_project_phase_list') + result = mod_obj._get_id(cr, uid, 'project_long_term', 'act_project_phase') id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id'] result = act_obj.read(cr, uid, [id], context=context)[0] - result['context'] = {"search_default_project_id":data['project_id'], "search_default_responsible_id":uid, "search_default_current": 1} + result['target'] = 'current' + 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 0d5fa22e6a8..658350a27d2 100644 --- a/addons/project_long_term/wizard/project_compute_tasks.py +++ b/addons/project_long_term/wizard/project_compute_tasks.py @@ -50,13 +50,13 @@ class project_compute_tasks(osv.osv_memory): context = {} mod_obj = self.pool.get('ir.model.data') act_obj = self.pool.get('ir.actions.act_window') - result = mod_obj._get_id(cr, uid, 'project', 'action_view_task') + result = mod_obj._get_id(cr, uid, 'project_long_term', 'act_resouce_allocation') id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id'] result = {} if not id: return result result = act_obj.read(cr, uid, [id], context=context)[0] - result['context'] = {"search_default_project_id":data['project_id'], "search_default_user_id":uid, "search_default_current": 1} + result['target'] = 'current' return result project_compute_tasks() |