From: Roland Häder Date: Mon, 25 Jun 2018 21:10:01 +0000 (+0200) Subject: Please cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=859f053b7a6a36158e1e243467612ab537c87d0a;p=jfinancials-war.git Please cherry-pick: - exposed branch office and employee number in list views - added missing i18n string Signed-off-by: Roland Häder --- diff --git a/src/java/org/mxchange/localization/generic_de_DE.properties b/src/java/org/mxchange/localization/generic_de_DE.properties index 826fbf25..3079d9a1 100644 --- a/src/java/org/mxchange/localization/generic_de_DE.properties +++ b/src/java/org/mxchange/localization/generic_de_DE.properties @@ -1218,3 +1218,4 @@ COUNTRY_OF_BRANCH_OFFICE_TITLE=Land der Filiale #@TODO Please fix German umlauts! ADMIN_OPENING_TIMES_TAB_TITLE=Oeffnungszeiten TAX_NUMBER_HEADER=Steuernummer: +EMPLOYEE_NUMBER_HEADER=Mitarbeiternummer: diff --git a/src/java/org/mxchange/localization/generic_en_US.properties b/src/java/org/mxchange/localization/generic_en_US.properties index 543786d2..3f5af7e7 100644 --- a/src/java/org/mxchange/localization/generic_en_US.properties +++ b/src/java/org/mxchange/localization/generic_en_US.properties @@ -1104,3 +1104,4 @@ COUNTRY_HEADER=Country: COUNTRY_OF_BRANCH_OFFICE_TITLE=Country of branch office ADMIN_OPENING_TIMES_TAB_TITLE=Opening times TAX_NUMBER_HEADER=Tax number: +EMPLOYEE_NUMBER_HEADER=Employee number: diff --git a/web/admin/branch_office/admin_branch_office_list.xhtml b/web/admin/branch_office/admin_branch_office_list.xhtml index 013961e8..320bec09 100644 --- a/web/admin/branch_office/admin_branch_office_list.xhtml +++ b/web/admin/branch_office/admin_branch_office_list.xhtml @@ -86,6 +86,11 @@ + + + + + + + + + +