diff --git a/module/bug/control.php b/module/bug/control.php
index 0980e3e697..de3401f335 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -510,6 +510,7 @@ class bug extends control
         if(isset($bugID))
         {
             $bug = $this->bug->getById($bugID);
+
             extract((array)$bug);
             $executionID = $bug->execution;
             $moduleID    = $bug->module;
@@ -610,8 +611,9 @@ class bug extends control
 
                 /* Replace language. */
                 if(!empty($project->model) and $project->model == 'waterfall') $this->lang->bug->execution = str_replace($this->lang->executionCommon, $this->lang->project->stage, $this->lang->bug->execution);
-
                 $projectModel = $project->model;
+
+                if(!$project->multiple) $executionID = $this->loadModel('execution')->getNoMultipleID($projectID);
             }
         }
 
@@ -655,7 +657,7 @@ class bug extends control
         $this->view->moduleID         = (int)$moduleID;
         $this->view->projectID        = $projectID;
         $this->view->projectModel     = $projectModel;
-        $this->view->executionID      = $executionID;
+        $this->view->execution        = $execution;
         $this->view->taskID           = $taskID;
         $this->view->storyID          = $storyID;
         $this->view->buildID          = $buildID;
@@ -1034,6 +1036,7 @@ class bug extends control
         $projectID       = $bug->project;
         $currentModuleID = $bug->module;
         $product         = $this->loadModel('product')->getByID($productID);
+        $execution       = $this->loadModel('execution')->getByID($executionID);
         $this->bug->checkBugExecutionPriv($bug);
 
         if(!isset($this->products[$bug->product]))
@@ -1043,14 +1046,16 @@ class bug extends control
         }
 
         /* Set the menu. */
-        if($this->app->tab == 'project') $this->loadModel('project')->setMenu($bug->project);
+        if($this->app->tab == 'project')   $this->loadModel('project')->setMenu($bug->project);
         if($this->app->tab == 'execution') $this->loadModel('execution')->setMenu($bug->execution);
-        if($this->app->tab == 'qa') $this->qa->setMenu($this->products, $productID, $bug->branch);
+        if($this->app->tab == 'qa')        $this->qa->setMenu($this->products, $productID, $bug->branch);
         if($this->app->tab == 'devops')
         {
             session_write_close();
+
             $repos = $this->loadModel('repo')->getRepoPairs('project', $bug->project);
             $this->repo->setMenu($repos);
+
             $this->lang->navGroup->bug = 'devops';
         }
 
@@ -1066,9 +1071,10 @@ class bug extends control
         }
         if($this->app->tab == 'project')
         {
-            $products = array();
+            $products    = array();
             $productList = $this->config->CRProduct ? $this->product->getOrderedProducts('all', 40, $bug->project) : $this->product->getOrderedProducts('normal', 40, $bug->project);
             foreach($productList as $productInfo) $products[$productInfo->id] = $productInfo->name;
+
             $this->view->products = $products;
         }
 
@@ -1158,6 +1164,7 @@ class bug extends control
         $this->view->bug              = $bug;
         $this->view->productID        = $productID;
         $this->view->product          = $product;
+        $this->view->execution        = $execution;
         $this->view->productBugs      = $productBugs;
         $this->view->productName      = $this->products[$productID];
         $this->view->plans            = $this->loadModel('productplan')->getPairs($productID, $bug->branch, '', true);
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index e437a9bfb5..bb56a13546 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -191,8 +191,8 @@ global $config;
 /* legend列表。*/
 $lang->bug->legendBasicInfo             = '基本信息';
 $lang->bug->legendAttatch               = '附件';
-$lang->bug->legendPRJExecStoryTask      = $config->systemMode == 'new' ? "项目/" . $lang->executionCommon . "/{$lang->SRCommon}/任务" : $lang->executionCommon . "/{$lang->SRCommon}/任务";
-$lang->bug->legendExecStoryTask         = $lang->executionCommon . "/{$lang->SRCommon}/任务";
+$lang->bug->legendPRJExecStoryTask      = "项目/{$lang->executionCommon}/{$lang->SRCommon}/任务";
+$lang->bug->legendExecStoryTask         = "项目/{$lang->SRCommon}/任务";
 $lang->bug->lblTypeAndSeverity          = '类型/严重程度';
 $lang->bug->lblSystemBrowserAndHardware = '系统/浏览器';
 $lang->bug->legendSteps                 = '重现步骤';
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index b2117b02da..c5e19cb618 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -29,7 +29,7 @@ js::set('moduleID', $moduleID);
 js::set('tab', $this->app->tab);
 js::set('requiredFields', $config->bug->create->requiredFields);
 js::set('showFields', $showFields);
-if($this->app->tab == 'execution') js::set('objectID', $executionID);
+if($this->app->tab == 'execution') js::set('objectID', zget($execution, 'id', ''));
 if($this->app->tab == 'project')   js::set('objectID', $projectID);
 ?>
 <div id="mainContent" class="main-content fade">
@@ -116,10 +116,11 @@ if($this->app->tab == 'project')   js::set('objectID', $projectID);
                 <div class='table-col' id='projectBox'>
                   <?php echo html::select('project', $projects, $projectID, "class='form-control chosen' onchange='loadProductExecutions({$productID}, this.value)'");?>
                 </div>
-                <div class='table-col'>
+                <?php $executionClass = ($execution and $execution->multiple) ? 'hidden' : '';?>
+                <div class="table-col <?php echo $executionClass;?>">
                   <div class='input-group' id='executionIdBox'>
                     <span class='input-group-addon fix-border' id='executionBox'><?php echo $projectModel == 'kanban' ? $lang->bug->kanban : $lang->bug->execution;?></span>
