diff --git a/config/zentaopms.php b/config/zentaopms.php
index 4e0296a8bb..d95d5c86cc 100644
--- a/config/zentaopms.php
+++ b/config/zentaopms.php
@@ -19,6 +19,30 @@ $config->productCommonList['fr'][0]    = 'Product';
 $config->productCommonList['vi'][0]    = 'Sản phẩm';
 
 /* Project common list. */
+$config->projectCommonList['zh-cn'][0] = '项目';
+$config->projectCommonList['zh-cn'][1] = '迭代';
+$config->projectCommonList['zh-cn'][2] = '冲刺';
+
+$config->projectCommonList['zh-tw'][0] = '項目';
+$config->projectCommonList['zh-tw'][1] = '迭代';
+$config->projectCommonList['zh-tw'][2] = '冲刺';
+
+$config->projectCommonList['en'][0] = 'Project';
+$config->projectCommonList['en'][1] = 'Iteration';
+$config->projectCommonList['en'][2] = 'Sprint';
+
+$config->projectCommonList['de'][0] = 'Project';
+$config->projectCommonList['de'][1] = 'Iteration';
+$config->projectCommonList['de'][2] = 'Sprint';
+
+$config->projectCommonList['fr'][0] = 'Project';
+$config->projectCommonList['fr'][1] = 'Iteration';
+$config->projectCommonList['fr'][2] = 'Sprint';
+
+$config->projectCommonList['vi'][0] = 'Project';
+$config->projectCommonList['vi'][1] = 'Iteration';
+$config->projectCommonList['vi'][2] = 'Sprint';
+
 $config->executionCommonList['zh-cn'][0] = '迭代';
 $config->executionCommonList['zh-cn'][1] = '冲刺';
 $config->executionCommonList['zh-cn'][2] = '阶段';
diff --git a/framework/router.class.php b/framework/router.class.php
index f4e8b8768a..ffc3561397 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -191,9 +191,9 @@ class router extends baseRouter
             if($setting->key == 'mode' and $setting->section == 'global') $mode = $setting->value;
         }
 
-
         /* Record system mode. */
         $config->systemMode = $mode;
+        if($config->systemMode == 'old') $this->config->executionCommonList = $this->config->projectCommonList;
 
         /* Record hour unit. */
         $config->hourUnit = 'H';
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index f6cda578b1..23e55ae0fc 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -141,7 +141,6 @@ list($projectModule, $projectMethod) = explode('-', $config->projectLink);
 /* Main menu. */
 $lang->mainNav = new stdclass();
 $lang->mainNav->my      = '<i class="icon icon-menu-my"></i> My|my|index|';
-$lang->mainNav->program = '<i class="icon icon-folder-open-o"></i> Program|program|pgmbrowse|';
 $lang->mainNav->product = '<i class="icon icon-menu-project"></i> Product|product|index|';
 $lang->mainNav->project = '<i class="icon icon-file"></i> Project|program|prjbrowse|';
 $lang->mainNav->qa      = '<i class="icon icon-test"></i> Test|qa|index|';
@@ -150,6 +149,7 @@ $lang->mainNav->doc     = '<i class="icon icon-doc"></i> Doc|doc|index|';
 $lang->mainNav->report  = "<i class='icon icon-statistic'></i> Statistic|report|productsummary|";
 $lang->mainNav->system  = '<i class="icon icon-menu-users"></i> System|custom|estimate|';
 $lang->mainNav->admin   = '<i class="icon icon-menu-backend"></i> Admin|admin|index|';
+if($config->systemMode == 'new') $lang->mainNav->program = '<i class="icon icon-folder-open-o"></i> Program|program|pgmbrowse|';
 
 $lang->reporting = new stdclass();
 $lang->dividerMenu = ',qa,report,admin,';
@@ -294,8 +294,15 @@ $lang->my->menu = new stdclass();
 $lang->my->menu->index       = 'Index|my|index';
 $lang->my->menu->calendar    = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
 $lang->my->menu->myWork      = array('link' => 'Work|my|work|mode=task');
