diff --git a/module/action/model.php b/module/action/model.php
index 8062c46551..985dbe7e4a 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -668,7 +668,7 @@ class actionModel extends model
         if(is_numeric($projectID))
         {
             $project = $this->loadModel('program')->getPRJByID($projectID);
-            if($project->type == 'project')
+            if(!empty($project) && $project->type == 'project')
             {
                 $executions = $this->loadModel('project')->getExecutionPairs($projectID);
                 $products   = $this->loadModel('product')->getProductPairsByProject($projectID);
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index e2630d2fb2..f6cda578b1 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -144,13 +144,15 @@ $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|';
 $lang->mainNav->repo    = '<i class="icon icon-code1"></i> Code|repo|browse|';
 $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|';
 
 $lang->reporting = new stdclass();
-$lang->dividerMenu = ',project,doc,admin,';
+$lang->dividerMenu = ',qa,report,admin,';
 
 /* Program set menu. */
 $lang->program = new stdclass();
@@ -509,7 +511,7 @@ $lang->report->menu = new stdclass();
 
 $lang->report->menu->annual  = array('link' => 'Annual Summary|report|annualData|year=&dept=&userID=' . (isset($_SESSION['user']) ? zget($_SESSION['user'], 'id', 0) : 0), 'target' => '_blank');
 $lang->report->menu->product = array('link' => $lang->productCommon . '|report|productsummary');
-$lang->report->menu->prj     = array('link' => $lang->executionCommon . '|report|projectdeviation');
+$lang->report->menu->project = array('link' => $lang->executionCommon . '|report|projectdeviation');
 $lang->report->menu->test    = array('link' => 'Test|report|bugcreate', 'alias' => 'bugassign');
 $lang->report->menu->staff   = array('link' => 'Unternehmen|report|workload');
 
@@ -1023,6 +1025,6 @@ $lang->design->menu->ads      = array('link' => 'ADS|design|browse|productID={PR
 $lang->design->menu->bysearch = array('link' => '<a href="javascript:;" class="querybox-toggle"><i class="icon-search icon"></i> ' . $lang->searchAB . '</a>');
 
 $lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('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');
+$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');
 
 include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 6d13a2e0df..b5cbac8e3b 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -144,13 +144,15 @@ $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|';
 $lang->mainNav->repo    = '<i class="icon icon-code1"></i> Code|repo|browse|';
 $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|';
 
 $lang->reporting = new stdclass();
-$lang->dividerMenu = ',project,doc,admin,';
+$lang->dividerMenu = ',qa,report,admin,';
 
 /* Program set menu. */
 $lang->program = new stdclass();
@@ -509,7 +511,7 @@ $lang->report->menu = new stdclass();
 
 $lang->report->menu->annual  = array('link' => 'Annual Summary|report|annualData|year=&dept=&userID=' . (isset($_SESSION['user']) ? zget($_SESSION['user'], 'id', 0) : 0), 'target' => '_blank');
 $lang->report->menu->product = array('link' => $lang->productCommon . '|report|productsummary');
-$lang->report->menu->prj     = array('link' => $lang->executionCommon . '|report|projectdeviation');
+$lang->report->menu->project = array('link' => $lang->executionCommon . '|report|projectdeviation');
 $lang->report->menu->test    = array('link' => 'Request|report|bugcreate', 'alias' => 'bugassign');
 $lang->report->menu->staff   = array('link' => 'Company|report|workload');
 
@@ -1023,6 +1025,6 @@ $lang->design->menu->ads      = array('link' => 'ADS|design|browse|productID={PR
 $lang->design->menu->bysearch = array('link' => '<a href="javascript:;" class="querybox-toggle"><i class="icon-search icon"></i> ' . $lang->searchAB . '</a>');
 
 $lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('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');
+$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');
 
 include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 66b4482308..8eb8677317 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -144,13 +144,15 @@ $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|';
 $lang->mainNav->repo    = '<i class="icon icon-code1"></i> Code|repo|browse|';
+$lang->mainNav->report  = "<i class='icon icon-statistic'></i> Statistic|report|productsummary|";
 $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|';
 
 $lang->reporting = new stdclass();
-$lang->dividerMenu = ',project,doc,admin,';
+$lang->dividerMenu = ',qa,report,admin,';
 
 /* Program set menu. */
 $lang->program = new stdclass();
@@ -509,7 +511,7 @@ $lang->report->menu = new stdclass();
 
 $lang->report->menu->annual  = array('link' => 'Annual Summary|report|annualData|year=&dept=&userID=' . (isset($_SESSION['user']) ? zget($_SESSION['user'], 'id', 0) : 0), 'target' => '_blank');
 $lang->report->menu->product = array('link' => $lang->productCommon . '|report|productsummary');
-$lang->report->menu->prj     = array('link' => $lang->executionCommon . '|report|projectdeviation');
+$lang->report->menu->project = array('link' => $lang->executionCommon . '|report|projectdeviation');
 $lang->report->menu->test    = array('link' => 'Recette|report|bugcreate', 'alias' => 'bugassign');
 $lang->report->menu->staff   = array('link' => 'Entreprise|report|workload');
 
@@ -1023,6 +1025,6 @@ $lang->design->menu->ads      = array('link' => 'ADS|design|browse|productID={PR
 $lang->design->menu->bysearch = array('link' => '<a href="javascript:;" class="querybox-toggle"><i class="icon-search icon"></i> ' . $lang->searchAB . '</a>');
 
 $lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('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');
+$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');
 
 include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php
index 077e65b72b..47eaf86b71 100644
--- a/module/common/lang/menuOrder.php
+++ b/module/common/lang/menuOrder.php
@@ -3,8 +3,10 @@ $lang->mainNav->menuOrder[5]  = 'my';
 $lang->mainNav->menuOrder[10] = 'program';
 $lang->mainNav->menuOrder[15] = 'product';
 $lang->mainNav->menuOrder[20] = 'project';
+$lang->mainNav->menuOrder[23] = 'qa';
 $lang->mainNav->menuOrder[25] = 'repo';
 $lang->mainNav->menuOrder[30] = 'doc';
+$lang->mainNav->menuOrder[35] = 'report';
 $lang->mainNav->menuOrder[60] = 'system';
 $lang->mainNav->menuOrder[70] = 'admin';
 
@@ -125,7 +127,7 @@ $lang->doc->menuOrder[30] = 'create';
 /* report menu order. */
 $lang->report->menuOrder[5]  = 'annual';
 $lang->report->menuOrder[10] = 'product';
-$lang->report->menuOrder[15] = 'prj';
+$lang->report->menuOrder[15] = 'project';
 $lang->report->menuOrder[20] = 'test';
 $lang->report->menuOrder[25] = 'staff';
 
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index 28a7fdebab..315e1a40de 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -144,13 +144,15 @@ $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|';
 $lang->mainNav->repo    = '<i class="icon icon-code1"></i> Code|repo|browse|';
 $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|';
 
 $lang->reporting = new stdclass();
-$lang->dividerMenu = ',project,doc,admin,';
+$lang->dividerMenu = ',qa,report,admin,';
 
 /* Program set menu. */
 $lang->program = new stdclass();
@@ -509,7 +511,7 @@ $lang->report->menu = new stdclass();
 
 $lang->report->menu->annual  = array('link' => 'Tóm tắt năm|report|annualData|year=&dept=&userID=' . (isset($_SESSION['user']) ? zget($_SESSION['user'], 'id', 0) : 0), 'target' => '_blank');
 $lang->report->menu->product = array('link' => $lang->productCommon . '|report|productsummary');
-$lang->report->menu->prj     = array('link' => $lang->executionCommon . '|report|projectdeviation');
+$lang->report->menu->project = array('link' => $lang->executionCommon . '|report|projectdeviation');
 $lang->report->menu->test    = array('link' => 'Yêu cầu|report|bugcreate', 'alias' => 'bugassign');
 $lang->report->menu->staff   = array('link' => 'Doanh nghiệp|report|workload');
 
@@ -1023,6 +1025,6 @@ $lang->design->menu->ads      = array('link' => 'ADS|design|browse|productID={PR
 $lang->design->menu->bysearch = array('link' => '<a href="javascript:;" class="querybox-toggle"><i class="icon-search icon"></i> ' . $lang->searchAB . '</a>');
 
 $lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('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');
+$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');
 
 include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index bf609df41b..41e53f1280 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -144,13 +144,14 @@ $lang->mainNav->my      = '<i class="icon icon-menu-my"></i> 地盘|my|index|';
 $lang->mainNav->program = "<i class='icon icon-folder-open-o'></i> 项目集|$programModule|$programMethod|";
 $lang->mainNav->product = "<i class='icon icon-product'></i> 产品|$productModule|$productMethod|";
 $lang->mainNav->project = "<i class='icon icon-project'></i> 项目|$projectModule|$projectMethod|";
+$lang->mainNav->qa      = '<i class="icon icon-test"></i> 测试|qa|index|';
 $lang->mainNav->repo    = '<i class="icon icon-code1"></i> 代码|repo|browse|';
 $lang->mainNav->doc     = '<i class="icon icon-doc"></i> 文档|doc|index|';
+$lang->mainNav->report  = "<i class='icon icon-statistic'></i> 统计|report|productSummary|";
 $lang->mainNav->system  = '<i class="icon icon-group"></i> 组织|subject|browse|';
 $lang->mainNav->admin   = '<i class="icon icon-cog-outline"></i> 后台|admin|index|';
 
-$lang->reporting = new stdclass();
-$lang->dividerMenu = ',project,doc,admin,';
+$lang->dividerMenu = ',qa,report,admin,';
 
 /* Program set menu. */
 $lang->program = new stdclass();
@@ -509,7 +510,7 @@ $lang->report->menu = new stdclass();
 
 $lang->report->menu->annual  = array('link' => '年度总结|report|annualData|year=&dept=&userID=' . (isset($_SESSION['user']) ? zget($_SESSION['user'], 'id', 0) : 0), 'target' => '_blank');
 $lang->report->menu->product = array('link' => $lang->productCommon . '|report|productsummary');
-$lang->report->menu->prj     = array('link' => $lang->executionCommon . '|report|projectdeviation');
+$lang->report->menu->project = array('link' => $lang->executionCommon . '|report|projectdeviation');
 $lang->report->menu->test    = array('link' => '测试|report|bugcreate', 'alias' => 'bugassign');
 $lang->report->menu->staff   = array('link' => '组织|report|workload');
 
@@ -608,7 +609,6 @@ $lang->menugroup->testtask    = 'qa';
 $lang->menugroup->testsuite   = 'qa';
 $lang->menugroup->caselib     = 'qa';
 $lang->menugroup->testreport  = 'qa';
-$lang->menugroup->report      = 'reporting';
 $lang->menugroup->people      = 'admin';
 $lang->menugroup->dept        = 'company';
 $lang->menugroup->todo        = 'my';
@@ -1023,6 +1023,6 @@ $lang->design->menu->ads      = array('link' => '接口设计|design|browse|prod
 $lang->design->menu->bysearch = array('link' => '<a href="javascript:;" class="querybox-toggle"><i class="icon-search icon"></i> ' . $lang->searchAB . '</a>');
 
 $lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('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');
+$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');
 
 include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index d3d7207dd1..3400801354 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -144,13 +144,15 @@ $lang->mainNav->my      = '<i class="icon icon-menu-my"></i> 地盤|my|index|';
 $lang->mainNav->program = "<i class='icon icon-folder-open-o'></i> 項目集|$programModule|$programMethod|";
 $lang->mainNav->product = "<i class='icon icon-product'></i> 產品|$productModule|$productMethod|";
 $lang->mainNav->project = "<i class='icon icon-project'></i> 項目|$projectModule|$projectMethod|";
+$lang->mainNav->qa      = '<i class="icon icon-test"></i> 测试|qa|index|';
 $lang->mainNav->repo    = '<i class="icon icon-code1"></i> 代碼|repo|browse|';
 $lang->mainNav->doc     = '<i class="icon icon-doc"></i> 文檔|doc|index|';
+$lang->mainNav->report  = "<i class='icon icon-statistic'></i> 统计|report|productSummary|";
 $lang->mainNav->system  = '<i class="icon icon-group"></i> 組織|subject|browse|';
 $lang->mainNav->admin   = '<i class="icon icon-cog-outline"></i> 後台|admin|index|';
 
 $lang->reporting = new stdclass();
-$lang->dividerMenu = ',project,doc,admin,';
+$lang->dividerMenu = ',qa,report,admin,';
 
 /* Program set menu. */
 $lang->program = new stdclass();
@@ -509,7 +511,7 @@ $lang->report->menu = new stdclass();
 
 $lang->report->menu->annual  = array('link' => '年度總結|report|annualData|year=&dept=&userID=' . (isset($_SESSION['user']) ? zget($_SESSION['user'], 'id', 0) : 0), 'target' => '_blank');
 $lang->report->menu->product = array('link' => $lang->productCommon . '|report|productsummary');
-$lang->report->menu->prj     = array('link' => $lang->executionCommon . '|report|projectdeviation');
+$lang->report->menu->project = array('link' => $lang->executionCommon . '|report|projectdeviation');
 $lang->report->menu->test    = array('link' => '測試|report|bugcreate', 'alias' => 'bugassign');
 $lang->report->menu->staff   = array('link' => '組織|report|workload');
 
@@ -1023,6 +1025,6 @@ $lang->design->menu->ads      = array('link' => '介面設計|design|browse|prod
 $lang->design->menu->bysearch = array('link' => '<a href="javascript:;" class="querybox-toggle"><i class="icon-search icon"></i> ' . $lang->searchAB . '</a>');
 
 $lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('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');
+$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');
 
 include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/model.php b/module/common/model.php
index 7ad0a304fa..99c94e76a5 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -2306,7 +2306,7 @@ EOD;
             $lang->report->menu = $lang->measurement->menu;
         }
         if($group == 'doclib') return;
-        if($group == 'reporting')
+        if($group == 'report')
         {
             $lang->menu      = $lang->report->menu;
             $lang->menuOrder = $lang->report->menuOrder;
diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php
index 8be4fb13c0..de01ee312e 100755
--- a/module/common/view/header.html.php
+++ b/module/common/view/header.html.php
@@ -7,9 +7,13 @@ include 'chosen.html.php';
 <?php if(empty($_GET['onlybody']) or $_GET['onlybody'] != 'yes'):?>
 <?php $this->app->loadConfig('sso');?>
 <?php if(!empty($config->sso->redirect)) js::set('ssoRedirect', $config->sso->redirect);?>
-<?php $isProgram = (zget($lang->navGroup, $app->rawModule) == 'program');?>
-<?php $isProduct = (zget($lang->navGroup, $app->rawModule) == 'product');?>
-<?php $isProject = (zget($lang->navGroup, $app->rawModule) == 'project');?>
+<?php
+$rawModule = zget($lang->navGroup, $app->rawModule);
+$isProgram = $rawModule == 'program';
+$isProduct = $rawModule == 'product';
+$isProject = $rawModule == 'project';
+$isReport  = $rawModule == 'report';
+?>
 <header id='header'>
   <div id='mainHeader'>
     <div class='container'>
@@ -23,6 +27,7 @@ include 'chosen.html.php';
         <?php if($isProgram) echo isset($lang->program->mainMenuAction) ? $lang->program->mainMenuAction : '';?>
         <?php if($isProject) echo $this->loadModel('program')->getPRJMainAction($app->rawModule, $app->rawMethod);?>
         <?php if($isProduct) echo isset($lang->product->mainMenuAction) ? $lang->product->mainMenuAction : '';?>
+        <?php if($isReport)  echo isset($lang->report->mainMenuAction) ? $lang->report->mainMenuAction : '';?>
       </div>
     </div>
   </div>
diff --git a/module/index/js/index.js b/module/index/js/index.js
index 8683ba2411..6bf44ae6ed 100644
--- a/module/index/js/index.js
+++ b/module/index/js/index.js
@@ -79,7 +79,18 @@
         {
             return 'system';
         }
-        if(moduleName === 'report') return link.prj ? 'project' : 'system';
+
+        if(moduleName === 'report')
+        {
+            if(['usereport', 'editreport', 'deletereport', 'custom'].includes(methodLowerCase) && link.params.from)
+            {
+                return 'system';
+            }
+            else
+            {
+                return link.prj ? 'project' : 'report';
+            }
+        }
         if(moduleName === 'program')
         {
             if(methodLowerCase.indexOf('pgm') === 0) return 'program';
diff --git a/module/program/model.php b/module/program/model.php
index 01a401db25..5e971571ba 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -104,7 +104,7 @@ class programModel extends model
      */
     public function getPGMByID($programID = 0)
     {
-        return $this->dao->select('*')->from(TABLE_PROGRAM)->where('id')->eq((int)$programID)->andWhere('`type`')->eq('program')->fetch();
+        return $this->dao->select('*')->from(TABLE_PROGRAM)->where('id')->eq($programID)->andWhere('`type`')->eq('program')->fetch();
     }
 
     /**
diff --git a/module/project/model.php b/module/project/model.php
index 7f19ae22d5..f72d07d85c 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -861,6 +861,7 @@ class projectModel extends model
         /* Order by status's content whether or not done */
         $executions = $this->dao->select('*, IF(INSTR(" done,closed", status) < 2, 0, 1) AS isDone, INSTR("doing,wait,suspended,closed", status) AS sortStatus')->from(TABLE_EXECUTION)
             ->where('deleted')->eq(0)
+            ->beginIF(!$projectID && $type == 'all')->andWhere('type')->in('stage,sprint')->fi()
             ->beginIF($projectID)->andWhere('project')->eq($projectID)->fi()
             ->beginIF($type != 'all')->andWhere('type')->eq($type)->fi()
             ->beginIF(strpos($mode, 'withdelete') === false)->andWhere('deleted')->eq(0)->fi()
diff --git a/module/report/control.php b/module/report/control.php
index bccbb0348d..5df7984b7b 100644
--- a/module/report/control.php
+++ b/module/report/control.php
@@ -11,6 +11,8 @@
  */
 class report extends control
 {
+    public $projectID = 0;
+
     /**
      * Construct.
      *
@@ -23,7 +25,14 @@ class report extends control
 
         /* Set report menu group. */
         $this->projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0;
-        if(!$this->projectID) $this->lang->navGroup->report = 'system';
+        if(!$this->projectID) $this->lang->navGroup->report = 'report';
+        if($this->lang->navGroup->report == 'project' && $this->config->maxVersion)
+        {
+            $index = array_search('report', $this->lang->noMenuModule);
+            unset($this->lang->noMenuModule[$index]);
+            $this->lang->report->menu = $this->lang->report->projectMenu;
+        }
+        if(isset($this->config->proVersion) &&$this->lang->navGroup->report == 'report') $this->lang->report->mainMenuAction = html::a(helper::createLink('report', 'custom'), $this->lang->crystal->custom, '', "class='btn btn-link'");
     }
 
     /**
@@ -98,8 +107,8 @@ class report extends control
         $this->view->end        = $end;
         $this->view->bugs       = $this->report->getBugs($begin, $end, $product, $project);
         $this->view->users      = $this->loadModel('user')->getPairs('noletter|noclosed|nodeleted');
-        $this->view->projects   = array('' => '') + $this->loadModel('project')->getExecutionPairs($this->session->PRJ);
-        $this->view->products   = array('' => '') + $this->loadModel('product')->getPairs('', $this->session->PRJ);
+        $this->view->projects   = array('' => '') + $this->loadModel('project')->getExecutionPairs();
+        $this->view->products   = array('' => '') + $this->loadModel('product')->getPairs();
         $this->view->project    = $project;
         $this->view->product    = $product;
         $this->view->submenu    = 'test';
@@ -254,20 +263,20 @@ class report extends control
     }
 
     /**
-     * Show annual data
+     * Show annual data.
      *
-     * @param  string $year 
-     * @param  string $dept 
-     * @param  string $userID 
+     * @param  string $year
+     * @param  string $dept
+     * @param  string $userID
      * @access public
      * @return void
      */
     public function annualData($year = '', $dept = '', $userID = '')
-	{
-		$this->app->loadLang('story');
-		$this->app->loadLang('task');
-		$this->app->loadLang('bug');
-		$this->app->loadLang('testcase');
+    {
+        $this->app->loadLang('story');
+        $this->app->loadLang('task');
+        $this->app->loadLang('bug');
+        $this->app->loadLang('testcase');
 
         $firstAction = $this->dao->select('*')->from(TABLE_ACTION)->orderBy('id')->limit(1)->fetch();
         $currentYear = date('Y');
@@ -302,7 +311,7 @@ class report extends control
         if($userID)
         {
             $user = $this->loadModel('user')->getById($userID, 'id');
-			$dept = $user->dept;
+            $dept = $user->dept;
             $accounts = array($user->account => ($user->realname ? $user->realname : $user->account));
         }
         if(empty($accounts)) $accounts = $this->user->getPairs('noletter|noclosed');
diff --git a/module/report/model.php b/module/report/model.php
index a0623341e9..c3a0df3cd7 100644
--- a/module/report/model.php
+++ b/module/report/model.php
@@ -100,7 +100,7 @@ class reportModel extends model
             ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
             ->where('t1.status')->ne('cancel')
             ->andWhere('t1.deleted')->eq(0)
-            ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->projects)->fi()
+            ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->sprints)->fi()
             ->andWhere('t2.deleted')->eq(0)
             ->andWhere('t1.parent')->lt(1)
             ->andWhere('t2.status')->eq('closed')
@@ -617,7 +617,7 @@ class reportModel extends model
      * Get user effort stat in this error.
      * 
      * @param  array  $accounts
-     * @param  int    $year 
+     * @param  int    $year
      * @access public
      * @return object
      */
diff --git a/module/report/view/projectdeviation.html.php b/module/report/view/projectdeviation.html.php
index 0669c006bc..1c9253c93f 100644
--- a/module/report/view/projectdeviation.html.php
+++ b/module/report/view/projectdeviation.html.php
@@ -1,6 +1,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/chart.html.php';?>
+<?php $chartData = array('labels' => array(), 'data' => array());?>
 <div id='mainContent' class='main-row'>
   <div class='side-col col-lg'>
     <?php include 'blockreportlist.html.php';?>
@@ -47,7 +48,6 @@
               </tr>
             </thead>
             <tbody>
-              <?php $chartData = array();?>
               <?php foreach($projects as $id  =>$project):?>
               <tr class="text-center">
                 <td><?php echo $id;?></td>
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 6edb02a78f..9a874b08c4 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -54,7 +54,7 @@ a.showMoreImage:hover {opacity: 1;}
 .table-actions .btn{border: 1px solid #1183fb; color: #1183fb}
 .table-actions .btn:hover{background: #b3d4fc}
 
-#header #toolbar a{color: #84a2e2; font-size: 14px; line-height: 15px; border: #84a2e2 1px solid}
+#header #toolbar a{color: #fff; font-size: 14px; line-height: 15px; border: #84a2e2 1px solid}
 
 #navbar .nav>li.divider {margin: 15px 8px 15px 8px;}
 #navbar .nav>li>a { padding: 10px 10px;}