From: Roland Häder <roland@mxchange.org>
Date: Tue, 26 Jun 2018 19:57:44 +0000 (+0200)
Subject: Don't cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d90fe5ea2b0fdfeb27aa8aabf11ee7f3715c5a2c;p=jfinancials-war.git

Don't cherry-pick:
- one i18n string for bar-code numbers is okay, removed for receipt

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/src/java/org/mxchange/localization/project_de_DE.properties b/src/java/org/mxchange/localization/project_de_DE.properties
index eb41a166..e6f8b4aa 100644
--- a/src/java/org/mxchange/localization/project_de_DE.properties
+++ b/src/java/org/mxchange/localization/project_de_DE.properties
@@ -315,7 +315,6 @@ NO_SELLER_ASSIGNED_TO_RECEIPT=Kein Verkaeufer dem Kassenbon zugewiesen.
 ASSIGNED_RECEIPT_USER_TITLE=Zugewiesener Benutzer zum Kassenbon.
 NO_USER_ASSIGNED_TO_RECEIPT=Kein Benutzer dem Kassenbon zugewiesen.
 RECEIPT_ID_NUMBER_TITLE=Id-Nummer des Kassenbonus.
-RECEIPT_BARCODE_HEADER=Streifencode:
 RECEIPT_BARCODE_TITLE=Streifencode des Kassenbons.
 RECEIPT_SEQUENCE_NUMBER_HEADER=Durchlaufende Nummer:
 RECEIPT_SEQUENCE_NUMBER_TITLE=Durchlaufende Nummer des Kassenbons.
diff --git a/src/java/org/mxchange/localization/project_en_US.properties b/src/java/org/mxchange/localization/project_en_US.properties
index 5596651a..ba1af22b 100644
--- a/src/java/org/mxchange/localization/project_en_US.properties
+++ b/src/java/org/mxchange/localization/project_en_US.properties
@@ -229,7 +229,6 @@ NO_SELLER_ASSIGNED_TO_RECEIPT=No seller assigned to receipt.
 ASSIGNED_RECEIPT_USER_TITLE=Assigned user of receipt.
 NO_USER_ASSIGNED_TO_RECEIPT=No user assigned to receipt.
 RECEIPT_ID_NUMBER_TITLE=Id number of receipt.
-RECEIPT_BARCODE_HEADER=Barcode:
 RECEIPT_BARCODE_TITLE=Barcode of receipt.
 RECEIPT_SEQUENCE_NUMBER_HEADER=Sequence number:
 RECEIPT_SEQUENCE_NUMBER_TITLE=Sequence number of receipt.
diff --git a/web/admin/financial/receipt/admin_receipt_list.xhtml b/web/admin/financial/receipt/admin_receipt_list.xhtml
index 3e2c3edc..c152a6ce 100644
--- a/web/admin/financial/receipt/admin_receipt_list.xhtml
+++ b/web/admin/financial/receipt/admin_receipt_list.xhtml
@@ -235,7 +235,7 @@
 						<p:outputLabel value="#{project.RECEIPT_REGISTER_NUMBER_HEADER}" title="#{project.RECEIPT_REGISTER_NUMBER_TITLE}" />
 						<h:outputText value="#{receiptListController.selectedReceipt.receiptRegisterNumber}" />
 
-						<p:outputLabel value="#{project.RECEIPT_BARCODE_HEADER}" title="#{project.RECEIPT_BARCODE_TITLE}" />
+						<p:outputLabel value="#{project.BARCODE_NUMBER_HEADER}" title="#{project.RECEIPT_BARCODE_TITLE}" />
 						<h:outputText value="#{project.RECEIPT_NO_BARCODE_ASSIGNED}" rendered="#{empty receiptListController.selectedReceipt.receiptBarCodeNumber}" />
 						<p:barcode format="svg" width="100%" type="#{initParam['receipt_barcode_type']}" value="#{receiptListController.selectedReceipt.receiptBarCodeNumber}" rendered="#{not empty receiptListController.selectedReceipt.receiptBarCodeNumber}" />