diff --git a/config/filter.php b/config/filter.php
index d449ea43be..7e012a7302 100644
--- a/config/filter.php
+++ b/config/filter.php
@@ -98,6 +98,7 @@ $filter->webhook->bind           = new stdclass();
 
 $filter->bug->batchcreate->cookie['preBranch'] = 'int';
 $filter->bug->browse->cookie['bugModule']      = 'int';
+$filter->bug->browse->cookie['bugBranch']      = 'int';
 $filter->bug->browse->cookie['preBranch']      = 'int';
 $filter->bug->browse->cookie['qaBugOrder']     = 'reg::orderBy';
 $filter->bug->browse->cookie['windowWidth']    = 'int';
@@ -125,6 +126,7 @@ $filter->product->browse->cookie['preBranch']         = 'int';
 $filter->product->browse->cookie['preProductID']      = 'int';
 $filter->product->browse->cookie['productStoryOrder'] = 'reg::orderBy';
 $filter->product->browse->cookie['storyModule']       = 'int';
+$filter->product->browse->cookie['storyBranch']       = 'int';
 $filter->product->default->cookie['lastProduct']      = 'int';
 $filter->product->default->cookie['preProductID']     = 'int';
 $filter->product->index->cookie['preBranch']          = 'int';
diff --git a/module/block/view/flowchart.html.php b/module/block/view/flowchart.html.php
index fb32e6c06f..21a03de567 100644
--- a/module/block/view/flowchart.html.php
+++ b/module/block/view/flowchart.html.php
@@ -1,5 +1,8 @@
 <div class='panel-body scrollbar-hover'>
 <?php foreach ($lang->block->flowchart as $rowIndex => $flow):?>
+<?php if($this->config->global->flow == 'onlyStory' and in_array($rowIndex, ['project', 'dev', 'tester'])) continue; ?>
+<?php if($this->config->global->flow == 'onlyTask'  and in_array($rowIndex, ['product', 'dev', 'tester'])) continue; ?>
+<?php if($this->config->global->flow == 'onlyTest'  and in_array($rowIndex, ['project', 'product'])) continue; ?>
 <?php $idx = 0; ?>
   <div class='row row-<?php echo $rowIndex?>'>
   <?php foreach ($flow as $flowItem):?>
@@ -44,4 +47,4 @@
 .block-sm .flow-item > div:before, .block-sm .flow-item > div:after {border-width: 15px 0 15px 6px;}
 .block-sm .row-3 .flow-item-1, .block-sm .row-3 .flow-item-3 {width: 25%}
 .block-sm .flow-item > div:after {right: -6px;}
