From: Roland Häder <roland@mxchange.org>
Date: Sun, 8 Oct 2017 00:14:56 +0000 (+0200)
Subject: Don't cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=976f726852b52201f1b4884fd7610ac53fc7db7e;p=jfinancials-war.git

Don't cherry-pick:
- renamed companyEmployee -> employee

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 9e7b4340..ec9bd47e 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
@@ -62,7 +62,7 @@
 				>
 				<f:converter converterId="CompanyEmployeeConverter" />
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-				<f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="companyEmployee" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.employeeNumber} #{beanHelper.renderContact(companyEmployee.employeePersonalData)}" itemDescription="#{companyEmployee.employeeCompany.companyName}, #{beanHelper.renderBranchOffice(companyEmployee.employeeBranchOffice)}" />
+				<f:selectItems value="#{employeeController.allCompanyEmployees()}" var="companyEmployee" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.employeeNumber} #{beanHelper.renderContact(companyEmployee.employeePersonalData)}" itemDescription="#{companyEmployee.employeeCompany.companyName}, #{beanHelper.renderBranchOffice(companyEmployee.employeeBranchOffice)}" />
 			</p:selectOneMenu>
 
 			<p:outputLabel for="receiptUser" value="#{project.ADMIN_SELECT_FINANCIAL_RECEIPT_USER_OWNER}" />
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 f6c1a3de..27db3dfa 100644
--- 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
@@ -66,7 +66,7 @@
 				>
 				<f:converter converterId="CompanyEmployeeConverter" />
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-				<f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
+				<f:selectItems value="#{employeeController.allCompanyEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
 			</p:selectOneMenu>
 			<p:message for="receiptSellerEmployee" />
 		</p:panelGrid>
diff --git a/web/admin/financials/receipts/admin_receipt_list.xhtml b/web/admin/financials/receipts/admin_receipt_list.xhtml
index b2a54a24..936a2e49 100644
--- a/web/admin/financials/receipts/admin_receipt_list.xhtml
+++ b/web/admin/financials/receipts/admin_receipt_list.xhtml
@@ -86,7 +86,7 @@
 							>
 							<f:converter converterId="CompanyEmployeeConverter" />
 							<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-							<f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" />
+							<f:selectItems value="#{employeeController.allCompanyEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" />
 						</p:selectCheckboxMenu>
 					</f:facet>