From: Roland Häder <roland@mxchange.org>
Date: Sun, 17 Sep 2017 17:30:16 +0000 (+0200)
Subject: WIP Don't cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=69f39272260155e96d35000ddf696a562fa2f1b1;p=jfinancials-war.git

WIP Don't cherry-pick:
- added project-specific language bundle
- this has the great advantage that project-specific messages are kept separate
  from general (e.g. bundle_de_DE) messages
- added template to add receipts
- added admin menu for receipts
- added navigation rule
- also listing them is added

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

diff --git a/src/java/org/mxchange/jfinancials/beans/financial/income/FinancialsIncomeWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/financial/income/FinancialsIncomeWebRequestBean.java
index 31bd5a20..c2edf3ff 100644
--- a/src/java/org/mxchange/jfinancials/beans/financial/income/FinancialsIncomeWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/financial/income/FinancialsIncomeWebRequestBean.java
@@ -25,9 +25,9 @@ import javax.inject.Inject;
 import javax.inject.Named;
 import org.mxchange.jfinancials.beans.BaseFinancialsController;
 import org.mxchange.jfinancials.beans.user.login.FinancialsUserLoginWebSessionController;
-import org.mxchange.jfinancials.model.income.FinancialIncomeSessionBeanRemote;
 import org.mxchange.jfinancials.model.income.BillableIncome;
 import org.mxchange.jfinancials.model.income.FinancialIncome;
+import org.mxchange.jfinancials.model.income.FinancialIncomeSessionBeanRemote;
 import org.mxchange.jfinancials.model.income.interval.FinancialInterval;
 
 /**
@@ -47,7 +47,7 @@ public class FinancialsIncomeWebRequestBean extends BaseFinancialsController imp
 	/**
 	 * EJB for general financial income purposes
 	 */
-	@EJB (lookup = "java:global/jfinancials-ejb/financial!org.mxchange.jfinancials.model.income.FinancialIncomeSessionBeanRemote")
+	@EJB (lookup = "java:global/jfinancials-ejb/financialIncome!org.mxchange.jfinancials.model.income.FinancialIncomeSessionBeanRemote")
 	private FinancialIncomeSessionBeanRemote financialBean;
 
 	/**
diff --git a/src/java/org/mxchange/jfinancials/beans/financial/receipt/FinancialsReceiptWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/financial/receipt/FinancialsReceiptWebRequestBean.java
index ec88aebc..3e9c128f 100644
--- a/src/java/org/mxchange/jfinancials/beans/financial/receipt/FinancialsReceiptWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/financial/receipt/FinancialsReceiptWebRequestBean.java
@@ -31,9 +31,9 @@ import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
 import org.mxchange.jfinancials.beans.BaseFinancialsController;
 import org.mxchange.jfinancials.beans.user.login.FinancialsUserLoginWebSessionController;
 import org.mxchange.jfinancials.exceptions.ReceiptAlreadyAddedException;
-import org.mxchange.jfinancials.model.receipt.FinancialReceiptSessionBeanRemote;
 import org.mxchange.jfinancials.model.receipt.BillableReceipt;
 import org.mxchange.jfinancials.model.receipt.FinancialReceipt;
+import org.mxchange.jfinancials.model.receipt.FinancialReceiptSessionBeanRemote;
 import org.mxchange.jproduct.model.payment.PaymentType;
 import org.mxchange.juserlogincore.events.login.ObservableUserLoggedInEvent;
 
@@ -54,7 +54,7 @@ public class FinancialsReceiptWebRequestBean extends BaseFinancialsController im
 	/**
 	 * EJB for general financial receipt purposes
 	 */
