diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2010-03-05 18:40:30 +0100 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2010-03-05 18:40:30 +0100 |
| commit | f5cee58d2d5b1b869a6f841e2cf6f70c83492154 (patch) | |
| tree | e5de2ee95b108854dc0d41c525d5490dc8e566e0 /addons/project_long_term | |
| parent | 561641716383613c2855f16da54b523ea14d44c6 (diff) | |
| parent | e0e34c0828eb19041372d4af7df7719b7a47d10d (diff) | |
merge
bzr revid: fp@tinyerp.com-20100305174030-9ig1wx0ujzwlasjb
Diffstat (limited to 'addons/project_long_term')
| -rw-r--r-- | addons/project_long_term/__terp__.py | 2 | ||||
| -rw-r--r-- | addons/project_long_term/project.py | 5 | ||||
| -rw-r--r-- | addons/project_long_term/security/ir.model.access.csv | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/addons/project_long_term/__terp__.py b/addons/project_long_term/__terp__.py index 44a15c5a679..75c73396549 100644 --- a/addons/project_long_term/__terp__.py +++ b/addons/project_long_term/__terp__.py @@ -32,7 +32,7 @@ "init_xml" : [], "demo_xml" : ["project_demo.xml"], "update_xml": [ - 'security/ir.model.access.csv', + #"security/ir.model.access.csv", "project_wizard.xml" , "project_view.xml", "project_phase_workflow.xml" diff --git a/addons/project_long_term/project.py b/addons/project_long_term/project.py index 9b41b3a726f..9c87f3048c2 100644 --- a/addons/project_long_term/project.py +++ b/addons/project_long_term/project.py @@ -339,7 +339,10 @@ class task(osv.osv): # if the task is performed by a resource then its calendar and efficiency also taken # otherwise the project's working calendar considered - tasks = self.browse( cr, uid, ids[0]) + task_id = ids + if isinstance(ids, list): + task_id = ids[0] + tasks = self.browse(cr, uid, task_id, context=context) resource_cal_pool = self.pool.get('resource.calendar') resource_pool = self.pool.get('resource.resource') calendar_id = tasks.project_id.resource_calendar_id.id diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv new file mode 100644 index 00000000000..7a91ce257ed --- /dev/null +++ b/addons/project_long_term/security/ir.model.access.csv @@ -0,0 +1,3 @@ +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_project_phase","project.phase","model_project_phase",,1,1,1,1 +"access_project_resource_allocation","project.resource.allocation","model_project_resource_allocation",,1,1,1,1 |