diff --git a/lib/scm/gitlab.class.php b/lib/scm/gitlab.class.php
index 1730ea27ce..82474eeb3c 100644
--- a/lib/scm/gitlab.class.php
+++ b/lib/scm/gitlab.class.php
@@ -90,6 +90,9 @@ class gitlab
     /**
      * Get files info.
      *
+     * The API path requested is: "GET /projects/:id/repository/files/:file_path".
+     * Known issue of GitLab API: if a '%' in 'file_path', GitLab API will show a error 'file_path should be a valid file path'.
+     *
      * @param  string    $path
      * @param  string    $ref
      * @access public
diff --git a/module/api/control.php b/module/api/control.php
index 4f70ef0c99..0f6655ce44 100755
--- a/module/api/control.php
+++ b/module/api/control.php
@@ -69,7 +69,7 @@ class api extends control
             $this->view->typeList = $this->api->getTypeList($libID);
         }
 
-        $this->setMenu($libID);
+        $this->setMenu($libID, $moduleID);
 
         $this->view->isRelease  = $release > 0;
         $this->view->release    = $release;
@@ -462,6 +462,7 @@ class api extends control
         {
             $now    = helper::now();
             $params = fixer::input('post')
+                ->trim('title,path')
                 ->remove('type')
                 ->skipSpecial('params,response')
                 ->add('addedBy', $this->app->user->account)
@@ -601,10 +602,11 @@ class api extends control
      * Set doc menu by method name.
      *
      * @param  int $libID
+     * @param  int $moduleID
      * @access public
      * @return void
      */
