diff options
| author | Raphael Collet <rco@openerp.com> | 2012-06-12 11:58:35 +0200 |
|---|---|---|
| committer | Raphael Collet <rco@openerp.com> | 2012-06-12 11:58:35 +0200 |
| commit | fcca76b487575e82f00ab8ff9d8f021f3fa3187d (patch) | |
| tree | 733d6ceab7177d52e91f02bc27203419fa5ada8b /addons | |
| parent | b152336fe48e6b5c4cc4dd9b48f2fae124771ba9 (diff) | |
| parent | 3daedd56c24e9a86d74dedb2b3b04f4d09e3bd32 (diff) | |
[MERGE] trunk-first_10_clicks-psi (add group to enable task delegation)
bzr revid: rco@openerp.com-20120612095835-iisiv73hqbhe9l9w
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/project/project_view.xml | 4 | ||||
| -rw-r--r-- | addons/project/res_config.py | 5 | ||||
| -rw-r--r-- | addons/project/res_config_view.xml | 1 | ||||
| -rw-r--r-- | addons/project/security/project_security.xml | 5 |
4 files changed, 12 insertions, 3 deletions
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index e8d2455be89..fb875b9dc60 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -336,7 +336,7 @@ <button name="do_draft" string="Draft" type="object" states="cancel,done"/> <button name="%(action_project_task_delegate)d" string="Delegate" type="action" - states="pending,open,draft"/> + states="pending,open,draft" groups="project.group_delegate_task"/> <button name="do_cancel" string="Cancel" type="object" states="draft,open,pending" /> <button name="stage_previous" string="Previous Stage" type="object" @@ -391,7 +391,7 @@ </tree> </field> </page> - <page string="Delegations History"> + <page string="Delegations History" groups="project.group_delegate_task"> <separator string="Parent Tasks"/> <field name="parent_ids"/> <separator string="Delegated tasks"/> diff --git a/addons/project/res_config.py b/addons/project/res_config.py index 21281110fb9..0d3c548c913 100644 --- a/addons/project/res_config.py +++ b/addons/project/res_config.py @@ -54,7 +54,10 @@ class project_configuration(osv.osv_memory): help="Allows you to compute work on tasks."), 'group_time_work_estimation_tasks': fields.boolean("Time Estimation on Tasks", implied_group='project.group_time_work_estimation_tasks', - help="Allows you to compute Time Estimation on tasks."), + help="Allows you to compute Time Estimation on tasks."), + 'group_manage_delegation_task': fields.boolean("Manage Taks Delegation", + implied_group='project.group_delegate_task', + help="Allows you to delegate tasks to other users."), } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml index cf371a39672..9d1e19a7c81 100644 --- a/addons/project/res_config_view.xml +++ b/addons/project/res_config_view.xml @@ -20,6 +20,7 @@ <field name="module_pad"/> <field name="group_tasks_work_on_tasks"/> <field name="group_time_work_estimation_tasks"/> + <field name="group_manage_delegation_task"/> <separator string="Planning" colspan="4"/> <field name="module_project_long_term"/> diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml index 2bfe967e675..199d3c0c422 100644 --- a/addons/project/security/project_security.xml +++ b/addons/project/security/project_security.xml @@ -29,6 +29,11 @@ <field name="category_id" ref="base.module_category_hidden"/> </record> + <record id="group_delegate_task" model="res.groups"> + <field name="name">Task Delegation</field> + <field name="category_id" ref="base.module_category_hidden"/> + </record> + <record model="ir.rule" id="project_comp_rule"> <field name="name">Project multi-company</field> <field name="model_id" ref="model_project_project"/> |