Don't cherry-pick:

- reformatted f:selectItem tag for having each attribute in a single line

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 350a0f4f9fadf8e554e5c711721f6693b7012554..14f4e099aeed642e4236f960a812aaf157e25f6c 100644 (file)
--- a/src/java/org/mxchange/localization/project_de_DE.properties
+++ b/src/java/org/mxchange/localization/project_de_DE.properties
@@ -194,3 +194,8 @@ ADMIN_ENABLE_INCOME=Einkommen aktiviert?
 ADMIN_ENABLE_INCOME_TITLE=Bitte waehlen Sie aus, ob das Einkommen aktiviert ist.
 #@TODO Please fix German umlauts!
 SELECT_RECEIPT_RESUMPTION_OF=Waehle wiederaufgenommenen Kassenbon aus:
+ADMIN_RECEIPT_RESUMPTION_OF=Wiederaufnahme von Kassenbon:
+RECEIPT_RESUMPTION_OF_HEADER=Wiederaufnahme des Kassenbons:
+ASSIGNED_RECEIPT_RESUMPTION_OF_TITLE=Kassenbon, der mit diesem Kassenbon wiederaufgenommen wurde.
+ADMIN_LINK_SHOW_RECEIPT_RESUMPTION_OF_TITLE=Zeit den Kassenbon an, der mit diesem wieder aufgenommen wurde.
+NO_RESUMED_RECEIPT_ASSIGNED_TO_RECEIPT=Es wurde kein Kassenbon mit diesem wieder aufgenommen.

diff --git a/src/java/org/mxchange/localization/project_en_US.properties b/src/java/org/mxchange/localization/project_en_US.properties
index bea4f033026d224f886e74d75d64b6a552fc2085..4da938528d13d396f7f599df4a82d9777bd6feb8 100644 (file)
--- a/src/java/org/mxchange/localization/project_en_US.properties
+++ b/src/java/org/mxchange/localization/project_en_US.properties
@@ -163,3 +163,8 @@ ADMIN_ENABLE_INCOME_REQUIRED=You have to whether enable or disabled the income.
 ADMIN_ENABLE_INCOME=Income enabled?
 ADMIN_ENABLE_INCOME_TITLE=Please choose whether the income is enabled.
 SELECT_RECEIPT_RESUMPTION_OF=Select which receipt is being resumed:
+ADMIN_RECEIPT_RESUMPTION_OF=Resumption of receipt:
+RECEIPT_RESUMPTION_OF_HEADER=Resumption of receipt:
+ASSIGNED_RECEIPT_RESUMPTION_OF_TITLE=Receipt has has been resumed with this receipt.
+ADMIN_LINK_SHOW_RECEIPT_RESUMPTION_OF_TITLE=Shows the resumed receipt by this receipt.
+NO_RESUMED_RECEIPT_ASSIGNED_TO_RECEIPT=No resumed receipt assigned to this.

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index e611b432c84c15b450e96a7da037e09dc4017e6e..3e65dd5045b0ce9dab569d63ba0b1f47c6fb75f4 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -1040,6 +1040,10 @@
                        <from-outcome>admin_assign_receipt_user</from-outcome>
                        <to-view-id>/admin/financial/receipt/admin_assign_receipt_user.xhtml</to-view-id>
                </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_assign_receipt_resumption</from-outcome>
+                       <to-view-id>/admin/financial/receipt/admin_assign_receipt_resumption.xhtml</to-view-id>
+               </navigation-case>
                <navigation-case>
                        <from-outcome>admin_show_user</from-outcome>
                        <to-view-id>/admin/user/admin_user_show.xhtml</to-view-id>

diff --git a/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl b/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl
index cefc83cc43aa325eb457068bd43a5426d393f2dc..8c7df94b9e013e2cc9707419570e24b6e102091d 100644 (file)
--- a/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl
+++ b/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl
@@ -85,7 +85,10 @@
 
                                <f:converter converterId="EmployeeConverter" />
 
-                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+                               <f:selectItem
+                                       itemValue="#{null}"
+                                       itemLabel="#{msg.NONE_SELECTED}"
+                                       />
 
                                <f:selectItems
                                        value="#{employeeListController.allEmployees}"