-    private function setMenu($libID = 0)
+    private function setMenu($libID = 0, $moduleID = 0)
     {
         common::setMenuVars('doc', $libID);
 
@@ -629,7 +631,7 @@ class api extends control
                 if(common::hasPriv('api', 'create'))
                 {
                     $menu .= "<li>";
-                    $menu .= html::a(helper::createLink('api', 'create', "libID=$libID"), "<i class='icon-rich-text icon'></i> " . $this->lang->api->apiDoc, '', "data-app='{$this->app->tab}'");
+                    $menu .= html::a(helper::createLink('api', 'create', "libID=$libID&moduleID=$moduleID"), "<i class='icon-rich-text icon'></i> " . $this->lang->api->apiDoc, '', "data-app='{$this->app->tab}'");
                     $menu .= "</li>";
                 }
 
diff --git a/module/api/lang/zh-cn.php b/module/api/lang/zh-cn.php
index b5506e0540..d8946ad167 100755
--- a/module/api/lang/zh-cn.php
+++ b/module/api/lang/zh-cn.php
@@ -41,7 +41,7 @@ $lang->api->noUniqueName     = '接口库名已存在。';
 $lang->api->noUniqueVersion  = '版本已存在。';
 $lang->api->version          = '版本';
 $lang->api->createStruct     = '创建数据结构';
-$lang->api->editStruct       = '修改数据结构';
+$lang->api->editStruct       = '编辑数据结构';
 $lang->api->deleteStruct     = '删除数据结构';
 $lang->api->create           = '创建接口';
 $lang->api->title            = '接口名称';
diff --git a/module/api/model.php b/module/api/model.php
index 5d5ad7997b..d0271b2cd1 100644
--- a/module/api/model.php
+++ b/module/api/model.php
@@ -209,20 +209,17 @@ class apiModel extends model
         $now     = helper::now();
         $account = $this->app->user->account;
         $data    = fixer::input('post')
-            ->remove('type')
             ->skipSpecial('params,response')
             ->add('editedBy', $account)
             ->add('editedDate', $now)
+            ->add('version', $oldApi->version)
             ->setDefault('product,module', 0)
+            ->remove('type')
             ->get();
 
-        $data->id      = $oldApi->id;
-        $data->version = $oldApi->version + 1;
-        $apiSpec       = $this->getApiSpecByData($data);
+        $changes = common::createChanges($oldApi, $data);
+        if(!empty($changes)) $data->version = $oldApi->version + 1;
 
-        $this->dao->replace(TABLE_API_SPEC)->data($apiSpec)->exec();
-
-        unset($data->id);
         $this->dao->update(TABLE_API)
             ->data($data)
             ->autoCheck()
@@ -230,7 +227,11 @@ class apiModel extends model
             ->where('id')->eq($apiID)
             ->exec();
 
-        return common::createChanges($oldApi, $data);
+        $data->id = $apiID;
+        $apiSpec  = $this->getApiSpecByData($data);
+        $this->dao->replace(TABLE_API_SPEC)->data($apiSpec)->exec();
+
+        return $changes;
     }
 
     /**
diff --git a/module/api/view/content.html.php b/module/api/view/content.html.php
index b86262c5d2..dd9ddad90c 100644
--- a/module/api/view/content.html.php
+++ b/module/api/view/content.html.php
@@ -1,4 +1,4 @@
-<div class="main-col" data-min-width="400">
+<div class="main-col" data-min-width="500">
   <div id="mainContent" class="main-row in">
     <div class="main-col col-8">
       <div class="cell" id="content">
diff --git a/module/api/view/create.html.php b/module/api/view/create.html.php
index 0bd168a361..4f5684931b 100644
--- a/module/api/view/create.html.php
+++ b/module/api/view/create.html.php
@@ -68,7 +68,7 @@ js::set('struct_paramsType', $lang->struct->paramsType);
           <tr>
             <th><?php echo $lang->api->module;?></th>
             <td>
-            <span id='moduleBox'><?php echo html::select('module', $moduleOptionMenu, '', "class='form-control chosen'");?></span>
+            <span id='moduleBox'><?php echo html::select('module', $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></span>
             </td>
             <td></td>
           </tr>
diff --git a/module/api/view/index.html.php b/module/api/view/index.html.php
index bcad350858..ba0656c6c2 100644
--- a/module/api/view/index.html.php
+++ b/module/api/view/index.html.php
@@ -42,8 +42,10 @@
       </div>
       <?php if(!$moduleTree):?>
       <hr class="space">
+      <?php if(!$isRelease):?>
       <div class="text-center text-muted tips"><?php echo $lang->api->noModule;?></div>
       <?php endif;?>
+      <?php endif;?>
       <?php echo $moduleTree;?>
     </div>
   </div>
@@ -71,7 +73,7 @@
     </div>
   </div>
   <?php else:?>
-  <div class="cell">
+  <div class="cell main-col" data-min-width="400">
     <div class="detail">
       <ul class="list-group">
         <?php foreach($apiList as $api):?>
diff --git a/module/api/view/releases.html.php b/module/api/view/releases.html.php
index ca0afb44b6..1c1e1a7d69 100644
--- a/module/api/view/releases.html.php
+++ b/module/api/view/releases.html.php
@@ -41,7 +41,7 @@
             <td><?php echo zget($users, $release->addedBy, '');?></td>
             <td class="c-date"><?php echo $release->addedDate;?></td>
             <td class='c-actions'>
-              <?php echo html::a($this->createLink('api', 'deleteRelease', "libID=$libID&id=$release->id"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->api->delete}' class='btn'");?>
+              <?php if(common::hasPriv('api', 'deleteRelease')) echo html::a($this->createLink('api', 'deleteRelease', "libID=$libID&id=$release->id"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->api->deleteRelease}' class='btn'");?>
             </td>
           </tr>
           <?php endforeach;?>
diff --git a/module/api/view/struct.html.php b/module/api/view/struct.html.php
index d7f744ab1f..f1983a737b 100644
--- a/module/api/view/struct.html.php
+++ b/module/api/view/struct.html.php
@@ -49,8 +49,8 @@
             <td class="c-date"><?php echo $struct->addedDate;?></td>
             <td class='c-actions'>
               <?php
-              if(common::hasPriv('api', 'editStruct')) echo html::a($this->createLink('api', 'editStruct', "libID=$libID&structID=$struct->id"), '<i class="icon-edit"></i>', '', "title='{$lang->api->edit}' class='btn'");
-              if(common::hasPriv('api', 'deleteStruct')) echo html::a($this->createLink('api', 'deleteStruct', "libID=$libID&structID=$struct->id"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->api->delete}' class='btn'");
+              if(common::hasPriv('api', 'editStruct')) echo html::a($this->createLink('api', 'editStruct', "libID=$libID&structID=$struct->id"), '<i class="icon-edit"></i>', '', "title='{$lang->api->editStruct}' class='btn'");
+              if(common::hasPriv('api', 'deleteStruct')) echo html::a($this->createLink('api', 'deleteStruct', "libID=$libID&structID=$struct->id"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->api->deleteStruct}' class='btn'");
               ?>
             </td>
           </tr>
diff --git a/module/bug/control.php b/module/bug/control.php
index 0beba6c819..b2e402475e 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -407,7 +407,16 @@ class bug extends control
 
             if($this->app->tab == 'execution')
             {
-                $location = $this->session->bugList ? $this->session->bugList : $this->createLink('execution', 'bug', "executionID={$output['executionID']}");
+                if(!preg_match("/(m=|\/)execution(&f=|-)bug(&|-|\.)?/", $this->session->bugList))
+                {
+                    $location = $this->session->bugList;
+                }
+                else
+                {
+                    $executionID = $this->post->execution ? $this->post->execution : $output['executionID'];
+                    $location    = $this->createLink('execution', 'bug', "executionID=$executionID");
+                }
+
             }
             elseif($this->app->tab == 'project')
             {
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 216fbacdf6..e34988bbdb 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -93,7 +93,7 @@
 
         if($this->app->tab != 'product')
         {
-            common::printIcon('bug', 'toStory', "product=$bug->product&branch=$bug->branch&module=0&story=0&execution=0&bugID=$bug->id", $bug, 'button', $lang->icons['story'], '', '', '', "data-app='" . $this->app->tab . "'", $lang->bug->toStory);
+            common::printIcon('bug', 'toStory', "product=$bug->product&branch=$bug->branch&module=0&story=0&execution=0&bugID=$bug->id", $bug, 'button', $lang->icons['story'], '', '', '', "data-app='product'", $lang->bug->toStory);
             common::printIcon('bug', 'createCase', $convertParams, $bug, 'button', 'sitemap');
         }
 
diff --git a/module/ci/model.php b/module/ci/model.php
index 7d632d1519..0bf3b7ca57 100644
--- a/module/ci/model.php
+++ b/module/ci/model.php
@@ -54,6 +54,7 @@ class ciModel extends model
      */
     public function syncCompileStatus($compile)
     {
+        /* Max retry times is: 3. */
         if($compile->times >= 3)
         {
             $this->dao->update(TABLE_COMPILE)->set('status')->eq('failure')->where('id')->eq($compile->id)->exec();
diff --git a/module/common/view/noticeimport.html.php b/module/common/view/noticeimport.html.php
index 5f87dd9b43..600fcbea00 100644
--- a/module/common/view/noticeimport.html.php
+++ b/module/common/view/noticeimport.html.php
@@ -27,5 +27,7 @@ function submitForm(type)
     $('.modal-body #insert').val(type == 'insert' ? 1 : 0);
     $('#importNoticeModal .form-actions .btn').addClass('disabled');
     $("button[data-target='#importNoticeModal']").closest('form').submit();
+
+    setTimeout(function(){$('#importNoticeModal .form-actions .btn').removeClass('disabled');}, 1000);
 }
 </script>
diff --git a/module/compile/model.php b/module/compile/model.php
index f395bbb110..07738955a0 100644
--- a/module/compile/model.php
+++ b/module/compile/model.php
@@ -178,8 +178,8 @@ class compileModel extends model
 
         $this->dao->update(TABLE_COMPILE)->data($compile)->where('id')->eq($compileID)->exec();
         $this->dao->update(TABLE_JOB)
-            ->set('lastStatus')->eq($build->status)
-            ->set('lastExec')->eq($build->updateDate)
+            ->set('lastStatus')->eq($compile->status)
+            ->set('lastExec')->eq($compile->updateDate)
             ->where('id')->eq($job->id)
             ->exec();
 
diff --git a/module/doc/js/objectlibs.js b/module/doc/js/objectlibs.js
index 992cb3cae6..8830c91235 100644
--- a/module/doc/js/objectlibs.js
+++ b/module/doc/js/objectlibs.js
@@ -133,7 +133,7 @@ $(function()
 
     $('#content').on('click', '.outline .outline-toggle i.icon-angle-right', function()
     {
-        $('.article-content').width('85%');
+        $('.article-content').css('width', '85%');
         $('.outline').css({'min-width' : '180px', 'border-left' : '2px solid #efefef'});
         $(this).removeClass('icon-angle-right').addClass('icon-angle-left').css('left', '-9px');
         $('.outline-content').show();
diff --git a/module/gitlab/model.php b/module/gitlab/model.php
index 437a2a05ce..b2af4366f7 100644
--- a/module/gitlab/model.php
+++ b/module/gitlab/model.php
@@ -411,7 +411,7 @@ class gitlabModel extends model
         if(is_numeric($host)) $host = $this->getApiRoot($host);
         if(strpos($host, 'http://') !== 0 and strpos($host, 'https://') !== 0) return false;
 
-        $url = sprintf($apiRoot, $api);
+        $url = sprintf($host, $api);
         return json_decode(commonModel::http($url, $data, $options));
     }
 
@@ -635,7 +635,7 @@ class gitlabModel extends model
      *
      * @param  int $gitlabID
      * @access public
-     * @return void
+     * @return array 
      */
     public function apiGetProjects($gitlabID)
     {
@@ -1715,9 +1715,9 @@ class gitlabModel extends model
     /**
      * Create webhook for zentao.
      *
-     * @param  int $products
-     * @param  int $gitlabID
-     * @param  int $projectID
+     * @param  array $products
+     * @param  int   $gitlabID
+     * @param  int   $projectID
      * @access public
      * @return bool
      */
@@ -1830,7 +1830,7 @@ class gitlabModel extends model
             if($value) $issue->$field = $value;
         }
 
-        if($isset($issue->assignee_id) and $issue->assignee_id == 'closed') unset($issue->assignee_id);
+        if(isset($issue->assignee_id) and $issue->assignee_id == 'closed') unset($issue->assignee_id);
 
         /* issue->state is null when creating it, we should put status_event when updating it. */
         if(isset($issue->state) and $issue->state == 'closed') $issue->state_event = 'close';
diff --git a/module/gitlab/view/view.html.php b/module/gitlab/view/view.html.php
index 30fc445968..b1cb6b07d3 100644
--- a/module/gitlab/view/view.html.php
+++ b/module/gitlab/view/view.html.php
@@ -27,4 +27,3 @@
 </div>
 
 <?php include '../../common/view/footer.html.php';?>
-
diff --git a/module/job/control.php b/module/job/control.php
index f4ba69c1dc..961f71c525 100644
--- a/module/job/control.php
+++ b/module/job/control.php
@@ -120,7 +120,7 @@ class job extends control
         $this->view->repoTypes   = $repoTypes;
         $this->view->products    = array(0 => '') + $this->loadModel('product')->getProductPairsByProject($this->projectID);
 
-        $this->view->jenkinsServerList = $this->loadModel('jenkins')->getPairs();
+        $this->view->jenkinsServerList = array('' => '') + $this->loadModel('jenkins')->getPairs();
 
         $this->display();
     }
@@ -352,7 +352,7 @@ class job extends control
                     if($productLeft == $productRight) $matchedProducts[$productName] = $productRight;
                 }
             }
