diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index c29b5dd96c..ef08f4fd74 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -31,7 +31,7 @@
   <?php if(!isonlybody()):?>
   <div class="btn-toolbar pull-right">
     <?php if(common::canModify('product', $product)):?>
-    <?php common::printLink('bug', 'create', "productID={$bug->product}&branch={$bug->branch}&extra=moduleID={$bug->module}", "<i class='icon icon-plus'></i>" . $lang->bug->create, '', "class='btn btn-primary'"); ?>
+    <?php common::printLink('bug', 'create', "productID={$bug->product}&branch={$bug->branch}&extra=moduleID={$bug->module},projectID={$bug->project},executionID={$bug->execution}", "<i class='icon icon-plus'></i>" . $lang->bug->create, '', "class='btn btn-primary'"); ?>
     <?php endif;?>
   </div>
   <?php endif;?>
@@ -67,7 +67,7 @@
     <div class='cell'><?php include '../../common/view/action.html.php';?></div>
     <?php
     $params        = "bugID=$bug->id";
-    $copyParams    = "productID=$productID&branch=$bug->branch&extras=bugID=$bug->id";
+    $copyParams    = "productID=$productID&branch=$bug->branch&extras=bugID=$bug->id,projectID={$bug->project},executionID={$bug->execution}";
     $convertParams = "productID=$productID&branch=$bug->branch&moduleID=0&from=bug&bugID=$bug->id";
     ?>
     <div class='main-actions'>
diff --git a/module/caselib/view/browse.html.php b/module/caselib/view/browse.html.php
index b63964542c..ab7cd2412e 100644
--- a/module/caselib/view/browse.html.php
+++ b/module/caselib/view/browse.html.php
@@ -60,6 +60,7 @@ js::set('flow',          $config->global->flow);
      <?php common::printLink('caselib', 'exportTemplet', "libID=$libID", "<i class='icon icon-export muted'> </i>" . $lang->caselib->exportTemplet, '', "class='btn btn-link export' data-width='35%'");?>
      <?php common::printLink('caselib', 'import', "libID=$libID", "<i class='icon muted icon-import'> </i>" . $lang->testcase->fileImport, '', "class='btn btn-link export'");?>
     </div>
+    <?php echo html::a($this->createLink('caselib', 'create'), $lang->caselib->create, '', 'class="btn btn-secondary"');?>
     <div class='btn-group dropdown'>
       <?php
       $params = "libID=$libID&moduleID=" . (isset($moduleID) ? $moduleID : 0);
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index d253f69f75..1571240b61 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -198,10 +198,10 @@ $lang->scrum->menuOrder[48] = 'dynamic';
 $lang->scrum->menuOrder[50] = 'settings';
 
 $lang->scrum->menu->qa['subMenu'] = new stdclass();
+//$lang->scrum->menu->qa['subMenu']->index      = array('link' => "$lang->dashboard|project|qa|projectID=%s");
 $lang->scrum->menu->qa['subMenu']->bug        = array('link' => "{$lang->bug->common}|project|bug|projectID=%s", 'subModule' => 'bug');
 $lang->scrum->menu->qa['subMenu']->testcase   = array('link' => "{$lang->testcase->shortCommon}|project|testcase|projectID=%s", 'subModule' => 'testsuite,testcase,caselib,tree');
 $lang->scrum->menu->qa['subMenu']->testtask   = array('link' => "{$lang->testtask->common}|project|testtask|projectID=%s", 'subModule' => 'testtask', 'class' => 'dropdown dropdown-hover');
-$lang->scrum->menu->qa['subMenu']->testtask   = array('link' => "{$lang->testtask->common}|project|testtask|projectID=%s", 'subModule' => 'testtask', 'class' => 'dropdown dropdown-hover');
 $lang->scrum->menu->qa['subMenu']->testreport = array('link' => "{$lang->testreport->common}|project|testreport|projectID=%s", 'subModule' => 'testreport');
 
 $lang->scrum->menu->settings['subMenu'] = new stdclass();
