From: Roland Häder Date: Sat, 24 Sep 2022 05:41:03 +0000 (+0200) Subject: Don't cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c511d1ef524636a50c32e28d5d48452800f8122c;p=jfinancials-war.git Don't cherry-pick: - receipt items are being show in p:dialog, copy-paste mistake - added missing i18n keys --- diff --git a/src/java/org/mxchange/localization/project_de_DE.properties b/src/java/org/mxchange/localization/project_de_DE.properties index f81ec051..73eb2fa3 100644 --- a/src/java/org/mxchange/localization/project_de_DE.properties +++ b/src/java/org/mxchange/localization/project_de_DE.properties @@ -111,6 +111,7 @@ CHOOSE_RECEIPT_ITEM_IS_DISCOUNT_TITLE=Waehlen Sie aus, ob dies ein Nachlass auf LABEL_RECEIPT_SELLERS=Verkaeufer ADMIN_SINGLE_RECEIPT_DETAILS_HEADER=Details zum einzelnen Kassenbon ADMIN_RECEIPT_DETAILS_HEADER=Details zur Kassenbon-Id {0}: +ADMIN_RECEIPT_ITEM_DETAILS_HEADER=Details zum Artikel {0}: #@TODO Please fix German umlauts! ADMIN_LINK_SHOW_RECEIPT_SELLER_EMPLOYEE_TITLE=Zeigt zugewiesenen Verkaeufer des Kassenbons an. #@TODO Please fix German umlauts! diff --git a/src/java/org/mxchange/localization/project_en_US.properties b/src/java/org/mxchange/localization/project_en_US.properties index d203a143..a67c7a56 100644 --- a/src/java/org/mxchange/localization/project_en_US.properties +++ b/src/java/org/mxchange/localization/project_en_US.properties @@ -91,6 +91,7 @@ ENTERED_RECEIPT_REGISTER_NUMBER_INVALID=Your entered cash register number is sma LABEL_RECEIPT_SELLERS=Seller ADMIN_SINGLE_RECEIPT_DETAILS_HEADER=Details of a single receipt ADMIN_RECEIPT_DETAILS_HEADER=Details of receipt id {0}: +ADMIN_RECEIPT_ITEM_DETAILS_HEADER=Details of receipt item id {0}: ADMIN_LINK_SHOW_RECEIPT_SELLER_EMPLOYEE_TITLE=Shows assigned seller employee of receipt. ADMIN_LINK_ASSIGN_RECEIPT_SELLER_EMPLOYEE_TITLE=Assign seller to receipt. ADMIN_LINK_ASSIGN_RECEIPT_OWNER_USER_TITLE=Assign owning user to receipt. diff --git a/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml b/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml index 9e32401e..c44e58d0 100644 --- a/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml +++ b/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml @@ -281,12 +281,12 @@ - + - +