-            die(json_encode($matchedProduct));
+            die(json_encode($matchedProducts));
         }
 
         $productName = $this->loadModel('product')->getByID($repo->product)->name;
diff --git a/module/job/model.php b/module/job/model.php
index 72514a4d49..2e69ab65f1 100644
--- a/module/job/model.php
+++ b/module/job/model.php
@@ -378,7 +378,7 @@ class jobModel extends model
 
         if($job->triggerType == 'tag')
         {
-            $lastTag = $this->getLastTagByRepo($repo);
+            $lastTag = $this->getLastTagByRepo($repo, $job);
             if($lastTag)
             {
                 $build->tag   = $lastTag;
@@ -444,7 +444,7 @@ class jobModel extends model
     /**
      * Exec gitlab pipeline.
      *
-     * @param  int    $job
+     * @param  object $job
      * @access public
      * @return void
      */
@@ -486,11 +486,12 @@ class jobModel extends model
     /**
      * Get last tag of one repo.
      *
-     * @param  object    $repo
+     * @param  object $repo
+     * @param  object $job
      * @access public
      * @return void
      */
-    public function getLastTagByRepo($repo)
+    public function getLastTagByRepo($repo, $job)
     {
         if($repo->SCM == 'Subversion')
         {
diff --git a/module/message/model.php b/module/message/model.php
index 1a6df4425b..27d92e820f 100644
--- a/module/message/model.php
+++ b/module/message/model.php
@@ -47,10 +47,7 @@ class messageModel extends model
         $objectActions = array();
         foreach($this->config->message->objectTypes as $objectType => $actions)
         {
-            foreach($actions as $action)
-            {
-                $objectActions[$objectType][$action] = str_replace($this->lang->webhook->trimWords, '', $this->lang->action->label->$action);
-            }
+            foreach($actions as $action) $objectActions[$objectType][$action] = $this->lang->message->label->$action;
         }
         return $objectActions;
     }
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index 3fa6265c48..58494e26f8 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -96,7 +96,7 @@
             }
             else 
             {
-                echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', '', $task->project), $task->name, null, "style='color: $task->color' data-group='execution'");
+                echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', '', $task->project), $task->name, null, "style='color: $task->color'");
             }
             ?>
             <?php if(!empty($task->children)) echo '<a class="task-toggle" data-id="' . $task->id . '"><i class="icon icon-angle-double-right"></i></a>';?>
@@ -104,7 +104,7 @@
           <?php if($config->systemMode == 'new'):?>
           <td class='c-project' title="<?php echo $task->projectName;?>"><?php echo html::a($this->createLink('project', 'index', "projectID=$task->project"), $task->projectName);?></td>
           <?php endif;?>
-          <td class='c-project' title="<?php echo $task->executionName;?>"><?php echo html::a($this->createLink('execution', 'task', "executionID=$task->execution"), $task->executionName, '', "data-group='execution'");?></td>
+          <td class='c-project' title="<?php echo $task->executionName;?>"><?php echo html::a($this->createLink('execution', 'task', "executionID=$task->execution"), $task->executionName, '');?></td>
           <?php if($type != 'openedBy'): ?>
           <td class='c-user'><?php echo zget($users, $task->openedBy);?></td>
           <?php endif;?>
@@ -171,7 +171,7 @@
             <?php if($config->systemMode == 'new'):?>
             <td class='c-project' title="<?php echo $child->projectName;?>"><?php echo html::a($this->createLink('project', 'view', "projectID=$child->project"), $child->projectName);?></td>
             <?php endif;?>
-            <td class='c-project' title="<?php echo $child->projectName;?>"><?php echo html::a($this->createLink('execution', 'task', "executionID=$child->project"), $child->executionName, '', "data-group='execution'");?></td>
+            <td class='c-project' title="<?php echo $child->projectName;?>"><?php echo html::a($this->createLink('execution', 'task', "executionID=$child->project"), $child->executionName, '');?></td>
             <?php if($type != 'openedBy'): ?>
             <td class='c-user'><?php echo zget($users, $child->openedBy);?></td>
             <?php endif;?>
@@ -208,8 +208,8 @@
                       common::printIcon('task', 'finish', "taskID=$child->id", $child, 'list', '', '', 'iframe', true, '', '', $child->project);
 
                       common::printIcon('task', 'recordEstimate', "taskID=$child->id", $child, 'list', 'time', '', 'iframe', true, '', '', $child->project);
-                      common::printIcon('task', 'edit',   "taskID=$child->id", $child, 'list', '', '', '', '', 'data-group="execution"', '', $child->project);
-                      common::printIcon('task', 'batchCreate', "executionID=$child->execution&storyID=$child->story&moduleID=$child->module&taskID=$child->id&iframe=true", $child, 'list', 'split', '', 'iframe', true, 'data-group="execution"', $this->lang->task->children, $child->project);
+                      common::printIcon('task', 'edit',   "taskID=$child->id", $child, 'list', '', '', '', '', '', '', $child->project);
+                      common::printIcon('task', 'batchCreate', "executionID=$child->execution&storyID=$child->story&moduleID=$child->module&taskID=$child->id&iframe=true", $child, 'list', 'split', '', 'iframe', true, '', $this->lang->task->children, $child->project);
                   }
               }
               ?>
