* Fix bug #15737.

module/common/model.php

@@ -320,7 +320,6 @@ class commonModel extends model
             if($module == 'block' and $method == 'main') return true;
             if($module == 'block' and $method == 'delete') return true;
             if($module == 'product' and $method == 'showerrornone') return true;
-            if($module == 'report' and $method == 'annualdata') return true;
         }
         return false;
     }
@@ -2150,8 +2149,6 @@ EOD;
         $rights = $app->user->rights['rights'];
         $acls   = $app->user->rights['acls'];
 
-        if((($app->user->account != 'guest') or ($app->company->guest and $app->user->account == 'guest')) and $module == 'report' and $method == 'annualdata') return true;
-
         if(isset($rights[$module][$method]))
         {
             if(!commonModel::hasDBPriv($object, $module, $method)) return false;

module/group/lang/resource.php

@@ -1309,12 +1309,14 @@ $lang->resource->report->productSummary     = 'productSummary';
 $lang->resource->report->bugCreate          = 'bugCreate';
 $lang->resource->report->bugAssign          = 'bugAssign';
 $lang->resource->report->workload           = 'workload';
+$lang->resource->report->annualData         = 'annualDataAction';
 
 $lang->report->methodOrder[0]  = 'index';
 $lang->report->methodOrder[5]  = 'projectDeviation';
 $lang->report->methodOrder[10] = 'productSummary';
 $lang->report->methodOrder[15] = 'bugCreate';
 $lang->report->methodOrder[20] = 'workload';
+$lang->report->methodOrder[25] = 'annualData';
 
 /* Search. */
 $lang->resource->search = new stdclass();

module/report/lang/zh-cn.php

@@ -43,6 +43,7 @@ $lang->report->bugCreate        = 'Bug创建表';
 $lang->report->bugAssign        = 'Bug指派表';
 $lang->report->workload         = '员工负载表';
 $lang->report->workloadAB       = '工作负载';
+$lang->report->annualDataAction = '年度总结';
 $lang->report->bugOpenedDate    = 'Bug创建时间';
 $lang->report->beginAndEnd      = '起止时间';
 $lang->report->begin            = '起始日期';