diff --git a/db/zentao.sql b/db/zentao.sql
index 39768146fa..f085f5801c 100755
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -2161,6 +2161,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (1,'custom','project'),
 (1,'custom','restore'),
 (1,'custom','set'),
+(1,'custom','hours'),
 (1,'custom','setDefaultConcept'),
 (1,'custom','setPublic'),
 (1,'custom','setStoryConcept'),
@@ -2753,6 +2754,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (2,'custom','product'),
 (2,'custom','restore'),
 (2,'custom','set'),
+(2,'custom','hours'),
 (2,'custom','setPublic'),
 (2,'datatable','setGlobal'),
 (2,'dept','browse'),
diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php
index d7ff4fa7c8..d7e25fd518 100644
--- a/module/admin/lang/menu.php
+++ b/module/admin/lang/menu.php
@@ -84,12 +84,12 @@ $lang->admin->menuList->model['menuOrder']['15'] = 'waterfall';
 $lang->admin->menuList->model['menuOrder']['20'] = 'agileplus';
 $lang->admin->menuList->model['menuOrder']['25'] = 'waterfallplus';
 
-$lang->admin->menuList->model['tabMenu']['common']['project']      = array('link' => "{$lang->project->common}|custom|required|module=project", 'alias' => 'set', 'exclude' => 'custom', 'links' => array('custom|set|'));
+$lang->admin->menuList->model['tabMenu']['common']['project']      = array('link' => "{$lang->project->common}|custom|required|module=project", 'alias' => 'set', 'exclude' => 'custom', 'links' => array('custom|set|module=project&field=unitList'));
 $lang->admin->menuList->model['tabMenu']['common']['stage']        = array('link' => "{$lang->stage->type}|stage|settype|", 'subModule' => 'stage', 'links' => array('stage|browse|'));
 $lang->admin->menuList->model['tabMenu']['common']['build']        = array('link' => "{$lang->build->common}|custom|required|module=build", 'alias' => 'set', 'exclude' => 'custom');
 $lang->admin->menuList->model['tabMenu']['common']['flow']         = array('link' => "{$lang->custom->flow}|custom|flow|", 'divider' => true);
 $lang->admin->menuList->model['tabMenu']['common']['code']         = array('link' => "{$lang->code}|custom|code|");
-$lang->admin->menuList->model['tabMenu']['common']['hours']        = array('link' => "{$lang->workingHour}|custom|hours|", 'subModule' => 'holiday', 'links' => array('holiday|browse|'));
+$lang->admin->menuList->model['tabMenu']['common']['hours']        = array('link' => "{$lang->workingHour}|custom|hours|", 'subModule' => 'holiday', 'links' => array('holiday|browse|', 'custom|hours'));
 $lang->admin->menuList->model['tabMenu']['waterfall']['stage']     = array('link' => "{$lang->stage->list}|stage|browse|", 'subModule' => 'stage', 'exclude' => 'stage-plusbrowse');
 $lang->admin->menuList->model['tabMenu']['waterfallplus']['stage'] = array('link' => "{$lang->stage->list}|stage|plusbrowse|", 'subModule' => 'stage', 'exclude' => 'stage-browse');
 $lang->admin->menuList->model['tabMenu']['menuOrder']['common']['5']        = 'project';
diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php
index b3140f2c89..1ed0bb6dee 100644
--- a/module/custom/lang/de.php
+++ b/module/custom/lang/de.php
@@ -10,6 +10,7 @@ $lang->custom->key                  = 'Key';
 $lang->custom->value                = 'Value';
 $lang->custom->working              = 'WorkStyle';
 $lang->custom->select               = 'Select Concept';
+$lang->custom->hours                = 'Hours';
 $lang->custom->branch               = 'Multi Branch';
 $lang->custom->owner                = 'Owner';
 $lang->custom->module               = 'Module';
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index 8f2e139a8d..171bc035f2 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -10,6 +10,7 @@ $lang->custom->key                  = 'Key';
 $lang->custom->value                = 'Value';
 $lang->custom->working              = 'Mode';
 $lang->custom->select               = 'Select Concept';
+$lang->custom->hours                = 'Hours';
 $lang->custom->branch               = 'Multi-Branch';
 $lang->custom->owner                = 'Owner';
 $lang->custom->module               = 'Module';
diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php
index 2e43227781..f434865205 100644
--- a/module/custom/lang/fr.php
+++ b/module/custom/lang/fr.php
@@ -10,6 +10,7 @@ $lang->custom->key                  = 'Clé';
 $lang->custom->value                = 'Valeur';
 $lang->custom->working              = 'Mode';
 $lang->custom->select               = 'Choix du Concept';
+$lang->custom->hours                = 'Hours';
 $lang->custom->branch               = 'Multi-Branches';
 $lang->custom->owner                = 'Propriétaire';
 $lang->custom->module               = 'Module';
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index 8ed08ff52c..1ff729cb98 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -9,6 +9,7 @@ $lang->custom->restore              = '恢复默认';
 $lang->custom->key                  = '键';
 $lang->custom->value                = '值';
 $lang->custom->working              = '工作方式';
+$lang->custom->hours                = '工时';
 $lang->custom->select               = '请选择流程：';
 $lang->custom->branch               = '多分支';
 $lang->custom->owner                = '所有者';
diff --git a/module/custom/view/hours.html.php b/module/custom/view/hours.html.php
index 466398467d..50807ab711 100644
--- a/module/custom/view/hours.html.php
+++ b/module/custom/view/hours.html.php
@@ -17,7 +17,7 @@
       <div class='nav list-group tab-menu'>
         <a href="#hoursContent" data-toggle="tab" class="hours <?php if($type == 'hours') echo 'active'?>"><?php echo $lang->custom->setHours;?></a>
         <a href="#weekendContent" data-toggle="tab" class="weekend <?php if($type == 'weekend') echo 'active'?>"><?php echo $lang->custom->setWeekend;?></a>
-        <?php echo html::a($this->createLink('holiday', 'browse'), $lang->custom->setHoliday);?>
+        <?php if(common::hasPriv('holiday', 'browse')) echo html::a($this->createLink('holiday', 'browse'), $lang->custom->setHoliday);?>
       </div>
     </div>
   </div>
diff --git a/module/execution/model.php b/module/execution/model.php
index 3b5386d02f..52724ab8d2 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -1957,7 +1957,7 @@ class executionModel extends model
             ->andWhere('t1.reviewStatus')->eq('doing')
             ->fi()
             ->orderBy($orderBy)
-            ->page($pager)
+            ->page($pager, 't1.id')
             ->fetchAll('id');
 
         if(empty($productID) and !empty($executions)) $projectProductIdList = $this->dao->select('project, product')->from(TABLE_PROJECTPRODUCT)->where('project')->in(array_keys($executions))->fetchPairs();
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index d89215cffd..8b3fe28f99 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1444,6 +1444,7 @@ $lang->resource->custom->setDefaultConcept  = 'setDefaultConcept';
 $lang->resource->custom->deleteStoryConcept = 'deleteStoryConcept';
 $lang->resource->custom->kanban             = 'kanban';
 $lang->resource->custom->code               = 'code';
+$lang->resource->custom->hours              = 'hours';
 
 $lang->custom->methodOrder[5]  = 'index';
 $lang->custom->methodOrder[10] = 'set';
@@ -1461,6 +1462,7 @@ $lang->custom->methodOrder[65] = 'setDefaultConcept';
 $lang->custom->methodOrder[70] = 'deleteStoryConcept';
 $lang->custom->methodOrder[75] = 'kanban';
 $lang->custom->methodOrder[80] = 'code';
+$lang->custom->methodOrder[85] = 'hours';
 
 $lang->resource->datatable = new stdclass();
 $lang->resource->datatable->setGlobal = 'setGlobal';
diff --git a/module/holiday/view/browse.html.php b/module/holiday/view/browse.html.php
index 0f81948867..8aca520eff 100644
--- a/module/holiday/view/browse.html.php
+++ b/module/holiday/view/browse.html.php
@@ -15,8 +15,10 @@
   <div class='side-col' id='sidebar'>
     <div class='cell'>
       <div class='nav list-group tab-menu'>
+        <?php if(common::hasPriv('custom', 'hours')):?>
         <a href="<?php echo $this->createLink('custom', 'hours', 'type=hours')?>"><?php echo $lang->custom->setHours;?></a>
         <a href="<?php echo $this->createLink('custom', 'hours', 'type=weekend')?>"><?php echo $lang->custom->setWeekend;?></a>
+        <?php endif;?>
         <?php echo html::a($this->createLink('holiday', 'browse'), $lang->custom->setHoliday, '', "class='active'");?>
       </div>
     </div>
