From: Roland Häder <roland@mxchange.org>
Date: Thu, 20 Dec 2018 11:13:28 +0000 (+0100)
Subject: Don't cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a023ff55bba91d8f9a1bca5a73d65a4e51697f91;p=jfinancials-war.git

Don't cherry-pick:
- converted single-line JSF tag to multi-line, having attributes in distinct
  lines
- ID_NUMBER_HEADER is to long, just let us use ID_HEADER, allowing more space
  for other columns
- removed spurious id attributes, thumb of a rule: only use them when really
  needed and don't "over-id" everthing!
- removed no longer used i18n keys

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

diff --git a/src/java/org/mxchange/localization/project_de_DE.properties b/src/java/org/mxchange/localization/project_de_DE.properties
index d51c299e..8d198a14 100644
--- a/src/java/org/mxchange/localization/project_de_DE.properties
+++ b/src/java/org/mxchange/localization/project_de_DE.properties
@@ -337,8 +337,6 @@ RECEIPT_ITEM_PRODUCT_QUANTITY_HEADER=Menge des Eintrages:
 RECEIPT_ITEM_PRODUCT_QUANTITY_TITLE=Menge des Kassenboneintrages.
 RECEIPT_ITEM_BRAND_NAME_TITLE=Warenzeichen des Kassenboneintrages.
 PRODUCT_I18N_KEY_HEADER=Internationalisierungsschluessel des Produktes:
-ADMIN_ASSIGNED_RECEIPT_ITEM_CATEGORY_HEADER=Zum Eintrag zugewiesene Kategorie:
-ADMIN_ASSIGNED_RECEIPT_ITEM_CATEGORY_TITLE=Dem Kassenboneintrag zugewiesene Kategorie.
 RECEIPT_ITEM_GROSS_PRICE_TITLE=Gesamtbruttopreis eines einzelnen Kassenboneintrages.
 RECEIPT_ITEM_NET_PRICE_TITLE=GesamtNettopreis eines einzelnen Kassenboneintrages.
 ADMIN_ASSIGNED_MANUFACTURER_HEADER=Zugewiesener Hersteller:
diff --git a/src/java/org/mxchange/localization/project_en_US.properties b/src/java/org/mxchange/localization/project_en_US.properties
index 13468d01..276d8d1b 100644
--- a/src/java/org/mxchange/localization/project_en_US.properties
+++ b/src/java/org/mxchange/localization/project_en_US.properties
@@ -248,8 +248,6 @@ RECEIPT_ITEM_PRODUCT_QUANTITY_HEADER=Quantity of receipt item:
 RECEIPT_ITEM_PRODUCT_QUANTITY_TITLE=Quantity of the receipt item.
 RECEIPT_ITEM_BRAND_NAME_TITLE=Brand name of receipt item.
 PRODUCT_I18N_KEY_HEADER=Product's internationalization key:
-ADMIN_ASSIGNED_RECEIPT_ITEM_CATEGORY_HEADER=Assigned category to receipt item:
-ADMIN_ASSIGNED_RECEIPT_ITEM_CATEGORY_TITLE=Category assigned to receipt item.
 RECEIPT_ITEM_GROSS_PRICE_TITLE=Total gross price of a single receipt item.
 RECEIPT_ITEM_NET_PRICE_TITLE=Total net price of a single receipt item.
 ADMIN_ASSIGNED_MANUFACTURER_HEADER=Assigned manufacturer:
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 26e87727..41a41516 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
@@ -25,9 +25,17 @@
 				required="true"
 				requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_REQUIRED}"
 				>
+
 				<f:converter converterId="BranchOfficeConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-				<f:selectItems value="#{branchOfficeListController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{branchOffice.branchCompany.companyName} #{branchOffice.branchStreet} #{branchOffice.branchHouseNumber}, #{branchOffice.branchCity}" />
+
+				<f:selectItems
+					value="#{branchOfficeListController.allBranchOffices()}"
+					var="branchOffice"
+					itemValue="#{branchOffice}"
+					itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}"
+					/>
 			</p:selectOneMenu>
 
 			<p:outputLabel for="receiptIssued" value="#{project.ENTER_RECEIPT_ISSUE_DATE}" />
@@ -54,9 +62,17 @@
 				required="true"
 				requiredMessage="#{msg.FIELD_PAYMENT_TYPE_REQUIRED}"
 				>
+
 				<f:converter converterId="PaymentTypeConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-				<f:selectItems value="#{dataController.paymentTypes}" var="paymentType" itemValue="#{paymentType}" itemLabel="#{msg[paymentType.i18nKey]}" />