diff --git a/module/product/control.php b/module/product/control.php
index 8dbc91141b..afa3f5c5d1 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -1266,6 +1266,7 @@ class product extends control
         if($_POST)
         {
             $this->product->manageLine();
+            if(dao::isError()) die(js::error(dao::getError()));
             die(js::reload('parent'));
         }
 
diff --git a/module/product/css/view.css b/module/product/css/view.css
index e5c7c817ad..c1f6809c12 100644
--- a/module/product/css/view.css
+++ b/module/product/css/view.css
@@ -6,5 +6,5 @@ td.normal {color: #00da88;}
 td.acl {white-space: nowrap;}
 .row > .col-sm-12:first-child {padding-bottom: 20px;}
 .c-product ,.c-release ,.c-code  {width: 100px !important;}
-.c-openedBy ,.c-acl ,.c-common {width:110px !important;}
-.c-bugs {width:120px !important;}
+.c-openedBy ,.c-acl ,.c-prs ,.c-common {width:110px !important;}
+.c-bugs ,.c-type {width:120px !important;}
diff --git a/module/product/js/create.js b/module/product/js/create.js
index ba883405c5..9c79b3cd40 100644
--- a/module/product/js/create.js
+++ b/module/product/js/create.js
@@ -61,12 +61,14 @@ function toggleLine(obj)
     {
         $('form .line-no-exist').removeClass('hidden');
         $('form .line-exist').addClass('hidden');
+        $('#line_chosen').addClass('hidden');
         $line.attr('disabled', 'disabled');
     }
     else
     {
-        $('form .line-exist').removeClass('hidden');
+        $('#line').removeClass('hidden');
         $('form .line-no-exist').addClass('hidden');
+        $('#line_chosen').removeClass('hidden');
         $line.removeAttr('disabled');
     }
 }
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index b7ed529b21..77bc4261f4 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -87,6 +87,7 @@ $lang->product->programChangeTip     = "The projects linked with this {$lang->pr
 $lang->product->notChangeProgramTip  = "The {$lang->SRCommon} of {$lang->productCommon} has been linked to the following projects, please cancel the link before proceeding";
 $lang->product->confirmChangeProgram = "The projects linked with this {$lang->productCommon}: %s is also linked with other products, whether to transfer projects to the modified program set.";
 $lang->product->changeProgramError   = "The {$lang->SRCommon} of this {$lang->productCommon} has been linked to the project, please unlink it before proceeding";
+$lang->product->programEmpty         = 'Program should not be empty!';
 
 $lang->product->id             = 'ID';
 $lang->product->program        = "Program";
diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php
index 7fc4525dd2..6d20c31f33 100644
--- a/module/product/lang/zh-cn.php
+++ b/module/product/lang/zh-cn.php
@@ -24,7 +24,7 @@ $lang->product->mine            = '我负责';
 $lang->product->other           = '其他';
 $lang->product->closed          = '已关闭';
 $lang->product->updateOrder     = '排序';
-$lang->product->all             = "{$lang->productCommon}列表";
+$lang->product->all             = "所有{$lang->productCommon}";
 $lang->product->manageLine      = "维护{$lang->productCommon}线";
 $lang->product->newLine         = "新建{$lang->productCommon}线";
 $lang->product->export          = '导出数据';
@@ -87,6 +87,7 @@ $lang->product->programChangeTip     = "如下项目只关联了该{$lang->produ
 $lang->product->notChangeProgramTip  = "该{$lang->productCommon}的{$lang->SRCommon}已经关联到如下项目，请取消关联后再操作";
 $lang->product->confirmChangeProgram = "如下项目既关联了该{$lang->productCommon}又关联了其他{$lang->productCommon}，请确认是否继续关联该{$lang->productCommon}，勾选后将取消与其他{$lang->productCommon}的关联关系，同时转移至新项目集下。";
 $lang->product->changeProgramError   = "该{$lang->productCommon}的{$lang->SRCommon}已经关联到项目，请取消关联后再操作";
