diff --git a/module/execution/control.php b/module/execution/control.php
index 4705801720..3b71572c4a 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1215,7 +1215,6 @@ class execution extends control
      */
     public function create($projectID = '', $executionID = '', $copyExecutionID = '', $planID = 0, $confirm = 'no', $productID = 0, $extra = '')
     {
-        if($projectID == 'null')die(js::alert($this->lang->execution->projectNotEmpty) . js::locate($this->server->http_referer , 'parent'));
         /* Set menu. */
         if($this->app->tab == 'project')
         {
diff --git a/module/productplan/js/browse.js b/module/productplan/js/browse.js
index d8851258c0..7aa817f97f 100644
--- a/module/productplan/js/browse.js
+++ b/module/productplan/js/browse.js
@@ -24,7 +24,14 @@ $(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);
+        }
+        else
+        {
+            $.apps.open(createLink('execution', 'create', 'projectID=' + projectID + '&executionID=&copyExecutionID=&planID=' + planID + '&confirm=&productID=' + productID), 'project')
+        }
     });
 });
 $(document).on('click', 'td.content .more', function(e)
diff --git a/module/productplan/lang/de.php b/module/productplan/lang/de.php
index f2cc6ab8b5..bb038601fd 100644
--- a/module/productplan/lang/de.php
+++ b/module/productplan/lang/de.php
@@ -46,6 +46,7 @@ $lang->productplan->confirmUnlinkBug   = "Möchten Sie diesen Bug löschen?";
 $lang->productplan->noPlan             = 'Kein Plan. ';
 $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';
diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php
index 80e832cd21..f277c7fbbc 100644
--- a/module/productplan/lang/en.php
+++ b/module/productplan/lang/en.php
@@ -46,6 +46,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';
diff --git a/module/productplan/lang/fr.php b/module/productplan/lang/fr.php
index c2ce442c2a..da702ba7d7 100644
--- a/module/productplan/lang/fr.php
+++ b/module/productplan/lang/fr.php
@@ -46,6 +46,7 @@ $lang->productplan->confirmUnlinkBug   = "Voulez-vous retirer ce bug du plan ?";
 $lang->productplan->noPlan             = "Aucun plan pour l'instant. ";
 $lang->productplan->cannotDeleteParent = 'Impossible de supprimer le plan parent';
 $lang->productplan->selectProjects     = "Please select the project";
+$lang->productplan->projectNotEmpty    = 'Project cannot be empty.';
 $lang->productplan->nextStep           = "Next step";
 
 $lang->productplan->id         = 'ID';
diff --git a/module/productplan/lang/vi.php b/module/productplan/lang/vi.php
index ec97bffbdf..ce12fba817 100644
--- a/module/productplan/lang/vi.php
+++ b/module/productplan/lang/vi.php
@@ -46,6 +46,7 @@ $lang->productplan->confirmUnlinkBug   = "Bạn có muốn hủy liên kết bug
 $lang->productplan->noPlan             = 'Không có kế hoạch nào';
 $lang->productplan->cannotDeleteParent = 'Không thể xóa kế hoạch mẹ';
 $lang->productplan->selectProjects     = "Please select the project";
+$lang->productplan->projectNotEmpty    = 'Project cannot be empty.';
 $lang->productplan->nextStep           = "Next step";
 
 $lang->productplan->id         = 'ID';
diff --git a/module/productplan/lang/zh-cn.php b/module/productplan/lang/zh-cn.php
index 4ff355ac7a..7414100754 100644
--- a/module/productplan/lang/zh-cn.php
+++ b/module/productplan/lang/zh-cn.php
@@ -46,6 +46,7 @@ $lang->productplan->confirmUnlinkBug   = "您确认移除该Bug吗？";
 $lang->productplan->noPlan             = "暂时没有计划。";
 $lang->productplan->cannotDeleteParent = "不能删除父计划";
 $lang->productplan->selectProjects     = "请选择所属项目";
+$lang->productplan->projectNotEmpty    = '所属项目不能为空。';
 $lang->productplan->nextStep           = "下一步";
 
 $lang->productplan->id         = '编号';
diff --git a/module/productplan/lang/zh-tw.php b/module/productplan/lang/zh-tw.php
index e42e7db0af..60d1238dd2 100644
--- a/module/productplan/lang/zh-tw.php
+++ b/module/productplan/lang/zh-tw.php
@@ -46,6 +46,7 @@ $lang->productplan->confirmUnlinkBug   = "您確認移除該Bug嗎？";
 $lang->productplan->noPlan             = "暫時沒有計劃。";
 $lang->productplan->cannotDeleteParent = "不能刪除父計劃";
 $lang->productplan->selectProjects     = "請選擇所屬項目";
+$lang->productplan->projectNotEmpty    = '所屬項目不能為空。';
 $lang->productplan->nextStep           = "下一步";
 
 $lang->productplan->id         = '編號';
diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php
index 5f74370493..79e50de4c6 100644
--- a/module/productplan/view/browse.html.php
+++ b/module/productplan/view/browse.html.php
@@ -202,4 +202,5 @@
     </div>
   </div>
 </div>
+<?php js::set('projectNotEmpty', $lang->productplan->projectNotEmpty)?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/todo/model.php b/module/todo/model.php
index 5fa88b3d21..5473018c90 100644
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -515,8 +515,8 @@ class todoModel extends model
 
         $stmt = $this->dao->select('*')->from(TABLE_TODO)
             ->where('deleted')->eq('0')
-            ->andWhere('account', true)->eq($account)
-            ->orWhere('assignedTo')->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()