+
+				<f:selectItems
+					value="#{dataController.paymentTypes}"
+					var="paymentType"
+					itemValue="#{paymentType}"
+					itemLabel="#{msg[paymentType.i18nKey]}"
+					/>
 			</p:selectOneMenu>
 
 			<p:outputLabel for="receiptSellerEmployee" value="#{msg.ADMIN_SELECT_SELLER_EMPLOYEE}" />
@@ -66,9 +82,18 @@
 				filter="true"
 				filterMatchMode="contains"
 				>
+
 				<f:converter converterId="EmployeeConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-				<f:selectItems value="#{employeeController.allEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" itemDescription="#{employee.employeeBasicData.companyName}, #{beanHelper.renderBranchOffice(employee.employeeBranchOffice)}" />
+
+				<f:selectItems
+					value="#{employeeController.allEmployees()}"
+					var="employee"
+					itemValue="#{employee}"
+					itemLabel="#{beanHelper.renderEmployee(employee)}"
+					itemDescription="#{employee.employeeBasicData.companyName}, #{beanHelper.renderBranchOffice(employee.employeeBranchOffice)}"
+					/>
 			</p:selectOneMenu>
 
 			<p:outputLabel for="receiptUser" value="#{project.ADMIN_SELECT_RECEIPT_USER_OWNER}" />
@@ -78,9 +103,17 @@
 				filter="true"
 				filterMatchMode="contains"
 				>
+
 				<f:converter converterId="UserConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-				<f:selectItems value="#{userController.allUsers()}" var="receiptUser" itemValue="#{receiptUser}" itemLabel="#{receiptUser.userContact.contactFirstName} #{receiptUser.userContact.contactFamilyName} (#{receiptUser.userName})" />
+
+				<f:selectItems
+					value="#{userController.allUsers()}"
+					var="receiptUser"
+					itemValue="#{receiptUser}"
+					itemLabel="#{beanHelper.renderContact(receiptUser.userContact)} (#{receiptUser.userName})"
+					/>
 			</p:selectOneMenu>
 		</p:panelGrid>
 	</p:fieldset>
diff --git a/web/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl b/web/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl
index 97566ba8..95eb23ba 100644
--- a/web/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl
+++ b/web/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl
@@ -45,9 +45,17 @@
 				required="true"
 				requiredMessage="#{project.ADMIN_PRODUCT_REQUIRED}"
 				>
+
 				<f:converter converterId="GenericProductConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-				<f:selectItems value="#{productListController.allProducts}" var="product" itemValue="#{product}" itemLabel="#{productBeanHelper.renderGenericProduct(product)}" />
+
+				<f:selectItems
+					value="#{productListController.allProducts}"
+					var="product"
+					itemValue="#{product}"
+					itemLabel="#{productBeanHelper.renderGenericProduct(product)}"
+					/>
 			</p:selectOneMenu>
 
 			<p:outputLabel for="itemManufacturer" value="#{project.SELECT_RECEIPT_ITEM_MANUFACTURER}" />
@@ -57,9 +65,17 @@
 				filter="true"
 				filterMatchMode="contains"
 				>
+
 				<f:converter converterId="BasicCompanyDataConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-				<f:selectItems value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+
+				<f:selectItems
+					value="#{basicDataListController.allBasicData}"
+					var="basicData"
+					itemValue="#{basicData}"
+					itemLabel="#{beanHelper.renderBasicData(basicData)}"
+					/>
 			</p:selectOneMenu>
 
 			<p:outputLabel for="itemQuantity" value="#{project.ENTER_RECEIPT_ITEM_QUANTITY}" />
@@ -112,9 +128,17 @@
 				required="true"
 				requiredMessage="#{project.ADMIN_RECEIPT_REQUIRED}"
 				>
+
 				<f:converter converterId="ReceiptConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-				<f:selectItems value="#{receiptListController.allReceipts}" var="receipt" itemValue="#{receipt}" itemLabel="#{receiptBeanHelper.renderReceipt(receipt)}" />
+
+				<f:selectItems
+					value="#{receiptListController.allReceipts}"
+					var="receipt"
+					itemValue="#{receipt}"
+					itemLabel="#{receiptBeanHelper.renderReceipt(receipt)}"
+					/>
 			</p:selectOneMenu>
 
 			<p:outputLabel value="#{project.ADMIN_ENTER_GENERIC_PRODUCT_PRICE}" />
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 b8258e9a..dedf30ec 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
@@ -27,9 +27,17 @@
 				required="true"
 				requiredMessage="#{msg.LOGIN_BRANCH_OFFICE_REQUIRED}"
 				>
