Ajay Chauhan(OpenERP) has proposed merging 
lp:~openerp-commiter/openobject-addons/trunk-first_10_clicks-project_stage-cha 
into lp:~openerp-dev/openobject-addons/trunk-first_10_clicks-psi.

Requested reviews:
  OpenERP R&D Team (openerp-dev)

For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-first_10_clicks-project_stage-cha/+merge/108878

Hello,
here i add one new group(group_delegate_task) for
restricing "delegate" button & "Delegation History" page on project form view..

Thanks,
Ajay Chauhan
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-first_10_clicks-project_stage-cha/+merge/108878
Your team OpenERP R&D Team is requested to review the proposed merge of 
lp:~openerp-commiter/openobject-addons/trunk-first_10_clicks-project_stage-cha 
into lp:~openerp-dev/openobject-addons/trunk-first_10_clicks-psi.
=== modified file 'project/project_view.xml'
--- project/project_view.xml	2012-06-04 12:16:51 +0000
+++ project/project_view.xml	2012-06-06 05:45:06 +0000
@@ -301,6 +301,7 @@
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Project" layout="manual">
+<<<<<<< TREE
                     <header>
                         <button name="do_open" string="Start Task" type="object"
                                 states="draft,pending"/>
@@ -322,6 +323,21 @@
                                 states="open,pending" icon="gtk-go-forward" attrs="{'invisible': [('stage_id','=', False)]}"/>
                         <field name="stage_id" widget="statusbar"/>
                     </header>
+=======
+                    <div class="oe_form_topbar">
+                        <button name="action_close" states="pending,open" string="Done" type="object"/>
+                        <button name="do_open" states="pending,draft" string="Start Task" type="object"/>
+                        <button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" context="{'button_reactivate':True}" />
+                        <button name="do_pending" states="open" string="Pending" type="object"/>
+                        <button name="do_draft" states="open" string="Draft" type="object"/>
+                        <button name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" groups="project.group_delegate_task"/>
+                        <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object"/>
+                        <div class="oe_right">
+                            <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
+                        </div>
+                        <div class="oe_clear"/>
+                    </div>
+>>>>>>> MERGE-SOURCE
                     <sheet string="Task edition" layout="auto">
                     <group colspan="6" col="6">
                         <field name="name" select="1"/>
@@ -359,7 +375,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"/>

=== modified file 'project/res_config.py'
--- project/res_config.py	2012-05-14 15:09:26 +0000
+++ project/res_config.py	2012-06-06 05:45:06 +0000
@@ -54,7 +54,10 @@
             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:

=== modified file 'project/res_config_view.xml'
--- project/res_config_view.xml	2012-06-04 12:11:39 +0000
+++ project/res_config_view.xml	2012-06-06 05:45:06 +0000
@@ -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"/>

=== modified file 'project/security/project_security.xml'
--- project/security/project_security.xml	2012-04-27 07:17:01 +0000
+++ project/security/project_security.xml	2012-06-06 05:45:06 +0000
@@ -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>

_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help   : https://help.launchpad.net/ListHelp

Reply via email to