-$lang->my->menu->myProject   = array('link' => 'Project|my|project|');
-$lang->my->menu->myExecution = 'Execution|my|execution|type=undone';
+if($config->systemMode == 'new')
+{
+    $lang->my->menu->myProject   = array('link' => 'Project|my|project|');
+    $lang->my->menu->myExecution = 'Execution|my|execution|type=undone';
+}
+else
+{
+    $lang->my->menu->myExecution = $lang->executionCommon . '|my|execution|type=undone';
+}
 $lang->my->menu->contribute  = array('link' => 'Contribute|my|contribute|mode=task');
 $lang->my->menu->dynamic     = 'Dynamic|my|dynamic|';
 $lang->my->menu->score       = 'Score|my|score|';
@@ -309,8 +316,11 @@ $lang->my->workMenu->story       = "$lang->SRCommon|my|work|mode=story";
 $lang->my->workMenu->bug         = 'Bug|my|work|mode=bug';
 $lang->my->workMenu->testcase    = 'Test Case|my|work|mode=testcase&type=assigntome';
 $lang->my->workMenu->testtask    = 'Test Task|my|work|mode=testtask&type=wait';
-$lang->my->workMenu->issue       = 'Issue|my|work|mode=issue';
-$lang->my->workMenu->risk        = 'Risk|my|work|mode=risk';
+if($config->systemMode == 'new')
+{
+    $lang->my->workMenu->issue       = 'Issue|my|work|mode=issue';
+    $lang->my->workMenu->risk        = 'Risk|my|work|mode=risk';
+}
 
 $lang->my->contributeMenu = new stdclass();
 $lang->my->contributeMenu->task        = 'Task|my|contribute|mode=task';
@@ -319,8 +329,11 @@ $lang->my->contributeMenu->story       = "$lang->SRCommon|my|contribute|mode=sto
 $lang->my->contributeMenu->bug         = 'Bug|my|contribute|mode=bug';
 $lang->my->contributeMenu->testcase    = 'Test Case|my|contribute|mode=testtask&type=openedbyme';
 $lang->my->contributeMenu->testtask    = 'Test Task|my|contribute|mode=testtask&type=done';
-$lang->my->contributeMenu->issue       = 'Issue|my|contribute|mode=issue';
-$lang->my->contributeMenu->risk        = 'Risk|my|contribute|mode=risk';
+if($config->systemMode == 'new')
+{
+    $lang->my->contributeMenu->issue       = 'Issue|my|contribute|mode=issue';
+    $lang->my->contributeMenu->risk        = 'Risk|my|contribute|mode=risk';
+}
 
 $lang->my->dividerMenu = ',myProject,team,';
 
