Merge branch 'MergeProblem1' of https://git.2fi-solutions.com/derek/FPSMS-frontend into MergeProblem1

translate
--- a/src/i18n/en/common.json
+++ b/src/i18n/en/common.json
@@ -63,5 +63,6 @@
    "Search or select branch": "Search or select branch",
    "Mass Edit": "Mass Edit",
    "Save All": "Save All",
    "All shops updated successfully": "All shops updated successfully"
    "All shops updated successfully": "All shops updated successfully",
    "PO Workbench": "PO Workbench"
 }
--- a/src/i18n/zh/common.json
+++ b/src/i18n/zh/common.json
@@ -164,6 +164,7 @@
    "warehouse": "倉庫",
    "Supplier": "供應商",
    "Purchase Order": "採購單",
    "PO Workbench": "採購單工作台",
    "Demand Forecast": "需求預測",
    "Pick Order": "提料單",
    "Deliver Order": "送貨訂單",
Аутор	SHA1	Порука	Датум
kelvin.yau	de25934531	Merge branch 'MergeProblem1' of https://git.2fi-solutions.com/derek/FPSMS-frontend into MergeProblem1	пре 3 недеља
kelvin.yau	1458db7e20	translate	пре 3 недеља