Merge branch 'dev_oracle' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_oracle

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/JXFP.java

@@ -192,7 +192,8 @@ public class JXFP extends FunctionBase implements FreeRefFunction {
     }
 
     private static Date strToDate(String strDate) {
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyyMM");
+        strDate = strDate + 15;
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
         ParsePosition pos = new ParsePosition(0);
         Date strtodate = formatter.parse(strDate, pos);
         return strtodate;

atms-web/src/main/webapp/app/admin/systemConfiguration/declarationFormConfiguration/declaration-form-configuration.ctrl.js

@@ -2171,9 +2171,9 @@ ng-show="hasEditPermission && ToggleSaveAs && editModel.hasModel"/>');
 
                 var tabs = [
                     {id: 0, text: $translate.instant('AutoCalculateTab')},
-                    {id: 1, text: $translate.instant('ManualInputTab')},
+                    {id: 1, text: $translate.instant('ManualInputTab')}
                     // {id: 2, text: $translate.instant('ModelTab')},
-                    {id: 2, text: $translate.instant('ValidationTab')}
+//                    {id: 2, text: $translate.instant('ValidationTab')}
                 ];
                 $scope.tabOptions = {
                     dataSource: tabs,

atms-web/src/main/webapp/app/framework/app-side-bar/app-side-bar.ctrl.js

@@ -15,13 +15,11 @@ frameworkModule.controller('appSideBarController', ['$scope', '$log', 'menuServi
                 menuService.getMenusForDisplay(1).success(function (menuData) {
 
                     $scope.menuData = menuData;
-                    if ($scope.specialUser === 'simon') {
-                        $scope.menuData[2].subMenus[0].isVisible = false;
-                        $scope.menuData[2].subMenus[1].isVisible = false;
-                        $scope.menuData[2].subMenus[3].isVisible = false;
-                        $scope.menuData[2].subMenus[4].isVisible = false;
-                        $scope.menuData[2].subMenus[5].isVisible = false;
-                    }
+                    $scope.menuData[2].subMenus[0].isVisible = true;
+                    $scope.menuData[2].subMenus[1].isVisible = false;
+                    $scope.menuData[2].subMenus[3].isVisible = false;
+                    $scope.menuData[2].subMenus[4].isVisible = true;
+                    $scope.menuData[2].subMenus[5].isVisible = true;
                     $window.location.href = '#/adminHomePage';
                 });
             }, 500);