@@ -1026,5 +1039,10 @@ $lang->design->menu->bysearch = array('link' => '<a href="javascript:;" class="q
 
 $lang->nc->menu = $lang->auditplan->menu;
 $lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
+if($config->systemMode == 'old')
+{
+    $lang->noMenuModule[] = 'project';
+    $lang->noMenuModule[] = 'task';
+}
 
 include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index b5cbac8e3b..d5532ff6d4 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -141,7 +141,6 @@ list($projectModule, $projectMethod) = explode('-', $config->projectLink);
 /* Main menu. */
 $lang->mainNav = new stdclass();
 $lang->mainNav->my      = '<i class="icon icon-menu-my"></i> My|my|index|';
-$lang->mainNav->program = '<i class="icon icon-folder-open-o"></i> Program|program|pgmbrowse|';
 $lang->mainNav->product = '<i class="icon icon-menu-project"></i> Product|product|index|';
 $lang->mainNav->project = '<i class="icon icon-file"></i> Project|program|prjbrowse|';
 $lang->mainNav->qa      = '<i class="icon icon-test"></i> Test|qa|index|';
@@ -150,6 +149,7 @@ $lang->mainNav->doc     = '<i class="icon icon-doc"></i> Doc|doc|index|';
 $lang->mainNav->report  = "<i class='icon icon-statistic'></i> Statistic|report|productsummary|";
 $lang->mainNav->system  = '<i class="icon icon-menu-users"></i> System|custom|estimate|';
 $lang->mainNav->admin   = '<i class="icon icon-menu-backend"></i> Admin|admin|index|';
+if($config->systemMode == 'new') $lang->mainNav->program = '<i class="icon icon-folder-open-o"></i> Program|program|pgmbrowse|';
 
 $lang->reporting = new stdclass();
 $lang->dividerMenu = ',qa,report,admin,';
@@ -294,8 +294,15 @@ $lang->my->menu = new stdclass();
 $lang->my->menu->index       = 'Index|my|index';
 $lang->my->menu->calendar    = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
 $lang->my->menu->myWork      = array('link' => 'Work|my|work|mode=task');
-$lang->my->menu->myProject   = array('link' => 'Project|my|project|');
-$lang->my->menu->myExecution = 'Execution|my|execution|type=undone';
+if($config->systemMode == 'new')
+{
+    $lang->my->menu->myProject   = array('link' => 'Project|my|project|');
+    $lang->my->menu->myExecution = 'Execution|my|execution|type=undone';
+}
+else
+{
+    $lang->my->menu->myExecution = $lang->executionCommon . '|my|execution|type=undone';
+}
 $lang->my->menu->contribute  = array('link' => 'Contribute|my|contribute|mode=task');
 $lang->my->menu->dynamic     = 'Dynamic|my|dynamic|';
 $lang->my->menu->score       = 'Score|my|score|';
@@ -309,8 +316,11 @@ $lang->my->workMenu->story       = "$lang->SRCommon|my|work|mode=story";
 $lang->my->workMenu->bug         = 'Bug|my|work|mode=bug';
 $lang->my->workMenu->testcase    = 'Test Case|my|work|mode=testcase&type=assigntome';
 $lang->my->workMenu->testtask    = 'Test Task|my|work|mode=testtask&type=wait';
-$lang->my->workMenu->issue       = 'Issue|my|work|mode=issue';
-$lang->my->workMenu->risk        = 'Risk|my|work|mode=risk';
+if($config->systemMode == 'new')
+{
+    $lang->my->workMenu->issue       = 'Issue|my|work|mode=issue';
+    $lang->my->workMenu->risk        = 'Risk|my|work|mode=risk';
+}
 
 $lang->my->contributeMenu = new stdclass();
 $lang->my->contributeMenu->task        = 'Task|my|contribute|mode=task';
@@ -319,8 +329,11 @@ $lang->my->contributeMenu->story       = "$lang->SRCommon|my|contribute|mode=sto
 $lang->my->contributeMenu->bug         = 'Bug|my|contribute|mode=bug';
 $lang->my->contributeMenu->testcase    = 'Test Case|my|contribute|mode=testtask&type=openedbyme';
 $lang->my->contributeMenu->testtask    = 'Test Task|my|contribute|mode=testtask&type=done';
-$lang->my->contributeMenu->issue       = 'Issue|my|contribute|mode=issue';
-$lang->my->contributeMenu->risk        = 'Risk|my|contribute|mode=risk';
+if($config->systemMode == 'new')
+{
+    $lang->my->contributeMenu->issue       = 'Issue|my|contribute|mode=issue';
+    $lang->my->contributeMenu->risk        = 'Risk|my|contribute|mode=risk';
+}
 
 $lang->my->dividerMenu = ',myProject,team,';
 
@@ -1026,5 +1039,10 @@ $lang->design->menu->bysearch = array('link' => '<a href="javascript:;" class="q
 
 $lang->nc->menu = $lang->auditplan->menu;
 $lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
+if($config->systemMode == 'old')
+{
+    $lang->noMenuModule[] = 'project';
+    $lang->noMenuModule[] = 'task';
+}
 
 include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 8eb8677317..ae596dfdc4 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -141,7 +141,6 @@ list($projectModule, $projectMethod) = explode('-', $config->projectLink);
 /* Main menu. */
 $lang->mainNav = new stdclass();
 $lang->mainNav->my      = '<i class="icon icon-menu-my"></i> My|my|index|';
-$lang->mainNav->program = '<i class="icon icon-folder-open-o"></i> Program|program|pgmbrowse|';
 $lang->mainNav->product = '<i class="icon icon-menu-project"></i> Product|product|index|';
 $lang->mainNav->project = '<i class="icon icon-file"></i> Project|program|prjbrowse|';
 $lang->mainNav->qa      = '<i class="icon icon-test"></i> Test|qa|index|';
@@ -150,6 +149,7 @@ $lang->mainNav->report  = "<i class='icon icon-statistic'></i> Statistic|report|
 $lang->mainNav->doc     = '<i class="icon icon-doc"></i> Doc|doc|index|';
 $lang->mainNav->system  = '<i class="icon icon-menu-users"></i> System|custom|estimate|';
 $lang->mainNav->admin   = '<i class="icon icon-menu-backend"></i> Admin|admin|index|';
+if($config->systemMode == 'new') $lang->mainNav->program = '<i class="icon icon-folder-open-o"></i> Program|program|pgmbrowse|';
 
 $lang->reporting = new stdclass();
 $lang->dividerMenu = ',qa,report,admin,';
@@ -294,8 +294,15 @@ $lang->my->menu = new stdclass();
 $lang->my->menu->index       = 'Index|my|index';
 $lang->my->menu->calendar    = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
 $lang->my->menu->myWork      = array('link' => 'Work|my|work|mode=task');
-$lang->my->menu->myProject   = array('link' => 'Project|my|project|');
-$lang->my->menu->myExecution = 'Execution|my|execution|type=undone';
+if($config->systemMode == 'new')
+{
+    $lang->my->menu->myProject   = array('link' => 'Project|my|project|');
+    $lang->my->menu->myExecution = 'Execution|my|execution|type=undone';
+}
+else
+{
+    $lang->my->menu->myExecution = $lang->executionCommon . '|my|execution|type=undone';
+}
 $lang->my->menu->contribute  = array('link' => 'Contribute|my|contribute|mode=task');
 $lang->my->menu->dynamic     = 'Dynamic|my|dynamic|';
 $lang->my->menu->score       = 'Score|my|score|';
@@ -309,8 +316,11 @@ $lang->my->workMenu->story       = "$lang->SRCommon|my|work|mode=story";
 $lang->my->workMenu->bug         = 'Bug|my|work|mode=bug';
 $lang->my->workMenu->testcase    = 'Test Case|my|work|mode=testcase&type=assigntome';
 $lang->my->workMenu->testtask    = 'Test Task|my|work|mode=testtask&type=wait';
-$lang->my->workMenu->issue       = 'Issue|my|work|mode=issue';
-$lang->my->workMenu->risk        = 'Risk|my|work|mode=risk';
+if($config->systemMode == 'new')
+{
+    $lang->my->workMenu->issue       = 'Issue|my|work|mode=issue';
+    $lang->my->workMenu->risk        = 'Risk|my|work|mode=risk';
+}
 
 $lang->my->contributeMenu = new stdclass();
 $lang->my->contributeMenu->task        = 'Task|my|contribute|mode=task';
@@ -319,8 +329,11 @@ $lang->my->contributeMenu->story       = "$lang->SRCommon|my|contribute|mode=sto
 $lang->my->contributeMenu->bug         = 'Bug|my|contribute|mode=bug';
 $lang->my->contributeMenu->testcase    = 'Test Case|my|contribute|mode=testtask&type=openedbyme';
 $lang->my->contributeMenu->testtask    = 'Test Task|my|contribute|mode=testtask&type=done';
-$lang->my->contributeMenu->issue       = 'Issue|my|contribute|mode=issue';
-$lang->my->contributeMenu->risk        = 'Risk|my|contribute|mode=risk';
+if($config->systemMode == 'new')
+{
+    $lang->my->contributeMenu->issue       = 'Issue|my|contribute|mode=issue';
+    $lang->my->contributeMenu->risk        = 'Risk|my|contribute|mode=risk';
+}
 
 $lang->my->dividerMenu = ',myProject,team,';
 
@@ -1026,5 +1039,10 @@ $lang->design->menu->bysearch = array('link' => '<a href="javascript:;" class="q
 
 $lang->nc->menu = $lang->auditplan->menu;
 $lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
+if($config->systemMode == 'old')
+{
+    $lang->noMenuModule[] = 'project';
+    $lang->noMenuModule[] = 'task';
+}
 
 include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index 315e1a40de..0d97ea19f0 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -141,7 +141,6 @@ list($projectModule, $projectMethod) = explode('-', $config->projectLink);
 /* Main menu. */
 $lang->mainNav = new stdclass();
 $lang->mainNav->my      = '<i class="icon icon-menu-my"></i> My|my|index|';
-$lang->mainNav->program = '<i class="icon icon-folder-open-o"></i> Program|program|pgmbrowse|';
 $lang->mainNav->product = '<i class="icon icon-menu-project"></i> Product|product|index|';
 $lang->mainNav->project = '<i class="icon icon-file"></i> Project|program|prjbrowse|';
 $lang->mainNav->qa      = '<i class="icon icon-test"></i> Test|qa|index|';
@@ -150,6 +149,7 @@ $lang->mainNav->doc     = '<i class="icon icon-doc"></i> Doc|doc|index|';
 $lang->mainNav->report  = "<i class='icon icon-statistic'></i> Statistic|report|productsummary|";
 $lang->mainNav->system  = '<i class="icon icon-menu-users"></i> System|custom|estimate|';
 $lang->mainNav->admin   = '<i class="icon icon-menu-backend"></i> Admin|admin|index|';
+if($config->systemMode == 'new') $lang->mainNav->program = '<i class="icon icon-folder-open-o"></i> Program|program|pgmbrowse|';
 
 $lang->reporting = new stdclass();
 $lang->dividerMenu = ',qa,report,admin,';
@@ -294,8 +294,15 @@ $lang->my->menu = new stdclass();
 $lang->my->menu->index       = 'Index|my|index';
 $lang->my->menu->calendar    = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
 $lang->my->menu->myWork      = array('link' => 'Work|my|work|mode=task');
-$lang->my->menu->myProject   = array('link' => 'Project|my|project|');
-$lang->my->menu->myExecution = 'Execution|my|execution|type=undone';
+if($config->systemMode == 'new')
+{
+    $lang->my->menu->myProject   = array('link' => 'Project|my|project|');
+    $lang->my->menu->myExecution = 'Execution|my|execution|type=undone';
+}
+else
+{
+    $lang->my->menu->myExecution = $lang->executionCommon . '|my|execution|type=undone';
+}
 $lang->my->menu->contribute  = array('link' => 'Contribute|my|contribute|mode=task');
 $lang->my->menu->dynamic     = 'Dynamic|my|dynamic|';
 $lang->my->menu->score       = 'Score|my|score|';
@@ -309,8 +316,11 @@ $lang->my->workMenu->story       = "$lang->SRCommon|my|work|mode=story";
 $lang->my->workMenu->bug         = 'Bug|my|work|mode=bug';
 $lang->my->workMenu->testcase    = 'Test Case|my|work|mode=testcase&type=assigntome';
 $lang->my->workMenu->testtask    = 'Test Task|my|work|mode=testtask&type=wait';
-$lang->my->workMenu->issue       = 'Issue|my|work|mode=issue';
-$lang->my->workMenu->risk        = 'Risk|my|work|mode=risk';
+if($config->systemMode == 'new')
+{
+    $lang->my->workMenu->issue       = 'Issue|my|work|mode=issue';
+    $lang->my->workMenu->risk        = 'Risk|my|work|mode=risk';
+}
 
 $lang->my->contributeMenu = new stdclass();
 $lang->my->contributeMenu->task        = 'Task|my|contribute|mode=task';
@@ -319,8 +329,11 @@ $lang->my->contributeMenu->story       = "$lang->SRCommon|my|contribute|mode=sto
 $lang->my->contributeMenu->bug         = 'Bug|my|contribute|mode=bug';
 $lang->my->contributeMenu->testcase    = 'Test Case|my|contribute|mode=testtask&type=openedbyme';
 $lang->my->contributeMenu->testtask    = 'Test Task|my|contribute|mode=testtask&type=done';
-$lang->my->contributeMenu->issue       = 'Issue|my|contribute|mode=issue';
-$lang->my->contributeMenu->risk        = 'Risk|my|contribute|mode=risk';
+if($config->systemMode == 'new')
+{
+    $lang->my->contributeMenu->issue       = 'Issue|my|contribute|mode=issue';
+    $lang->my->contributeMenu->risk        = 'Risk|my|contribute|mode=risk';
+}
 
 $lang->my->dividerMenu = ',myProject,team,';
 
@@ -1026,5 +1039,10 @@ $lang->design->menu->bysearch = array('link' => '<a href="javascript:;" class="q
 
 $lang->nc->menu = $lang->auditplan->menu;
 $lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
+if($config->systemMode == 'old')
+{
+    $lang->noMenuModule[] = 'project';
+    $lang->noMenuModule[] = 'task';
+}
 
 include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 37a2b69439..03761d3932 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -293,8 +293,15 @@ $lang->my->menu = new stdclass();
 $lang->my->menu->index       = '首页|my|index';
 $lang->my->menu->calendar    = array('link' => '日程|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
 $lang->my->menu->myWork      = array('link' => '待处理|my|work|mode=task');
-$lang->my->menu->myProject   = array('link' => '项目|my|project|');
-$lang->my->menu->myExecution = '执行|my|execution|type=undone';
+if($config->systemMode == 'new')
+{
+    $lang->my->menu->myProject   = array('link' => '项目|my|project|');
+    $lang->my->menu->myExecution = '执行|my|execution|type=undone';
+}
+else
+{
+    $lang->my->menu->myExecution = $lang->executionCommon . '|my|execution|type=undone';
+}
 $lang->my->menu->contribute  = array('link' => '贡献|my|contribute|mode=task');
 $lang->my->menu->dynamic     = '动态|my|dynamic|';
 $lang->my->menu->score       = array('link' => '积分|my|score|', 'subModule' => 'score');
@@ -1030,6 +1037,10 @@ $lang->design->menu->bysearch = array('link' => '<a href="javascript:;" class="q
 
 $lang->nc->menu = $lang->auditplan->menu;
 $lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
-if($config->systemMode == 'old') $lang->noMenuModule[] = 'project';
+if($config->systemMode == 'old') 
+{
+    $lang->noMenuModule[] = 'project';
+    $lang->noMenuModule[] = 'task';
+}
 
 include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/model.php b/module/common/model.php
index 735f26bc1d..a78259a0d7 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -2294,8 +2294,7 @@ EOD;
      */
     public static function setMainMenuByGroup($group, $moduleName, $methodName)
     {
-        global $lang;
-        global $config;
+        global $lang, $config;
         if($group == 'my')
         {
             $lang->menu      = $lang->my->menu;
diff --git a/module/doc/control.php b/module/doc/control.php
index 42675cb466..fd4c05d90b 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -125,6 +125,7 @@ class doc extends control
             $this->lang->navGroup->doc  = 'project';
             $this->lang->doc->menu      = $this->lang->project->menu;
             $this->lang->doc->menuOrder = $this->lang->project->menuOrder;
+            if($this->config->global->mode == 'old') $this->lang->noMenuModule[] = 'doc';
             $this->project->setMenu($this->project->getExecutionsByProject($this->session->PRJ, 'all', 0, true), $lib->project);
             $this->lang->set('menugroup.doc', 'project');
         }
@@ -361,6 +362,7 @@ class doc extends control
             $this->lang->navGroup->doc  = 'project';
             $this->lang->doc->menu      = $this->lang->project->menu;
             $this->lang->doc->menuOrder = $this->lang->project->menuOrder;
+            if($this->config->global->mode == 'old') $this->lang->noMenuModule[] = 'doc';
             $this->project->setMenu($this->project->getExecutionsByProject($this->session->PRJ, 'all', 0, true), $lib->project);
             $this->lang->set('menugroup.doc', 'project');
 
@@ -447,6 +449,7 @@ class doc extends control
             $this->lang->navGroup->doc  = 'project';
             $this->lang->doc->menu      = $this->lang->project->menu;
             $this->lang->doc->menuOrder = $this->lang->project->menuOrder;
+            if($this->config->global->mode == 'old') $this->lang->noMenuModule[] = 'doc';
             $this->project->setMenu($this->project->getExecutionsByProject($this->session->PRJ, 'all', 0, true), $objectID);
             $this->lang->set('menugroup.doc', 'project');
         }
@@ -512,6 +515,7 @@ class doc extends control
             $this->lang->navGroup->doc  = 'project';
             $this->lang->doc->menu      = $this->lang->project->menu;
             $this->lang->doc->menuOrder = $this->lang->project->menuOrder;
+            if($this->config->global->mode == 'old') $this->lang->noMenuModule[] = 'doc';
             $this->project->setMenu($this->project->getExecutionsByProject($this->session->PRJ, 'all', 0, true), $objectID);
             $this->lang->set('menugroup.doc', 'project');
         }
@@ -841,6 +845,7 @@ class doc extends control
             $this->lang->navGroup->doc  = 'project';
             $this->lang->doc->menu      = $this->lang->project->menu;
             $this->lang->doc->menuOrder = $this->lang->project->menuOrder;
+            if($this->config->global->mode == 'old') $this->lang->noMenuModule[] = 'doc';
             $this->project->setMenu($this->project->getExecutionsByProject($this->session->PRJ, 'all', 0, true), $objectID);
             $this->lang->set('menugroup.doc', 'project');
         }
@@ -940,6 +945,7 @@ class doc extends control
             $this->lang->navGroup->doc  = 'project';
             $this->lang->doc->menu      = $this->lang->project->menu;
             $this->lang->doc->menuOrder = $this->lang->project->menuOrder;
+            if($this->config->global->mode == 'old') $this->lang->noMenuModule[] = 'doc';
             $this->project->setMenu($this->project->getExecutionsByProject($this->session->PRJ, 'all', 0, true), $objectID);
             $this->lang->set('menugroup.doc', 'project');
         }
diff --git a/module/project/control.php b/module/project/control.php
index dfcdbc203a..65f0f4a447 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1194,14 +1194,24 @@ class project extends control
         $this->view->isSprint = false;
         $project = $this->project->getById($this->session->PRJ);
 
-        if($project->model == 'scrum' && isset($this->config->custom->sprintConcept) and $this->config->custom->sprintConcept == 1)
+        if($this->config->global->mode == 'new')
         {
-            $this->view->isSprint = true;
+            if($project->model == 'scrum' && isset($this->config->custom->sprintConcept) and $this->config->custom->sprintConcept == 1)
+            {
+                $this->view->isSprint = true;
 
-            unset($this->lang->project->endList[62]);
-            unset($this->lang->project->endList[93]);
-            unset($this->lang->project->endList[186]);
-            unset($this->lang->project->endList[365]);
+                unset($this->lang->project->endList[62]);
+                unset($this->lang->project->endList[93]);
+                unset($this->lang->project->endList[186]);
+                unset($this->lang->project->endList[365]);
+            }
+
+            $this->view->isStage    = $project->model == 'waterfall' ? true : false;
+            $this->view->iconObject = $project->model == 'waterfall' ? 'stage' : 'sprint';
+        }
+        else
+        {
+            $this->view->isStage = false;
         }
 
         $projectID = key($this->projects);
@@ -1226,8 +1236,6 @@ class project extends control
         $this->view->copyProjectID = $copyProjectID;
         $this->view->branchGroups  = $this->loadModel('branch')->getByProducts(array_keys($products));
         $this->view->users         = $this->loadModel('user')->getPairs('nodeleted|noclosed');
-        $this->view->isStage       = $project->model == 'waterfall' ? true    : false;
-        $this->view->iconObject    = $project->model == 'waterfall' ? 'stage' : 'sprint';
         $this->display();
     }
 
@@ -1323,15 +1331,24 @@ class project extends control
         }
 
         $this->view->isSprint = false;
-        $PRJData = $this->project->getById($this->session->PRJ);
-        if($PRJData->model == 'scrum' && isset($this->config->custom->sprintConcept) && $this->config->custom->sprintConcept == 1)
+        if($this->config->global->mode == 'new')
         {
-            $this->view->isSprint = true;
+            $PRJData = $this->project->getById($this->session->PRJ);
+            if($PRJData->model == 'scrum' && isset($this->config->custom->sprintConcept) && $this->config->custom->sprintConcept == 1)
+            {
+                $this->view->isSprint = true;
 
-            unset($this->lang->project->endList[62]);
-            unset($this->lang->project->endList[93]);
-            unset($this->lang->project->endList[186]);
-            unset($this->lang->project->endList[365]);
+                unset($this->lang->project->endList[62]);
+                unset($this->lang->project->endList[93]);
+                unset($this->lang->project->endList[186]);
+                unset($this->lang->project->endList[365]);
+            }
+
+            $this->view->isStage = $PRJData->model == 'waterfall' ? true : false;
+        }
+        else
+        {
+            $this->view->isStage = false;
         }
 
         $this->loadModel('user');
@@ -1362,7 +1379,6 @@ class project extends control
         $this->view->notRemoveProducts = $notRemoveProducts;
         $this->view->productPlans      = $productPlans;
         $this->view->branchGroups      = $this->loadModel('branch')->getByProducts(array_keys($linkedProducts), '', $linkedBranches);
-        $this->view->isStage           = $PRJData->model == 'waterfall' ? true : false;
         $this->display();
     }
 
