diff --git a/framework/base/model.class.php b/framework/base/model.class.php
index bf4a0136ab..3c734d0071 100644
--- a/framework/base/model.class.php
+++ b/framework/base/model.class.php
@@ -281,8 +281,8 @@ class baseModel
         /* 设置扩展的名字和相应的文件。Set extenson name and extension file. */
         $moduleExtPath = $this->app->getModuleExtPath($this->appName, $moduleName, $type);
         if(!empty($moduleExtPath['site'])) $extensionFile = $moduleExtPath['site'] . 'class/' . $extensionName . '.class.php';
-        if(!isset($extensionFile) or !file_exists($extensionFile)) $extensionFile = $moduleExtPath['custom'] . 'class/' . $extensionName . '.class.php';
         if(!isset($extensionFile) or !file_exists($extensionFile)) $extensionFile = $moduleExtPath['saas']   . 'class/' . $extensionName . '.class.php';
+        if(!isset($extensionFile) or !file_exists($extensionFile)) $extensionFile = $moduleExtPath['custom'] . 'class/' . $extensionName . '.class.php';
         if(!isset($extensionFile) or !file_exists($extensionFile)) $extensionFile = $moduleExtPath['vision'] . 'class/' . $extensionName . '.class.php';
         if(!isset($extensionFile) or !file_exists($extensionFile)) $extensionFile = $moduleExtPath['xuan']   . 'class/' . $extensionName . '.class.php';
         if(!isset($extensionFile) or !file_exists($extensionFile)) $extensionFile = $moduleExtPath['common'] . 'class/' . $extensionName . '.class.php';
diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index 0c74f79a6f..3cf0a2ac8b 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -35,7 +35,7 @@ function markReleasedBuilds($option)
         if(!$option.find('.label-released').length)
         {
             var optionText = $option.find('.picker-option-text').html();
-            $option.find('.picker-option-text').replaceWith("<p class='picker-option-text no-margin'><span class='label label-released label-primary label-outline'>" + releasedBuild + "</span> " + optionText + "</p>");
+            $option.find('.picker-option-text').replaceWith("<p class='picker-option-text no-margin'>" + optionText + " <span class='label label-released label-primary label-outline'>" + released + "</span></p>");
         }
     }
 }
diff --git a/module/bug/view/activate.html.php b/module/bug/view/activate.html.php
index 37cc6027b6..4ea8e2bab9 100644
--- a/module/bug/view/activate.html.php
+++ b/module/bug/view/activate.html.php
@@ -58,6 +58,6 @@
 </div>
 <?php
 js::set('productID', $bug->product);
-js::set('releasedBuild', $lang->build->releasedBuild);
+js::set('released', $lang->build->released);
 ?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php
index eb34d2370a..6e62fc7d47 100755
--- a/module/bug/view/batchcreate.html.php
+++ b/module/bug/view/batchcreate.html.php
@@ -14,7 +14,7 @@
 include '../../common/view/header.html.php';
 js::set('requiredFields', $config->bug->create->requiredFields);
 js::set('productID', $productID);
