fixed admin report config issue

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

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

atms-web/src/main/webapp/app/admin/systemConfiguration/ruleEngineeConfiguration/vatRuleEnginee/rule-enginee-config.ctrl.js

@@ -19,9 +19,17 @@
                     return item.isDefault === 1;
                 }))[0];
 
+                if($scope.defaultTaxPayerReportMapping){
+                    $scope.defaultTaxPayerReportMapping.templateGroupID = $scope.defaultTaxPayerReportMapping.templateGroupID.toString();
+                }
+
                 $scope.taxPayerReportMappingExceptions = taxPayerReportMappings.filter(function (item) {
                     return item.isDefault !== 1;
                 });
+
+                $scope.taxPayerReportMappingExceptions.forEach(function (value) {
+                    value.templateGroupID = value.templateGroupID.toString();
+                })
             });
 
 

atms-web/src/main/webapp/bundles/systemConfiguration.js

@@ -2172,8 +2172,8 @@ ng-show="hasEditPermission && ToggleSaveAs && editModel.hasModel"/>');
                 var tabs = [
                     {id: 0, text: $translate.instant('AutoCalculateTab')},
                     {id: 1, text: $translate.instant('ManualInputTab')},
-                    {id: 2, text: $translate.instant('ModelTab')},
-                    {id: 3, text: $translate.instant('ValidationTab')}
+                    // {id: 2, text: $translate.instant('ModelTab')},
+                    {id: 2, text: $translate.instant('ValidationTab')}
                 ];
                 $scope.tabOptions = {
                     dataSource: tabs,
@@ -7267,9 +7267,17 @@ systemConfigurationModule.controller('ruleEngineeConfigController', ['$scope', '
                     return item.isDefault === 1;
                 }))[0];
 
+                if($scope.defaultTaxPayerReportMapping){
+                    $scope.defaultTaxPayerReportMapping.templateGroupID = $scope.defaultTaxPayerReportMapping.templateGroupID.toString();
+                }
+
                 $scope.taxPayerReportMappingExceptions = taxPayerReportMappings.filter(function (item) {
                     return item.isDefault !== 1;
                 });
+
+                $scope.taxPayerReportMappingExceptions.forEach(function (value) {
+                    value.templateGroupID = value.templateGroupID.toString();
+                })
             });