+$lang->product->programEmpty         = '项目集不能为空';
 
 $lang->product->id             = '编号';
 $lang->product->program        = "所属项目集";
diff --git a/module/product/model.php b/module/product/model.php
index b7c7c80051..d3eb1d6139 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -810,7 +810,13 @@ class productModel extends model
         $maxOrder = $maxOrder ? $maxOrder : 0;
         foreach($data->modules as $id => $name)
         {
-            if(!$name) continue;
+            if(empty($name)) continue;
+            if($this->config->systemMode == 'new' and empty($data->programs[$id]))
+            {
+                dao::$errors[] = $this->lang->product->programEmpty;
+                return false;
+            }
+
             $line->name  = strip_tags(trim($name));
             $line->root  = $data->programs[$id];
 
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 8419b8a322..91d8e65fec 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -132,7 +132,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
   <div class="btn-toolbar pull-right">
     <?php if($this->app->rawModule != 'projectstory') common::printIcon('story', 'report', "productID=$productID&branchID=$branch&storyType=$storyType&browseType=$browseType&moduleID=$moduleID&chartType=pie", '', 'button', 'bar-chart muted'); ?>
     <div class="btn-group">
-      <button class="btn btn-link" data-toggle="dropdown"><i class="icon icon-export muted"></i> <span class="text"><?php echo $lang->export ?></span> <span class="caret"></span></button>
+      <button class="btn pull-right btn-link" data-toggle="dropdown"><i class="icon icon-export muted"></i> <span class="text"><?php echo $lang->export ?></span> <span class="caret"></span></button>
       <ul class="dropdown-menu" id='exportActionMenu'>
         <?php
         $tab   = $isProjectStory ? 'project' : 'product';
diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php
index d94ec4fc41..ef4f24e87a 100644
--- a/module/product/view/create.html.php
+++ b/module/product/view/create.html.php
@@ -34,7 +34,7 @@
             <?php if($config->systemMode == 'classic' or $programID):?>
             <td>
               <div class='input-group'>
-                <?php echo html::select("line", $lines, '', "class='form-control hidden line-exist'");?>
+                <?php echo html::select("line", $lines, '', "class='form-control hidden line-exist chosen'");?>
                 <?php echo html::input("lineName", '', "class='form-control line-no-exist'");?>
                 <?php if(count($lines)):?>
                 <span class='input-group-addon'>
@@ -56,23 +56,23 @@
           </tr>
           <tr>
             <th><?php echo $lang->product->code;?></th>
-            <td><?php echo html::input('code', '', "class='form-control' required");?></td><td></td>
+            <td><?php echo html::input('code', '', "class='form-control' required");?></td>
           </tr>
           <tr>
             <th><?php echo $lang->product->PO;?></th>
-            <td><?php echo html::select('PO', $poUsers, $this->app->user->account, "class='form-control chosen'");?></td><td></td>
+            <td><?php echo html::select('PO', $poUsers, $this->app->user->account, "class='form-control chosen'");?></td>
           </tr>
           <tr>
             <th><?php echo $lang->product->QD;?></th>
-            <td><?php echo html::select('QD', $qdUsers, '', "class='form-control chosen'");?></td><td></td>
+            <td><?php echo html::select('QD', $qdUsers, '', "class='form-control chosen'");?></td>
           </tr>
           <tr>
             <th><?php echo $lang->product->RD;?></th>
-            <td><?php echo html::select('RD', $rdUsers, '', "class='form-control chosen'");?></td><td></td>
+            <td><?php echo html::select('RD', $rdUsers, '', "class='form-control chosen'");?></td>
           </tr>
           <tr>
             <th><?php echo $lang->product->reviewer;?></th>
-            <td><?php echo html::select('reviewer[]', $users, '', "class='form-control chosen' multiple");?></td><td></td>
+            <td><?php echo html::select('reviewer[]', $users, '', "class='form-control chosen' multiple");?></td>
           </tr>
           <tr>
             <th><?php echo $lang->product->type;?></th>
diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php
index e7c3d1c04f..cc246c27e2 100644
--- a/module/product/view/project.html.php
+++ b/module/product/view/project.html.php
@@ -32,9 +32,11 @@
       <thead>
         <tr>
           <th class='c-id'><?php echo $lang->idAB;?></th>
-          <th><?php echo $lang->project->name;?></th>
           <?php if($config->systemMode == 'new'):?>
           <th class='c-program'><?php echo $lang->program->common;?></th>
+          <th><?php echo $lang->project->name;?></th>
+          <?php else:?>
+          <th><?php echo $lang->execution->name;?></th>
           <?php endif;?>
           <th class='c-user text-left'><?php echo $lang->project->PM;?></th>
           <th class='c-date'><?php echo $lang->project->begin;?></th>
@@ -51,6 +53,9 @@
         <?php foreach($projectStats as $project):?>
         <tr>
           <td><?php printf('%03d', $project->id);?></td>
+          <?php if($config->systemMode == 'new'):?>
+          <td title='<?php echo $project->programName;?>' class='text-ellipsis'><?php echo $project->programName;?></td>
+          <?php endif;?>
           <td class='text-left'>
             <?php
             if($config->systemMode == 'new')
@@ -63,9 +68,6 @@
             }
             ?>
           </td>
-          <?php if($config->systemMode == 'new'):?>
-          <td title='<?php echo $project->programName;?>' class='text-ellipsis'><?php echo $project->programName;?></td>
-          <?php endif;?>
           <td class='padding-right'>
             <?php $userID = isset($PMList[$project->PM]) ? $PMList[$project->PM]->id : ''?>
             <?php if(!empty($project->PM)) echo html::a($this->createLink('user', 'profile', "userID=$userID", '', true), zget($users, $project->PM), '', "data-toggle='modal' data-type='iframe' data-width='800'");?>