diff --git a/module/project/model.php b/module/project/model.php
index e27bb47a7f..3b54eb8bfa 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -185,15 +185,18 @@ class projectModel extends model
         setCookie("lastProject", $projectID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
         $currentProject = $this->getById($projectID);
 
-        if(isset($currentProject->type) and $currentProject->type == 'program') return;
-
-        if(isset($currentProject->project)) $project = $this->loadModel('program')->getPRJByID($currentProject->project);
-
-        if(isset($project) and $project->model == 'waterfall')
+        if($this->config->global->mode == 'new')
         {
-            $productID = $this->loadModel('product')->getProductIDByProject($currentProject->id);
-            $productName = $this->dao->findByID($productID)->from(TABLE_PRODUCT)->fetch('name');
-            $currentProject->name = $productName . '/' . $currentProject->name;
+            if(isset($currentProject->type) and $currentProject->type == 'program') return;
+
+            if(isset($currentProject->project)) $project = $this->loadModel('program')->getPRJByID($currentProject->project);
+
+            if(isset($project) and $project->model == 'waterfall')
+            {
+                $productID = $this->loadModel('product')->getProductIDByProject($currentProject->id);
+                $productName = $this->dao->findByID($productID)->from(TABLE_PRODUCT)->fetch('name');
+                $currentProject->name = $productName . '/' . $currentProject->name;
+            }
         }
 
         $dropMenuLink = helper::createLink('project', 'ajaxGetDropMenu', "objectID=$projectID&module=$currentModule&method=$currentMethod&extra=$extra");
diff --git a/module/task/control.php b/module/task/control.php
index 9217afb633..b2781f13a2 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -237,8 +237,11 @@ class task extends control
             die(js::locate($this->createLink('project', 'task', "projectID=$projectID")));
         }
 
-        $program = $this->loadModel('project')->getByID($this->session->PRJ);
-        if($program->model == 'waterfall') $this->config->task->create->requiredFields .= ',estStarted,deadline';
+        if($this->config->global->mode == 'new')
+        {
+            $program = $this->loadModel('project')->getByID($this->session->PRJ);
+            if($program->model == 'waterfall') $this->config->task->create->requiredFields .= ',estStarted,deadline';
+        }
 
         $project   = $this->project->getById($projectID);
         $taskLink  = $this->createLink('project', 'browse', "projectID=$projectID&tab=task");
diff --git a/module/task/model.php b/module/task/model.php
index d108901ead..45fbfe58b8 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -47,7 +47,7 @@ class taskModel extends model
             ->setDefault('project', $projectID)
             ->setDefault('estimate,left,story', 0)
             ->setDefault('status', 'wait')
-            ->setDefault('PRJ', $this->session->PRJ)
+            ->setIF($this->config->global->mode == 'new', 'PRJ', $this->session->PRJ)
             ->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')
@@ -303,7 +303,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]->PRJ        = $this->session->PRJ;
+            $data[$i]->PRJ        = $this->config->global->mode == 'new' ? $this->session->PRJ : 0;
             $data[$i]->project    = $projectID;
             $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];