+
 				<f:converter converterId="BranchOfficeConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-				<f:selectItems value="#{branchOfficeListController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{branchOffice.branchCompany.companyName} #{branchOffice.branchStreet} #{branchOffice.branchHouseNumber}, #{branchOffice.branchCity}" />
+
+				<f:selectItems
+					value="#{branchOfficeListController.allBranchOffices()}"
+					var="branchOffice"
+					itemValue="#{branchOffice}"
+					itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}"
+					/>
 			</p:selectOneMenu>
 			<p:message for="branchOffice" />
 
@@ -55,9 +63,17 @@
 				required="true"
 				requiredMessage="#{msg.FIELD_PAYMENT_TYPE_REQUIRED}"
 				>
+
 				<f:converter converterId="PaymentTypeConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-				<f:selectItems value="#{dataController.paymentTypes}" var="receiptPaymentType" itemValue="#{paymentType}" itemLabel="#{msg[paymentType.i18nKey]}" />
+
+				<f:selectItems
+					value="#{dataController.paymentTypes}"
+					var="receiptPaymentType"
+					itemValue="#{paymentType}"
+					itemLabel="#{msg[paymentType.i18nKey]}"
+					/>
 			</p:selectOneMenu>
 			<p:message for="receiptPaymentType" />
 
@@ -68,9 +84,17 @@
 				filter="true"
 				filterMatchMode="contains"
 				>
+
 				<f:converter converterId="EmployeeConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-				<f:selectItems value="#{employeeController.allEmployees()}" var="companyHeadquarter" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
+
+				<f:selectItems
+					value="#{employeeController.allEmployees()}"
+					var="companyHeadquarter"
+					itemValue="#{companyEmployee}"
+					itemLabel="#{beanHelper.renderEmployee(companyEmployee)}"
+					/>
 			</p:selectOneMenu>
 			<p:message for="receiptSellerEmployee" />
 		</p:panelGrid>
diff --git a/web/admin/financial/receipt/admin_receipt_list.xhtml b/web/admin/financial/receipt/admin_receipt_list.xhtml
index 83d551ec..7d631c23 100644
--- a/web/admin/financial/receipt/admin_receipt_list.xhtml
+++ b/web/admin/financial/receipt/admin_receipt_list.xhtml
@@ -76,7 +76,7 @@
 					oncomplete="PF('receiptDialog').show()"
 					/>
 
-				<p:column headerText="#{msg.ID_NUMBER_HEADER}" sortBy="#{receipt.receiptId}" filterBy="#{receipt.receiptId}">
+				<p:column headerText="#{msg.ID_HEADER}" sortBy="#{receipt.receiptId}" filterBy="#{receipt.receiptId}">
 					<p:link outcome="admin_show_receipt" title="#{project.ADMIN_LINK_SHOW_RECEIPT_TITLE}" value="#{receipt.receiptId}">
 						<f:param name="receiptId" value="#{receipt.receiptId}" />
 					</p:link>
@@ -98,7 +98,13 @@
 							title="#{msg.FILTER_BY_MULTIPLE_BRANCH_OFFICES_TITLE}"
 							>
 							<f:converter converterId="BranchOfficeConverter" />
-							<f:selectItems value="#{branchOfficeListController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
+
+							<f:selectItems
+								value="#{branchOfficeListController.allBranchOffices()}"
+								var="branchOffice"
+								itemValue="#{branchOffice}"
+								itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}"
+								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
@@ -118,8 +124,15 @@
 							title="#{project.FILTER_BY_MULTIPLE_RECEIPT_SELLERS_TITLE}"
 							>
 							<f:converter converterId="EmployeeConverter" />
+
 							<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-							<f:selectItems value="#{employeeController.allEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" />
+
+							<f:selectItems
+								value="#{employeeController.allEmployees()}"
+								var="employee"
+								itemValue="#{employee}"
+								itemLabel="#{beanHelper.renderEmployee(employee)}"
+								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
@@ -143,8 +156,15 @@
 							title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
 							>
 							<f:converter converterId="UserConverter" />
+
 							<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-							<f:selectItems value="#{userController.allUsers()}" var="user" itemValue="#{user}" itemLabel="#{user.userName}" />
