Don't cherry-pick:

- added p:message for payment type
- used always 'receipt' as prefix as the "target" entity has same attribute
  names

Signed-off-by: Roland Häder <roland@mxchange.org>

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 f1c270547d05e7d3edcc4fbcbb3937b2bd81012a..58b9c114307b3ef10618c64b313e31b893ea201f 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
@@ -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">