diff --git a/module/execution/control.php b/module/execution/control.php
index 2077b548e1..c05bf53dc9 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -3051,6 +3051,7 @@ class execution extends control
     {
         $this->app->loadLang('my');
         $this->app->loadLang('product');
+        $this->app->loadLang('stage');
         $this->app->loadLang('programplan');
 
         $from = $this->app->tab;
@@ -3059,6 +3060,7 @@ class execution extends control
         {
             $projects  = $this->project->getPairsByProgram();
             $projectID = $this->project->saveState($projectID, $projects);
+            $this->view->project = $this->loadModel('project')->getByID($projectID);
             $this->project->setMenu($projectID);
         }
 
@@ -3085,6 +3087,7 @@ class execution extends control
         $this->view->position[] = $this->lang->execution->allExecutions;
 
         $this->view->executionStats = $this->project->getStats($projectID, $status, $productID, 0, 30, $orderBy, $pager);
+        $this->view->productList    = $this->loadModel('product')->getProductPairsByProject($projectID);
         $this->view->productID      = $productID;
         $this->view->projectID      = $projectID;
         $this->view->projects       = array('') + $this->project->getPairsByProgram();
diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php
index b2afc320ed..3ee0f126e4 100644
--- a/module/execution/view/all.html.php
+++ b/module/execution/view/all.html.php
@@ -13,6 +13,21 @@
 <?php include '../../common/view/sortable.html.php';?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
+    <?php if($from == 'project'):?>
+    <div class='btn-group'>
+      <?php $viewName = $productID != 0 ? zget($productList,$productID) : $lang->product->all;?>
+      <a href='javascript:;' class='btn btn-link btn-limit' data-toggle='dropdown'><span class='text' title='<?php echo $viewName;?>'><?php echo $viewName;?></span> <span class='caret'></span></a>
+      <ul class='dropdown-menu' style='max-height:240px; max-width: 300px; overflow-y:auto'>
+        <?php
+          echo "<li>" . html::a($this->createLink('project', 'execution', "status=$status&projectID=$projectID&orderby=$orderBy"), $lang->product->allProduct) . "</li>";
+          foreach($productList as $key => $product)
+          {
+            echo "<li>" . html::a($this->createLink('project', 'execution', "status=$status&projectID=$projectID&orderby=$orderBy&productID=$key"), $product) . "</li>";
+          }
+        ?>
+      </ul>
+    </div>
+    <?php endif;?>
     <?php foreach($lang->execution->featureBar['all'] as $key => $label):?>
     <?php echo html::a($this->createLink($this->app->rawModule, $this->app->rawMethod, "status=$key&projectID=$projectID&orderBy=$orderBy&productID=$productID"), "<span class='text'>{$label}</span>", '', "class='btn btn-link' id='{$key}Tab' data-app='$from'");?>
     <?php endforeach;?>
@@ -24,6 +39,9 @@
   </div>
   <div class='btn-toolbar pull-right'>
     <?php common::printLink('execution', 'export', "status=$status&productID=$productID&orderBy=$orderBy&from=$from", "<i class='icon-export muted'> </i> " . $lang->export, '', "class='btn btn-link export'")?>
+     <?php if(common::hasPriv('programplan', 'create') && isset($project) and $project->model == 'waterfall'):?>
+     <?php echo html::a($this->createLink('programplan', 'create', "projectID=$projectID&productID=$productID"), "<i class='icon icon-plus'></i> " . $lang->programplan->create, '', "class='btn btn-primary'");?>
+    <?php endif;?>
     <?php if(common::hasPriv('execution', 'create')) echo html::a($this->createLink('execution', 'create', "projectID=$projectID"), "<i class='icon icon-sm icon-plus'></i> " . ((($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->createExec : $lang->execution->create), '', "class='btn btn-primary create-execution-btn' data-app='$from'");?>
   </div>
 </div>
@@ -53,14 +71,24 @@
             <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
           </th>
           <th><?php common::printOrderLink('name', $orderBy, $vars, (($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->execName : $lang->execution->name);?></th>
+
+          <?php if(isset($project) and $project->model == 'waterfall'):?>
+          <th class='w-120px'><?php common::printOrderLink('percent',   $orderBy, $vars, $lang->programplan->percent);?></th>
+          <th class='w-80px'><?php common::printOrderLink('attribute', $orderBy, $vars, $lang->programplan->attribute);?></th>
+          <th class='w-90px'><?php common::printOrderLink('begin',     $orderBy, $vars, $lang->execution->begin);?></th>
+          <th class='w-90px'><?php common::printOrderLink('end',       $orderBy, $vars, $lang->execution->end);?></th>
+          <th class='w-100px'><?php common::printOrderLink('realBegan', $orderBy, $vars, $lang->execution->realBegan);?></th>
+          <th class='w-90px'><?php common::printOrderLink('realEnd',   $orderBy, $vars, $lang->execution->realEnd);?></th>
+          <?php endif;?>
           <th class='thWidth'><?php common::printOrderLink('PM', $orderBy, $vars, $lang->execution->owner);?></th>
-          <th class='c-date'><?php common::printOrderLink('end', $orderBy, $vars, $lang->execution->end);?></th>
           <th class='c-status'><?php common::printOrderLink('status', $orderBy, $vars, $from == 'execution' ? $lang->execution->execStatus : $lang->execution->status);?></th>
           <th class='c-estimate text-right hours'><?php echo $lang->execution->totalEstimate;?></th>
           <th class='c-consumed text-right hours'><?php echo $lang->execution->totalConsumed;?></th>
           <th class='c-left text-right hours'><?php echo $lang->execution->totalLeft;?></th>
           <th class='c-progress'><?php echo $lang->execution->progress;?></th>
+          <?php if(isset($project) and $project->model == 'scrum'):?>
           <th class='c-burn'><?php echo $lang->execution->burn;?></th>
+          <?php endif;?>
           <?php
           $extendFields = $this->execution->getFlowExtendFields();
           foreach($extendFields as $extendField) echo "<th rowspan='2'>{$extendField->name}</th>";
@@ -91,8 +119,15 @@
               <a class="plan-toggle" data-id="<?php echo $execution->id;?>"><i class="icon icon-angle-double-right"></i></a>
             <?php endif;?>
           </td>
-          <td><?php echo zget($users, $execution->PM);?></td>
+          <?php if(isset($project) and $execution->type == 'stage'):?>
+          <td><?php echo $execution->percent;?></td>
+          <td><?php echo zget($lang->stage->typeList, $execution->attribute, '');?></td>
+          <td><?php echo $execution->begin;?></td>
           <td><?php echo $execution->end;?></td>
+          <td><?php echo $execution->realBegan;?></td>
+          <td><?php echo $execution->realEnd;?></td>
+          <?php endif;?>
+          <td><?php echo zget($users, $execution->PM);?></td>
           <?php $executionStatus = $this->processStatus('execution', $execution);?>
           <td class='c-status text-center' title='<?php echo $executionStatus;?>'>
             <span class="status-execution status-<?php echo $execution->status?>"><?php echo $executionStatus;?></span>
@@ -144,7 +179,9 @@
                  <div class='progress-info'><?php echo round($child->hours->progress);?></div>
                </div>
              </td>
+             <?php if(isset($project) and $project->model == 'scrum'):?>
              <td id='spark-<?php echo $child->id?>' class='sparkline text-left no-padding' values='<?php echo join(',', $child->burns);?>'></td>
+             <?php endif;?>
              <?php foreach($extendFields as $extendField) echo "<td>" . $this->loadModel('flow')->getFieldValue($extendField, $child) . "</td>";?>
            </tr>
            <?php $i ++;?>
diff --git a/module/programplan/control.php b/module/programplan/control.php
index 457fed7b61..17c77aacc4 100644
--- a/module/programplan/control.php
+++ b/module/programplan/control.php
@@ -119,7 +119,7 @@ class programplan extends control
             $this->programplan->create($projectID, $this->productID, $planID);
             if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
-            $locate = $this->session->projectPlanList ? $this->session->projectPlanList : $this->createLink('programplan', 'browse', "projectID=$projectID");
+            $locate = $this->createLink('project', 'execution', "status=all&projectID=$projectID");
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locate));
         }
 
diff --git a/module/programplan/model.php b/module/programplan/model.php
index 35c9b4f375..2ec418fe6b 100644
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -56,8 +56,7 @@ class programplanModel extends model
 
         $plans = $this->dao->select('t2.*')->from(TABLE_PROJECTPRODUCT)->alias('t1')
             ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
-            ->where('t1.product')->eq($productID)
-            ->andWhere('t2.type')->eq('stage')
+            ->where('t2.type')->eq('stage')
             ->beginIF($browseType == 'all')->andWhere('t2.project')->eq($executionID)->fi()
             ->beginIF($browseType == 'parent')->andWhere('t2.parent')->eq($executionID)->fi()
             ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->sprints)->fi()
diff --git a/module/project/model.php b/module/project/model.php
index 68616da49d..2dadc62f81 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1839,7 +1839,7 @@ class projectModel extends model
         else
         {
             $executions = $this->dao->select('t2.*')->from(TABLE_PROJECTPRODUCT)->alias('t1')
-                ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.execution=t2.id')
+                ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.project=t2.id')
                 ->where('t1.product')->eq($productID)
                 ->beginIF($projectID)->andWhere('t2.project')->eq($projectID)->fi()
                 ->beginIF($status == 'undone')->andWhere('t2.status')->notIN('done,closed')->fi()