diff --git a/module/execution/control.php b/module/execution/control.php
index 5d487439f6..054bb6656f 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1831,7 +1831,7 @@ class execution extends control
      * @access public
      * @return void
      */
-    public function kanban($executionID, $type = 'all', $orderBy = 'order_asc', $groupBy = 'default')
+    public function kanban($executionID, $browseType = 'all', $orderBy = 'order_asc', $groupBy = 'default')
     {
         /* Save to session. */
         $uri = $this->app->getURI(true);
@@ -1844,7 +1844,7 @@ class execution extends control
         $kanbanGroup = $this->loadModel('kanban')->getExecutionKanban($executionID, $browseType);
         if(empty($kanbanGroup))
         {
-            $this->kanban->createLanes($executionID);
+            $this->kanban->createLanes($executionID, $browseType, $groupBy);
             $kanbanGroup = $this->kanban->getExecutionKanban($executionID, $browseType);
         }
 
@@ -1875,10 +1875,9 @@ class execution extends control
         $this->view->executionID   = $executionID;
         $this->view->productID     = $productID;
         $this->view->allPlans      = $allPlans;
-        $this->view->browseType    = '';
+        $this->view->browseType    = $browseType;
         $this->view->kanbanGroup   = $kanbanGroup;
         $this->view->execution     = $execution;
-        $this->view->type          = $type;
         $this->view->groupBy       = $groupBy;
         $this->view->canBeChanged  = $canBeChanged;
 
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index 0476c0fb9c..39f516e3aa 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -14,10 +14,10 @@
   <div class='btn-toolbar pull-left'>
     <div class="input-control space c-type">
       <i class="icon icon-list-all"></i>
-      <?php echo html::select('type', $lang->kanban->type, $type, 'class="form-control chosen" data-max_drop_width="215"');?>
+      <?php echo html::select('type', $lang->kanban->type, $browseType, 'class="form-control chosen" data-max_drop_width="215"');?>
     </div>
     <div class="input-control space c-group">
-      <?php echo html::select('group',  $lang->kanban->group->$type, $groupBy, 'class="form-control chosen" data-max_drop_width="215"');?>
+      <?php echo html::select('group',  $lang->kanban->group->$browseType, $groupBy, 'class="form-control chosen" data-max_drop_width="215"');?>
     </div>
   </div>
   <div class='btn-toolbar pull-right'>
diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php
index 06848cc002..0317b72171 100644
--- a/module/kanban/lang/zh-cn.php
+++ b/module/kanban/lang/zh-cn.php
@@ -34,19 +34,24 @@ $lang->kanban->group->bug['module']     = "bug模块";
 $lang->kanban->group->bug['severity']   = "bug严重程度";
 $lang->kanban->group->bug['assignedTo'] = "指派人员";
 
-$lang->kanban->WIP             = 'WIP';
-$lang->kanban->setWIP          = '在制品设置';
-$lang->kanban->WIPStatus       = '在制品状态';
-$lang->kanban->WIPStage        = '在制品阶段';
-$lang->kanban->WIPType         = '在制品类型';
-$lang->kanban->WIPCount        = '在制品数量';
-$lang->kanban->noLimit         = '不限制∞';
-$lang->kanban->setLane         = '泳道设置';
-$lang->kanban->laneName        = '泳道名称';
-$lang->kanban->laneColor       = '泳道颜色';
-$lang->kanban->setLaneColumn   = '看板列设置';
-$lang->kanban->columnName      = '看板列名称';
-$lang->kanban->columnColor     = '看板列颜色';
+$lang->kanban->WIP                = 'WIP';
+$lang->kanban->setWIP             = '在制品设置';
+$lang->kanban->WIPStatus          = '在制品状态';
+$lang->kanban->WIPStage           = '在制品阶段';
+$lang->kanban->WIPType            = '在制品类型';
+$lang->kanban->WIPCount           = '在制品数量';
+$lang->kanban->noLimit            = '不限制∞';
+$lang->kanban->setLane            = '泳道设置';
+$lang->kanban->laneName           = '泳道名称';
+$lang->kanban->laneColor          = '泳道颜色';
+$lang->kanban->setLaneColumn      = '看板列设置';
+$lang->kanban->columnName         = '看板列名称';
+$lang->kanban->columnColor        = '看板列颜色';
+$lang->kanban->noColumnUniqueName = '看板列名称已存在';
+
+$lang->kanban->error = new stdclass();
+$lang->kanban->error->parentLimitNote = '父列的在制品数量不能小于子列在制品数量之和';
+$lang->kanban->error->childLimitNote  = '子列在制品数量之和不能大于父列的在制品数量';
 
 $this->lang->kanban->laneTypeList = array();
 $this->lang->kanban->laneTypeList['story'] = $lang->SRCommon;
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 0e03bdefe5..e018344bb0 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -22,12 +22,12 @@ class kanbanModel extends model
      * @access public
      * @return array
      */
-    public function getExecutionKanban($executionID, $objectType = 'all', $groupBy = 'default')
+    public function getExecutionKanban($executionID, $browseType = 'all', $groupBy = 'default')
     {
         $lanes = $this->dao->select('*')->from(TABLE_KANBANLANE)
             ->where('execution')->eq($executionID)
             ->andWhere('deleted')->eq(0)
-            ->beginIF($objectType != 'all')->andWhere('type')->eq($objectType)
+            ->beginIF($browseType != 'all')->andWhere('type')->eq($browseType)
             ->beginIF($groupBy != 'default')->andWhere('extra')->eq($groupBy)
             ->fetchAll('id');