diff --git a/module/productplan/css/browse.css b/module/productplan/css/browse.css
index 9d99a5e3fa..ad619f6ed8 100644
--- a/module/productplan/css/browse.css
+++ b/module/productplan/css/browse.css
@@ -18,5 +18,5 @@ td.c-branch {overflow: hidden; text-align: left !important; text-overflow: ellip
 .c-title {width: 160px;}
 .c-branch {width: 100px;}
 .c-story {width: 80px;}
-.c-execution {width: 70px;}
+.c-execution {width: 120px;}
 .c-bug, .c-hour {width: 60px;}
diff --git a/module/productplan/js/browse.js b/module/productplan/js/browse.js
index 407242bacb..6a5cc77b42 100644
--- a/module/productplan/js/browse.js
+++ b/module/productplan/js/browse.js
@@ -8,6 +8,7 @@ $(document).on('click', '.task-toggle', function(e)
     e.stopPropagation();
     e.preventDefault();
 });
+
 $(function()
 {
     $('#productplanList tbody tr').each(function()
@@ -24,10 +25,19 @@ $(function()
     {
         var projectID = $('#project').val();
         var planID    = $('#planID').val();
-        $.apps.open(createLink('execution', 'create', 'projectID=' + projectID + '&executionID=&copyExecutionID=&planID=' + planID + '&confirm=&productID=' + productID), 'project')
+        if(!projectID)
+        {
+            alert(projectNotEmpty);
+            return false;
+        }
+        else
+        {
+            $.apps.open(createLink('execution', 'create', 'projectID=' + projectID + '&executionID=&copyExecutionID=&planID=' + planID + '&confirm=&productID=' + productID), 'project')
+        }
         $('#projects').modal('hide');
     });
 });
+
 $(document).on('click', 'td.content .more', function(e)
 {
     var $toggle = $(this);
diff --git a/module/productplan/js/create.js b/module/productplan/js/create.js
index 9991c7e47a..09617fe5d4 100644
--- a/module/productplan/js/create.js
+++ b/module/productplan/js/create.js
@@ -41,7 +41,6 @@ function computeEndDate(delta)
 
 $('#begin').on('change', function()
 {
-    $("#end").val('');
     $("input:radio[name='delta']").attr("checked",false);
 });
 
@@ -54,13 +53,13 @@ $('#future').on('change', function()
 {
     if($(this).prop('checked'))
     {
-        $('#begin').val('').attr('disabled', 'disabled');
-        $('#end').val('').parents('tr').hide();
+        $('#begin').attr('disabled', 'disabled');
+        $('#end').attr('disabled', 'disabled').parents('tr').hide();
     }
     else
     {
         $('#begin').removeAttr('disabled');
-        $('#end').val('').parents('tr').show();
+        $('#end').removeAttr('disabled').parents('tr').show();
     }
 });
 
diff --git a/module/productplan/js/edit.js b/module/productplan/js/edit.js
index 3acfaeb631..6b4d8cc604 100644
--- a/module/productplan/js/edit.js
+++ b/module/productplan/js/edit.js
@@ -43,11 +43,14 @@ $('#future').on('change', function()
 {
     if($(this).prop('checked'))
     {
-        $('#begin').val('').attr('disabled', 'disabled');
+        $('#begin').attr('disabled', 'disabled');
         $('#end').val('').parents('tr').hide();
     }
     else
     {
+        var begin = $('#begin').val();
+        if(begin == '') $('#begin').val(today);
+
         $('#begin').removeAttr('disabled');
         $('#end').parents('tr').show();
     }
diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php
index 0f61f73e15..1718f7ed57 100644
--- a/module/productplan/lang/en.php
+++ b/module/productplan/lang/en.php
@@ -32,7 +32,7 @@ $lang->productplan->linkedStories    = 'Linked Stories';
 $lang->productplan->unlinkedStories  = 'Unlinked Stories';
 $lang->productplan->updateOrder      = 'Order';
 $lang->productplan->createChildren   = "Create Child Plans";
-$lang->productplan->createExecution  = "Create {$lang->executionCommon}";
+$lang->productplan->createExecution  = "Create {$lang->execution->common}";
 
 $lang->productplan->linkBug          = "Link Bug";
 $lang->productplan->unlinkBug        = "Unlink Bug";
@@ -48,6 +48,7 @@ $lang->productplan->confirmUnlinkBug   = "Do you want to unlink this bug?";
 $lang->productplan->noPlan             = 'No plans yet. ';
 $lang->productplan->cannotDeleteParent = 'Cannot delete parent plan';
 $lang->productplan->selectProjects     = "Please select the project";
+$lang->productplan->projectNotEmpty    = 'Project cannot be empty.';
 $lang->productplan->nextStep           = "Next step";
 
 $lang->productplan->id         = 'ID';
@@ -62,7 +63,7 @@ $lang->productplan->future     = 'TBD';
 $lang->productplan->stories    = 'Story';
 $lang->productplan->bugs       = 'Bug';
 $lang->productplan->hour       = $lang->hourCommon;
-$lang->productplan->execution  = $lang->executionCommon;
+$lang->productplan->execution  = $lang->execution->common;
 $lang->productplan->parent     = "Parent Plan";
 $lang->productplan->parentAB   = "Parent";
 $lang->productplan->children   = "Child Plan";
diff --git a/module/productplan/lang/zh-cn.php b/module/productplan/lang/zh-cn.php
index 793df51c5a..24db78a28e 100644
--- a/module/productplan/lang/zh-cn.php
+++ b/module/productplan/lang/zh-cn.php
@@ -32,7 +32,7 @@ $lang->productplan->linkedStories    = $lang->SRCommon;
 $lang->productplan->unlinkedStories  = "未关联{$lang->SRCommon}";
 $lang->productplan->updateOrder      = '排序';
 $lang->productplan->createChildren   = "创建子计划";
-$lang->productplan->createExecution  = "创建{$lang->executionCommon}";
+$lang->productplan->createExecution  = "创建{$lang->execution->common}";
 
 $lang->productplan->linkBug          = "关联Bug";
 $lang->productplan->unlinkBug        = "移除Bug";
@@ -48,6 +48,7 @@ $lang->productplan->confirmUnlinkBug   = "您确认移除该Bug吗？";
 $lang->productplan->noPlan             = "暂时没有计划。";
 $lang->productplan->cannotDeleteParent = "不能删除父计划";
 $lang->productplan->selectProjects     = "请选择所属项目";
+$lang->productplan->projectNotEmpty    = '所属项目不能为空。';
 $lang->productplan->nextStep           = "下一步";
 
 $lang->productplan->id         = '编号';
@@ -62,7 +63,7 @@ $lang->productplan->future     = '待定';
 $lang->productplan->stories    = "{$lang->SRCommon}数";
 $lang->productplan->bugs       = 'Bug数';
 $lang->productplan->hour       = $lang->hourCommon;
-$lang->productplan->execution  = $lang->executionCommon;
+$lang->productplan->execution  = $lang->execution->common;
 $lang->productplan->parent     = "父计划";
 $lang->productplan->parentAB   = "父";
 $lang->productplan->children   = "子计划";
diff --git a/module/productplan/model.php b/module/productplan/model.php
index dcbc5ebd3c..ca62b7a040 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -382,6 +382,18 @@ class productplanModel extends model
             ->setIF($this->post->future || empty($_POST['end']), 'end', '2030-01-01')
             ->remove('delta,uid,future')
             ->get();
+
+        if(!empty($plan->parentBegin))
+        {
+            if($plan->begin < $plan->parentBegin) dao::$errors['begin'] = sprintf($this->lang->productplan->beginLetterParent, $plan->parentBegin);
+        }
+        if(!empty($plan->parentEnd))
+        {
+            if($plan->end !=='2030-01-01' and $plan->end > $plan->parentEnd) dao::$errors['end'] = sprintf($this->lang->productplan->endGreaterParent, $plan->parentEnd);
+        }
+        unset($plan->parentBegin);
+        unset($plan->parentEnd);
+
         if(!$this->post->future and strpos($this->config->productplan->create->requiredFields, 'begin') !== false and empty($_POST['begin']))
         {
             dao::$errors['begin'] = sprintf($this->lang->error->notempty, $this->lang->productplan->begin);
diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php
index e082210d53..0118a58b51 100644
--- a/module/productplan/view/browse.html.php
+++ b/module/productplan/view/browse.html.php
@@ -203,4 +203,5 @@
     </div>
   </div>
 </div>
+<?php js::set('projectNotEmpty', $lang->productplan->projectNotEmpty)?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/productplan/view/create.html.php b/module/productplan/view/create.html.php
index c131aa5f34..7cb4809c12 100644
--- a/module/productplan/view/create.html.php
+++ b/module/productplan/view/create.html.php
@@ -27,7 +27,10 @@
           <?php if($parent):?>
           <tr>
             <th><?php echo $lang->productplan->parent;?></th>
-            <td class='muted'><?php echo $parentPlan->title;?></td><td></td><td></td>
+            <td class='muted'><?php echo $parentPlan->title;?>
+            <?php echo html::hidden('parentBegin', $parentPlan->begin);?>
+            <?php echo html::hidden('parentEnd', $parentPlan->end);?>
+            </td><td></td><td></td>
           </tr>
           <?php else:?>
           <tr>
@@ -50,7 +53,7 @@
             <th><?php echo $lang->productplan->begin;?></th>
             <td><?php echo html::input('begin', formatTime($begin), "class='form-control form-date'");?></td>
             <td>
-              <div class='checkbox-primary'> 
+              <div class='checkbox-primary'>
                 <input type='checkbox' id='future' name='future' value='1' />
                 <label for='future'><?php echo $lang->productplan->future;?></label>
               </div>
diff --git a/module/productplan/view/edit.html.php b/module/productplan/view/edit.html.php
index 8688cacca7..67c25b8426 100644
--- a/module/productplan/view/edit.html.php
+++ b/module/productplan/view/edit.html.php
@@ -14,6 +14,7 @@
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::set('weekend', $config->execution->weekend);?>
 <?php js::import($jsRoot . 'misc/date.js');?>
+<?php js::set('today', helper::today());?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
diff --git a/module/program/view/edit.html.php b/module/program/view/edit.html.php
index 06fe71d320..e04d68b45e 100644
--- a/module/program/view/edit.html.php
+++ b/module/program/view/edit.html.php
@@ -85,7 +85,7 @@
         </tr>
         <tr>
           <th><?php echo $lang->project->realBegan;?></th>
-          <td><?php echo html::input('realBegan', $program->realBegan, "class='form-control form-date'");?></td><td></td><td></td>
+          <td><?php echo html::input('realBegan', helper::isZeroDate($program->realBegan) ? '' : $program->realBegan, "class='form-control form-date'");?></td>
         </tr>
         <tr>
           <th><?php echo $lang->program->desc;?></th>
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 3e26598ab8..b47bca0d24 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -172,7 +172,7 @@ $lang->project->laneColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26'
 $lang->project->productNotEmpty        = 'Please link products or create products.';
 $lang->project->existProductName       = 'Product name already exists.';
 $lang->project->changeProgram          = '%s > Change project';
-$lang->project->changeProgramTip       = 'After modifying the project set, the products linked with the project will also modify the project set to which it belongs. Please confirm whether to modify it.';
+$lang->project->changeProgramTip       = 'Once the program is edited, the product that is linked to this program will be changed. Do you want to edit it?';
 $lang->project->linkedProjectsTip      = 'Linked projects are as follows';
 $lang->project->multiLinkedProductsTip = 'The following products linked to this project are also linked to other projects, please unlink before proceeding.';
 $lang->project->linkStoryByPlanTips    = "This action will associate all {$lang->SRCommon} under the selected plan to this project";
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index bcf5e8bc26..643d7f02d8 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -172,7 +172,7 @@ $lang->project->laneColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26'
 $lang->project->productNotEmpty        = '请关联产品或创建产品。';
 $lang->project->existProductName       = '产品名称已存在。';
 $lang->project->changeProgram          = '%s > 修改项目集';
-$lang->project->changeProgramTip       = '修改项目集后，该项目关联的产品也会同时修改所属项目集，请确认是否修改。';
+$lang->project->changeProgramTip       = '修改项目集后，该项目关联产品的项目集也会被修改，请确认是否修改。';
 $lang->project->linkedProjectsTip      = '关联的项目如下';
 $lang->project->multiLinkedProductsTip = '该项目关联的如下产品还关联了其他项目，请取消关联后再操作';
 $lang->project->linkStoryByPlanTips    = "此操作会将所选计划下面的{$lang->SRCommon}全部关联到此项目中";
diff --git a/module/testreport/lang/en.php b/module/testreport/lang/en.php
index 14dcbc879e..3297084c43 100644
--- a/module/testreport/lang/en.php
+++ b/module/testreport/lang/en.php
@@ -84,6 +84,7 @@ $lang->testreport->noTestTask     = "No test requests for this {$lang->productCo
 $lang->testreport->noObjectID     = "No test request or {$lang->executionCommon} is selected, so no report can be generated.";
 $lang->testreport->moreProduct    = "Testing reports can only be generated for the same {$lang->productCommon}.";
 $lang->testreport->hiddenCase     = "Hide %s use cases";
+$lang->testreport->goalTip        = "Descriptive information about the {$lang->execution->common} of this build";
 
 $lang->testreport->bugSummary = <<<EOD
 Total <strong>%s</strong> Bugs reported <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->foundBugTip}'><i class='icon-help'></i></a>,
diff --git a/module/testreport/lang/zh-cn.php b/module/testreport/lang/zh-cn.php
index 6e609e0107..6d94df07b5 100644
--- a/module/testreport/lang/zh-cn.php
+++ b/module/testreport/lang/zh-cn.php
@@ -84,6 +84,7 @@ $lang->testreport->noTestTask     = "该{$lang->productCommon}下还没有关联
 $lang->testreport->noObjectID     = "没有选定测试单或{$lang->executionCommon}，无法创建测试报告！";
 $lang->testreport->moreProduct    = "只能对同一个{$lang->productCommon}生成测试报告。";
 $lang->testreport->hiddenCase     = "隐藏 %s 个用例";
+$lang->testreport->goalTip        = "该版本所属{$lang->execution->common}的描述信息";
 
 $lang->testreport->bugSummary = <<<EOD
 共发现<strong>%s</strong>个Bug <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->foundBugTip}'><i class='icon-help'></i></a>，
diff --git a/module/testreport/view/create.html.php b/module/testreport/view/create.html.php
index df18c2bd6f..f5cadb3e90 100644
--- a/module/testreport/view/create.html.php
+++ b/module/testreport/view/create.html.php
@@ -67,11 +67,16 @@
               <td colspan='2'><?php echo html::input('title', $reportTitle, "class='form-control'")?></td>
               <td></td>
             </tr>
+            <?php if(!empty($execution->desc)):?>
             <tr>
               <th><?php echo $lang->testreport->goal?></th>
-              <td colspan='2'><?php echo isset($execution->desc) ? $execution->desc : '';?></td>
+              <td colspan='2'>
+                <?php echo $execution->desc;?>
+                <a data-toggle='tooltip' class='text-warning' title='<?php echo $lang->testreport->goalTip;?>'><i class='icon-help'></i></a>
+              </td>
               <td></td>
             </tr>
+            <?php endif;?>
             <tr>
               <th><?php echo $lang->testreport->profile?></th>
               <td colspan='2'>
diff --git a/module/testreport/view/edit.html.php b/module/testreport/view/edit.html.php
index 65d8589de0..2362b021d5 100644
--- a/module/testreport/view/edit.html.php
+++ b/module/testreport/view/edit.html.php
@@ -55,11 +55,16 @@
             <td colspan='2'><?php echo html::input('title', $report->title, "class='form-control'")?></td>
             <td></td>
           </tr>
+          <?php if(!empty($execution->desc)):?>
           <tr>
             <th><?php echo $lang->testreport->goal?></th>
-            <td colspan='2'><?php echo $execution->desc?></td>
+            <td colspan='2'>
+              <?php echo $execution->desc?>
+              <a data-toggle='tooltip' class='text-warning' title='<?php echo $lang->testreport->goalTip;?>'><i class='icon-help'></i></a>
+            </td>
             <td></td>
           </tr>
+          <?php endif;?>
           <tr>
             <th><?php echo $lang->testreport->profile?></th>
             <td colspan='2'>
diff --git a/module/testreport/view/view.html.php b/module/testreport/view/view.html.php
index 98874cf91e..cddbd9bbd5 100644
--- a/module/testreport/view/view.html.php
+++ b/module/testreport/view/view.html.php
@@ -63,10 +63,13 @@
           <th><?php echo $lang->testreport->members?></th>
           <td colspan='2'><?php foreach(explode(',', $report->members) as $member)echo zget($users, $member) . ' &nbsp; ';?></td>
         </tr>
-        <?php if(!empty($execution)):?>
+        <?php if(!empty($execution->desc)):?>
         <tr>
           <th><?php echo $lang->testreport->goal?></th>
-          <td colspan='2'><?php echo $execution->desc?></td>
+          <td colspan='2'>
+            <?php echo $execution->desc?>
+            <a data-toggle='tooltip' class='text-warning' title='<?php echo $lang->testreport->goalTip;?>'><i class='icon-help'></i></a>
+          </td>
         </tr>
         <?php endif;?>
         <tr>
diff --git a/module/todo/model.php b/module/todo/model.php
index cb5f8782d3..5473018c90 100644
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -515,7 +515,8 @@ class todoModel extends model
 
         $stmt = $this->dao->select('*')->from(TABLE_TODO)
             ->where('deleted')->eq('0')
-            ->andWhere('assignedTo', true)->eq($account)
+            ->beginIF($type == 'assignedtoother')->andWhere('account', true)->eq($account)->fi()
+            ->beginIF($type != 'assignedtoother')->andWhere('assignedTo', true)->eq($account)->fi()
             ->orWhere('finishedBy')->eq($account)
             ->markRight(1)
             ->beginIF($begin)->andWhere('date')->ge($begin)->fi()