From c67e391d913494550573343039f51c723207dafe Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 30 Mar 2018 19:47:42 +0200
Subject: [PATCH] Don't cherry-pick: - on a p:dataTable it is recommneded (to
 avoid JavaScript errors) to have both   id and widgetVar named the same
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../receipt_item/admin_form_financial_receipt_item.tpl |  4 ++--
 web/admin/financial/receipt/admin_receipt_list.xhtml   |  6 +++---
 .../receipt_item/admin_receipt_item_list.xhtml         | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

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 b532b0c8..718bf5d0 100644
--- 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
@@ -41,7 +41,7 @@
 				>
 				<f:converter converterId="GenericProductConverter" />
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-				<f:selectItems value="#{productController.allProducts()}" var="product" itemValue="#{product}" itemLabel="#{beanHelper.renderGenericProduct(product)}" />
+				<f:selectItems value="#{productListController.allProducts}" var="product" itemValue="#{product}" itemLabel="#{beanHelper.renderGenericProduct(product)}" />
 			</p:selectOneMenu>
 
 			<p:outputLabel for="itemManufacturer" value="#{project.SELECT_RECEIPT_ITEM_MANUFACTURER}" />
@@ -53,7 +53,7 @@
 				>
 				<f:converter converterId="BasicCompanyDataConverter" />
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-				<f:selectItems value="#{basicCompanyDataController.allBasicData()}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+				<f:selectItems value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
 			</p:selectOneMenu>
 
 			<p:outputLabel for="itemQuantity" value="#{project.ENTER_RECEIPT_ITEM_QUANTITY}" />
diff --git a/web/admin/financial/receipt/admin_receipt_list.xhtml b/web/admin/financial/receipt/admin_receipt_list.xhtml
index c8928c85..f6d3dfef 100644
--- a/web/admin/financial/receipt/admin_receipt_list.xhtml
+++ b/web/admin/financial/receipt/admin_receipt_list.xhtml
@@ -20,7 +20,7 @@
 	<ui:define name="content">
 		<h:form id="form-list-financial-receipt">
 			<p:dataTable
-				id="table-list-financial-receipt"
+				id="receiptList"
 				var="receipt"
 				value="#{receiptController.allReceipts()}"
 				filteredValue="#{receiptController.filteredReceipts}"
@@ -42,7 +42,7 @@
 
 						<h:panelGroup>
 							<p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
-							<p:columnToggler datasource="table-list-financial-receipt" trigger="toggler" />
+							<p:columnToggler datasource="receiptList" trigger="toggler" />
 						</h:panelGroup>
 					</p:panelGrid >
 				</f:facet>
@@ -176,7 +176,7 @@
 						type="submit"
 						value="#{project.BUTTON_ADMIN_ADD_RECEIPT}"
 						action="#{adminReceiptController.addReceipt()}"
-						update=":master:form-list-financial-receipt:table-list-financial-receipt"
+						update=":master:form-list-financial-receipt:receiptList"
 						/>
 				</p:panelGrid>
 			</p:panelGrid>
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 bbc08f5c..81c39951 100644
--- a/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
+++ b/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
@@ -21,7 +21,7 @@
 	<ui:define name="content">
 		<h:form id="form-list-financial-receipt-item">
 			<p:dataTable
-				id="table-list-financial-receipt-item"
+				id="receiptItemList"
 				var="receiptItem"
 				value="#{receiptItemController.allReceiptItems()}"
 				filteredValue="#{receiptItemController.filteredReceiptItems}"
@@ -44,7 +44,7 @@
 
 						<h:panelGroup>
 							<p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
-							<p:columnToggler datasource="table-list-financial-receipt-item" trigger="toggler" />
+							<p:columnToggler datasource="receiptItemList" trigger="toggler" />
 						</h:panelGroup>
 					</p:panelGrid >
 				</f:facet>
@@ -88,7 +88,7 @@
 							>
 							<f:converter converterId="GenericProductConverter" />
 							<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-							<f:selectItems value="#{productController.allProducts()}" var="product" itemValue="#{product}" itemLabel="#{beanHelper.renderGenericProduct(product)}" />
+							<f:selectItems value="#{productListController.allProducts}" var="product" itemValue="#{product}" itemLabel="#{beanHelper.renderGenericProduct(product)}" />
 						</p:selectCheckboxMenu>
 					</f:facet>
 
@@ -108,7 +108,7 @@
 							title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}"
 							>
 							<f:converter converterId="BasicCompanyDataConverter" />
-							<f:selectItems value="#{basicCompanyDataController.allBasicData()}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+							<f:selectItems value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
 						</p:selectCheckboxMenu>
 					</f:facet>
 
@@ -161,7 +161,7 @@
 						type="submit"
 						value="#{project.BUTTON_ADMIN_ADD_RECEIPT_TEM}"
 						action="#{adminReceiptItemController.addReceiptItem()}"
-						update=":master:form-list-financial-receipt-item:table-list-financial-receipt-item"
+						update=":master:form-list-financial-receipt-item:receiptItemList"
 						/>
 				</p:panelGrid>
 			</p:panelGrid>
-- 
2.39.5