Merge branch 'sprint/168'

2021-11-30 14:38:32 +08:00
parent 0ab2f6d249 801c9ce3d0
commit c42cca1249
357 changed files with 14454 additions and 2349 deletions
@@ -847,6 +847,9 @@ class commonModel extends model
                    $linkPart = explode('|', $menu['link']);
                    if(!isset($linkPart[2])) continue;
                    $method = $linkPart[2];
+
+                    if($currentModule == 'report' and $method == 'annualData') continue; // Skip some pages that do not require permissions.
+
                    if(common::hasPriv($currentModule, $method))
                    {
                        $display       = true;