From 3d9be0b21bf11d8322886cd0602edba24412f4e2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 19 Sep 2017 23:43:40 +0200
Subject: [PATCH] Don't cherry-pick: - added p:message for payment type - used
 always 'receipt' as prefix as the "target" entity has same attribute   names
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../receipt/admin_form_financial_receipt.tpl     | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

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 f1c27054..58b9c114 100644
--- 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
@@ -21,7 +21,7 @@
 				<div class="table-right-medium">
 					<p:selectOneMenu
 						id="branchOffice"
-						value="#{adminReceiptController.branchOffice}"
+						value="#{adminReceiptController.receiptBranchOffice}"
 						filter="true"
 						filterMatchMode="contains"
 						required="true"
@@ -67,7 +67,7 @@
 				</div>
 
 				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="receiptNumber" size="2" maxlength="10" value="#{receiptController.receiptNumber}" validatorMessage="#{msg.ENTERED_RECEIPT_NUMBER_INVALID}">
+					<p:inputText styleClass="input" id="receiptNumber" size="2" maxlength="10" value="#{adminReceiptController.receiptNumber}" validatorMessage="#{msg.ENTERED_RECEIPT_NUMBER_INVALID}">
 						<f:validateLongRange minimum="1" maximum="20" />
 					</p:inputText>
 				</div>
@@ -79,23 +79,27 @@
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<p:outputLabel for="paymentType" value="#{project.LOGIN_FINANCIAL_INCOME_INTERVAL}" />
+					<p:outputLabel for="receiptPaymentType" value="#{project.LOGIN_FINANCIAL_RECEIPT_PAYMENT_TYPE}" />
 				</div>
 
 				<div class="table-right-medium">
 					<p:selectOneMenu
-						id="paymentType"
-						value="#{adminReceiptController.paymentType}"
+						id="receiptPaymentType"
+						value="#{adminReceiptController.receiptPaymentType}"
 						filter="true"
 						filterMatchMode="contains"
 						required="true"
 						requiredMessage="#{project.FIELD_FINANCIAL_RECEIPT_PAYMENT_TYPE_REQUIRED}"
 						>
 						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
-						<f:selectItems value="#{receiptController.allPaymentTypes()}" var="paymentType" itemValue="#{paymentType}" itemLabel="#{msg[paymentType.i18nKey]}" />
+						<f:selectItems value="#{receiptController.allPaymentTypes()}" var="receiptPaymentType" itemValue="#{paymentType}" itemLabel="#{msg[paymentType.i18nKey]}" />
 					</p:selectOneMenu>
 				</div>
 			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="receiptPaymentType" />
+			</h:panelGroup>
 		</fieldset>
 
 		<div class="table-footer">
-- 
2.39.5