diff --git a/module/execution/model.php b/module/execution/model.php
index e64cd88ade..ac8f78512b 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -5364,7 +5364,7 @@ class executionModel extends model
             foreach($execution->children as $child)
             {
                 $child->division = $execution->division;
-                $this->printNestedList($child, true, $users, $productID);
+                $this->printNestedList($child, true, $users, $productID, $project);
             }
         }
 
diff --git a/module/task/model.php b/module/task/model.php
index 39affb7f43..8d57603e48 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -4215,6 +4215,12 @@ class taskModel extends model
     {
         if($task->deleted) return '';
 
+        if($this->config->systemMode == 'PLM')
+        {
+            $execution = $this->loadModel('execution')->getByID($task->execution);
+            $execution = $this->loadModel('execution')->canStageStart($execution);
+        }
+
         $menu   = '';
         $params = "taskID=$task->id";
         if((empty($task->team) || empty($task->children)) && $task->executionList->type != 'kanban')
@@ -4224,11 +4230,11 @@ class taskModel extends model
 
         $menu .= $this->buildMenu('task', 'assignTo', "executionID=$task->execution&taskID=$task->id", $task, 'button', '', '', 'iframe', true, '', $this->lang->task->assignTo);
 
-        $menu .= $this->buildMenu('task', 'start',          $params, $task, 'view', '', '', 'iframe showinonlybody', true);
-        $menu .= $this->buildMenu('task', 'restart',        $params, $task, 'view', '', '', 'iframe showinonlybody', true);
-        $menu .= $this->buildMenu('task', 'recordEstimate', $params, $task, 'view', '', '', 'iframe showinonlybody', true);
+        if(!empty($execution['canStart'])) $menu .= $this->buildMenu('task', 'start',          $params, $task, 'view', '', '', 'iframe showinonlybody', true);
+        if(!empty($execution['canStart'])) $menu .= $this->buildMenu('task', 'restart',        $params, $task, 'view', '', '', 'iframe showinonlybody', true);
+        if(!empty($execution['canStart'])) $menu .= $this->buildMenu('task', 'recordEstimate', $params, $task, 'view', '', '', 'iframe showinonlybody', true);
         $menu .= $this->buildMenu('task', 'pause',          $params, $task, 'view', '', '', 'iframe showinonlybody', true);
-        $menu .= $this->buildMenu('task', 'finish',         $params, $task, 'view', '', '', 'iframe showinonlybody text-success', true);
+        if(!empty($execution['canStart'])) $menu .= $this->buildMenu('task', 'finish',         $params, $task, 'view', '', '', 'iframe showinonlybody text-success', true);
         $menu .= $this->buildMenu('task', 'activate',       $params, $task, 'view', '', '', 'iframe showinonlybody text-success', true);
         $menu .= $this->buildMenu('task', 'close',          $params, $task, 'view', '', '', 'iframe showinonlybody', true);
         $menu .= $this->buildMenu('task', 'cancel',         $params, $task, 'view', '', '', 'iframe showinonlybody', true);