+
+							<f:selectItems
+								value="#{userController.allUsers()}"
+								var="user"
+								itemValue="#{user}"
+								itemLabel="#{beanHelper.renderUser(user)}"
+								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
@@ -173,7 +193,13 @@
 							onchange="PF('receiptList').filter()"
 							>
 							<f:converter converterId="PaymentTypeConverter" />
-							<f:selectItems value="#{dataController.paymentTypes}" var="paymentType" itemValue="#{paymentType}" itemLabel="#{msg[paymentType.i18nKey]}" />
+
+							<f:selectItems
+								value="#{dataController.paymentTypes}"
+								var="paymentType"
+								itemValue="#{paymentType}"
+								itemLabel="#{msg[paymentType.i18nKey]}"
+								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
@@ -204,7 +230,7 @@
 							</h:outputFormat>
 						</f:facet>
 
-						<p:outputLabel value="#{msg.ID_NUMBER_HEADER}" title="#{project.RECEIPT_ID_NUMBER_TITLE}" />
+						<p:outputLabel value="#{msg.ID_HEADER}" title="#{project.RECEIPT_ID_NUMBER_TITLE}" />
 						<h:outputText value="#{receiptListController.selectedReceipt.receiptId}" />
 
 						<p:outputLabel value="#{project.RECEIPT_NUMBER_HEADER}" title="#{project.RECEIPT_NUMBER_HEADER_TITLE}" />
@@ -254,7 +280,7 @@
 			</p:dialog>
 		</h:form>
 
-		<h:form id="form-add-receipt">
+		<h:form>
 			<p:panelGrid
 				layout="grid"
 				columns="1"
@@ -275,7 +301,6 @@
 						/>
 
 					<p:commandButton
-						process="@form"
 						type="submit"
 						value="#{project.BUTTON_ADMIN_ADD_RECEIPT}"
 						action="#{adminReceiptController.addReceipt()}"
diff --git a/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml b/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
index b562b3e9..ac0da8b7 100644
--- a/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
+++ b/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
@@ -77,7 +77,7 @@
 					oncomplete="PF('receiptItemDialog').show()"
 					/>
 
-				<p:column headerText="#{msg.ID_NUMBER_HEADER}" sortBy="#{receiptItem.itemId}" filterBy="#{receiptItem.itemId}">
+				<p:column headerText="#{msg.ID_HEADER}" sortBy="#{receiptItem.itemId}" filterBy="#{receiptItem.itemId}">
 					<p:link outcome="admin_show_receipt_item" title="#{project.ADMIN_LINK_SHOW_RECEIPT_ITEM_TITLE}" value="#{receiptItem.itemId}">
 						<f:param name="receiptItemId" value="#{receiptItem.itemId}" />
 					</p:link>
@@ -94,7 +94,13 @@
 							title="#{project.FILTER_BY_MULTIPLE_RECEIPTS_TITLE}"
 							>
 							<f:converter converterId="ReceiptConverter" />
-							<f:selectItems value="#{receiptListController.allReceipts}" var="receipt" itemValue="#{receipt}" itemLabel="#{receiptBeanHelper.renderReceipt(receipt)}" />
+
+							<f:selectItems
+								value="#{receiptListController.allReceipts}"
+								var="receipt"
+								itemValue="#{receipt}"
+								itemLabel="#{receiptBeanHelper.renderReceipt(receipt)}"
+								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
@@ -114,7 +120,13 @@
 							title="#{project.FILTER_BY_MULTIPLE_ITEM_PRODUCTS_TITLE}"
 							>
 							<f:converter converterId="GenericProductConverter" />
-							<f:selectItems value="#{productListController.allProducts}" var="product" itemValue="#{product}" itemLabel="#{productBeanHelper.renderGenericProduct(product)}" />
+
+							<f:selectItems
+								value="#{productListController.allProducts}"
+								var="product"
+								itemValue="#{product}"
+								itemLabel="#{productBeanHelper.renderGenericProduct(product)}"
+								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
@@ -134,7 +146,13 @@
 							title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}"
 							>
 							<f:converter converterId="BasicCompanyDataConverter" />
-							<f:selectItems value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+
+							<f:selectItems
+								value="#{basicDataListController.allBasicData}"
+								var="basicData"
+								itemValue="#{basicData}"
+								itemLabel="#{basicData.companyName}"
+								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
@@ -175,7 +193,7 @@
 							</h:outputFormat>
 						</f:facet>
 