@@ -106,7 +109,10 @@
 
                                <f:converter converterId="UserConverter" />
 
-                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+                               <f:selectItem
+                                       itemValue="#{null}"
+                                       itemLabel="#{msg.NONE_SELECTED}"
+                                       />
 
                                <f:selectItems
                                        value="#{userListController.allUsers}"
@@ -128,9 +134,7 @@
 
                                <f:selectItem
                                        itemValue="#{null}"
-                                       itemLabel="#{msg.PLEASE_SELECT}"
-                                       noSelectionOption="true"
-                                       itemDisabled="true"
+                                       itemLabel="#{msg.NONE_SELECTED}"
                                        />
 
                                <f:selectItems

diff --git a/web/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl b/web/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl
index e2905d42fbee67e973dd82c75c032426180497f9..7fd38f817c8200989873214d2a3cd3a8e0a1d237 100644 (file)
--- a/web/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl
+++ b/web/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl
@@ -71,7 +71,10 @@
 
                                <f:converter converterId="BasicCompanyDataConverter" />
 
-                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+                               <f:selectItem
+                                       itemValue="#{null}"
+                                       itemLabel="#{msg.NONE_SELECTED}"
+                                       />
 
                                <f:selectItems
                                        value="#{basicDataListController.allBasicData}"

diff --git a/web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl b/web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl
index 904cbcf7b23e7737782bb9915865c95e94fb3f77..71a17eb4276c33a149644a0619e835733aff38b3 100644 (file)
--- a/web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl
+++ b/web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl
@@ -87,7 +87,10 @@
 
                                <f:converter converterId="EmployeeConverter" />
 
-                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+                               <f:selectItem
+                                       itemValue="#{null}"
+                                       itemLabel="#{msg.NONE_SELECTED}"
+                                       />
 
                                <f:selectItems
                                        value="#{employeeListController.allEmployees}"

diff --git a/web/admin/financial/receipt/admin_receipt_list.xhtml b/web/admin/financial/receipt/admin_receipt_list.xhtml
index 787225ec37cc7608fc14682a64bde0273b813a35..28dafe7a07608573f37ed7bce01a0ce1e335824f 100644 (file)
--- a/web/admin/financial/receipt/admin_receipt_list.xhtml
+++ b/web/admin/financial/receipt/admin_receipt_list.xhtml
@@ -162,9 +162,13 @@
                                                        updateLabel="true"
                                                        title="#{project.FILTER_BY_MULTIPLE_RECEIPT_SELLERS_TITLE}"
                                                        >
+
                                                        <f:converter converterId="EmployeeConverter" />
 
-                                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+                                                       <f:selectItem
+                                                               itemValue="#{null}"
+                                                               itemLabel="#{msg.NONE_SELECTED}"
+                                                               />
 
                                                        <f:selectItems
                                                                value="#{employeeListController.allEmployees}"
@@ -209,9 +213,13 @@
                                                        updateLabel="true"
                                                        title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
                                                        >
+
                                                        <f:converter converterId="UserConverter" />
 
-                                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+                                                       <f:selectItem
+                                                               itemValue="#{null}"
+                                                               itemLabel="#{msg.NONE_SELECTED}"
+                                                               />
 
                                                        <f:selectItems
                                                                value="#{userListController.allUsers}"
@@ -241,6 +249,50 @@
                                        </p:link>
                                </p:column>
 