-                    <?php echo html::select('execution', $executions, $executionID, "class='form-control chosen' onchange='loadExecutionRelated(this.value)'");?>
+                    <?php echo html::select('execution', $executions, zget($execution, 'id', ''), "class='form-control chosen' onchange='loadExecutionRelated(this.value)'");?>
                   </div>
                 </div>
               </div>
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 1ef01b1820..c2fd0b8526 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -207,16 +207,16 @@ if($this->app->tab == 'project')   js::set('objectID', $bug->project);
             <div class='detail-title'><?php echo $config->systemMode == 'class' ? $lang->bug->legendExecStoryTask : $lang->bug->legendPRJExecStoryTask;?></div>
             <table class='table table-form'>
               <tbody>
-                <?php if($config->systemMode == 'new'):?>
                 <tr>
                   <th class='w-85px'><?php echo $lang->bug->project;?></th>
                   <td><span id='projectBox'><?php echo html::select('project', $projects, $bug->project, "class='form-control chosen' onchange='loadProductExecutions($bug->product, this.value)'");?></span></td>
                 </tr>
-                <?php endif;?>
+                <?php if(!$execution or $execution->multiple):?>
                 <tr>
                   <th class='w-85px' id='executionBox'><?php echo $lang->bug->execution;?></th>
                   <td><span id='executionIdBox'><?php echo html::select('execution', $executions, $bug->execution, "class='form-control chosen' onchange='loadExecutionRelated(this.value)'");?></span></td>
                 </tr>
+                <?php endif;?>
                 <tr>
                   <th><?php echo $lang->bug->story;?></th>
                   <td><div id='storyIdBox'><?php echo html::select('story', $stories, $bug->story, "class='form-control chosen'");?></div>
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 12b5c68b51..73442c8ef7 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -106,7 +106,7 @@
       <div class='tabs'>
         <ul class='nav nav-tabs'>
           <li class='active'><a href='#legendBasicInfo' data-toggle='tab'><?php echo $lang->bug->legendBasicInfo;?></a></li>
-          <li><a href='#legendExecStoryTask' data-toggle='tab'><?php echo $config->systemMode == 'new' ? $lang->bug->legendPRJExecStoryTask : $lang->bug->legendExecStoryTask;?></a></li>
+          <li><a href='#legendExecStoryTask' data-toggle='tab'><?php echo $project->multiple ? $lang->bug->legendPRJExecStoryTask : $lang->bug->legendExecStoryTask;?></a></li>
         </ul>
         <div class='tab-content'>
           <div class='tab-pane active' id='legendBasicInfo'>
@@ -279,16 +279,16 @@
           <div class='tab-pane' id='legendExecStoryTask'>
             <table class='table table-data'>
               <tbody>
-                <?php if($config->systemMode == 'new'):?>
                 <tr>
                   <th class='w-70px'><?php echo $lang->bug->project;?></th>
                   <td><?php if($bug->project) echo html::a($this->createLink('project', 'view', "projectID=$bug->project"), $bug->projectName);?></td>
                 </tr>
-                <?php endif;?>
+                <?php if($project->multiple):?>
                 <tr>
                   <th class='w-70px'><?php echo (isset($project->model) and $project->model == 'kanban') ? $lang->bug->kanban : $lang->bug->execution;?></th>
                   <td><?php if($bug->execution) echo html::a($this->createLink('execution', 'browse', "executionID=$bug->execution"), $bug->executionName);?></td>
                 </tr>
+                <?php endif;?>
                 <tr class='nofixed'>
                   <th><?php echo $lang->bug->story;?></th>
                   <td>
diff --git a/module/datatable/control.php b/module/datatable/control.php
index db7b938ff2..9a45be059f 100644
--- a/module/datatable/control.php
+++ b/module/datatable/control.php
@@ -104,10 +104,9 @@ class datatable extends control
         if($moduleName == 'project' and $method == 'bug')
         {
             $project = $this->loadModel('project')->getByID($this->session->project);
-            if(!$project->hasProduct and $project->model != 'scrum')
-            {
-                unset($cols['plan']);
-            }
+
+            if(!$project->multiple) unset($cols['execution']);
+            if(!$project->hasProduct and $project->model != 'scrum') unset($cols['plan']);
         }
 
         if($moduleName == 'execution' and $method == 'bug')
diff --git a/module/execution/model.php b/module/execution/model.php
index 323eea12f3..32081f4a5e 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -336,6 +336,7 @@ class executionModel extends model
             ->setDefault('lastEditedBy', $this->app->user->account)
             ->setDefault('lastEditedDate', helper::now())
             ->setDefault('team', $this->post->name)
+            ->setDefault('parent', $this->post->project)
             ->setIF($this->post->heightType == 'auto', 'displayCards', 0)
             ->setIF(!isset($_POST['whitelist']), 'whitelist', '')
             ->setIF($this->post->acl == 'open', 'whitelist', '')
diff --git a/module/project/control.php b/module/project/control.php
index 84aa4924f5..49c41a6998 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1149,6 +1149,8 @@ class project extends control
         $queryID  = ($type == 'bysearch') ? (int)$param : 0;
         $products = $this->product->getProducts($projectID);
 
+        if(!$project->multiple) unset($this->config->bug->datatable->fieldList['execution']);
+
         if(!$project->hasProduct)
         {
             unset($this->config->bug->search['fields']['product']);