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

0de392d6 · eddie.woo · b695bff4 · 69aab9f3 · 0de392d6 · 0de392d6
Commit 0de392d6 authored Apr 24, 2019 by eddie.woo
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

tax-document-list.ctrl.js ...ocumentManage/tax-document-list/tax-document-list.ctrl.js +0 -0

No files found.
--- a/atms-web/src/main/webapp/app-resources/i18n/en-us/app.json
+++ b/atms-web/src/main/webapp/app-resources/i18n/en-us/app.json
@@ -107,8 +107,8 @@
    "CertificationResult": "Certification Result",
    "Change": "Change",
    "Alter": "Alter",
-    "MenuRecordManage": "Record Manage",
-    "MenuAnalysis": "Analysis",
+    "MenuRecordManage": "Document Management",
+    "MenuAnalysis": "Tax Analysis",
    "ChangePassword": "Change Password",
    "ChangePasswordFailInfo": "Failed Password Modification Operation:",
    "ChangePasswordSuccessInfo": "The Password Modification Operation was Successful! Automatic Shutdown After 3 Seconds...",

--- a/atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.ctrl.js
+++ b/atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.ctrl.js