+                               <p:column
+                                       headerText="#{project.ADMIN_RECEIPT_RESUMPTION_OF}"
+                                       sortBy="#{receipt.receiptResumptionOf}"
+                                       filterBy="#{receipt.receiptResumptionOf}"
+                                       filterMatchMode="in"
+                                       >
+                                       <f:facet name="filter">
+                                               <p:selectCheckboxMenu
+                                                       filter="true"
+                                                       filterMatchMode="contains"
+                                                       label="#{project.LABEL_RECEIPTS}"
+                                                       onchange="PF('receiptList').filter()"
+                                                       updateLabel="true"
+                                                       title="#{project.FILTER_BY_MULTIPLE_RECEIPTS_TITLE}"
+                                                       >
+                                                       <f:converter converterId="ReceiptConverter" />
+
+                                                       <f:selectItems
+                                                               value="#{receiptListController.allReceipts}"
+                                                               var="receiptResumptionOf"
+                                                               itemValue="#{receiptResumptionOf}"
+                                                               itemLabel="#{receiptBeanHelper.renderReceipt(receiptResumptionOf, false)}"
+                                                               />
+                                               </p:selectCheckboxMenu>
+                                       </f:facet>
+
+                                       <p:link
+                                               outcome="admin_show_receipt"
+                                               value="#{receiptBeanHelper.renderReceipt(receipt.receiptResumptionOf, false)}"
+                                               title="#{project.ADMIN_LINK_SHOW_RECEIPT_TITLE}"
+                                               >
+                                               <f:param name="receiptId" value="#{receipt.receiptResumptionOf.receiptId}" />
+                                       </p:link>
+
+                                       <p:link
+                                               outcome="admin_assign_receipt_resumption"
+                                               value="#{msg.ADMIN_LINK_ASSIGN}"
+                                               title="#{project.ADMIN_LINK_ASSIGN_RECEIPT_RESUNPTION_OF_TITLE}"
+                                               rendered="#{empty receipt.receiptResumptionOf}"
+                                               >
+                                               <f:param name="receiptId" value="#{receipt.receiptId}" />
+                                       </p:link>
+                               </p:column>
+
                                <p:column
                                        headerText="#{msg.ADMIN_DATE_OF_ISSUE}"
                                        sortBy="#{receipt.receiptIssued}"
@@ -279,6 +331,26 @@
                                        <h:outputText value="#{msg[receipt.receiptPaymentType.messageKey]}" />
                                </p:column>
 
+                               <p:column
+                                       headerText="#{msg.ENTRY_CREATED_HEADER}"
+                                       sortBy="#{receipt.receiptEntryCreated}"
+                                       filterable="false"
+                                       >
+                                       <h:outputText value="#{receipt.receiptEntryCreated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+                                       </h:outputText>
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.ENTRY_UPDATED_HEADER}"
+                                       sortBy="#{receipt.receiptEntryUpdated}"
+                                       filterable="false"
+                                       >
+                                       <h:outputText value="#{receipt.receiptEntryUpdated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+                                       </h:outputText>
+                               </p:column>
+
                                <p:column
                                        headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
                                        sortable="false"
@@ -374,6 +446,17 @@
                                                </p:link>
                                                <h:outputText value="#{project.NO_USER_ASSIGNED_TO_RECEIPT}" rendered="#{empty receiptListController.selectedReceipt.receiptUser}" />
 
+                                               <p:outputLabel value="#{project.RECEIPT_RESUMPTION_OF_HEADER}" title="#{project.ASSIGNED_RECEIPT_RESUMPTION_OF_TITLE}" />
+                                               <p:link
+                                                       outcome="admin_show_receipt"
+                                                       value="#{receiptBeanHelper.renderReceipt(receiptListController.selectedReceipt.receiptResumptionOf, true)}"
+                                                       title="#{project.ADMIN_LINK_SHOW_RECEIPT_RESUMPTION_OF_TITLE}"
+                                                       rendered="#{not empty receiptListController.selectedReceipt.receiptResumptionOf}"
+                                                       >
+                                                       <f:param name="receiptId" value="#{receiptListController.selectedReceipt.receiptResumptionOf.receiptId}" />
+                                               </p:link>
+                                               <h:outputText value="#{project.NO_RESUMED_RECEIPT_ASSIGNED_TO_RECEIPT}" rendered="#{empty receiptListController.selectedReceipt.receiptResumptionOf}" />
+
                                                <p:outputLabel value="#{project.RECEIPT_REGISTER_NUMBER_HEADER}" title="#{project.RECEIPT_REGISTER_NUMBER_TITLE}" />
                                                <h:outputText value="#{receiptListController.selectedReceipt.receiptRegisterNumber}" />