Don't cherry-pick:

- need to invoke renderUser() instead, strange is that my IDE didn't show this
  error but okay.
- added register number to dialog box
- added missing i18n strings

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 fa67bafed9f42f54b2b85a61a1ceb6c984fd26d1..6c726655e02d78229c49e3cef524eba277d993a0 100644 (file)
--- a/src/java/org/mxchange/localization/project_de_DE.properties
+++ b/src/java/org/mxchange/localization/project_de_DE.properties
@@ -365,3 +365,5 @@ ADMIN_EDIT_GENERIC_PRODUCT_MINIMUM_DATA=Sie koennen hier alle Werte aendern aber
 #@TODO Please fix German umlauts!
 BUTTON_ADMIN_EDIT_GENERIC_PRODUCT=Allgemeines Produkt aendern
 ENTER_RECEIPT_TRANSACTION_NUMBER=Transaktionsnummer eingeben:
+RECEIPT_REGISTER_NUMBER_HEADER=Kassennummer:
+RECEIPT_REGISTER_NUMBER_TITLE=Kassenummer 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 72e9526725cad16a0ed123d8c00afb65546e5848..a8fbfd8b8caf9bb22df555ad98f8b53760d4293b 100644 (file)
--- a/src/java/org/mxchange/localization/project_en_US.properties
+++ b/src/java/org/mxchange/localization/project_en_US.properties
@@ -271,3 +271,5 @@ ADMIN_EDIT_GENERIC_PRODUCT_TITLE=Edit product id {0}
 ADMIN_EDIT_GENERIC_PRODUCT_MINIMUM_DATA=You can edit all values here but enter or select at least all marked (*) values.
 BUTTON_ADMIN_EDIT_GENERIC_PRODUCT=Change generic product
 ENTER_RECEIPT_TRANSACTION_NUMBER=Enter transaction Number:
+RECEIPT_REGISTER_NUMBER_HEADER=Register number:
+RECEIPT_REGISTER_NUMBER_TITLE=Register's number of receipt.

diff --git a/web/admin/financial/receipt/admin_receipt_list.xhtml b/web/admin/financial/receipt/admin_receipt_list.xhtml
index 69821d59debb25abf23b2d9ec48f1a4a07e1eea8..dadecc3a65832b6be595891b2441b3717beb5808 100644 (file)
--- a/web/admin/financial/receipt/admin_receipt_list.xhtml
+++ b/web/admin/financial/receipt/admin_receipt_list.xhtml
@@ -222,11 +222,14 @@
                                                <h:outputText value="#{project.NO_SELLER_ASSIGNED_TO_RECEIPT}" rendered="#{empty receiptListController.selectedReceipt.receiptSellerEmployee}" />
 
                                                <p:outputLabel value="#{msg.USER_HEADER}" title="#{project.ASSIGNED_RECEIPT_USER_TITLE}" />
-                                               <p:link outcome="admin_show_user" title="#{project.ADMIN_LINK_SHOW_RECEIPT_USER_EMPLOYEE_TITLE}" value="#{beanHelper.renderEmployee(receiptListController.selectedReceipt.receiptUser)}" rendered="#{not empty receiptListController.selectedReceipt.receiptUser}">
+                                               <p:link outcome="admin_show_user" title="#{project.ADMIN_LINK_SHOW_RECEIPT_USER_EMPLOYEE_TITLE}" value="#{beanHelper.renderUser(receiptListController.selectedReceipt.receiptUser)}" rendered="#{not empty receiptListController.selectedReceipt.receiptUser}">
                                                        <f:param name="userId" value="#{receiptListController.selectedReceipt.receiptUser.userId}" />
                                                </p:link>
                                                <h:outputText value="#{project.NO_USER_ASSIGNED_TO_RECEIPT}" rendered="#{empty receiptListController.selectedReceipt.receiptUser}" />
 
+                                               <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}" />
                                                <h:outputText value="#{receiptListController.selectedReceipt.receiptBarCodeNumber}" />