diff --git a/db/update16.5.sql b/db/update16.5.sql
index 51518cb552..ae5b49e6c4 100644
--- a/db/update16.5.sql
+++ b/db/update16.5.sql
@@ -84,3 +84,5 @@ REPLACE INTO `zt_zoutput` (`id`, `activity`, `name`, `content`, `optional`, `sta
 (78,52,'禅道缺陷记录','','','','admin','2020-01-09 14:22:52','','0000-00-00 00:00:00',390,'0'),
 (89,58,'禅道缺陷跟踪系统记录项','','yes','','admin','2020-01-09 14:25:16','','0000-00-00 00:00:00',445,'0'),
 (99,64,'禅道缺陷记录项','','yes','','admin','2020-01-09 14:26:52','','0000-00-00 00:00:00',495,'0');
+
+DELETE FROM `zt_config` WHERE `section` = 'customMenu';
diff --git a/extension/lite/task/ext/view/batchcreate.html.php b/extension/lite/task/ext/view/batchcreate.html.php
index 8907bf1f32..6f432d2625 100644
--- a/extension/lite/task/ext/view/batchcreate.html.php
+++ b/extension/lite/task/ext/view/batchcreate.html.php
@@ -135,7 +135,7 @@
             </td>
             <td <?php echo zget($visibleFields, 'region', "class='hidden'")?> style='overflow:visible'><?php echo html::select("region[$i]", $regionList, isset($regionID) ? $regionID : '', "class='form-control chosen' onchange='loadLaneGroup(this.value, $i)'");?></td>
             <td <?php echo zget($visibleFields, 'lane', "class='hidden'")?> style='overflow:visible'><?php echo html::select("lane[$i]", $lanes, '', "class='form-control chosen'");?></td>
-            <td><?php echo html::select("type[$i]", $lang->task->typeList, $type, 'class=form-control');?></td>
+            <td><?php echo html::select("type[$i]", $lang->task->typeList, $type, "class='form-control chosen'");?></td>
             <td <?php echo zget($visibleFields, 'assignedTo', "class='hidden'")?> style='overflow:visible'><?php echo html::select("assignedTo[$i]", $members, $member, "class='form-control chosen'");?></td>
             <td <?php echo zget($visibleFields, 'estimate', "class='hidden'")?>><?php echo html::input("estimate[$i]", '', "class='form-control text-center'");?></td>
             <td <?php echo zget($visibleFields, 'estStarted', "class='hidden'")?>>
diff --git a/module/common/view/footer.html.php b/module/common/view/footer.html.php
index 95e4a8db38..84ebd0b205 100755
--- a/module/common/view/footer.html.php
+++ b/module/common/view/footer.html.php
@@ -16,11 +16,12 @@ needPing = false;
 $(function()
 {
     var windowBlur = false;
-    if(window.Notification)
+    if(window.Notification && Notification.permission == 'granted')
     {
         window.onblur  = function(){windowBlur = true;}
         window.onfocus = function(){windowBlur = false;}
     }
+
     setInterval(function()
     {
         $.get(createLink('message', 'ajaxGetMessage', "windowBlur=" + (windowBlur ? '1' : '0')), function(data)
diff --git a/module/execution/css/all.css b/module/execution/css/all.css
index c1ac7084d4..49211f1ddb 100644
--- a/module/execution/css/all.css
+++ b/module/execution/css/all.css
@@ -26,3 +26,5 @@ td.flex span.project-type-label {margin-left: 5px; min-width: 36px;}
 td.flex span.project-type-label {min-width: 40px;}
 
 .label-children {min-width:22px !important;}
+.c-name > a, .table-children .text-left > a {padding-left: 5px;}
+.has-child > span {margin-right: 5px;}
diff --git a/module/execution/view/treestory.html.php b/module/execution/view/treestory.html.php
index 8aa91ed49c..719c39b78d 100644
--- a/module/execution/view/treestory.html.php
+++ b/module/execution/view/treestory.html.php
@@ -199,6 +199,7 @@
   <div class="detail-content">
     <table class="table table-data">
       <tbody>
+        <?php if($this->config->vision != 'lite'):?>
         <?php if(!empty($fromBug)):?>
         <tr class='text-top'>
           <th class='thWidth'><?php echo $lang->story->legendFromBug;?></th>
@@ -243,6 +244,7 @@
             <?php endif;?>
           </td>
         </tr>
+        <?php endif;?>
         <tr class='text-top'>
           <th><?php echo $lang->story->legendLinkStories;?></th>
           <td class='pd-0'>
diff --git a/module/gitlab/css/common.css b/module/gitlab/css/common.css
index 162e6d9854..ad50c2a1d2 100644
--- a/module/gitlab/css/common.css
+++ b/module/gitlab/css/common.css
@@ -1 +1,2 @@
 #publicTip {padding-left: 10px;}
+.table-form>tbody>tr>th {width: 110px;}
diff --git a/module/mr/model.php b/module/mr/model.php
index 712740bb74..b60a9a3566 100644
--- a/module/mr/model.php
+++ b/module/mr/model.php
@@ -1392,6 +1392,7 @@ class mrModel extends model
             ->where('t1.AType')->eq('mr')
             ->andWhere('t1.BType')->eq($objectType)
             ->andWhere('t1.BID')->eq($objectID)
+            ->andWhere('t2.id')->ne(0)
             ->fetchPairs();
     }
 
diff --git a/module/product/css/kanban.css b/module/product/css/kanban.css
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/module/product/css/kanban.en.css b/module/product/css/kanban.en.css
new file mode 100644
index 0000000000..fdf8e681ab
--- /dev/null
+++ b/module/product/css/kanban.en.css
@@ -0,0 +1 @@
+#kanbanList .kanban-lane {min-height: 140px !important;}
diff --git a/module/product/css/kanban.zh-cn.css b/module/product/css/kanban.zh-cn.css
new file mode 100644
index 0000000000..758037fd90
--- /dev/null
+++ b/module/product/css/kanban.zh-cn.css
@@ -0,0 +1 @@
+#kanbanList .kanban-lane {min-height: 115px !important;}
diff --git a/module/programplan/view/create.html.php b/module/programplan/view/create.html.php
index 39ac93c799..c95a562a64 100644
--- a/module/programplan/view/create.html.php
+++ b/module/programplan/view/create.html.php
@@ -22,6 +22,7 @@
       echo "<span class='text'>{$title}</span>";
       ?>
     </span>
+    <?php if($productList):?>
     <div class='btn-group'>
       <?php $viewName = $productID != 0 ? zget($productList,$productID) : current($productList);?>
       <a href='javascript:;' class='btn btn-link btn-limit' data-toggle='dropdown'><span class='text' title='<?php echo $viewName;?>'><?php echo $viewName;?></span> <span class='caret'></span></a>
@@ -34,6 +35,7 @@
         ?>
       </ul>
     </div>
+    <?php endif;?>
   </div>
 </div>
 <?php $hideAttribute = $planID == 0 ? '' : ' hidden'?>
diff --git a/module/repo/css/common.css b/module/repo/css/common.css
index afa3d5d369..be0378342c 100644
--- a/module/repo/css/common.css
+++ b/module/repo/css/common.css
@@ -16,6 +16,7 @@ h3 {font-size: 16px;}
 .versions {position: relative;}
 #diffRepo {position: absolute; left: 20px; z-index: 1000;}
 #repoID {display: inline-block; width: auto;}
+.table-form>tbody>tr>th {width: 110px;}
 .repoCode a:hover {text-decoration: none;}
 .commentButton
 {
diff --git a/module/stage/model.php b/module/stage/model.php
index 2a747ac4ae..53017e7b25 100644
--- a/module/stage/model.php
+++ b/module/stage/model.php
@@ -30,7 +30,11 @@ class stageModel extends model
 
         if(round($totalPercent + $stage->percent) > 100) return dao::$errors['message'][] = $this->lang->stage->error->percentOver;
 
-        $this->dao->insert(TABLE_STAGE)->data($stage)->autoCheck()->exec();
+        $this->dao->insert(TABLE_STAGE)
+            ->data($stage)
+            ->autoCheck()
+            ->checkIF($stage->percent != '', 'percent', 'float')
+            ->exec();
 
         if(!dao::isError()) return $this->dao->lastInsertID();
         return false;
@@ -62,7 +66,7 @@ class stageModel extends model
             $stage->createdBy   = $this->app->user->account;
             $stage->createdDate = helper::today();
 
-            $this->dao->insert(TABLE_STAGE)->data($stage)->autoCheck()->exec();
+            $this->dao->insert(TABLE_STAGE)->data($stage)->autoCheck()->checkIF($stage->percent != '', 'percent', 'float')->exec();
 
             $stageID = $this->dao->lastInsertID();
             $this->action->create('stage', $stageID, 'Opened');
@@ -91,7 +95,7 @@ class stageModel extends model
 
         if(round($totalPercent + $stage->percent - $oldStage->percent) > 100) return dao::$errors['message'][] = $this->lang->stage->error->percentOver;
 
-        $this->dao->update(TABLE_STAGE)->data($stage)->autoCheck()->where('id')->eq((int)$stageID)->exec();
+        $this->dao->update(TABLE_STAGE)->data($stage)->autoCheck()->checkIF($stage->percent != '', 'percent', 'float')->where('id')->eq((int)$stageID)->exec();
 
         if(!dao::isError()) return common::createChanges($oldStage, $stage);
         return false;
diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php
index ecfdc202fa..4e8550cc2f 100755
--- a/module/task/view/batchedit.html.php
+++ b/module/task/view/batchedit.html.php
@@ -132,7 +132,7 @@ js::set('dittoNotice', $dittoNotice);
             <td <?php echo zget($visibleFields, 'deadline',   "class='hidden'")?>><?php echo html::input("deadlines[$taskID]", helper::isZeroDate($tasks[$taskID]->deadline) ? '' : $tasks[$taskID]->deadline, "class='form-control text-center form-date'");?></td>
             <td <?php echo zget($visibleFields, 'pri',        "class='hidden'")?>><?php echo html::select("pris[$taskID]", $priList, $tasks[$taskID]->pri, "class='form-control'");?></td>
             <td <?php echo zget($visibleFields, 'estimate',   "class='hidden'")?>><?php echo html::input("estimates[$taskID]", $tasks[$taskID]->estimate, "class='form-control text-center' {$disableHour}");?></td>
-            <td <?php echo zget($visibleFields, 'record',     "class='hidden'")?>><?php echo html::input("consumeds[$taskID]", '', "class='form-control text-center' {$disableHour}");?></td>
+            <td <?php echo zget($visibleFields, 'record',     "class='hidden'")?>><?php echo html::input("consumeds[$taskID]", 0, "class='form-control text-center' {$disableHour}");?></td>
             <td <?php echo zget($visibleFields, 'left',       "class='hidden'")?>><?php echo html::input("lefts[$taskID]", $tasks[$taskID]->left, "class='form-control text-center' {$disableHour}");?></td>
             <td class='text-left<?php echo zget($visibleFields, 'finishedBy', ' hidden')?>' style='overflow:visible'><?php echo html::select("finishedBys[$taskID]", $members, $tasks[$taskID]->finishedBy, "class='form-control chosen'");?></td>
             <td class='text-left<?php echo zget($visibleFields, 'canceledBy', ' hidden')?>' style='overflow:visible'><?php echo html::select("canceledBys[$taskID]", $members, $tasks[$taskID]->canceledBy, "class='form-control chosen'");?></td>
diff --git a/module/todo/control.php b/module/todo/control.php
index f34e92a214..1643aa1001 100644
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -633,7 +633,7 @@ class todo extends control
 
             $this->post->set('fields', $fields);
             $this->post->set('rows', $todos);
-            $this->post->set('kind', $this->lang->todo->common);
+            $this->post->set('kind', 'todo');
             $this->fetch('file', 'export2' . $this->post->fileType, $_POST);
         }