-						<p:outputLabel value="#{msg.ID_NUMBER_HEADER}" title="#{project.RECEIPT_ID_NUMBER_TITLE}" />
+						<p:outputLabel value="#{msg.ID_HEADER}" title="#{project.RECEIPT_ID_NUMBER_TITLE}" />
 						<h:outputText value="#{receiptItemListController.selectedReceiptItem.itemId}" />
 
 						<p:outputLabel value="#{project.RECEIPT_ITEM_NUMBER_HEADER}" title="#{project.RECEIPT_ITEM_NUMBER_TITLE}" />
@@ -192,11 +210,6 @@
 							<f:param name="productId" value="#{receiptItemListController.selectedReceiptItem.itemProduct.productId}" />
 						</p:link>
 
-						<p:outputLabel value="#{project.ADMIN_ASSIGNED_RECEIPT_ITEM_CATEGORY_HEADER}" title="#{project.ADMIN_ASSIGNED_RECEIPT_ITEM_CATEGORY_TITLE}" />
-						<p:link outcome="admin_show_product_category" title="#{project.ADMIN_LINK_SHOW_RECEIPT_ITEM_CATEGORY_TITLE}" value="#{local[receiptItemListController.selectedReceiptItem.itemCategory.categoryI18nKey]}">
-							<f:param name="categoryId" value="#{receiptItemListController.selectedReceiptItem.itemCategory.categoryId}" />
-						</p:link>
-
 						<p:outputLabel value="#{project.ADMIN_ASSIGNED_MANUFACTURER_HEADER}" title="#{project.ADMIN_ASSIGNED_RECEIPT_ITEM_MANUFACTURER_TITLE}" />
 						<p:link
 							outcome="admin_show_basic_data"
@@ -249,7 +262,7 @@
 			</p:dialog>
 		</h:form>
 
-		<h:form id="form-add-receipt-item">
+		<h:form>
 			<p:panelGrid
 				columns="1"
 				layout="grid"
@@ -270,7 +283,6 @@
 						/>
 
 					<p:commandButton
-						process="@form"
 						type="submit"
 						value="#{project.BUTTON_ADMIN_ADD_RECEIPT_TEM}"
 						action="#{adminReceiptItemController.addReceiptItem()}"
diff --git a/web/user/financials/login_financials_add_income.xhtml b/web/user/financials/login_financials_add_income.xhtml
index d1acad00..3f4777ce 100644
--- a/web/user/financials/login_financials_add_income.xhtml
+++ b/web/user/financials/login_financials_add_income.xhtml
@@ -17,7 +17,7 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<h:form id="form_add_financials_income">
+		<h:form>
 			<h:panelGroup layout="block">
 				<div class="table-header">
 					<h:outputText value="#{project.LOGIN_FINANCIAL_ADD_INCOME_FORM_TITLE}" />
@@ -49,7 +49,12 @@
 							required="true"
 							requiredMessage="#{project.FIELD_FINANCIAL_INCOME_REQUIRED}"
 							>
-							<f:selectItems value="#{financialIncomeController.allIncomeIntervals()}" var="incomeInterval" itemValue="#{incomeInterval}" itemLabel="#{msg[incomeInterval.concat('_INTERVAL')]}" />
+							<f:selectItems
+								value="#{financialIncomeController.allIncomeIntervals()}"
+								var="incomeInterval"
+								itemValue="#{incomeInterval}"
+								itemLabel="#{msg[incomeInterval.concat('_INTERVAL')]}"
+								/>
 						</p:selectOneMenu>
 					</div>
 				</h:panelGroup>
@@ -73,7 +78,6 @@
 						/>
 
 					<p:commandButton
-						process="@form"
 						type="submit"
 						value="#{project.BUTTON_LOGIN_FINANCIAL_ADD_INCOME}"
 						action="#{financialIncomeController.addIncome()}"
diff --git a/web/user/financials/login_financials_add_receipt.xhtml b/web/user/financials/login_financials_add_receipt.xhtml
index 270c8760..160b7e25 100644
--- a/web/user/financials/login_financials_add_receipt.xhtml
+++ b/web/user/financials/login_financials_add_receipt.xhtml
@@ -17,7 +17,7 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<h:form id="form_add_financial_receipt">
+		<h:form>
 			<p:panelGrid
 				columns="1"
 				layout="grid"
@@ -37,7 +37,6 @@
 						/>
 
 					<p:commandButton
-						process="@form"
 						type="submit"
 						value="#{project.BUTTON_LOGIN_ADD_RECEIPT}"
 						action="#{receiptController.addReceipt()}"