-js::set('releasedBuild', $lang->build->releasedBuild);
+js::set('released', $lang->build->released);
 ?>
 <?php
 $visibleFields  = array();
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 0a665ed306..6a519a0673 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -328,7 +328,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
                           {
                               $actionLink = $this->createLink('bug', 'batchResolve', "resolution=fixed&resolvedBuild=$key");
                               echo "<li class='option' data-key='$key'>";
-                              echo html::a('javascript:;', (in_array($key, $releasedBuilds) ? "<span class='label label-primary label-outline'>{$lang->build->releasedBuild}</span> " : '') . $build, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin', '#bugList')\"");
+                              echo html::a('javascript:;', $build . (in_array($key, $releasedBuilds) ? " <span class='label label-primary label-outline'>{$lang->build->released}</span> " : ''), '', "onclick=\"setFormAction('$actionLink', 'hiddenwin', '#bugList')\"");
                               echo "</li>";
                           }
                           echo "</ul>";
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index 3cb9f567a2..27819e3c62 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -31,7 +31,7 @@ js::set('requiredFields', $config->bug->create->requiredFields);
 js::set('showFields', $showFields);
 js::set('projectExecutionPairs', $projectExecutionPairs);
 js::set('productID', $productID);
-js::set('releasedBuild', $lang->build->releasedBuild);
+js::set('released', $lang->build->released);
 if($this->app->tab == 'execution') js::set('objectID', zget($execution, 'id', ''));
 if($this->app->tab == 'project')   js::set('objectID', $projectID);
 ?>
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 5abdec20a3..10ad3fdc16 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -31,7 +31,7 @@ js::set('bugBranch'              , $bug->branch);
 js::set('isClosedBug'            , $bug->status == 'closed');
 js::set('projectExecutionPairs'  , $projectExecutionPairs);
 js::set('productID'              , $product->id);
-js::set('releasedBuild'          , $lang->build->releasedBuild);
+js::set('released'               , $lang->build->released);
 if($this->app->tab == 'execution') js::set('objectID', $bug->execution);
 if($this->app->tab == 'project')   js::set('objectID', $bug->project);
 ?>
diff --git a/module/bug/view/resolve.html.php b/module/bug/view/resolve.html.php
index b284f83a5c..78ed516c22 100644
--- a/module/bug/view/resolve.html.php
+++ b/module/bug/view/resolve.html.php
@@ -16,7 +16,7 @@
 <?php
 js::set('page', 'resolve');
 js::set('productID', $bug->product);
-js::set('releasedBuild', $lang->build->releasedBuild);
+js::set('released', $lang->build->released);
 ?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
diff --git a/module/build/lang/de.php b/module/build/lang/de.php
index 385db70d1c..12095b323b 100644
--- a/module/build/lang/de.php
+++ b/module/build/lang/de.php
@@ -36,7 +36,7 @@ $lang->build->execution      = $lang->executionCommon;
 $lang->build->integrated     = 'Integrated';
 $lang->build->singled        = 'Singled';
 $lang->build->builds         = 'Included Builds';
-$lang->build->releasedBuild  = 'Released Build';
+$lang->build->released       = 'Released';
 $lang->build->name           = 'Name';
 $lang->build->date           = 'Datum';
 $lang->build->builder        = 'Builder';
diff --git a/module/build/lang/en.php b/module/build/lang/en.php
index 0b64199217..6be3a2d6df 100644
--- a/module/build/lang/en.php
+++ b/module/build/lang/en.php
@@ -36,7 +36,7 @@ $lang->build->execution      = $lang->executionCommon;
 $lang->build->integrated     = 'Integrated';
 $lang->build->singled        = 'Singled';
 $lang->build->builds         = 'Included Builds';
-$lang->build->releasedBuild  = 'Released Build';
+$lang->build->released       = 'Released';
 $lang->build->name           = 'Name';
 $lang->build->date           = 'Date';
 $lang->build->builder        = 'Builder';
diff --git a/module/build/lang/fr.php b/module/build/lang/fr.php
index 7633876217..ee7d3312db 100644
--- a/module/build/lang/fr.php
+++ b/module/build/lang/fr.php
@@ -36,7 +36,7 @@ $lang->build->execution      = $lang->executionCommon;
 $lang->build->integrated     = 'Integrated';
 $lang->build->singled        = 'Singled';
 $lang->build->builds         = 'Included Builds';
-$lang->build->releasedBuild  = 'Released Build';
+$lang->build->released       = 'Released';
 $lang->build->name           = 'Nom';
 $lang->build->date           = 'Date';
 $lang->build->builder        = 'Builder';
diff --git a/module/build/lang/zh-cn.php b/module/build/lang/zh-cn.php
index f24b21bb26..a9f9d874db 100644
--- a/module/build/lang/zh-cn.php
+++ b/module/build/lang/zh-cn.php
@@ -36,7 +36,7 @@ $lang->build->execution      = '所属' . $lang->executionCommon;
 $lang->build->integrated     = '集成版本';
 $lang->build->singled        = '单一版本';
 $lang->build->builds         = '包含版本';
-$lang->build->releasedBuild  = '发布版本';
+$lang->build->released       = '发布';
 $lang->build->name           = '名称编号';
 $lang->build->date           = '打包日期';
 $lang->build->builder        = '构建者';
diff --git a/module/build/model.php b/module/build/model.php
index fd739b41a0..baa9253ead 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -327,7 +327,7 @@ class buildModel extends model
                 $releaseName = $release->name;
                 $branchName  = $release->branchName ? $release->branchName : $this->lang->branch->main;
                 if($release->productType != 'normal') $releaseName = (strpos($params, 'withbranch') !== false ? $branchName . '/' : '') . $releaseName;
-                if(strpos($params, 'releasetag') !== false) $releaseName = "[{$this->lang->build->releasedBuild}] " . $releaseName;
+                if(strpos($params, 'releasetag') !== false) $releaseName = $releaseName . " [{$this->lang->build->released}]";
                 $builds[$release->date][$release->shadow] = $releaseName;
                 foreach(explode(',', trim($release->build, ',')) as $buildID)
                 {
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index 0a22344249..16d5112f47 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -84,7 +84,7 @@
                 <?php if(common::hasPriv('doc', 'collect')):?>
                 <a data-url="<?php echo $this->createLink('doc', 'collect', "objectID=$doc->id&objectType=doc");?>" title="<?php echo $collectTitle;?>" class='btn btn-link ajaxCollect'><i class='icon <?php echo $star;?>'></i></a>
                 <?php endif;?>
-                <?php common::printLink('doc', 'edit', "docID=$doc->id&comment=false", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link iframe'", true, true)?>
+                <?php common::printLink('doc', 'edit', "docID=$doc->id&comment=false", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link'", true, false)?>
                 <?php common::printLink('doc', 'delete', "docID=$doc->id&confirm=no", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
                 <?php endif;?>
               </td>
diff --git a/module/execution/model.php b/module/execution/model.php
index 1e83956238..ed66a03b88 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -5189,6 +5189,7 @@ class executionModel extends model
         $_POST = array();
         $_POST['project']   = $projectID;
         $_POST['name']      = $project->name;
+        $_POST['code']      = $project->code;
         $_POST['begin']     = $project->begin;
         $_POST['end']       = $project->end;
         $_POST['realBegan'] = $project->realBegan;
@@ -5202,8 +5203,6 @@ class executionModel extends model
         $_POST['status']    = $project->status;
         $_POST['acl']       = 'open';
 
-        if(!empty($_POST['code'])) $_POST['code'] = $project->code;
-
         $projectProducts = $this->dao->select('*')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($projectID)->fetchAll();
         foreach($projectProducts as $projectProduct)
         {
diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php
index 7fe72a1081..c56abcee1d 100644
--- a/module/project/view/build.html.php
+++ b/module/project/view/build.html.php
@@ -48,7 +48,7 @@
       <thead>
         <tr>
           <th class="c-id-sm"><?php echo $lang->build->id;?></th>
-          <th class="c-name text-left"><?php echo $lang->build->name;?></th>
+          <th class="c-name w-250px text-left"><?php echo $lang->build->name;?></th>
           <?php if($project->hasProduct):?>
           <th class="c-name w-150px text-left"><?php echo $lang->build->product;?></th>
           <?php endif;?>
@@ -68,11 +68,11 @@
         <tr data-id="<?php echo $productID;?>">
           <td class="c-id-sm text-muted"><?php echo html::a(helper::createLink($module, 'view', "buildID=$build->id"), sprintf('%03d', $build->id), '', "data-app='project'");?></td>
           <td class="c-name" title='<?php echo $build->name;?>'>
-            <?php if(!$build->execution):?>
-            <span class='icon icon-code-fork text-muted'></span>
-            <?php endif;?>
             <?php if($build->branchName) echo "<span class='label label-outline label-badge'>{$build->branchName}</span>"?>
             <?php echo html::a($this->createLink($module, 'view', "buildID=$build->id"), $build->name, '', "data-app='project'");?>
+            <?php if(!$build->execution):?>
+              <span class='icon icon-code-fork text-muted' title='<?php echo $lang->build->integrated;?>'></span>
+            <?php endif;?>
           </td>
           <?php if($project->hasProduct):?>
           <td class="c-name text-left" title='<?php echo $build->productName;?>'><?php echo $build->productName;?></td>