Merge branch 'dev_mysql_chase_bug_1' into 'dev_mysql'

转换英文

See merge request root/atms!436

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

@@ -882,7 +882,7 @@
     "SelectAFile": "Browse...",
     "SelectASheet": "Select Sheet",
     "SelectColumnError": "Column Name Corresponds to Error",
-    "SelectFile": "Select File...",
+    "SelectFile": "Browse",
     "SelectFileToUpload": "Upload File...",
     "SelectMappTips": "Please Select The Name of The Company First..",
     "SelectOneAccountToClearMap": "Please Select at Least One Business Account to Cancel the Corresponding！",

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

@@ -1998,5 +1998,24 @@
 
   "ProfitTable": "Profit Table",
 
+  "RevenueAddBtn": "Add",
+  "RevenueDelBtn": "Delete",
+  "CoverImportBtn": "Overwrite",
+  "AddImportBtn": "Append",
+  "DownloadTemplate": "Download template",
+  "ExportReport": "Export report",
+  "RevenueColEdit": "Edit",
+  "RevenueColName": "Revenue type name",
+  "RevenueColOrg": "Applied entity",
+  "RevenueColAccountName": "Account revenue",
+  "RevenueColTaxRate": "Tax rate",
+  "RevenueColTaxBase": "Taxation revenue",
+  "RevenueColType": "Revenue type",
+  "RevenueColTaxType": "Taxation method",
+  "RevenueColStatus": "Status",
+  "RevenueColEnable": "Effective date",
+  "RevenueColDisable": "Expiry date",
+  "RevCMApplyBU": "Requesting BU",
+  "RevCMInvoiceCTX": "Invoice details",
   "~MustBeEndOneApp": "I Must be the End One, please!"
 }
\ No newline at end of file

atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json

@@ -138,7 +138,9 @@
     "AddCustRemap": "新增手工重分类",
     "AddDatasource": "添加数据源",
     "AddFile": "添加文件",
-    "AddImportBtn": "追加导入",
+    "DownloadTemplate": "下载模板",
+    "ExportReport": "导出报表",
+
     "AddImportInputInvoice": "追加导入进项发票汇总",
     "AddImportInputInvoiceItem": "追加导入进项发票明细",
     "AddImportJournalEntry": "追加导入序时帐",

atms-web/src/main/webapp/app/dataImport/vat-revenue-conf-mapping/vat-revenue-conf-mapping.ctrl.js

@@ -21,7 +21,7 @@
                         return (data.taxRate * 100) + '%';
                     }},
 
-                {dataField: 'revenueTypeName', caption: $translate.instant('RevSearchType'), fixed: true, allowHeaderFiltering: true, minWidth: '300px'},
+                {dataField: 'revenueTypeName', caption: $translate.instant('RevenueColType'), fixed: true, allowHeaderFiltering: true, minWidth: '300px'},
                 {dataField: 'startDate', caption: $translate.instant('RevenueColEnable'), fixed: true, allowHeaderFiltering: true, width: '120px'},
                 {dataField: 'endDate', caption: $translate.instant('RevenueColDisable'), fixed: true, allowHeaderFiltering: true, width: '120px'},
                 {dataField: 'statusStr', caption: $translate.instant('RevenueColStatus'), fixed: true, allowHeaderFiltering: true, width: '50px'},

atms-web/src/main/webapp/app/dataImport/vat-revenue-conf-mapping/vat-revenue-conf-mapping.html

@@ -15,7 +15,7 @@
 
                 <button type="button" class="btn btn-secondary" translate="AddImportBtn" ng-click="upload(2)"></button>
                 <button type="button" class="btn btn-in-grid inline-div" ng-click="downloadTemplate()"><i
-                        class="fa fa-download" aria-hidden="true"></i>下载模板
+                        class="fa fa-download" aria-hidden="true"></i>{{'DownloadTemplate' | translate }}
                 </button>
             </div>
 

atms-web/src/main/webapp/app/dataImport/vat-revenue-config/vat-revenue-config.html

@@ -15,10 +15,10 @@
 
                 <button type="button" class="btn btn-secondary" translate="AddImportBtn" ng-click="upload(2)"></button>
                 <button type="button" class="btn btn-in-grid inline-div" ng-click="downloadTemplate()"><i
-                        class="fa fa-download" aria-hidden="true"></i>下载模板
+                        class="fa fa-download" aria-hidden="true"></i>{{'DownloadTemplate' | translate }}
                 </button>
                 <button type="button" class="btn btn-in-grid inline-div" ng-click="exportRevenueConf()"><i
-                        class="fa fa-download" aria-hidden="true"></i>导出报表
+                        class="fa fa-download" aria-hidden="true"></i>{{'ExportReport' | translate }}
                 </button>
             </div>