diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index a63505fdc10..299b7b224d0 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -317,10 +317,11 @@
                 <tree colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0;red:bool(date_deadline) and (date_deadline&lt;current_date) and (state in ('draft','open'));black:state not in ('cancelled','done')" string="Tasks">
                     <field name="sequence" invisible="1"/>
                     <field name="name"/>
+                    <field name="planned_hours" widget="float_time" on_change="onchange_planned(planned_hours)" invisible="not context.get('set_visible',False)"/>
                     <field name="project_id" icon="gtk-indent"/>
                     <field name="user_id"/>
                     <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
-                    <field name="remaining_hours" widget="float_time" sum="Remaining Hours"  invisible="context.get('set_visible',False)"/>
+                    <field name="remaining_hours" widget="float_time" sum="Remaining Hours" invisible="context.get('set_visible',False)"/>
                     <field name="date_deadline" invisible="context.get('set_visible',False)"/>
                     <field name="type" groups="base.group_extended" invisible="context.get('set_visible',False)"/>
                     <field name="date_start" invisible="1"/>
@@ -334,9 +335,9 @@
                         help="Change Type"/>
                     <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
                     <field name="state" invisible="context.get('set_visible',False)"/>
-                    <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
+                    <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
                     <button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-execute" help="For changing to delegate state"/>
-                    <button name="%(wizard_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to" help="For changing to done state"/>
+                    <button name="%(wizard_close_task)d" states="draft,pending,open" string="Done" type="action" icon="gtk-jump-to" help="For changing to done state"/>
                     <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
                 </tree>
             </field>
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 695ae846547..c5aced62011 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -37,5 +37,16 @@
     </record>
 
 
+    <record model="ir.rule.group" id="task_visibility_rule_group">
+        <field name="name" >Tasks According to User and Project</field>
+        <field name="model_id" ref="model_project_task"/>
+        <field name="global" eval="True"/>
+    </record>
+    <record model="ir.rule" id="task_visibility_rule">
+        <field name="domain_force">['|','|',('user_id','=',user.id),('project_id.members','=',user.id),('project_id.user_id','=',user.id)]</field>
+        <field name="rule_group" ref="task_visibility_rule_group"/>
+    </record>
+
+
 </data>
 </openerp>
diff --git a/addons/project/wizard/task_delegate.py b/addons/project/wizard/task_delegate.py
index 7716b90929c..1c235b28d1d 100644
--- a/addons/project/wizard/task_delegate.py
+++ b/addons/project/wizard/task_delegate.py
@@ -65,6 +65,7 @@ class wizard_delegate(wizard.interface):
         })
         task_obj.write(cr, uid, [data['id']], {
             'remaining_hours': data['form']['planned_hours_me'],
+            'planned_hours': data['form']['planned_hours_me'] + (task.effective_hours or 0.0),
             'name': newname,
             'child_ids': [(6, 0, [new_task_id])]
         })
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index e0e4e0f2d06..05172675a9a 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -97,17 +97,5 @@
             </field>
         </field>
     </record>
-    <record id="view_project_task_tree2" model="ir.ui.view">
-        <field name="name">Tasks</field>
-        <field name="model">project.task</field>
-        <field name="type">tree</field>
-        <field name="inherit_id" ref="project.view_task_tree2"/>
-        <field eval="2" name="priority"/>
-        <field name="arch" type="xml">
-             <field name="name" position="after">
-                <field name="planned_hours" widget="float_time" on_change="onchange_planned(planned_hours)" invisible="not context.get('set_visible',False)"/>
-             </field>
-        </field>
-    </record>
     </data>
 </openerp>