diff --git a/module/program/js/browse.js b/module/program/js/browse.js
index 1bf95edd1f..5168be2e21 100644
--- a/module/program/js/browse.js
+++ b/module/program/js/browse.js
@@ -77,7 +77,7 @@ $(function()
 
 function showEditCheckbox(show)
 {
-    $('.icon-project,.icon-waterfall,.icon-scrum,.icon-kanban').each(function()
+    $('.icon-project,.icon-waterfall,.icon-scrum,.icon-kanban,.icon-agileplus,.icon-waterfallplus').each(function()
     {
         $this     = $(this);
         $tr       = $(this).closest('tr');
diff --git a/module/zanode/lang/de.php b/module/zanode/lang/de.php
index 6fb124d62c..76e365c3a0 100644
--- a/module/zanode/lang/de.php
+++ b/module/zanode/lang/de.php
@@ -48,6 +48,7 @@ $lang->zanode->confirmReboot   = "Are you sure to restart the ZenAgent Node？";
 $lang->zanode->confirmShutdown = "Are you sure to shutdown the ZenAgent Node？";
 $lang->zanode->confirmSuspend  = "Are you sure to suspend the ZenAgent Node？";
 $lang->zanode->confirmResume   = "Are you sure to resume the ZenAgent Node？";
+$lang->zanode->confirmRestore  = "The ZenAgent Node will be restored to this snapshot state, are you sure you want to continue?";
 $lang->zanode->actionSuccess   = 'Success';
 $lang->zanode->deleted         = "Deleted";
 $lang->zanode->scriptPath      = "Script path";
@@ -90,6 +91,7 @@ $lang->zanode->deleteSnapshot        = 'Delete Snapshot';
 $lang->zanode->snapshotEmpty         = 'No snapshots';
 $lang->zanode->confirmDeleteSnapshot = "The snapshot cannot be restored from the recycle bin after being deleted. Are you sure to continue?";
 
+$lang->zanode->snapshot = new stdClass();
 $lang->zanode->snapshot->statusList['creating']          = 'Creating';
 $lang->zanode->snapshot->statusList['completed']         = 'Create Completed';
 $lang->zanode->snapshot->statusList['failed']            = 'Create Failed';
@@ -97,7 +99,9 @@ $lang->zanode->snapshot->statusList['restoring']         = 'Restoring';
 $lang->zanode->snapshot->statusList['restore_failed']    = 'Restore Failed';
 $lang->zanode->snapshot->statusList['restore_completed'] = 'Restore Completed';
 
-$lang->zanode->imageNameEmpty = 'Name can not be empty.';
+$lang->zanode->imageNameEmpty  = 'Name can not be empty.';
+$lang->zanode->snapStatusError = 'Snapshot is not ready.';
+$lang->zanode->snapRestoring   = 'Snapshot is restoring.';
 
 $lang->zanode->runTimeout = 'Network connection timeout, please check the host and execution node status.';
 
diff --git a/module/zanode/lang/en.php b/module/zanode/lang/en.php
index 563d3eed23..8f7bc3edb3 100644
--- a/module/zanode/lang/en.php
+++ b/module/zanode/lang/en.php
@@ -48,7 +48,6 @@ $lang->zanode->confirmReboot   = "Are you sure to restart the ZenAgent Node?";
 $lang->zanode->confirmShutdown = "Are you sure to shutdown the ZenAgent Node?";
 $lang->zanode->confirmSuspend  = "Are you sure to suspend the ZenAgent Node?";
 $lang->zanode->confirmResume   = "Are you sure to resume the ZenAgent Node?";
-$lang->zanode->confirmRestore  = "Are you sure to restore the ZenAgent Node?";
 $lang->zanode->confirmRestore  = "The ZenAgent Node will be restored to this snapshot state, are you sure you want to continue?";
 $lang->zanode->actionSuccess   = 'Success';
 $lang->zanode->deleted         = "Deleted";
@@ -92,6 +91,7 @@ $lang->zanode->deleteSnapshot        = 'Delete Snapshot';
 $lang->zanode->snapshotEmpty         = 'No snapshots';
 $lang->zanode->confirmDeleteSnapshot = "The snapshot cannot be restored from the recycle bin after being deleted. Are you sure to continue?";
 
+$lang->zanode->snapshot = new stdClass();
 $lang->zanode->snapshot->statusList['creating']          = 'Creating';
 $lang->zanode->snapshot->statusList['completed']         = 'Create Completed';
 $lang->zanode->snapshot->statusList['failed']            = 'Create Failed';
@@ -151,8 +151,8 @@ $lang->zanode->init->title          = "Initialize Node";
 $lang->zanode->init->descTitle      = "Follow these steps to complete the initialization on the node:";
 $lang->zanode->init->initDesc       = "Execute the init script on the node: %s %s   <br>- Click check service status button.";
 
-$lang->zanode->tips = "The execution node is a virtual machine or container instance created by the host machine, which is a test environment for executing test tasks. After the execution node is configured with the automated test environment, the script can be automatically executed, and the results can be viewed in the execution results of Zen Dao's application cases.";
-$lang->zanode->scriptTips = 'Write the directory where the script is located on the execution node.';
-$lang->zanode->shellTips  = 'Before running the automated test script on the execution node, you can execute a custom shell command.';
+$lang->zanode->tips           = "The execution node is a virtual machine or container instance created by the host machine, which is a test environment for executing test tasks. After the execution node is configured with the automated test environment, the script can be automatically executed, and the results can be viewed in the execution results of Zen Dao's application cases.";
+$lang->zanode->scriptTips     = 'Write the directory where the script is located on the execution node.';
+$lang->zanode->shellTips      = 'Before running the automated test script on the execution node, you can execute a custom shell command.';
 $lang->zanode->automationTips = 'Before executing the test task on the execution node, you need to set up the execution node corresponding to the product, the directory of the automated test script, and the custom Shell command to execute.';
 $lang->zanode->nameUnique     = $lang->zanode->name . 'already exist';
diff --git a/module/zanode/lang/fr.php b/module/zanode/lang/fr.php
index 6fb124d62c..76e365c3a0 100644
--- a/module/zanode/lang/fr.php
+++ b/module/zanode/lang/fr.php
@@ -48,6 +48,7 @@ $lang->zanode->confirmReboot   = "Are you sure to restart the ZenAgent Node？";
 $lang->zanode->confirmShutdown = "Are you sure to shutdown the ZenAgent Node？";
 $lang->zanode->confirmSuspend  = "Are you sure to suspend the ZenAgent Node？";
 $lang->zanode->confirmResume   = "Are you sure to resume the ZenAgent Node？";
+$lang->zanode->confirmRestore  = "The ZenAgent Node will be restored to this snapshot state, are you sure you want to continue?";
 $lang->zanode->actionSuccess   = 'Success';
 $lang->zanode->deleted         = "Deleted";
 $lang->zanode->scriptPath      = "Script path";
@@ -90,6 +91,7 @@ $lang->zanode->deleteSnapshot        = 'Delete Snapshot';
 $lang->zanode->snapshotEmpty         = 'No snapshots';
 $lang->zanode->confirmDeleteSnapshot = "The snapshot cannot be restored from the recycle bin after being deleted. Are you sure to continue?";
 
+$lang->zanode->snapshot = new stdClass();
 $lang->zanode->snapshot->statusList['creating']          = 'Creating';
 $lang->zanode->snapshot->statusList['completed']         = 'Create Completed';
 $lang->zanode->snapshot->statusList['failed']            = 'Create Failed';
@@ -97,7 +99,9 @@ $lang->zanode->snapshot->statusList['restoring']         = 'Restoring';
 $lang->zanode->snapshot->statusList['restore_failed']    = 'Restore Failed';
 $lang->zanode->snapshot->statusList['restore_completed'] = 'Restore Completed';
 
-$lang->zanode->imageNameEmpty = 'Name can not be empty.';
+$lang->zanode->imageNameEmpty  = 'Name can not be empty.';
+$lang->zanode->snapStatusError = 'Snapshot is not ready.';
+$lang->zanode->snapRestoring   = 'Snapshot is restoring.';
 
 $lang->zanode->runTimeout = 'Network connection timeout, please check the host and execution node status.';
 
diff --git a/module/zanode/lang/zh-cn.php b/module/zanode/lang/zh-cn.php
index 220b61ae5e..a93e113823 100644
--- a/module/zanode/lang/zh-cn.php
+++ b/module/zanode/lang/zh-cn.php
@@ -99,7 +99,6 @@ $lang->zanode->snapshot->statusList['restoring']         = '还原中';
 $lang->zanode->snapshot->statusList['restore_failed']    = '还原失败';
 $lang->zanode->snapshot->statusList['restore_completed'] = '还原成功';
 
-$lang->zanode->imageNameEmpty = '名称不能为空';
 $lang->zanode->imageNameEmpty  = '名称不能为空';
 $lang->zanode->snapStatusError = '快照不可用';
 $lang->zanode->snapRestoring   = '快照正在还原中';
@@ -130,7 +129,7 @@ $lang->zanode->statusList['restoring']    = '还原中';
 $lang->zanode->initNotice = "保存成功，请初始化执行节点或返回列表。";
 $lang->zanode->initButton = "去初始化";
 
-$lang->zanode->init = new stdclass;
+$lang->zanode->init = new stdClass();
 $lang->zanode->init->statusTitle   = "服务状态";
 $lang->zanode->init->checkStatus   = "检测服务状态";
 $lang->zanode->init->not_install   = "未安装";
@@ -152,8 +151,8 @@ $lang->zanode->init->title          = "初始化执行节点";
 $lang->zanode->init->descTitle      = "请根据引导完成执行节点上的初始化: ";
 $lang->zanode->init->initDesc       = "- 在执行节点上执行命令：%s %s  <br>- 点击检测服务状态。";$lang->zanode->init->statusTitle    = "服务状态";
 
-$lang->zanode->tips = '执行节点是由宿主机创建的虚拟机或容器实例，是执行测试任务的测试环境，在执行节点配置自动化测试环境后可以自动执行脚本，结果可以在禅道对应用例执行结果中查看。';
-$lang->zanode->scriptTips = '填写执行节点上自动化测试脚本所在的目录。';
-$lang->zanode->shellTips  = '在执行节点上运行自动化测试脚本前，可以执行自定义的shell命令。';
+$lang->zanode->tips           = '执行节点是由宿主机创建的虚拟机或容器实例，是执行测试任务的测试环境，在执行节点配置自动化测试环境后可以自动执行脚本，结果可以在禅道对应用例执行结果中查看。';
+$lang->zanode->scriptTips     = '填写执行节点上自动化测试脚本所在的目录。';
+$lang->zanode->shellTips      = '在执行节点上运行自动化测试脚本前，可以执行自定义的shell命令。';
 $lang->zanode->automationTips = '在执行节点上执行测试任务前，需要设置产品对应的执行节点，自动化测试脚本的目录以及需要执行的自定义Shell命令。';
 $lang->zanode->nameUnique     = $lang->zanode->name . '已存在';
diff --git a/tools/prepareupdate.php b/tools/prepareupdate.php
index b832e58a8c..cae8d0590e 100755
--- a/tools/prepareupdate.php
+++ b/tools/prepareupdate.php
@@ -113,7 +113,7 @@ class prepareUpdate
             $bugs    = array_filter(explode(',', trim($release->bugs, ',')));
 
             if(!empty($stories))   $doneStories .= $title[$product] . "\n";
-            if(!empty($fixedBugs)) $fixedBugs   .= $title[$product] . "\n";
+            if(!empty($bugs))      $fixedBugs   .= $title[$product] . "\n";
             foreach($stories as $storyID)
             {
                 $storyTitle   = $this->getStoryOrBugTitle('story', $storyID);
@@ -266,7 +266,7 @@ class prepareUpdate
     {
         `sed -i "s/ \/\/ pms insert position\.$/\\n\\\$lang->upgrade->fromVersions['{$this->internalZT->pmsVersionAB}']       = '{$this->internalZT->pmsVersion}'; \/\/ pms insert position\./" ../module/upgrade/lang/version.php`;
         `sed -i "s/ \/\/ biz insert position\.$/\\n\\\$lang->upgrade->fromVersions['biz{$this->internalZT->bizVersionAB}']       = 'Biz{$this->internalZT->bizVersion}'; \/\/ biz insert position\./" ../module/upgrade/lang/version.php`;
-        `sed -i "s/ \/\/ max insert position\.$/\\n\\\$lang->upgrade->fromVersions['max{$this->internalZT->lastMaxVersionAB}']   = 'Max{$this->internalZT->lastMaxVersion}'; \/\/ max insert position\./" ../module/upgrade/lang/version.php`;
+        `sed -i "s/ \/\/ max insert position\.$/\\n\\\$lang->upgrade->fromVersions['max{$this->internalZT->lastMaxVersionAB}']      = 'Max{$this->internalZT->lastMaxVersion}'; \/\/ max insert position\./" ../module/upgrade/lang/version.php`;
     }
 
     /**