diff --git a/module/execution/control.php b/module/execution/control.php
index 8b8519cf77..aa6d2836ef 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -475,7 +475,7 @@ class execution extends control
         $toExecution = $execution->id;
         $branches    = $this->execution->getBranches($toExecution);
         $tasks       = $this->execution->getTasks2Imported($toExecution, $branches);
-        $executions  = $this->execution->getsToImport(array_keys($tasks), $execution->type);
+        $executions  = $this->execution->getToImport(array_keys($tasks), $execution->type);
         unset($executions[$toExecution]);
         unset($tasks[$toExecution]);
 
diff --git a/module/execution/model.php b/module/execution/model.php
index 6822f93ff5..67423429e2 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -212,7 +212,7 @@ class executionModel extends model
      */
     public function tree()
     {
-        $products     = $this->loadModel('product')->getPairs('nocode', $this->session->PRJ);
+        $products     = $this->loadModel('product')->getPairs('nocode', 0);
         $productGroup = $this->getProductGroupList();
         $executionTree  = "<ul class='tree tree-lines'>";
         foreach($productGroup as $productID => $executions)
@@ -1709,10 +1709,10 @@ class executionModel extends model
      */
     public function getTasks2Imported($toExecution, $branches)
     {
-        $products   = $this->getProducts($toExecution);
+        $products = $this->getProducts($toExecution);
         if(empty($products)) return array();
 
-        $execution    = $this->getById($toExecution);
+        $execution  = $this->getById($toExecution);
         $executions = $this->dao->select('t1.product, t1.project')->from(TABLE_PROJECTPRODUCT)->alias('t1')
             ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.project=t2.id')
             ->where('t1.product')->in(array_keys($products))
@@ -1855,6 +1855,7 @@ class executionModel extends model
 
         $bugToTasks = fixer::input('post')->get();
         $bugs       = $this->bug->getByList(array_keys($bugToTasks->import));
+        $projectID  = $this->loadModel('execution')->getProjectID($executionID);
         foreach($bugToTasks->import as $key => $value)
         {
             $bug = zget($bugs, $key, '');
@@ -1862,8 +1863,8 @@ class executionModel extends model
 
             $task = new stdClass();
             $task->bug          = $bug;
-            $task->PRJ          = $this->session->PRJ;
-            $task->execution      = $executionID;
+            $task->project      = $projectID;
+            $task->execution    = $executionID;
             $task->story        = $bug->story;
             $task->storyVersion = $bug->storyVersion;
             $task->module       = isset($modules[$bug->module]) ? $bug->module : 0;
diff --git a/module/task/model.php b/module/task/model.php
index 2f2053e347..7bbce65382 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -28,7 +28,6 @@ class taskModel extends model
             return false;
         }
 
-        $this->getExtraRequiredFields();
         $executionID    = (int)$executionID;
         $taskIdList     = array();
         $taskFiles      = array();
@@ -47,7 +46,7 @@ class taskModel extends model
             ->setDefault('execution', $executionID)
             ->setDefault('estimate,left,story', 0)
             ->setDefault('status', 'wait')
-            ->setIF($this->config->systemMode == 'new', 'project', $this->session->PRJ)
+            ->setIF($this->config->systemMode == 'new', 'project', $this->getProjectID($executionID))
             ->setIF($this->post->estimate != false, 'left', $this->post->estimate)
             ->setIF($this->post->story != false, 'storyVersion', $this->loadModel('story')->getVersion($this->post->story))
             ->setDefault('estStarted', '0000-00-00')
@@ -280,8 +279,8 @@ class taskModel extends model
         $assignedTo = '';
 
         /* Get task data. */
-        $this->getExtraRequiredFields();
         $extendFields = $this->getFlowExtendFields();
+        $projectID    = $this->getProjectID($executionID);
         $data         = array();
         foreach($tasks->name as $i => $name)
         {
@@ -303,7 +302,7 @@ class taskModel extends model
             $data[$i]->pri        = $tasks->pri[$i];
             $data[$i]->estimate   = $tasks->estimate[$i];
             $data[$i]->left       = $tasks->estimate[$i];
-            $data[$i]->project    = $this->config->systemMode == 'new' ? $this->session->PRJ : 0;
+            $data[$i]->project    = $this->config->systemMode == 'new' ? $projectID : 0;
             $data[$i]->execution  = $executionID;
             $data[$i]->estStarted = empty($tasks->estStarted[$i]) ? '0000-00-00' : $tasks->estStarted[$i];
             $data[$i]->deadline   = empty($tasks->deadline[$i]) ? '0000-00-00' : $tasks->deadline[$i];
@@ -779,8 +778,6 @@ class taskModel extends model
      */
     public function update($taskID)
     {
-        $this->getExtraRequiredFields();
-
         $oldTask = $this->getByID($taskID);
         if($this->post->estimate < 0 or $this->post->left < 0 or $this->post->consumed < 0)
         {
@@ -1872,6 +1869,11 @@ class taskModel extends model
         return $this->processTask($task);
     }
 
+    public function getProjectID($executionID = 0)
+    {
+        return $this->dao->select('project')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch('project');
+    }
+
     /**
      * Get task list.
      *
@@ -2534,7 +2536,7 @@ class taskModel extends model
 
         $datas = $this->processData4Report($tasks, '', 'execution');
 
-        $executions = $this->loadModel('execution')->getPairs($this->session->PRJ, 'all', 'all');
+        $executions = $this->loadModel('execution')->getPairs(0, 'all', 'all');
         foreach($datas as $executionID => $data)
         {
             $data->name  = isset($executions[$executionID]) ? $executions[$executionID] : $this->lang->report->undefined;
@@ -3250,21 +3252,4 @@ class taskModel extends model
         }
         return $members;
     }
-
-    /**
-     * Get additional required fields.
-     *
-     * @access public
-     * @return void
-     */
-    public function getExtraRequiredFields()
-    {
-        /* Add required fields to waterfall execution. */
-        $execution = $this->loadModel('project')->getByID($this->session->PRJ);
-        if(!empty($execution) && $execution->model == 'waterfall')
-        {
-            $this->config->task->create->requiredFields .= ',estStarted,deadline';
-            $this->config->task->edit->requiredFields   .= ',estStarted,deadline';
-        }
-    }
 }