[MERGE] project: merge with cha branch to get the new group
bzr revid: psi@tinyerp.com-20120607110630-qyyc3espsbauqlx9
This commit is contained in:
@@ -313,7 +313,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"
|
||||
@@ -359,7 +359,7 @@
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
<page string="Delegations History">
|
||||
<page string="Delegations History" groups="project.group_delegate_task">
|
||||
<separator string="Parent Tasks" colspan="4"/>
|
||||
<field colspan="4" height="150" name="parent_ids" nolabel="1"/>
|
||||
<separator string="Delegated tasks" colspan="4"/>
|
||||
|
||||
@@ -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 Delegation Task",
|
||||
implied_group='project.group_delegate_task',
|
||||
help="Allows you to make all delegation information visible."),
|
||||
}
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -19,6 +19,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"/>
|
||||
|
||||
@@ -14,6 +14,11 @@
|
||||
<field name="users" eval="[(4, ref('base.user_root'))]"/>
|
||||
</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.ui.menu" id="menu_definitions">
|
||||
<field name="groups_id" eval="[(6,0,[ref('group_project_manager')])]"/>
|
||||
</record>
|
||||
|
||||
Reference in New Issue
Block a user