@@ -223,7 +223,7 @@ $lang->execution->menu->kanban   = array('link' => "$lang->kanban|execution|kanb
 $lang->execution->menu->burn     = array('link' => "$lang->burn|execution|burn|executionID=%s");
 $lang->execution->menu->view     = array('link' => "$lang->view|execution|grouptask|executionID=%s", 'alias' => 'grouptask,tree', 'class' => 'dropdown dropdown-hover');
 $lang->execution->menu->story    = array('link' => "$lang->SRCommon|execution|story|executionID=%s", 'subModule' => 'story', 'alias' => 'batchcreate,linkstory,storykanban');
-$lang->execution->menu->qa       = array('link' => "{$lang->qa->common}|execution|qa|executionID=%s", 'subModule' => 'bug,testcase,testtask,testreport', 'alias' => 'qa,bug,testcase,testtask,testreport');
+$lang->execution->menu->qa       = array('link' => "{$lang->qa->common}|execution|bug|executionID=%s", 'subModule' => 'bug,testcase,testtask,testreport', 'alias' => 'qa,bug,testcase,testtask,testreport');
 $lang->execution->menu->devops   = array('link' => "{$lang->repo->common}|repo|browse|repoID=0&branchID=&objectID=%s", 'subModule' => 'repo');
 $lang->execution->menu->doc      = array('link' => "{$lang->doc->common}|doc|objectLibs|type=execution&objectID=%s", 'subModule' => 'doc');
 $lang->execution->menu->build    = array('link' => "{$lang->build->common}|execution|build|executionID=%s", 'subModule' => 'build');
@@ -250,7 +250,7 @@ $lang->execution->menu->view['subMenu']->groupTask = "$lang->groupView|execution
 $lang->execution->menu->view['subMenu']->tree      = "$lang->treeView|execution|tree|executionID=%s";
 
 $lang->execution->menu->qa['subMenu'] = new stdclass();
-$lang->execution->menu->qa['subMenu']->qa         = array('link' => "$lang->dashboard|execution|qa|executionID=%s");
+//$lang->execution->menu->qa['subMenu']->qa         = array('link' => "$lang->dashboard|execution|qa|executionID=%s");
 $lang->execution->menu->qa['subMenu']->bug        = array('link' => "{$lang->bug->common}|execution|bug|executionID=%s", 'subModule' => 'bug');
 $lang->execution->menu->qa['subMenu']->testcase   = array('link' => "{$lang->testcase->shortCommon}|execution|testcase|executionID=%s", 'alias' => 'create');
 $lang->execution->menu->qa['subMenu']->testtask   = array('link' => "{$lang->testtask->common}|execution|testtask|executionID=%s", 'subModule' => 'testtask');
diff --git a/module/execution/model.php b/module/execution/model.php
index cd06c413c4..acbc4c350e 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -2235,7 +2235,8 @@ class executionModel extends model
             ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.root = t2.id')
             ->where('t1.account')->eq($account)
             ->andWhere('t1.root')->ne($currentExecution)
-            ->andWhere('t1.type')->eq($execution->type)
+            ->andWhere('t1.type')->eq('execution')
+            ->andWhere('t2.project')->eq($execution->project)
             ->andWhere('t2.deleted')->eq('0')
             ->groupBy('t1.root')
             ->orderBy('t1.root DESC')
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 9076a37bd3..33c80064c3 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -536,7 +536,7 @@ $lang->resource->execution->importplanstories = 'importPlanStories';
 $lang->resource->execution->importBug         = 'importBug';
 $lang->resource->execution->story             = 'story';
 $lang->resource->execution->build             = 'build';
-$lang->resource->execution->qa                = 'qa';
+//$lang->resource->execution->qa                = 'qa';
 $lang->resource->execution->testtask          = 'testtask';
 $lang->resource->execution->testcase          = 'testcase';
 $lang->resource->execution->bug               = 'bug';
diff --git a/module/my/view/project.html.php b/module/my/view/project.html.php
index 1ceec409b1..911af9938f 100644
--- a/module/my/view/project.html.php
+++ b/module/my/view/project.html.php
@@ -63,7 +63,7 @@
           <td class='c-status'><span class="status-project status-<?php echo $project->status?>"><?php echo zget($lang->project->statusList, $project->status, '');?></span></td>
           <?php endif;?>
           <td class='text-left'><?php echo $project->begin;?></td>
-          <td class='text-left'><?php echo $project->end == '0000-00-00' ? '' : $project->end;?></td>
+          <td class='text-left'><?php echo $project->end == LONG_TIME ? $this->lang->project->longTime : $project->end;?></td>
           <?php $projectBudget = in_array($this->app->getClientLang(), ['zh-cn','zh-tw']) && $project->budget >= 10000 ? number_format($project->budget / 10000, 1) . $this->lang->project->tenThousand : number_format((float)$project->budget, 1);?>
           <td class='text-right'><?php echo $project->budget != 0 ? zget($lang->project->currencySymbol, $project->budgetUnit) . ' ' . $projectBudget : $lang->project->future;?></td>
           <td>
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 8a4e6b7d15..8adcae6f93 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1672,8 +1672,7 @@ class testcaseModel extends model
     {
         if(!empty($case->story))
         {
-            $projects = $this->dao->select('project')->from(TABLE_PROJECTSTORY)->where('story')->eq($case->story)->fetchAll('project');
-            $projects = array_keys($projects);
+            $projects = $this->dao->select('project')->from(TABLE_PROJECTSTORY)->where('story')->eq($case->story)->fetchPairs();
         }
         elseif($this->app->openApp == 'project' and empty($case->story))
         {
diff --git a/module/testreport/control.php b/module/testreport/control.php
index b5a55141f1..9aae880b1d 100644
--- a/module/testreport/control.php
+++ b/module/testreport/control.php
@@ -445,7 +445,7 @@ class testreport extends control
      */
     public function view($reportID, $tab = 'basic', $recTotal = 0, $recPerPage = 100, $pageID = 1)
     {
-        $report  = $this->testreport->getById($reportID);
+        $report = $this->testreport->getById($reportID);
         if(!$report) die(js::error($this->lang->notFound) . js::locate('back'));
         $this->session->project = $report->project;
 
diff --git a/module/testreport/view/create.html.php b/module/testreport/view/create.html.php
index a91c6ec0e2..e0773bf1d0 100644
--- a/module/testreport/view/create.html.php
+++ b/module/testreport/view/create.html.php
@@ -97,7 +97,9 @@
             <tr>
               <td class='text-center form-actions' colspan='4'>
                 <?php echo html::submitButton();?>
-                <?php echo html::backButton();?>
+                <?php $browseLink = 'javascript:history.go(-1);';?>
+                <?php if($objectType == 'testtask' and $this->session->reportList) $browseLink = $this->session->reportList;?>
+                <?php echo html::a($browseLink, $lang->goback, '', 'class="btn btn-back btn-wide"');?>
               </td>
             </tr>
           </table>