-</style>
\ No newline at end of file
+</style>
diff --git a/module/block/view/projectstatisticblock.html.php b/module/block/view/projectstatisticblock.html.php
index 84eb3dedfd..470b89462b 100644
--- a/module/block/view/projectstatisticblock.html.php
+++ b/module/block/view/projectstatisticblock.html.php
@@ -154,6 +154,7 @@ $(function()
                 </div>
               </div>
             </div>
+            <?php if($this->config->global->flow != 'onlyTask'): ?>
             <div class="product-info">
               <div class="progress-info"><i class="icon icon-check-circle text-success icon-sm"></i> <span class="text-muted"><?php echo $lang->story->released;?></span> <strong><?php echo $project->releasedStories;?></strong></div>
               <div class="progress">
@@ -195,6 +196,7 @@ $(function()
                 </div>
               </div>
             </div>
+            <?php endif;?>
           </div>
         </div>
       </div>
diff --git a/module/block/view/welcome.html.php b/module/block/view/welcome.html.php
index c0ed224a4b..35f3309e46 100644
--- a/module/block/view/welcome.html.php
+++ b/module/block/view/welcome.html.php
@@ -46,6 +46,7 @@
     <div class="col col-right">
     <h4><small class="text-muted"><?php echo date(DT_DATE3)?></small> <?php echo $lang->block->leftToday?></h4>
       <div class="row tiles">
+        <?php if($this->config->global->flow != 'onlyTest' and $this->config->global->flow != 'onlyStory'):?>
         <div class="col tile">
           <div class="tile-title"><?php echo $lang->block->myTask?></div>
           <div class="tile-amount"><?php echo empty($tasks) ? 0 : html::a($this->createLink('my', 'task', 'type=assignedTo'), (int)$tasks);?></div>
@@ -55,6 +56,8 @@
           </div>
           <?php endif;?>
         </div>
+        <?php endif;?>
+        <?php if($this->config->global->flow != 'onlyTask' and $this->config->global->flow != 'onlyStory'):?>
         <div class="col tile">
           <div class="tile-title"><?php echo $lang->block->myBug?></div>
           <div class="tile-amount"><?php echo empty($bugs) ? 0 : html::a($this->createLink('my', 'bug', 'type=assignedTo'), (int)$bugs);?></div>
@@ -64,10 +67,14 @@
           </div>
           <?php endif;?>
         </div>
+        <?php endif;?>
+        <?php if($this->config->global->flow != 'onlyTask' and $this->config->global->flow != 'onlyTest'):?>
         <div class="col tile">
           <div class="tile-title"><?php echo $lang->block->myStory?></div>
           <div class="tile-amount"><?php echo empty($stories) ? 0 : html::a($this->createLink('my', 'story', 'type=assignedTo'), (int)$stories);?></div>
         </div>
+        <?php endif;?>
+        <?php if($this->config->global->flow != 'onlyStory' and $this->config->global->flow != 'onlyTest'):?>
         <div class="col tile">
           <div class="tile-title"><?php echo $lang->block->myProject?></div>
           <div class="tile-amount"><?php echo empty($projects) ? 0 : html::a($this->createLink('project', 'all', 'type=undone'), (int)$projects);?></div>
@@ -77,10 +84,13 @@
           </div>
           <?php endif;?>
         </div>
+        <?php endif;?>
+        <?php if($this->config->global->flow != 'onlyTask' and $this->config->global->flow != 'onlyTest'):?>
         <div class="col tile">
           <div class="tile-title"><?php echo $lang->block->myProduct?></div>
           <div class="tile-amount"><?php echo empty($products) ? 0 : html::a($this->createLink('product', 'all', 'product=0&line=0&status=noclosed'), (int)$products);?></div>
         </div>
+        <?php endif;?>
       </div>
     </div>
   </div>
diff --git a/module/bug/control.php b/module/bug/control.php
index 1b6a95e3a6..72374d7456 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -67,7 +67,7 @@ class bug extends control
      * @access public
      * @return void
      */
-    public function browse($productID = 0, $branch = '', $browseType = 'unclosed', $param = 0, $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function browse($productID = 0, $branch = '', $browseType = '', $param = 0, $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         $this->loadModel('datatable');
 
@@ -77,18 +77,26 @@ class bug extends control
         /* Set productID, moduleID, queryID and branch. */
         $productID = $this->product->saveState($productID, $this->products);
         $branch    = ($branch == '') ? (int)$this->cookie->preBranch  : (int)$branch;
+        $branchID  = $browseType == '' ? $branch : ($browseType == 'bybranch' ? (int)$param : ($this->cookie->bugBranch ? $this->cookie->bugBranch : $branch));
         setcookie('preProductID', $productID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
         setcookie('preBranch', (int)$branch, $this->config->cookieLife, $this->config->webRoot, '', false, true);
 
-        if($this->cookie->preProductID != $productID or $this->cookie->preBranch != $branch)
+        if($this->cookie->preProductID != $productID or $this->cookie->preBranch != $branch or $browseType == 'bybranch')
         {
             $_COOKIE['bugModule'] = 0;
             setcookie('bugModule', 0, 0, $this->config->webRoot, '', false, false);
         }
-        if($browseType == 'bymodule') setcookie('bugModule', (int)$param, 0, $this->config->webRoot, '', false, false);
-        if($browseType != 'bymodule') $this->session->set('bugBrowseType', $browseType);
+        if($browseType == 'bymodule' or $browseType == '')
+        {
+            setcookie('bugModule', (int)$param, 0, $this->config->webRoot, '', false, false);
+            $_COOKIE['bugBranch'] = 0;
+            setcookie('bugBranch', 0, 0, $this->config->webRoot, '', false, false);
+            if($browseType == '') $browseType = 'unclosed';
+        }
+        if($browseType == 'bybranch') setcookie('bugBranch', (int)$param, 0, $this->config->webRoot, '', false, false);
+        if($browseType != 'bymodule' and $browseType != 'bybranch') $this->session->set('bugBrowseType', $browseType);
 
-        $moduleID = ($browseType == 'bymodule') ? (int)$param : ($browseType == 'bysearch' ? 0 : ($this->cookie->bugModule ? $this->cookie->bugModule : 0));
+        $moduleID = ($browseType == 'bymodule') ? (int)$param : (($browseType == 'bysearch' or $browseType == 'bybranch') ? 0 : ($this->cookie->bugModule ? $this->cookie->bugModule : 0));
         $queryID  = ($browseType == 'bysearch') ? (int)$param : 0;
 
         /* Set menu and save session. */
@@ -111,7 +119,7 @@ class bug extends control
         $projects = $this->loadModel('project')->getPairs('empty|withdelete');
 
         /* Get bugs. */
-        $bugs = $this->bug->getBugs($productID, $projects, $branch, $browseType, $moduleID, $queryID, $sort, $pager);
+        $bugs = $this->bug->getBugs($productID, $projects, $branchID, $browseType, $moduleID, $queryID, $sort, $pager);
 
         /* Process the sql, get the conditon partion, save it to session. */
         $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug', $browseType == 'needconfirm' ? false : true);
diff --git a/module/bug/model.php b/module/bug/model.php
index 008ae707c6..b107894db5 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -354,6 +354,7 @@ class bugModel extends model
         /* Set modules and browse type. */
         $modules    = $moduleID ? $this->loadModel('tree')->getAllChildId($moduleID) : '0';
         $browseType = ($browseType == 'bymodule' and $this->session->bugBrowseType and $this->session->bugBrowseType != 'bysearch') ? $this->session->bugBrowseType : $browseType;
+        $browseType = $browseType == 'bybranch' ? 'bymodule' : $browseType;
 
         /* Get bugs by browse type. */
         $bugs = array();
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index a031ae8fe9..e6f3616fb1 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -52,7 +52,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
         $menuBrowseType = strpos($menuItem->name, 'QUERY') === 0 ? 'bySearch' : $menuItem->name;
         $label  = "<span class='text'>{$menuItem->text}</span>";
         if($this->session->bugBrowseType == 'bysearch') $browseType = 'all';
-        if($this->session->bugBrowseType != 'bysearch' && $browseType == 'bymodule') $browseType = $this->session->bugBrowseType;
+        if($this->session->bugBrowseType != 'bysearch' && ($browseType == 'bymodule' or $browseType == 'bybranch')) $browseType = $this->session->bugBrowseType;
         $label .= $menuBrowseType == $browseType ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';
         $active = $menuBrowseType == $browseType ? 'btn-active-text' : '';
 
@@ -401,6 +401,8 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
 </div>
 <script>
 $('#module' + moduleID).closest('li').addClass('active');
+var branchID = $.cookie('bugBranch');
+$('#branch' + branchID).closest('li').addClass('active');
 <?php if($browseType == 'bysearch'):?>
 if($('#query li.active').size() == 0) $.toggleQueryBox(true);
 <?php endif;?>
diff --git a/module/product/control.php b/module/product/control.php
index e6908a7352..508191967e 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -101,7 +101,7 @@ class product extends control
      * @access public
      * @return void
      */
-    public function browse($productID = 0, $branch = '', $browseType = 'unclosed', $param = 0, $storyType = 'story', $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function browse($productID = 0, $branch = '', $browseType = '', $param = 0, $storyType = 'story', $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Lower browse type. */
         $browseType = strtolower($browseType);
@@ -116,18 +116,26 @@ class product extends control
         /* Set product, module and query. */
         $productID = $this->product->saveState($productID, $this->products);
         $branch    = ($branch === '') ? (int)$this->cookie->preBranch : (int)$branch;
+        $branchID  = $browseType == '' ? $branch : ($browseType == 'bybranch' ? (int)$param : ($this->cookie->storyBranch ? $this->cookie->storyBranch : $branch));
         setcookie('preProductID', $productID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
         setcookie('preBranch', (int)$branch, $this->config->cookieLife, $this->config->webRoot, '', false, true);
 
-        if($this->cookie->preProductID != $productID or $this->cookie->preBranch != $branch)
+        if($this->cookie->preProductID != $productID or $this->cookie->preBranch != $branch or $browseType == 'bybranch')
         {
             $_COOKIE['storyModule'] = 0;
             setcookie('storyModule', 0, 0, $this->config->webRoot, '', false, false);
         }
-        if($browseType == 'bymodule') setcookie('storyModule', (int)$param, 0, $this->config->webRoot, '', false, false);
-        if($browseType != 'bymodule') $this->session->set('storyBrowseType', $browseType);
+        if($browseType == 'bymodule' or $browseType == '')
+        {
+            setcookie('storyModule', (int)$param, 0, $this->config->webRoot, '', false, false);
+            $_COOKIE['storyBranch'] = 0;
+            setcookie('storyBranch', 0, 0, $this->config->webRoot, '', false, false);
+            if($browseType == '') $browseType = 'unclosed';
+        }
+        if($browseType == 'bybranch') setcookie('storyBranch', (int)$param, 0, $this->config->webRoot, '', false, false);
+        if($browseType != 'bymodule' and $browseType != 'bybranch') $this->session->set('storyBrowseType', $browseType);
 
-        $moduleID = ($browseType == 'bymodule') ? (int)$param : ($browseType == 'bysearch' ? 0 : ($this->cookie->storyModule ? $this->cookie->storyModule : 0));
+        $moduleID = ($browseType == 'bymodule') ? (int)$param : (($browseType == 'bysearch' or $browseType == 'bybranch') ? 0 : ($this->cookie->storyModule ? $this->cookie->storyModule : 0));
         $queryID  = ($browseType == 'bysearch') ? (int)$param : 0;
 
         /* Set menu. */
@@ -146,7 +154,7 @@ class product extends control
         $pager = new pager($recTotal, $recPerPage, $pageID);
 
         /* Get stories. */
-        $stories = $this->product->getStories($productID, $branch, $browseType, $queryID, $moduleID, $storyType, $sort, $pager);
+        $stories = $this->product->getStories($productID, $branchID, $browseType, $queryID, $moduleID, $storyType, $sort, $pager);
 
         /* Process the sql, get the conditon partion, save it to session. */
         $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story', $browseType != 'bysearch');
diff --git a/module/product/model.php b/module/product/model.php
index d22b3f350f..19af388b34 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -562,6 +562,7 @@ class productModel extends model
         /* Set modules and browse type. */
         $modules    = $moduleID ? $this->loadModel('tree')->getAllChildID($moduleID) : '0';
         $browseType = ($browseType == 'bymodule' and $this->session->storyBrowseType and $this->session->storyBrowseType != 'bysearch') ? $this->session->storyBrowseType : $browseType;
+        $browseType = $browseType == 'bybranch' ? 'bymodule' : $browseType;
 
         /* Get stories by browseType. */
         $stories = array();
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 61b8e605d5..67a31a1c2f 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -421,7 +421,9 @@ js::set('foldAll',       $lang->project->treeLevel['root']);
 </div>
 <script>
 var moduleID = <?php echo $moduleID?>;
+var branchID = $.cookie('storyBranch');
 $('#module<?php echo $moduleID;?>').closest('li').addClass('active');
+$('#branch' + branchID).closest('li').addClass('active');
 
 $(function()
 {
diff --git a/module/testreport/model.php b/module/testreport/model.php
index 2f8c4df39e..ae39fea0f0 100644
--- a/module/testreport/model.php
+++ b/module/testreport/model.php
@@ -102,6 +102,12 @@ class testreportModel extends model
             ->get();
         $data->members = trim($data->members, ',');
 
+        $builds = array();
+        $build   = $this->loadModel('build')->getById($data->builds);
+        if(!empty($build->id)) $builds[$build->id] = $build;
+        $bugs = $this->getBugs4Test($builds, $data->product, $data->begin, $data->end);
+        if(!empty($bugs)) $data->bugs = implode(",", array_keys($bugs));
+
         $data = $this->loadModel('file')->processImgURL($data, $this->config->testreport->editor->create['id'], $this->post->uid);
         $this->dao->insert(TABLE_TESTREPORT)->data($data)->autocheck()
              ->batchCheck($this->config->testreport->create->requiredFields, 'notempty')
@@ -136,6 +142,12 @@ class testreportModel extends model
             ->get();
         $data->members = trim($data->members, ',');
 
+        $builds = array();
+        $build   = $this->loadModel('build')->getById($data->builds);
+        if(!empty($build->id)) $builds[$build->id] = $build;
+        $bugs = $this->getBugs4Test($builds, $data->product, $data->begin, $data->end);
+        $data->bugs = !empty($bugs) ? implode(",", array_keys($bugs)) : '';
+
         $data = $this->loadModel('file')->processImgURL($data, $this->config->testreport->editor->edit['id'], $this->post->uid);
         $this->dao->update(TABLE_TESTREPORT)->data($data)->autocheck()
              ->batchCheck($this->config->testreport->edit->requiredFields, 'notempty')
diff --git a/module/tree/model.php b/module/tree/model.php
index 0373ca1177..7b6306bf0a 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -404,7 +404,7 @@ class treeModel extends model
             {
                 $linkHtml = ($type == 'case' and !empty($extra)) ? '<a>' . $branch . '</a>' : $this->createBranchLink($type, $rootID, $branchID, $branch);
                 $linkHtml = $manage ? html::a(inlink('browse', "root=$rootID&viewType=$type&currentModuleID=0&branch=$branchID"), $branch) : $linkHtml;
-                if($type == 'story' || $type == 'bug') $linkHtml = '<a>' . $branch . '</a>';
+                if($type == 'story' or $type == 'bug')   $linkHtml = html::a(inlink('browse', "productID=$rootID&branch=&browseType=bybranch&param=$branchID"), $branch, "", "id=branch" . $branchID);
                 if($firstBranch and $product->type != 'normal')
                 {
                     $linkHtml = '<a>' . $this->lang->product->branchName[$product->type] . '</a><ul><li>' . $linkHtml;