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

atms-web/src/main/webapp/Scripts/app.js

@@ -343,7 +343,7 @@ var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls',
                     langs = obj;
                 }
             } catch(e) {}
-            var region = langs[loginContext.userName] || 'en-us';
+            var region = langs[loginContext.userName] || 'zh-CN';
             var flag = window.localStorage.langTemp;
             $rootScope.changeLanguage = function(lang){
                 $translate.use(lang);

atms-web/src/main/webapp/app/framework/app-nav/app-nav.html

@@ -25,12 +25,12 @@
                 <span class="nav-icon-color">{{'MenuCIT' | translate}}</span>
             </a>
         </div>
-        <div class="nav-element-left" ng-if="analysisShow">
+        <div class="nav-element-left" ng-if="menuRecordManageShow">
             <a ui-sref="taxDocumentManage">
                 <span class="nav-icon-color">{{'MenuRecordManage' | translate}}</span>
             </a>
         </div>
-        <div class="nav-element-left" ng-if="menuRecordManageShow">
+        <div class="nav-element-left" ng-if="analysisShow">
             <a ui-sref="overviewAnalysis">
                 <span class="nav-icon-color">{{'MenuAnalysis' | translate}}</span>
             </a>

atms-web/src/main/webapp/app/vat/preview/vat-preview-trial-balance/vat-preview-trial-balance.ctrl.js

@@ -331,9 +331,9 @@
                  { name: $translate.instant('Alternate1Description'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment9Name}}</span></div>' },
                  { name: $translate.instant('Alternate2Description'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment10Name}}</span></div>' },
                  { name: $translate.instant('BegBal'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.begBalBeq}}</span></div>' },
-                 { name: $translate.instant('DebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.endBalBeq}}</span></div>' },
-                 { name: $translate.instant('CreditAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodDrBeq}}</span></div>' },
-                 { name: $translate.instant('EndingBalance'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodCrBeq}}</span></div>' },
+                 { name: $translate.instant('DebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodDrBeq}}</span></div>' },
+                 { name: $translate.instant('CreditAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodCrBeq}}</span></div>' },
+                 { name: $translate.instant('EndingBalance'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.endBalBeq}}</span></div>' },
                  { name: $translate.instant('SeasonDebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.qtdDrBeq}}</span></div>' },
                  { name: $translate.instant('SeasonCreditsAmount'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.qtdCrBeq}}</span></div>' }
                 ]