diff --git a/module/project/model.php b/module/project/model.php
index add815d489..63a9b06da7 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -2390,10 +2390,10 @@ class projectModel extends model
      * @access public
      * @return void
      */
-    public function  addProjectMembers($projectID = 0, $members = array())
+    public function addProjectMembers($projectID = 0, $members = array())
     {
         $projectType = 'project';
-        $oldJoin       = $this->dao->select('`account`, `join`')->from(TABLE_TEAM)->where('root')->eq($projectID)->andWhere('type')->eq($projectType)->fetchPairs();
+        $oldJoin     = $this->dao->select('`account`, `join`')->from(TABLE_TEAM)->where('root')->eq($projectID)->andWhere('type')->eq($projectType)->fetchPairs();
 
         $accounts = array();
         foreach($members as $account => $member)
diff --git a/module/todo/lang/de.php b/module/todo/lang/de.php
index e980277fbf..88c2819916 100644
--- a/module/todo/lang/de.php
+++ b/module/todo/lang/de.php
@@ -35,7 +35,7 @@ $lang->todo->cycle        = "Wiederkehrend";
 $lang->todo->cycleConfig  = "Wiederkehrend setzen";
 $lang->todo->project      = "Project";
 $lang->todo->product      = "Product";
-$lang->todo->execution    = "Stage/" . $lang->executionCommon;
+$lang->todo->execution    = $lang->executionCommon;
 
 $lang->todo->reasonList['story'] = "Story übertragen";
 $lang->todo->reasonList['task']  = "Aufgabe übertragen";
@@ -87,17 +87,20 @@ $lang->todo->statusList['closed'] = 'Geschlossen';
 //$lang->todo->statusList['cancel']   = 'Abgebrochen';
 //$lang->todo->statusList['postpone'] = 'Verzögert';
 
-$lang->todo->priList[0] = '';
-$lang->todo->priList[3] = 'Normal';
 $lang->todo->priList[1] = 'Höchste';
 $lang->todo->priList[2] = 'Hoch';
+$lang->todo->priList[3] = 'Normal';
 $lang->todo->priList[4] = 'Niedrig';
 
-$lang->todo->typeList['custom'] = 'Eigene';
-$lang->todo->typeList['cycle']  = 'Wiederkehrend';
-$lang->todo->typeList['bug']    = 'Bug';
-$lang->todo->typeList['task']   = $lang->executionCommon . ' Aufgabe';
-$lang->todo->typeList['story']  = $lang->executionCommon . ' Story';
+$lang->todo->typeList['custom']   = 'Eigene';
+$lang->todo->typeList['cycle']    = 'Wiederkehrend';
+$lang->todo->typeList['bug']      = 'Bug';
+$lang->todo->typeList['task']     = 'Aufgabe';
+$lang->todo->typeList['story']    = 'Story';
+$lang->todo->typeList['issue']    = 'Issue';
+$lang->todo->typeList['risk']     = 'Risk';
+$lang->todo->typeList['review']   = 'Review';
+$lang->todo->typeList['testtask'] = 'Testtask';
 
 $lang->todo->confirmDelete  = "Möchten Sie diesen ToDo löschen?";
 $lang->todo->thisIsPrivate  = 'Dies ist ein privater ToDo';
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index f143a20333..f365b70978 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -35,7 +35,7 @@ $lang->todo->cycle        = "Recur";
 $lang->todo->cycleConfig  = "Recurrence";
 $lang->todo->project      = "Project";
 $lang->todo->product      = "Product";
-$lang->todo->execution    = "Stage/" . $lang->executionCommon;
+$lang->todo->execution    = $lang->executionCommon;
 
 $lang->todo->reasonList['story'] = "Convert to Story";
 $lang->todo->reasonList['task']  = "Convert to Task";
@@ -87,10 +87,9 @@ $lang->todo->statusList['closed'] = 'Closed';
 //$lang->todo->statusList['cancel']   = 'Cancelled';
 //$lang->todo->statusList['postpone'] = 'Delayed';
 
-$lang->todo->priList[0] = '';
-$lang->todo->priList[3] = 'Normal';
 $lang->todo->priList[1] = 'Critical';
 $lang->todo->priList[2] = 'Important';
+$lang->todo->priList[3] = 'Normal';
 $lang->todo->priList[4] = 'Low';
 
 $lang->todo->typeList['custom']   = 'Custom';
@@ -98,6 +97,10 @@ $lang->todo->typeList['cycle']    = 'Recur';
 $lang->todo->typeList['bug']      = 'Bug';
 $lang->todo->typeList['task']     = 'Task';
 $lang->todo->typeList['story']    = 'Story';
+$lang->todo->typeList['issue']    = 'Issue';
+$lang->todo->typeList['risk']     = 'Risk';
+$lang->todo->typeList['review']   = 'Review';
+$lang->todo->typeList['testtask'] = 'Testtask';
 
 $lang->todo->confirmDelete  = "Do you want to delete this todo?";
 $lang->todo->thisIsPrivate  = 'This is a private todo';
diff --git a/module/todo/lang/fr.php b/module/todo/lang/fr.php
index 0db07acd55..d0d0ed311e 100644
--- a/module/todo/lang/fr.php
+++ b/module/todo/lang/fr.php
@@ -35,7 +35,7 @@ $lang->todo->cycle        = "Rendre Récurrent";
 $lang->todo->cycleConfig  = "Récurrence";
 $lang->todo->project      = "Project";
 $lang->todo->product      = "Product";
-$lang->todo->execution    = "Stage/" . $lang->executionCommon;
+$lang->todo->execution    = $lang->executionCommon;
 
 $lang->todo->reasonList['story'] = "Convertir en Story";
 $lang->todo->reasonList['task']  = "Convertir en Tâche";
@@ -87,10 +87,9 @@ $lang->todo->statusList['closed'] = 'Fermé';
 //$lang->todo->statusList['cancel']   = 'Cancelled';
 //$lang->todo->statusList['postpone'] = 'Delayed';
 
-$lang->todo->priList[0] = '';
-$lang->todo->priList[3] = 'Normale';
 $lang->todo->priList[1] = 'Critique';
 $lang->todo->priList[2] = 'Importante';
+$lang->todo->priList[3] = 'Normale';
 $lang->todo->priList[4] = 'Faible';
 
 $lang->todo->typeList['custom']   = 'Person.';
@@ -98,6 +97,10 @@ $lang->todo->typeList['cycle']    = 'Récur';
 $lang->todo->typeList['bug']      = 'Bug';
 $lang->todo->typeList['task']     = 'Tâche';
 $lang->todo->typeList['story']    = 'Story';
+$lang->todo->typeList['issue']    = 'Issue';
+$lang->todo->typeList['risk']     = 'Risk';
+$lang->todo->typeList['review']   = 'Review';
+$lang->todo->typeList['testtask'] = 'Testtask';
 
 $lang->todo->confirmDelete  = "Voulez-vous supprimer cette entrée de l'agenda ?";
 $lang->todo->thisIsPrivate  = "Il s'agit d'un rdv privé";
diff --git a/module/todo/lang/vi.php b/module/todo/lang/vi.php
index 07c083867a..e950d3d79a 100644
--- a/module/todo/lang/vi.php
+++ b/module/todo/lang/vi.php
@@ -35,7 +35,7 @@ $lang->todo->cycle        = "Lặp lại";
 $lang->todo->cycleConfig  = "Cấu hình lặp lại";
 $lang->todo->project      = "Project";
 $lang->todo->product      = "Product";
-$lang->todo->execution    = "Stage/" . $lang->executionCommon;
+$lang->todo->execution    = $lang->executionCommon;
 
 $lang->todo->reasonList['story'] = "Chuyển thành câu chuyện";
 $lang->todo->reasonList['task']  = "Chuyển thành nhiệm vụ";
@@ -87,17 +87,20 @@ $lang->todo->statusList['closed']     = 'Đã đóng';
 //$lang->todo->statusList['cancel']   = 'Đã hủy';
 //$lang->todo->statusList['postpone'] = 'Tạm ngưng';
 
-$lang->todo->priList[0] = '';
-$lang->todo->priList[3] = 'Bình thường';
 $lang->todo->priList[1] = 'Khẩn cấp';
 $lang->todo->priList[2] = 'Quan trọng';
+$lang->todo->priList[3] = 'Bình thường';
 $lang->todo->priList[4] = 'Thấp';
 
-$lang->todo->typeList['custom'] = 'Tùy biến';
-$lang->todo->typeList['cycle']  = 'Lặp lại';
-$lang->todo->typeList['bug']    = 'Bug';
-$lang->todo->typeList['task']   = 'Nhiệm vụ';
-$lang->todo->typeList['story']  = 'Câu chuyện';
+$lang->todo->typeList['custom']   = 'Tùy biến';
+$lang->todo->typeList['cycle']    = 'Lặp lại';
+$lang->todo->typeList['bug']      = 'Bug';
+$lang->todo->typeList['task']     = 'Nhiệm vụ';
+$lang->todo->typeList['story']    = 'Câu chuyện';
+$lang->todo->typeList['issue']    = 'Issue';
+$lang->todo->typeList['risk']     = 'Risk';
+$lang->todo->typeList['review']   = 'Review';
+$lang->todo->typeList['testtask'] = 'Testtask';
 
 $lang->todo->confirmDelete  = "Bạn có muốn xóa việc này?";
 $lang->todo->thisIsPrivate  = 'Đây là một việc riêng tư';
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index 8558c6943c..b3c5b5f622 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -35,7 +35,7 @@ $lang->todo->cycle        = "周期";
 $lang->todo->cycleConfig  = "周期设置";
 $lang->todo->project      = "所属项目";
 $lang->todo->product      = "所属产品";
-$lang->todo->execution    = "所属阶段/" . $lang->executionCommon;
+$lang->todo->execution    = "所属" . $lang->sprintCommon;
 
 $lang->todo->reasonList['story'] = "转{$lang->productSRCommon}";
 $lang->todo->reasonList['task']  = "转任务";
@@ -87,16 +87,20 @@ $lang->todo->statusList['closed'] = '已关闭';
 //$lang->todo->statusList['cancel']   = '已取消';
 //$lang->todo->statusList['postpone'] = '已延期';
 
-$lang->todo->priList[3] = 3;
 $lang->todo->priList[1] = 1;
 $lang->todo->priList[2] = 2;
+$lang->todo->priList[3] = 3;
 $lang->todo->priList[4] = 4;
 
 $lang->todo->typeList['custom']   = '自定义';
 $lang->todo->typeList['cycle']    = '周期';
 $lang->todo->typeList['bug']      = 'Bug';
-$lang->todo->typeList['task']     = $lang->executionCommon . '任务';
-$lang->todo->typeList['story']    = $lang->executionCommon . $lang->productSRCommon;
+$lang->todo->typeList['task']     = '任务';
+$lang->todo->typeList['story']    = '软需';
+$lang->todo->typeList['issue']    = '问题';
+$lang->todo->typeList['risk']     = '风险';
+$lang->todo->typeList['review']   = '评审';
+$lang->todo->typeList['testtask'] = '测试单';
 
 $lang->todo->confirmDelete  = "您确定要删除这条待办吗？";
 $lang->todo->thisIsPrivate  = '这是一条私人事务。:)';
diff --git a/module/todo/lang/zh-tw.php b/module/todo/lang/zh-tw.php
index 601376d212..e812e81963 100644
--- a/module/todo/lang/zh-tw.php
+++ b/module/todo/lang/zh-tw.php
@@ -33,6 +33,9 @@ $lang->todo->import       = "導入";
 $lang->todo->legendBasic  = "基本信息";
 $lang->todo->cycle        = "周期";
 $lang->todo->cycleConfig  = "周期設置";
+$lang->todo->project      = "所屬項目";
+$lang->todo->product      = "所屬產品";
+$lang->todo->execution    = "所屬" . $lang->sprintCommon;
 
 $lang->todo->reasonList['story'] = "轉{$lang->productSRCommon}";
 $lang->todo->reasonList['task']  = "轉任務";
@@ -84,17 +87,20 @@ $lang->todo->statusList['closed'] = '已關閉';
 //$lang->todo->statusList['cancel']   = '已取消';
 //$lang->todo->statusList['postpone'] = '已延期';
 
-$lang->todo->priList[0] = '';
-$lang->todo->priList[3] = '一般';
-$lang->todo->priList[1] = '最高';
-$lang->todo->priList[2] = '較高';
-$lang->todo->priList[4] = '最低';
+$lang->todo->priList[3] = 3;
+$lang->todo->priList[1] = 1;
+$lang->todo->priList[2] = 2;
+$lang->todo->priList[4] = 4;
 
 $lang->todo->typeList['custom']   = '自定義';
 $lang->todo->typeList['cycle']    = '周期';
 $lang->todo->typeList['bug']      = 'Bug';
-$lang->todo->typeList['task']     = $lang->executionCommon . '任務';
-$lang->todo->typeList['story']    = $lang->executionCommon . $lang->productSRCommon;
+$lang->todo->typeList['task']     = '任務';
+$lang->todo->typeList['story']    = '軟需';
+$lang->todo->typeList['issue']    = '問題';
+$lang->todo->typeList['risk']     = '風險';
+$lang->todo->typeList['review']   = '評審';
+$lang->todo->typeList['testtask'] = '測試單';
 
 $lang->todo->confirmDelete  = "您確定要刪除這條待辦嗎？";
 $lang->todo->thisIsPrivate  = '這是一條私人事務。:)';
diff --git a/module/todo/model.php b/module/todo/model.php
index be2a12aeaf..a2fc6d412e 100644
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -30,12 +30,13 @@ class todoModel extends model
             ->setIF($this->post->type == 'bug'  and $this->post->bug,  'idvalue', $this->post->bug)
             ->setIF($this->post->type == 'task' and $this->post->task, 'idvalue', $this->post->task)
             ->setIF($this->post->type == 'story' and $this->post->story, 'idvalue', $this->post->story)
+            ->setIF($this->post->type == 'issue' and $this->post->issue, 'idvalue', $this->post->issue)
             ->setIF($this->post->type == 'feedback' and $this->post->feedback, 'idvalue', $this->post->feedback)
             ->setIF($this->post->date == false,  'date', '2030-01-01')
             ->setIF($this->post->begin == false, 'begin', '2400')
             ->setIF($this->post->begin == false or $this->post->end   == false, 'end',   '2400')
             ->stripTags($this->config->todo->editor->create['id'], $this->config->allowedTags)
-            ->remove('bug, task, story, uid, feedback')
+            ->remove('bug, task, story, issue, uid, feedback')
             ->get();
 
         if($todo->end < $todo->begin)
@@ -79,6 +80,7 @@ class todoModel extends model
             ->checkIF($todo->type == 'bug'   and $todo->idvalue == 0, 'idvalue', 'notempty')
             ->checkIF($todo->type == 'task'  and $todo->idvalue == 0, 'idvalue', 'notempty')
             ->checkIF($todo->type == 'story' and $todo->idvalue == 0, 'idvalue', 'notempty')
+            ->checkIF($todo->type == 'issue' and $todo->idvalue == 0, 'idvalue', 'notempty')
             ->checkIF($todo->type == 'feedback' and $todo->idvalue == 0, 'idvalue', 'notempty')
             ->exec();