* Finish task #43619,43620

module/execution/control.php

@@ -1215,6 +1215,7 @@ 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')
         {

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)
+            ->andWhere('account', true)->eq($account)
+            ->orWhere('assignedTo')->eq($account)
             ->orWhere('finishedBy')->eq($account)
             ->markRight(1)
             ->beginIF($begin)->andWhere('date')->ge($begin)->fi()