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

atms-web/src/main/webapp/app-resources/i18n/en-us/app.json

@@ -406,15 +406,15 @@
     "ModelStatusException": "System Detection Abnormality",
     "ModelStatusNormal": "System Detection Normal",
     "Month": "Month",
-    "Month01": "Month01",
-    "Month02": "Month02",
-    "Month03": "Month03",
-    "Month04": "Month04",
-    "Month05": "Month05",
-    "Month06": "Month06",
-    "Month07": "Month07",
-    "Month08": "Month08",
-    "Month09": "Month09",
+    "Month02": "Feb",
+    "Month03": "Mar",
+    "Month04": "Apr",
+    "Month05": "May",
+    "Month06": "Jun",
+    "Month07": "Jul",
+    "Month08": "Aug",
+    "Month09": "Sep",
+    "Month01": "Jan",
     "MoveDown": "Move Down",
     "MoveUp": "Move Up",
     "MsgExpired": "Account Has Expired",

atms-web/src/main/webapp/app-resources/i18n/en-us/vat.json

@@ -1503,7 +1503,7 @@
   "Alternate1Description": "Alternate 1 Description",
   "Alternate2Description": "Alternate 2 Description",
   "YYYY-MM": "YYYY-MM",
-  "profitLoss": "Profit Statement&Loss",
+  "profitLoss": "Profit Statement",
   "ProfitLossTitle": "Profit Statement",
   "CurrentPeriodAmount": "Current Period Amount",
   "ThisYearAccumulatedAmount": "This Year Accumulated Amount",

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js

@@ -2151,6 +2151,10 @@
             $scope.updateOrgExtraCancel = function () {
                 $scope.selectCompanyExtra=$scope.comExtraOldData;
                 generalSelectCompanyExtraText();
+                cancelWebChange();
+            };
+
+            var cancelWebChange = function(){
                 $('.extra-organization-info .control-label span').removeAttr("hidden");
                 $('.extra-organization-info .right-option .button2position').attr("hidden","hidden");
                 $('.extra-organization-info .right-option .updOrgBtn').removeAttr("hidden");
@@ -2199,8 +2203,7 @@
                             }
                             $scope.editOrgExtraModel = angular.copy(data);
                             generalSelectCompanyExtraText();
-                            $scope.updateOrgExtraCancel();
-                            $scope.selectCompanyExtra = data;
+                            cancelWebChange();
                             SweetAlert.success($translate.instant('OrganizationExtraInfoEditSuccess'));
                         });
                     }

atms-web/src/main/webapp/app/vat/preview/vat-preview-cash-flow/vat-preview-cash-flow.html

@@ -6,9 +6,9 @@
     </div>
 
     <div style="margin-bottom: 10px;margin-left: 20px;margin-top: 10px;">
-        账套名称：<span class="numAmount">{{ledgerNameFirst}}</span>&nbsp;&nbsp;&nbsp;
-        账套币种：<span class="numAmount">{{ledgerCurrencyCodeFirst}}</span>&nbsp;&nbsp;&nbsp;
-        是否关账：<span class="numAmount">{{ledgerStatusFirst}}</span>
+        {{'EnterpriseAccountSetName' | translate }}：<span class="numAmount">{{ledgerNameFirst}}</span>&nbsp;&nbsp;&nbsp;
+        {{'EnterpriseAccountSetCurrency' | translate }}：<span class="numAmount">{{ledgerCurrencyCodeFirst}}</span>&nbsp;&nbsp;&nbsp;
+        {{'IsCloseAccount' | translate }}：<span class="numAmount">{{ledgerStatusFirst}}</span>
     </div>
 
     <div id="mainAreaDiv" class="main-area">