]> git.mxchange.org Git - jfinancials-war.git/commitdiff
Don't cherry-pick:
authorRoland Häder <roland@mxchange.org>
Sat, 29 Jul 2017 21:47:51 +0000 (23:47 +0200)
committerRoland Häder <roland@mxchange.org>
Sat, 29 Jul 2017 21:47:51 +0000 (23:47 +0200)
- &nbsp; seems to longer work with newer Majarra (2.3.2) and it was a bad idea
  anyway, as you can have simple space characters in surrounding h:outputText's
  values
- fixed EL backing bean method call

Signed-off-by: Roland Häder <roland@mxchange.org>
web/user/financials/login_financials_add_receipt.xhtml

index 4822df8e7103429287bcf1ce03962cc929271d9a..5b6d739bd50908c6bfdef47d28d7a79af289960c 100644 (file)
@@ -29,7 +29,7 @@
                                        <div class="table_right_medium">
                                                <h:selectOneMenu styleClass="select" id="receiptCompany" value="#{financialReceiptController.receiptCompany}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_RECEIPT_COMPANY_REQUIRED}" converter="BusinessContactConverter">
                                                        <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
-                                                       <f:selectItems value="#{businessDataController.allRegisteredCompanies()}" var="receiptCompany" itemValue="#{receiptCompany}" itemLabel="#{receiptCompany.basicBusinessData.companyName}" />
+                                                       <f:selectItems value="#{businessDataController.allBusinessContacts()}" var="receiptCompany" itemValue="#{receiptCompany}" itemLabel="#{receiptCompany.companyName}" />
                                                </h:selectOneMenu>
                                        </div>
 
@@ -63,8 +63,7 @@
                                </h:panelGroup>
 
                                <h:panelGroup styleClass="table_row" layout="block">
-                                       <h:outputText value="#{msg.LOGIN_FINANCIAL_COMPANY_NOT_FOUND}" />
-                                       <h:outputText value="&nbsp;" />
+                                       <h:outputText value="#{msg.LOGIN_FINANCIAL_COMPANY_NOT_FOUND} " />
                                        <h:link title="#{msg.LINK_LOGIN_FINANCIAL_ADD_COMPANY_TITLE}" outcome="login_add_receipt_company" value="#{msg.LINK_LOGIN_FINANCIAL_ADD_COMPANY}" />
                                </h:panelGroup>