-	@EJB (lookup = "java:global/jfinancials-ejb/financial!org.mxchange.jfinancials.model.receipt.FinancialReceiptSessionBeanRemote")
+	@EJB (lookup = "java:global/jfinancials-ejb/financialReceipt!org.mxchange.jfinancials.model.receipt.FinancialReceiptSessionBeanRemote")
 	private FinancialReceiptSessionBeanRemote financialBean;
 
 	/**
diff --git a/src/java/org/mxchange/localization/project_de_DE.properties b/src/java/org/mxchange/localization/project_de_DE.properties
new file mode 100644
index 00000000..d79d2a29
--- /dev/null
+++ b/src/java/org/mxchange/localization/project_de_DE.properties
@@ -0,0 +1,52 @@
+# Copyright (C) 2016, 2017 Roland H\u00e4der
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#@TODO Please fix German umlauts!
+PAGE_TITLE_LOGIN_FINANCIAL_OVERVIEW=Finanzen-Uebersicht
+#@TODO Please fix German umlauts!
+CONTENT_TITLE_LOGIN_FINANCIAL_OVERVIEW=Uebersicht Ihrer Finanzen:
+#@TODO Please fix German umlauts!
+PAGE_TITLE_LOGIN_FINANCIAL_ADD_RECEIPT=Rechnung hinzufuegen/erfassen
+CONTENT_TITLE_LOGIN_FINANCIAL_ADD_RECEIPT=Weitere Rechnung erfassen:
+#@TODO Please fix German umlauts!
+PAGE_TITLE_LOGIN_FINANCIAL_ADD_INCOME=Neue Einkommensart hinzufuegen
+#@TODO Please fix German umlauts!
+CONTENT_TITLE_LOGIN_FINANCIAL_ADD_INCOME=Weitere Einkommensart hinzufuegen:
+LOGIN_FINANCIAL_ADD_INCOME_FORM_TITLE=Daten einer Einkommensart erfassen:
+LOGIN_FINANCIAL_INCOME_INTERVAL=Einkommensinterval:
+#@TODO Please fix German umlauts!
+FIELD_FINANCIAL_INCOME_REQUIRED=Feld "Einkommensinterval" muss ausgewaehlt werden.
+#@TODO Please fix German umlauts!
+BUTTON_LOGIN_FINANCIAL_ADD_INCOME=Einkommensart hinzufuegen
+LOGIN_FINANCIAL_INCOME_SINGLE_VALUE=Einkommensbetrag:
+#@TODO Please fix German umlauts!
+FIELD_FINANCIAL_INCOME_SINGLE_VALUE_REQUIRED=Feld "Einkommensbetrag" bitte ausfuellen.
+LOGIN_FINANCIAL_INCOME_TITLE=Bezeichnung der Einkommensart:
+#@TODO Please fix German umlauts!
+FIELD_FINANCIAL_INCOME_TITLE_REQUIRED=Feld "Title" muss ausgefuellt werden.
+LOGIN_FINANCIAL_ENTER_RECEIPT_ISSUE_DATE_TITLE=Geben oder suchen Sie hier das genaue Datum aus, wann die Rechnung/der Kassenbon erstellt wurde. Dadurch kann ein genauer Zeitverlauf generiert werden.
+PAGE_TITLE_ADMIN_FINANCIALS_RECEIPT_LIST=Kassenbons auflisten
+CONTENT_TITLE_ADMIN_FINANCIALS_RECEIPT_LIST=Listet Kassenbons auf:
+TABLE_SUMMARY_ADMIN_LIST_FINANCIAL_RECEIPTS=Diese Tabelle listet bereits registrierte Kassenbons auf.
+#@TODO Please fix German umlauts!
+ADMIN_FINANCIAL_RECEIPT_LIST_EMPTY=Es befinden sich keine Kassenbons in der Datenbank. Oder Ihre Suche ergab keine Uebereinstimmungen.
+#@TODO Please fix German umlauts!
+ADMIN_ADD_FINANCIAL_RECEIPT_TITLE=Neuen Kassenbon hinzufuegen
+#@TODO Please fix German umlauts!
+BUTTON_ADMIN_ADD_FINANCIAL_RECEIPT=Kassenbon hinzufuegen
+ADMIN_FINANCIAL_RECEIPT_ISSUE_DATE_REQUIRED=Bitte geben Sie das Ausstellungsdatum des Kassenbons ein.
+ADMIN_MENU_FINANCIAL_RECEIPTS_TITLE=Kassenbons
+LINK_ADMIN_LIST_FINANCIAL_RECEIPTS_TITLE=Lists all registered receipts.
+LINK_ADMIN_LIST_FINANCIAL_RECEIPTS=Kassenbons auflisten
diff --git a/src/java/org/mxchange/localization/project_en_US.properties b/src/java/org/mxchange/localization/project_en_US.properties
new file mode 100644
index 00000000..3f05e723
--- /dev/null
+++ b/src/java/org/mxchange/localization/project_en_US.properties
@@ -0,0 +1,40 @@
+# Copyright (C) 2016, 2017 Roland H\u00e4der
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+PAGE_TITLE_LOGIN_FINANCIAL_OVERVIEW=Financials Overview
+CONTENT_TITLE_LOGIN_FINANCIAL_OVERVIEW=Overview of your financials:
+PAGE_TITLE_LOGIN_FINANCIAL_ADD_RECEIPT=Add receipt
+CONTENT_TITLE_LOGIN_FINANCIAL_ADD_RECEIPT=Add new receipt:
+PAGE_TITLE_LOGIN_FINANCIAL_ADD_INCOME=Add new income type
+CONTENT_TITLE_LOGIN_FINANCIAL_ADD_INCOME=Add new income type:
+LOGIN_FINANCIAL_ADD_INCOME_FORM_TITLE=Enter all data of one income type:
+LOGIN_FINANCIAL_INCOME_INTERVAL=Income interval:
+FIELD_FINANCIAL_INCOME_REQUIRED=Field "Income interval" must be selected.
+BUTTON_LOGIN_FINANCIAL_ADD_INCOME=Add income type
+LOGIN_FINANCIAL_INCOME_SINGLE_VALUE=Income value:
+FIELD_FINANCIAL_INCOME_SINGLE_VALUE_REQUIRED=Field "Income value" must be filled out.
+LOGIN_FINANCIAL_INCOME_TITLE=Title of income type:
+FIELD_FINANCIAL_INCOME_TITLE_REQUIRED=Field "Title" must be filled out.
+LOGIN_FINANCIAL_ENTER_RECEIPT_ISSUE_DATE_TITLE=Please enter or select here the exact date when the receipt has been issue. Then an exact time-line can be generated.
+PAGE_TITLE_ADMIN_FINANCIALS_RECEIPT_LIST=List receipts
+CONTENT_TITLE_ADMIN_FINANCIALS_RECEIPT_LIST=Lists receipts:
+TABLE_SUMMARY_ADMIN_LIST_FINANCIAL_RECEIPTS=This table lists already registered receipts.
+ADMIN_FINANCIAL_RECEIPT_LIST_EMPTY=There are no receipts in database. Or your search criteria doesn't match anything.
+ADMIN_ADD_FINANCIAL_RECEIPT_TITLE=Add new receipt
+BUTTON_ADMIN_ADD_FINANCIAL_RECEIPT=Add receipt
+ADMIN_FINANCIAL_RECEIPT_ISSUE_DATE_REQUIRED=Please enter date of issue of receipt.
+ADMIN_MENU_FINANCIAL_RECEIPTS_TITLE=Receipts
+LINK_ADMIN_LIST_FINANCIAL_RECEIPTS_TITLE=Listet alle registrierten Kassenbons auf.
+LINK_ADMIN_LIST_FINANCIAL_RECEIPTS=List receipts
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index bb48f082..4f5b89ec 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -152,6 +152,10 @@
 			<from-outcome>admin_list_contact_mobile</from-outcome>
 			<to-view-id>/admin/mobile/admin_contact_mobile_list.xhtml</to-view-id>
 		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_list_receipts</from-outcome>
+			<to-view-id>/admin/financials/receipts/admin_receipt_list.xhtml</to-view-id>
+		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
 		<from-view-id>/user/login_index.xhtml</from-view-id>
diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl
index 212e3615..e15f2733 100644
--- a/web/WEB-INF/templates/admin/admin_menu.tpl
+++ b/web/WEB-INF/templates/admin/admin_menu.tpl
@@ -29,6 +29,10 @@
 					<p:menuitem title="#{msg.LINK_ADMIN_LIST_BRANCH_OFFICES_TITLE}" outcome="admin_list_branch_offices" value="#{msg.LINK_ADMIN_LIST_BRANCH_OFFICES}" />
 				</p:submenu>
 
+				<p:submenu label="#{project.ADMIN_MENU_FINANCIAL_RECEIPTS_TITLE}">
+					<p:menuitem title="#{project.LINK_ADMIN_LIST_FINANCIAL_RECEIPTS_TITLE}" outcome="admin_list_receipts" value="#{project.LINK_ADMIN_LIST_FINANCIAL_RECEIPTS}" />
+				</p:submenu>
+
 				<p:submenu label="#{msg.ADMIN_MENU_PHONE_NUMBERS_TITLE}">
 					<p:menuitem title="#{msg.LINK_ADMIN_LIST_LAND_LINE_PHONE_NUMBERS_TITLE}" outcome="admin_list_landline" value="#{msg.LINK_ADMIN_LIST_LAND_LINE_PHONE_NUMBERS}" />
 					<p:menuitem title="#{msg.LINK_ADMIN_LIST_MOBILE_PHONE_NUMBERS_TITLE}" outcome="admin_list_mobile" value="#{msg.LINK_ADMIN_LIST_MOBILE_PHONE_NUMBERS}" />
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
new file mode 100644
index 00000000..353ed6eb
--- /dev/null
+++ b/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
+
+	<h:panelGroup styleClass="para" layout="block">
+		<fieldset class="fieldset">
+			<legend title="#{project.ADMIN_FINANCIAL_RECEIPT_LEGEND_TITLE}">
+				<h:outputText value="#{project.ADMIN_FINANCIAL_RECEIPT_LEGEND}" />
+			</legend>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<p:outputLabel for="branchOffice" value="#{project.ADMIN_SELECT_FINANCIAL_RECEIPT_BRANCH_OFFICE}" />
+				</div>
+
+				<div class="table-right-medium">
+					<p:selectOneMenu
+						id="branchOffice"
+						value="#{adminReceiptController.branchOffice}"
+						filter="true"
+						filterMatchMode="contains"
+						required="true"
+						requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_COMPANY_REQUIRED}"
+						>
+						<f:converter converterId="BranchOfficeConverter" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" itemDisabled="true" />
+						<f:selectItems value="#{branchOfficeController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{branchOffice.branchCompany.companyName} #{branchOffice.branchStreet} #{branchOffice.branchHouseNumber}, #{branchOffice.branchZipCode} #{branchOffice.branchCity}" />
+					</p:selectOneMenu>
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="branchOffice" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<p:outputLabel for="receiptIssued" value="#{msg.ENTER_FINANCIAL_RECEIPT_ISSUE_DATE}" />
+				</div>
+
+				<div class="table-right-medium">
+					<p:calendar
+						id="receiptIssued"
+						value="#{adminReceiptController.receiptIssued}"
+						required="true"
+						requiredMessage="#{msg.ADMIN_FINANCIAL_RECEIPT_ISSUE_DATE_REQUIRED}"
+						pattern="#{msg.DATE_PATTERN}"
+						navigator="true"
+						maskAutoClear="true"
+						title="#{msg.ADMIN_RECEIPT_DATE_OF_ISSUE_TITLE}"
+						/>
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="receiptIssued" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<p:outputLabel for="receiptNumber" value="#{project.LOGIN_FINANCIAL_RECEIPT_NUMBER}" />
+				</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}">
+						<f:validateLongRange minimum="1" maximum="20" />
+					</p:inputText>
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="receiptNumber" />
+			</h:panelGroup>
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<p:outputLabel for="paymentType" value="#{project.LOGIN_FINANCIAL_INCOME_INTERVAL}" />
+				</div>
+
+				<div class="table-right-medium">
+					<p:selectOneMenu
+						id="paymentType"
+						value="#{adminReceiptController.paymentType}"
+						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]}" />
+					</p:selectOneMenu>
+				</div>
+			</h:panelGroup>
+		</fieldset>
+
+		<div class="table-footer">
+			<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+
+			<p:commandButton styleClass="submit" id="submit_add_receipt" type="submit" action="#{receiptController.addReceipt()}" value="#{project.BUTTON_LOGIN_FINANCIAL_ADD_INCOME}" />
+		</div>
+	</h:panelGroup>
+</ui:composition>
diff --git a/web/admin/financials/receipts/admin_receipt_list.xhtml b/web/admin/financials/receipts/admin_receipt_list.xhtml
new file mode 100644
index 00000000..ad042f81
--- /dev/null
+++ b/web/admin/financials/receipts/admin_receipt_list.xhtml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+				xmlns="http://www.w3.org/1999/xhtml"
+				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+				xmlns:h="http://xmlns.jcp.org/jsf/html"
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
+
+	<ui:define name="admin_title">
+		<h:outputText value="#{project.PAGE_TITLE_ADMIN_FINANCIALS_RECEIPT_LIST}" />
+	</ui:define>
+
+	<ui:define name="content_header">
+		<h:outputText value="#{project.CONTENT_TITLE_ADMIN_FINANCIALS_RECEIPT_LIST}" />
+	</ui:define>
+
+	<ui:define name="content">
+		<h:form id="form-list-financial-receipt">
+			<p:dataTable
+				id="table-list-financial-receipt"
+				var="receipt"
+				value="#{adminReceiptController.allFinancialReceipts()}"
+				widgetVar="receiptTable"
+				filteredValue="#{adminReceiptController.filteredFinancialReceipts}"
+				tableStyleClass="table table-full"
+				rows="10"
+				paginator="true"
+				paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
+				reflow="true"
+				resizableColumns="true"
+				rowsPerPageTemplate="5,10,20,50,100"
+				sortMode="multiple"
+				summary="#{project.TABLE_SUMMARY_ADMIN_LIST_FINANCIAL_RECEIPTS}"
+				emptyMessage="#{msg.ADMIN_FINANCIAL_RECEIPT_LIST_EMPTY}">
+
+				<f:facet name="header">
+					<h:outputText value="#{project.ADMIN_LIST_FINANCIAL_RECEIPTS_HEADER}" />
+					<p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
+					<p:columnToggler datasource="table-list-financial-receipt" trigger="toggler" />
+				</f:facet>
+			</p:dataTable>
+		</h:form>
+
+		<h:form id="form_add_financial_receipt">
+			<h:panelGroup styleClass="table table-medium" layout="block">
+				<div class="table-header">
+					<h:outputText value="#{project.ADMIN_ADD_FINANCIAL_RECEIPT_TITLE}" />
+				</div>
+
+				<ui:include src="/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl" />
+
+				<div class="table-footer">
+					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<p:commandButton styleClass="submit" type="submit" id="button_add_financial_receipt" value="#{project.BUTTON_ADMIN_ADD_FINANCIAL_RECEIPT}" action="#{adminReceiptController.addReceipt()}" />
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="para notice" layout="block">
+				<h:outputText value="#{project.ADMIN_ADD_FINANCIAL_RECEIPT_NOTICES}" />
+				<ul>
+					<li><h:outputText value="#{project.ADMIN_ADD_FINANCIAL_RECEIPT_PATTERN}" /></li>
+				</ul>
+			</h:panelGroup>
+		</h:form>
+	</ui:define>
+</ui:composition>
diff --git a/web/user/financials/login_financials_add_income.xhtml b/web/user/financials/login_financials_add_income.xhtml
index ba1fa3fe..9541a547 100644
--- a/web/user/financials/login_financials_add_income.xhtml
+++ b/web/user/financials/login_financials_add_income.xhtml
@@ -7,27 +7,27 @@
 				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="login_title">
-		<h:outputText value="#{msg.PAGE_TITLE_LOGIN_FINANCIAL_ADD_INCOME}" />
+		<h:outputText value="#{project.PAGE_TITLE_LOGIN_FINANCIAL_ADD_INCOME}" />
 	</ui:define>
 
 	<ui:define name="content_header">
-		<h:outputText value="#{msg.SUB_TITLE_LOGIN_FINANCIAL_ADD_INCOME}" />
+		<h:outputText value="#{project.CONTENT_TITLE_LOGIN_FINANCIAL_ADD_INCOME}" />
 	</ui:define>
 
 	<ui:define name="content">
 		<h:form id="form_add_financials_income">
 			<h:panelGroup styleClass="table table-medium" layout="block">
 				<div class="table-header">
-					<h:outputText value="#{msg.LOGIN_FINANCIAL_ADD_INCOME_FORM_TITLE}" />
+					<h:outputText value="#{project.LOGIN_FINANCIAL_ADD_INCOME_FORM_TITLE}" />
 				</div>
 
 				<h:panelGroup styleClass="table-row" layout="block">
 					<div class="table-left-medium">
-						<p:outputLabel for="incomeTitle" value="#{msg.LOGIN_FINANCIAL_INCOME_TITLE}" />
+						<p:outputLabel for="incomeTitle" value="#{project.LOGIN_FINANCIAL_INCOME_TITLE}" />
 					</div>
 
 					<div class="table-right-medium">
-						<p:inputText styleClass="input" id="incomeTitle" size="2" maxlength="10" value="#{financialIncomeController.incomeTitle}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_INCOME_TITLE_REQUIRED}">
+						<p:inputText styleClass="input" id="incomeTitle" size="2" maxlength="10" value="#{financialIncomeController.incomeTitle}" required="true" requiredMessage="#{project.FIELD_FINANCIAL_INCOME_TITLE_REQUIRED}">
 							<f:validator validatorId="IncomeTitleValidator" />
 						</p:inputText>
 					</div>
@@ -35,11 +35,18 @@
 
 				<h:panelGroup styleClass="table-row" layout="block">
 					<div class="table-left-medium">
-						<p:outputLabel for="incomeInterval" value="#{msg.LOGIN_FINANCIAL_INCOME_INTERVAL}" />
+						<p:outputLabel for="incomeInterval" value="#{project.LOGIN_FINANCIAL_INCOME_INTERVAL}" />
 					</div>
 
 					<div class="table-right-medium">
-						<p:selectOneMenu id="incomeInterval" value="#{financialIncomeController.incomeInterval}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_INCOME_REQUIRED}">
+						<p:selectOneMenu
+							id="incomeInterval"
+							value="#{financialIncomeController.incomeInterval}"
+							filter="true"
+							filterMatchMode="contains"
+							required="true"
+							requiredMessage="#{project.FIELD_FINANCIAL_INCOME_REQUIRED}"
+							>
 							<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
 							<f:selectItems value="#{financialIncomeController.allIncomeIntervals()}" var="incomeInterval" itemValue="#{incomeInterval}" itemLabel="#{msg[incomeInterval.concat('_INTERVAL')]}" />
 						</p:selectOneMenu>
@@ -48,11 +55,11 @@
 
 				<h:panelGroup styleClass="table-row" layout="block">
 					<div class="table-left-medium">
-						<p:outputLabel for="incomeSingleValue" value="#{msg.LOGIN_FINANCIAL_INCOME_SINGLE_VALUE}" />
+						<p:outputLabel for="incomeSingleValue" value="#{project.LOGIN_FINANCIAL_INCOME_SINGLE_VALUE}" />
 					</div>
 
 					<div class="table-right-medium">
-						<p:inputText styleClass="input" id="incomeSingleValue" size="5" maxlength="20" value="#{financialIncomeController.incomeSingleAmount}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_INCOME_SINGLE_VALUE_REQUIRED}">
+						<p:inputText styleClass="input" id="incomeSingleValue" size="5" maxlength="20" value="#{financialIncomeController.incomeSingleAmount}" required="true" requiredMessage="#{project.FIELD_FINANCIAL_INCOME_SINGLE_VALUE_REQUIRED}">
 							<f:validator validatorId="CurrencyAmountValidator" />
 						</p:inputText>
 					</div>
@@ -61,7 +68,7 @@
 				<div class="table-footer">
 					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
-					<p:commandButton styleClass="submit" id="submit_add_income" type="submit" action="#{financialIncomeController.addIncome()}" value="#{msg.BUTTON_LOGIN_FINCIAL_ADD_INCOME}" />
+					<p:commandButton styleClass="submit" id="submit_add_income" type="submit" action="#{financialIncomeController.addIncome()}" value="#{project.BUTTON_LOGIN_FINANCIAL_ADD_INCOME}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/user/financials/login_financials_overview.xhtml b/web/user/financials/login_financials_overview.xhtml
index b33a6d31..592ad41f 100644
--- a/web/user/financials/login_financials_overview.xhtml
+++ b/web/user/financials/login_financials_overview.xhtml
@@ -7,34 +7,34 @@
 				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="login_title">
-		<h:outputText value="#{msg.PAGE_TITLE_LOGIN_FINANCIAL_OVERVIEW}" />
+		<h:outputText value="#{project.PAGE_TITLE_LOGIN_FINANCIAL_OVERVIEW}" />
 	</ui:define>
 
 	<ui:define name="content_header">
-		<h:outputText value="#{msg.SUB_TITLE_LOGIN_FINANCIAL_OVERVIEW}" />
+		<h:outputText value="#{project.CONTENT_TITLE_LOGIN_FINANCIAL_OVERVIEW}" />
 	</ui:define>
 
 	<ui:define name="content">
 		<h:panelGroup layout="block" styleClass="para">
 			<h:panelGrid columns="4">
 				<f:facet name="header">
-					<h:outputText value="#{msg.GENERAL_FINANCIAL_OVERVIEW}" />
+					<h:outputText value="#{project.GENERAL_FINANCIAL_OVERVIEW}" />
 				</f:facet>
 
 				<h:column>
-					<p:outputLabel for="totalReceipts" styleClass="data_label" value="#{msg.USER_FINANCIALS_TOTAL_RECEIPTS}" />
+					<p:outputLabel for="totalReceipts" styleClass="data_label" value="#{project.USER_FINANCIALS_TOTAL_RECEIPTS}" />
 
 					<h:outputLink id="totalReceipts" styleClass="data_field" target="list_user_financial_receipts" value="#{financialIncomeController.receipts.size()}" />
 				</h:column>
 
 				<h:column>
-					<p:outputLabel for="totalReceipts" styleClass="data_label" value="#{msg.USER_FINANCIALS_TOTAL_OTHER_EXPENSES}" />
+					<p:outputLabel for="totalReceipts" styleClass="data_label" value="#{project.USER_FINANCIALS_TOTAL_OTHER_EXPENSES}" />
 
 					<h:outputLink id="totalReceipts" styleClass="data_field" target="list_user_financial_other_expenses" value="#{financialIncomeController.otherExpenses.size()}" />
 				</h:column>
 
 				<h:column>
-					<p:outputLabel for="totalReceipts" styleClass="data_label" value="#{msg.USER_FINANCIALS_TOTAL_INCOME}" />
+					<p:outputLabel for="totalReceipts" styleClass="data_label" value="#{project.USER_FINANCIALS_TOTAL_INCOME}" />
 
 					<h:outputLink id="totalReceipts" styleClass="data_field" target="list_user_financial_income" value="#{financialIncomeController.income.size()}" />
 				</h:column>
@@ -42,19 +42,19 @@
 		</h:panelGroup>
 
 		<h:panelGroup layout="block" styleClass="para">
-			<h:outputText value="#{msg.USER_FINANCIALS_NEXT_ACTIONS}" />
+			<h:outputText value="#{project.USER_FINANCIALS_NEXT_ACTIONS}" />
 
 			<ul>
 				<li>
-					<p:link  title="#{msg.LINK_USER_FINANCIAL_ADD_RECEIPT_TITLE}" outcome="add_user_fiancial_receipt" value="#{msg.LINK_USER_FINANCIAL_ADD_RECEIPT}" />
+					<p:link  title="#{project.LINK_USER_FINANCIAL_ADD_RECEIPT_TITLE}" outcome="add_user_fiancial_receipt" value="#{project.LINK_USER_FINANCIAL_ADD_RECEIPT}" />
 				</li>
 
 				<li>
-					<p:link  title="#{msg.LINK_USER_FINANCIAL_ADD_OTHER_EXPENSES_TITLE}" outcome="add_user_fiancial_other_expenses" value="#{msg.LINK_USER_FINANCIAL_ADD_OTHER_EXPENSES}" />
+					<p:link  title="#{project.LINK_USER_FINANCIAL_ADD_OTHER_EXPENSES_TITLE}" outcome="add_user_fiancial_other_expenses" value="#{project.LINK_USER_FINANCIAL_ADD_OTHER_EXPENSES}" />
 				</li>
 
 				<li>
-					<p:link  title="#{msg.LINK_USER_FINANCIAL_ADD_INCOME_TITLE}" outcome="add_user_fiancial_income" value="#{msg.LINK_USER_FINANCIAL_ADD_INCOME}" />
+					<p:link  title="#{project.LINK_USER_FINANCIAL_ADD_INCOME_TITLE}" outcome="add_user_fiancial_income" value="#{project.LINK_USER_FINANCIAL_ADD_INCOME}" />
 				</li>
 			</ul>
 		</h:panelGroup>