From: Roland Häder <roland@mxchange.org>
Date: Thu, 24 Nov 2022 18:43:18 +0000 (+0100)
Subject: Don't cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8773327f677132c3b65b04302124221a0dcd8fd5;p=addressbook-war.git

Don't cherry-pick:
- removed JFinancials-related files
- renamed layout.css to custom.css as this is the new name
- made local variable final, still code is broken here
- changed missing references from JFinancials -> Addressbook
---

diff --git a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java
index 9b053878..3655a42e 100644
--- a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java
+++ b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java
@@ -409,7 +409,7 @@ public class AddressbookWebSessionBean extends BaseAddressbookBean implements Ad
 
 		try {
 			// Then try to look it up
-			Addressbook addressbook = this.addressbookBean.getAddressbookById(this.getAddressbookId());
+			final Addressbook addressbook = this.addressbookBean.getAddressbookById(this.getAddressbookId());
 
 			// Fire event here
 			this.loadedEvent.fire(new AddressbookLoadedEvent(addressbook));
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 10970fa6..cc753d73 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -11,7 +11,7 @@
 	</application>
 	<!--
 	<lifecycle>
-		<phase-listener>org.mxchange.jfinancials.debug.FinancialsDebugLifeCycleListener</phase-listener>
+		<phase-listener>org.mxchange.addressbook.debug.AddressbookDebugLifeCycleListener</phase-listener>
 	</lifecycle>
 	//-->
 	<navigation-rule>
@@ -940,14 +940,6 @@
 			<to-view-id>/admin/business/opening_time/admin_opening_time_delete.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
-	<navigation-rule>
-		<from-view-id>/admin/financial/receipt_item/admin_receipt_item_edit.xhtml</from-view-id>
-		<navigation-case>
-			<from-outcome>admin_list_receipt_items</from-outcome>
-			<to-view-id>/admin/financial/receipt_item/admin_receipt_item_list.xhtml</to-view-id>
-			<redirect></redirect>
-		</navigation-case>
-	</navigation-rule>
 	<!--
 	<factory>
 		<exception-handler-factory>
diff --git a/web/WEB-INF/project-links.jsf.taglib.xml b/web/WEB-INF/project-links.jsf.taglib.xml
index 554431f0..534d6b45 100644
--- a/web/WEB-INF/project-links.jsf.taglib.xml
+++ b/web/WEB-INF/project-links.jsf.taglib.xml
@@ -21,5 +21,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibrary_2_2.xsd"
 >
-	<namespace>http://mxchange.org/jsf/jfinancials/links</namespace>
+	<namespace>http://mxchange.org/jsf/addressbook/links</namespace>
 </facelet-taglib>
diff --git a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
index 81ad613f..146e3f13 100644
--- a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
+++ b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
@@ -20,7 +20,7 @@
 
 				<div class="table-right">
 					<p:inputText type="secret" id="currentPassword" size="10" maxlength="255" value="#{userLoginController.userCurrentPassword}" required="true" validatorMessage="#{msg.ERROR_USER_CURRENT_PASSWORD_MISMATCHING}">
-						<!-- <f:validator for="currentPassword" validatorId="FinancialsUserPasswordValidator" /> //-->
+						<!-- <f:validator for="currentPassword" validatorId="AddressbookUserPasswordValidator" /> //-->
 					</p:inputText>
 				</div>
 			</h:panelGroup>
diff --git a/web/admin/financial/receipt/admin_receipt_edit.xhtml b/web/admin/financial/receipt/admin_receipt_edit.xhtml
deleted file mode 100644
index 6b2ce982..00000000
--- a/web/admin/financial/receipt/admin_receipt_edit.xhtml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?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="metadata">
-		<f:metadata>
-			<f:viewParam
-				name="receiptId"
-				value="#{adminReceiptActionController.currentReceipt}"
-				converter="ReceiptConverter"
-				required="true"
-				requiredMessage="#{project.ERROR_PARAMETER_RECEIPT_ID_NOT_SET}"
-				converterMessage="#{project.PARAMETER_RECEIPT_ID_INVALID}"
-				/>
-
-			<f:viewAction
-				action="#{adminReceiptActionController.copyAllReceiptProperties()}"
-				/>
-		</f:metadata>
-	</ui:define>
-
-	<ui:define name="document_admin_title">
-		<h:outputText value="#{project.PAGE_TITLE_ADMIN_FINANCIALS_EDIT_RECEIPT}" />
-	</ui:define>
-
-	<ui:define name="content_header">
-		<h:outputText value="#{project.CONTENT_TITLE_ADMIN_FINANCIALS_EDIT_RECEIPT}" />
-	</ui:define>
-
-	<ui:define name="content">
-		<h:form
-			id="form-edit-receipt"
-			rendered="#{not empty adminReceiptActionController.currentReceipt}"
-			>
-			<h:inputHidden value="#{adminReceiptActionController.receiptId}" />
-
-			<p:panelGrid
-				columns="1"
-				layout="grid"
-				>
-				<f:facet name="header">
-					<h:outputFormat
-						value="#{project.ADMIN_EDIT_RECEIPT_NUMBER_TITLE}"
-						rendered="#{not empty adminReceiptActionController.receiptNumber}"
-						>
-						<f:param value="#{adminReceiptActionController.receiptNumber}" />
-						<f:param value="#{adminReceiptActionController.receiptId}" />
-					</h:outputFormat>
-
-					<h:outputFormat
-						value="#{project.ADMIN_EDIT_RECEIPT_TITLE}"
-						rendered="#{empty adminReceiptActionController.receiptNumber}"
-						>
-						<f:param value="#{adminReceiptActionController.receiptId}" />
-					</h:outputFormat>
-				</f:facet>
-
-				<h:panelGroup styleClass="para" layout="block">
-					<h:outputText value="#{project.ADMIN_EDIT_RECEIPT_MINIMUM_DATA}" />
-				</h:panelGroup>
-
-				<ui:include src="/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl" />
-
-				<f:facet name="footer">
-					<p:panelGrid columns="2" layout="grid">
-						<p:commandButton
-							type="reset"
-							value="#{msg.BUTTON_RESET_FORM}"
-							/>
-
-						<p:commandButton
-							type="submit"
-							value="#{project.BUTTON_ADMIN_EDIT_RECEIPT}"
-							action="#{adminReceiptActionController.updateReceipt()}"
-							/>
-					</p:panelGrid>
-				</f:facet>
-			</p:panelGrid>
-		</h:form>
-	</ui:define>
-</ui:composition>
diff --git a/web/admin/financial/receipt/admin_receipt_list.xhtml b/web/admin/financial/receipt/admin_receipt_list.xhtml
deleted file mode 100644
index 89afa08a..00000000
--- a/web/admin/financial/receipt/admin_receipt_list.xhtml
+++ /dev/null
@@ -1,531 +0,0 @@
-<?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:core="http://mxchange.org/jsf/core/widgets"
-	xmlns:pl="http://mxchange.org/jsf/jfinancials/links"
-	xmlns:links="http://mxchange.org/jsf/core/links"
-	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="document_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-receipts">
-			<p:dataTable
-				id="receiptList"
-				var="receipt"
-				value="#{receiptListController.allReceipts}"
-				paginator="true"
-				paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
-				filteredValue="#{receiptListController.filteredReceipts}"
-				rows="10"
-				rowKey="#{receipt.receiptId}"
-				reflow="true"
-				resizableColumns="true"
-				rowsPerPageTemplate="5,10,20,50,100"
-				sortMode="multiple"
-				summary="#{project.TABLE_SUMMARY_ADMIN_LIST_RECEIPTS}"
-				emptyMessage="#{project.ADMIN_EMPTY_LIST_RECEIPT}"
-				widgetVar="receiptList"
-				selectionMode="single"
-				selection="#{receiptListController.selectedReceipt}"
-				skipChildren="true"
-				>
-
-				<f:facet name="header">
-					<p:panelGrid
-						columns="3"
-						layout="grid"
-						columnClasses="ui-grid-col-4,ui-grid-col-6,ui-grid-col-2"
-						>
-						<p:spacer />
-
-						<p:panelGrid
-							columns="2"
-							columnClasses="ui-grid-4,ui-grid-8"
-							layout="grid"
-							styleClass="ui-noborder"
-							>
-							<p:outputLabel
-								for="globalFilter"
-								value="#{msg.SEARCH_ALL_FIELDS}"
-								style="float: right"
-								/>
-
-							<p:inputText
-								id="globalFilter"
-								onkeyup="PF('receiptList').filter()"
-								placeholder="#{msg.ENTER_KEYWORD}"
-								/>
-						</p:panelGrid>
-
-						<p:outputPanel>
-							<p:spacer height="4" />
-							<p:commandButton
-								id="toggler"
-								type="button"
-								value="#{msg.SELECT_SHOWN_COLUMNS}"
-								styleClass="column-selector"
-								/>
-
-							<p:columnToggler datasource="receiptList" trigger="toggler" />
-						</p:outputPanel>
-					</p:panelGrid>
-				</f:facet>
-
-				<p:ajax
-					event="rowSelect"
-					update="form-list-financial-receipts:receipt-details"
-					oncomplete="PF('receiptDialog').show()"
-					/>
-
-				<p:column
-					headerText="#{msg.ID_HEADER}"
-					sortBy="#{receipt.receiptId}"
-					filterBy="#{receipt.receiptId}"
-					>
-					<p:link
-						outcome="admin_show_receipt"
-						value="#{receipt.receiptId}"
-						title="#{project.ADMIN_LINK_SHOW_RECEIPT_TITLE}"
-						>
-						<f:param name="receiptId" value="#{receipt.receiptId}" />
-					</p:link>
-				</p:column>
-
-				<p:column
-					headerText="#{project.RECEIPT_NUMBER_HEADER}"
-					sortBy="#{receipt.receiptNumber}"
-					filterBy="#{receipt.receiptNumber}"
-					>
-					<h:outputText value="#{receipt.receiptNumber}" rendered="#{not empty receipt.receiptNumber}" />
-					<h:outputText value="-" rendered="#{empty receipt.receiptNumber}" />
-				</p:column>
-
-				<p:column
-					headerText="#{msg.ADMIN_BRANCH_OFFICE_HEADER}"
-					sortBy="#{receipt.receiptBranchOffice}"
-					filterBy="#{receipt.receiptBranchOffice}"
-					filterMatchMode="in"
-					>
-					<f:facet name="filter">
-						<p:selectCheckboxMenu
-							filter="true"
-							filterMatchMode="contains"
-							label="#{msg.LABEL_BRANCH_OFFICES}"
-							onchange="PF('receiptList').filter()"
-							updateLabel="true"
-							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, false)}"
-								/>
-						</p:selectCheckboxMenu>
-					</f:facet>
-
-					<p:link
-						outcome="admin_show_branch_office"
-						value="#{beanHelper.renderBranchOffice(receipt.receiptBranchOffice, false)}"
-						title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}"
-						>
-						<f:param name="branchId" value="#{receipt.receiptBranchOffice.branchId}" />
-					</p:link>
-				</p:column>
-
-				<p:column
-					headerText="#{project.ADMIN_SELLER_HEADER}"
-					sortBy="#{receipt.receiptSellerEmployee}"
-					filterBy="#{receipt.receiptSellerEmployee}"
-					filterMatchMode="in"
-					>
-					<f:facet name="filter">
-						<p:selectCheckboxMenu
-							filter="true"
-							filterMatchMode="contains"
-							label="#{project.LABEL_RECEIPT_SELLERS}"
-							onchange="PF('receiptList').filter()"
-							updateLabel="true"
-							title="#{project.FILTER_BY_MULTIPLE_RECEIPT_SELLERS_TITLE}"
-							>
-
-							<f:converter converterId="EmployeeConverter" />
-
-							<f:selectItem
-								itemValue="#{null}"
-								itemLabel="#{msg.NONE_SELECTED}"
-								/>
-
-							<f:selectItems
-								value="#{employeeListController.allEmployees}"
-								var="employee"
-								itemValue="#{employee}"
-								itemLabel="#{beanHelper.renderEmployee(employee, false)}"
-								/>
-						</p:selectCheckboxMenu>
-					</f:facet>
-
-					<p:link
-						outcome="admin_show_employee"
-						value="#{beanHelper.renderEmployee(receipt.receiptSellerEmployee, false)}"
-						title="#{project.ADMIN_LINK_SHOW_RECEIPT_SELLER_EMPLOYEE_TITLE}"
-						rendered="#{not empty receipt.receiptSellerEmployee}"
-						>
-						<f:param name="userId" value="#{receipt.receiptSellerEmployee.employeeId}" />
-					</p:link>
-
-					<p:link
-						outcome="admin_assign_receipt_seller"
-						value="#{msg.ADMIN_LINK_ASSIGN}"
-						title="#{project.ADMIN_LINK_ASSIGN_RECEIPT_SELLER_EMPLOYEE_TITLE}"
-						rendered="#{empty receipt.receiptSellerEmployee}"
-						>
-						<f:param name="receiptId" value="#{receipt.receiptId}" />
-					</p:link>
-				</p:column>
-
-				<p:column
-					headerText="#{msg.ADMIN_USER_HEADER}"
-					sortBy="#{receipt.receiptUser}"
-					filterBy="#{receipt.receiptUser}"
-					filterMatchMode="in"
-					>
-					<f:facet name="filter">
-						<p:selectCheckboxMenu
-							filter="true"
-							filterMatchMode="contains"
-							label="#{msg.LABEL_USERS}"
-							onchange="PF('receiptList').filter()"
-							updateLabel="true"
-							title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
-							>
-
-							<f:converter converterId="UserConverter" />
-
-							<f:selectItem
-								itemValue="#{null}"
-								itemLabel="#{msg.NONE_SELECTED}"
-								/>
-
-							<f:selectItems
-								value="#{userListController.allUsers}"
-								var="user"
-								itemValue="#{user}"
-								itemLabel="#{beanHelper.renderUser(user)}"
-								/>
-						</p:selectCheckboxMenu>
-					</f:facet>
-
-					<p:link
-						outcome="admin_show_user"
-						value="#{beanHelper.renderUser(receipt.receiptUser)}"
-						title="#{project.ADMIN_LINK_SHOW_RECEIPT_OWNER_USER_TITLE}"
-						rendered="#{not empty receipt.receiptUser}"
-						>
-						<f:param name="userId" value="#{receipt.receiptUser.userId}" />
-					</p:link>
-
-					<p:link
-						outcome="admin_assign_receipt_user"
-						value="#{msg.ADMIN_LINK_ASSIGN}"
-						title="#{project.ADMIN_LINK_ASSIGN_RECEIPT_OWNER_USER_TITLE}"
-						rendered="#{empty receipt.receiptUser}"
-						>
-						<f:param name="receiptId" value="#{receipt.receiptId}" />
-					</p:link>
-				</p:column>
-
-				<p:column
-					headerText="#{project.ADMIN_RECEIPT_RESUMPTION_OF}"
-					sortBy="#{receipt.receiptResumptionOf}"
-					filterBy="#{receipt.receiptResumptionOf}"
-					filterMatchMode="in"
-					>
-					<f:facet name="filter">
-						<p:selectCheckboxMenu
-							filter="true"
-							filterMatchMode="contains"
-							label="#{project.LABEL_RECEIPTS}"
-							onchange="PF('receiptList').filter()"
-							updateLabel="true"
-							title="#{project.FILTER_BY_MULTIPLE_RECEIPTS_TITLE}"
-							>
-							<f:converter converterId="ReceiptConverter" />
-
-							<f:selectItems
-								value="#{receiptListController.allReceipts}"
-								var="receiptResumptionOf"
-								itemValue="#{receiptResumptionOf}"
-								itemLabel="#{receiptBeanHelper.renderReceipt(receiptResumptionOf, false)}"
-								/>
-						</p:selectCheckboxMenu>
-					</f:facet>
-
-					<p:link
-						outcome="admin_show_receipt"
-						value="#{receiptBeanHelper.renderReceipt(receipt.receiptResumptionOf, false)}"
-						title="#{project.ADMIN_LINK_SHOW_RECEIPT_TITLE}"
-						>
-						<f:param name="receiptId" value="#{receipt.receiptResumptionOf.receiptId}" />
-					</p:link>
-
-					<p:link
-						outcome="admin_assign_receipt_resumption"
-						value="#{msg.ADMIN_LINK_ASSIGN}"
-						title="#{project.ADMIN_LINK_ASSIGN_RECEIPT_RESUNPTION_OF_TITLE}"
-						rendered="#{empty receipt.receiptResumptionOf}"
-						>
-						<f:param name="receiptId" value="#{receipt.receiptId}" />
-					</p:link>
-				</p:column>
-
-				<p:column
-					headerText="#{msg.ADMIN_DATE_OF_ISSUE}"
-					sortBy="#{receipt.receiptIssued}"
-					filterBy="#{receipt.receiptIssued}"
-					>
-					<h:outputText id="receiptIssued" value="#{receipt.receiptIssued}">
-						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
-					</h:outputText>
-				</p:column>
-
-				<p:column
-					headerText="#{msg.ADMIN_PAYMENT_TYPE}"
-					sortBy="#{receipt.receiptPaymentType}"
-					filterBy="#{receipt.receiptPaymentType}"
-					filterMatchMode="in"
-					>
-					<f:facet name="filter">
-						<p:selectCheckboxMenu
-							filter="true"
-							filterMatchMode="contains"
-							label="#{msg.LABEL_PAYMENT_TYPES}"
-							updateLabel="true"
-							onchange="PF('receiptList').filter()"
-							>
-							<f:converter converterId="PaymentTypeConverter" />
-
-							<f:selectItems
-								value="#{dataController.paymentTypes}"
-								var="paymentType"
-								itemValue="#{paymentType}"
-								itemLabel="#{msg[paymentType.messageKey]}"
-								/>
-						</p:selectCheckboxMenu>
-					</f:facet>
-
-					<h:outputText value="#{msg[receipt.receiptPaymentType.messageKey]}" />
-				</p:column>
-
-				<p:column
-					headerText="#{msg.ENTRY_CREATED_HEADER}"
-					sortBy="#{receipt.receiptEntryCreated}"
-					filterable="false"
-					>
-					<h:outputText value="#{receipt.receiptEntryCreated}">
-						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
-					</h:outputText>
-				</p:column>
-
-				<p:column
-					headerText="#{msg.ENTRY_UPDATED_HEADER}"
-					sortBy="#{receipt.receiptEntryUpdated}"
-					filterable="false"
-					>
-					<h:outputText value="#{receipt.receiptEntryUpdated}">
-						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
-					</h:outputText>
-				</p:column>
-
-				<p:column
-					headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
-					sortable="false"
-					>
-					<p:menuButton value="#{msg.OPTIONS}">
-						<p:menuitem
-							outcome="admin_show_receipt"
-							value="#{msg.ADMIN_LINK_SHOW_SHORT}"
-							title="#{project.ADMIN_LINK_SHOW_RECEIPT_TITLE}"
-							>
-							<f:param name="receiptId" value="#{receipt.receiptId}" />
-						</p:menuitem>
-
-						<p:menuitem
-							outcome="admin_edit_receipt"
-							value="#{msg.ADMIN_LINK_EDIT_SHORT}"
-							title="#{project.ADMIN_LINK_EDIT_RECEIPT_TITLE}"
-							>
-							<f:param name="receiptId" value="#{receipt.receiptId}" />
-						</p:menuitem>
-
-						<p:menuitem outcome="admin_delete_receipt">
-							<h:outputText
-								styleClass="link-danger"
-								value="#{msg.ADMIN_LINK_DELETE_SHORT}"
-								title="#{project.ADMIN_LINK_DELETE_RECEIPT_TITLE}"
-								/>
-							<f:param name="receiptId" value="#{receipt.receiptId}" />
-						</p:menuitem>
-					</p:menuButton>
-				</p:column>
-			</p:dataTable>
-
-			<p:dialog
-				dynamic="true"
-				modal="true"
-				resizable="false"
-				header="#{project.ADMIN_SINGLE_RECEIPT_DETAILS_HEADER}"
-				hideEffect="fade"
-				showEffect="fade"
-				widgetVar="receiptDialog"
-				position="top"
-				responsive="true"
-				closeOnEscape="true"
-				>
-				<p:outputPanel id="receipt-details">
-					<p:panelGrid columns="2" rendered="#{not empty receiptListController.selectedReceipt}">
-						<f:facet name="header">
-							<h:outputFormat value="#{project.ADMIN_RECEIPT_DETAILS_HEADER}">
-								<f:param value="#{receiptListController.selectedReceipt.receiptId}" />
-							</h:outputFormat>
-						</f:facet>
-
-						<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}" />
-						<h:outputText value="#{receiptListController.selectedReceipt.receiptNumber}" />
-
-						<p:outputLabel value="#{project.RECEIPT_ISSUED}" title="#{project.RECEIPT_ISSUED_TITLE}" />
-						<h:outputText value="#{receiptListController.selectedReceipt.receiptIssued}">
-							<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
-						</h:outputText>
-
-						<p:outputLabel value="#{msg.BRANCH_OFFICE}" title="#{project.ASSIGNED_RECEIPT_BRANCH_OFFICE_TITLE}" />
-						<p:link
-							outcome="admin_show_branch_office"
-							value="#{beanHelper.renderBranchOffice(receiptListController.selectedReceipt.receiptBranchOffice, true)}"
-							title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}"
-							>
-							<f:param name="branchId" value="#{receiptListController.selectedReceipt.receiptBranchOffice.branchId}" />
-						</p:link>
-
-						<p:outputLabel value="#{project.SELLER_HEADER}" title="#{project.ASSIGNED_RECEIPT_SELLER_TITLE}" />
-						<p:link
-							outcome="admin_show_employee"
-							value="#{beanHelper.renderEmployee(receiptListController.selectedReceipt.receiptSellerEmployee, true)}"
-							title="#{project.ADMIN_LINK_SHOW_RECEIPT_SELLER_EMPLOYEE_TITLE}"
-							rendered="#{not empty receiptListController.selectedReceipt.receiptSellerEmployee}"
-							>
-							<f:param name="userId" value="#{receiptListController.selectedReceipt.receiptSellerEmployee.employeeId}" />
-						</p:link>
-						<h:outputText value="#{project.NO_SELLER_ASSIGNED_TO_RECEIPT}" rendered="#{empty receiptListController.selectedReceipt.receiptSellerEmployee}" />
-
-						<p:outputLabel value="#{msg.USER_HEADER}" title="#{project.ASSIGNED_RECEIPT_USER_TITLE}" />
-						<p:link
-							outcome="admin_show_user"
-							value="#{beanHelper.renderUser(receiptListController.selectedReceipt.receiptUser)}"
-							title="#{project.ADMIN_LINK_SHOW_RECEIPT_USER_EMPLOYEE_TITLE}"
-							rendered="#{not empty receiptListController.selectedReceipt.receiptUser}"
-							>
-							<f:param name="userId" value="#{receiptListController.selectedReceipt.receiptUser.userId}" />
-						</p:link>
-						<h:outputText value="#{project.NO_USER_ASSIGNED_TO_RECEIPT}" rendered="#{empty receiptListController.selectedReceipt.receiptUser}" />
-
-						<p:outputLabel value="#{project.RECEIPT_RESUMPTION_OF_HEADER}" title="#{project.ASSIGNED_RECEIPT_RESUMPTION_OF_TITLE}" />
-						<p:link
-							outcome="admin_show_receipt"
-							value="#{receiptBeanHelper.renderReceipt(receiptListController.selectedReceipt.receiptResumptionOf, true)}"
-							title="#{project.ADMIN_LINK_SHOW_RECEIPT_RESUMPTION_OF_TITLE}"
-							rendered="#{not empty receiptListController.selectedReceipt.receiptResumptionOf}"
-							>
-							<f:param name="receiptId" value="#{receiptListController.selectedReceipt.receiptResumptionOf.receiptId}" />
-						</p:link>
-						<h:outputText value="#{project.NO_RESUMED_RECEIPT_ASSIGNED_TO_RECEIPT}" rendered="#{empty receiptListController.selectedReceipt.receiptResumptionOf}" />
-
-						<p:outputLabel value="#{project.RECEIPT_REGISTER_NUMBER_HEADER}" title="#{project.RECEIPT_REGISTER_NUMBER_TITLE}" />
-						<h:outputText value="#{receiptListController.selectedReceipt.receiptRegisterNumber}" />
-
-						<p:outputLabel value="#{project.BARCODE_HEADER}" title="#{project.RECEIPT_BARCODE_TITLE}" />
-						<h:outputText value="#{project.RECEIPT_NO_BARCODE_ASSIGNED}" rendered="#{empty receiptListController.selectedReceipt.receiptBarCodeNumber}" />
-						<p:barcode
-							width="100%"
-							type="#{initParam['receipt_barcode_type']}"
-							value="#{receiptListController.selectedReceipt.receiptBarCodeNumber}"
-							rendered="#{not empty receiptListController.selectedReceipt.receiptBarCodeNumber}"
-							/>
-
-						<p:outputLabel value="#{project.QRCODE_HEADER}" title="#{project.RECEIPT_QRCODE_TITLE}" />
-						<h:outputText value="#{project.RECEIPT_NO_QRCODE_ASSIGNED}" rendered="#{empty receiptListController.selectedReceipt.receiptQrCode}" />
-						<p:barcode
-							width="100%"
-							type="qr"
-							value="#{receiptListController.selectedReceipt.receiptQrCode}"
-							rendered="#{not empty receiptListController.selectedReceipt.receiptQrCode}"
-							/>
-
-						<p:outputLabel value="#{project.RECEIPT_SEQUENCE_NUMBER_HEADER}" title="#{project.RECEIPT_SEQUENCE_NUMBER_TITLE}" />
-						<h:outputText value="#{receiptListController.selectedReceipt.receiptSequenceNumber}" />
-
-						<p:outputLabel value="#{msg.PAYMENT_TYPE}" title="#{project.RECEIPT_PAYMENT_TYPE_TITLE}" />
-						<h:outputText value="#{msg[receiptListController.selectedReceipt.receiptPaymentType.messageKey]}" />
-
-						<p:outputLabel value="#{msg.ENTRY_CREATED_HEADER}" title="#{project.RECEIPT_ENTRY_CREATED_TITLE}" />
-						<h:outputText value="#{receiptListController.selectedReceipt.receiptEntryCreated}">
-							<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
-						</h:outputText>
-
-						<p:outputLabel value="#{msg.ENTRY_UPDATED_HEADER}" title="#{project.RECEIPT_ENTRY_UPDATED_TITLE}" />
-						<h:outputText value="#{receiptListController.selectedReceipt.receiptEntryUpdated}">
-							<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
-						</h:outputText>
-					</p:panelGrid>
-				</p:outputPanel>
-			</p:dialog>
-		</h:form>
-
-		<h:form>
-			<p:panelGrid
-				layout="grid"
-				columns="1"
-				>
-				<h:panelGroup styleClass="table-header" layout="block">
-					<h4>
-						<h:outputText value="#{project.ADMIN_ADD_RECEIPT_TITLE}" />
-					</h4>
-				</h:panelGroup>
-
-				<ui:include src="/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl" />
-
-				<p:panelGrid columns="2" layout="grid">
-					<p:commandButton
-						styleClass="reset"
-						type="reset"
-						value="#{msg.BUTTON_RESET_FORM}"
-						/>
-
-					<p:commandButton
-						type="submit"
-						value="#{project.BUTTON_ADMIN_ADD_RECEIPT}"
-						action="#{adminReceiptActionController.addReceipt()}"
-						update="form-list-financial-receipts:receiptList"
-						/>
-				</p:panelGrid>
-			</p:panelGrid>
-		</h:form>
-	</ui:define>
-</ui:composition>
diff --git a/web/admin/financial/receipt_item/admin_receipt_item_edit.xhtml b/web/admin/financial/receipt_item/admin_receipt_item_edit.xhtml
deleted file mode 100644
index ab1855df..00000000
--- a/web/admin/financial/receipt_item/admin_receipt_item_edit.xhtml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?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="metadata">
-		<f:metadata>
-			<f:viewParam
-				name="receiptItemId"
-				value="#{adminReceiptItemActionController.currentReceiptItem}"
-				converter="ReceiptItemConverter"
-				required="true"
-				requiredMessage="#{project.ERROR_PARAMETER_RECEIPT_ITEM_ID_NOT_SET}"
-				converterMessage="#{project.PARAMETER_RECEIPT_ITEM_ID_INVALID}"
-				/>
-
-			<f:viewAction
-				action="#{adminReceiptItemActionController.copyAllReceiptItemProperties()}"
-				/>
-		</f:metadata>
-	</ui:define>
-
-	<ui:define name="document_admin_title">
-		<h:outputText value="#{project.PAGE_TITLE_ADMIN_FINANCIALS_EDIT_RECEIPT_ITEM}" />
-	</ui:define>
-
-	<ui:define name="content_header">
-		<h:outputText value="#{project.CONTENT_TITLE_ADMIN_FINANCIALS_EDIT_RECEIPT_ITEM}" />
-	</ui:define>
-
-	<ui:define name="content">
-		<h:form
-			id="form-edit-receipt-item"
-			rendered="#{not empty adminReceiptItemActionController.currentReceiptItem}"
-			>
-			<h:inputHidden value="#{adminReceiptItemActionController.itemId}" />
-
-			<p:panelGrid
-				columns="1"
-				layout="grid"
-				>
-				<f:facet name="header">
-					<h:outputFormat
-						value="#{project.ADMIN_EDIT_RECEIPT_ITEM_NUMBER_TITLE}"
-						rendered="#{not empty adminReceiptItemActionController.itemReceipt.receiptNumber}"
-						>
-						<f:param value="#{adminReceiptItemActionController.itemReceipt.receiptNumber}" />
-						<f:param value="#{adminReceiptItemActionController.itemId}" />
-					</h:outputFormat>
-
-					<h:outputFormat
-						value="#{project.ADMIN_EDIT_RECEIPT_ITEM_TITLE}"
-						rendered="#{empty adminReceiptItemActionController.itemReceipt.receiptNumber}"
-						>
-						<f:param value="#{adminReceiptItemActionController.itemId}" />
-					</h:outputFormat>
-				</f:facet>
-
-				<h:panelGroup styleClass="para" layout="block">
-					<h:outputText value="#{project.ADMIN_EDIT_RECEIPT_ITEM_MINIMUM_DATA}" />
-				</h:panelGroup>
-
-				<ui:include src="/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl" />
-
-				<f:facet name="footer">
-					<p:panelGrid columns="2" layout="grid">
-						<p:commandButton
-							type="reset"
-							value="#{msg.BUTTON_RESET_FORM}"
-							/>
-
-						<p:commandButton
-							type="submit"
-							value="#{project.BUTTON_ADMIN_EDIT_RECEIPT_ITEM}"
-							action="#{adminReceiptItemActionController.updateReceiptItem()}"
-							/>
-					</p:panelGrid>
-				</f:facet>
-			</p:panelGrid>
-		</h:form>
-	</ui:define>
-</ui:composition>
diff --git a/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml b/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
deleted file mode 100644
index c986c129..00000000
--- a/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
+++ /dev/null
@@ -1,497 +0,0 @@
-<?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="document_admin_title">
-		<h:outputText value="#{project.PAGE_TITLE_ADMIN_FINANCIALS_RECEIPT_ITEM_LIST}" />
-	</ui:define>
-
-	<ui:define name="content_header">
-		<h:outputText value="#{project.CONTENT_TITLE_ADMIN_FINANCIALS_RECEIPT_ITEM_LIST}" />
-	</ui:define>
-
-	<ui:define name="content">
-		<h:form id="form-list-financial-receipt-items">
-			<p:dataTable
-				id="receiptItemList"
-				var="receiptItem"
-				value="#{receiptItemListController.allReceiptItems}"
-				paginator="true"
-				paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
-				filteredValue="#{receiptItemListController.filteredReceiptItems}"
-				rows="10"
-				rowKey="#{receiptItem.itemId}"
-				reflow="true"
-				resizableColumns="true"
-				rowsPerPageTemplate="5,10,20,50,100"
-				sortMode="multiple"
-				summary="#{project.TABLE_SUMMARY_ADMIN_LIST_RECEIPT_ITEMS}"
-				emptyMessage="#{project.ADMIN_EMPTY_LIST_RECEIPT_ITEM}"
-				widgetVar="receiptItemList"
-				selectionMode="single"
-				selection="#{receiptItemListController.selectedReceiptItem}"
-				skipChildren="true"
-				>
-
-				<f:facet name="header">
-					<p:panelGrid
-						columns="3"
-						layout="grid"
-						columnClasses="ui-grid-col-4,ui-grid-col-6,ui-grid-col-2"
-						>
-						<p:spacer />
-
-						<p:panelGrid
-							columns="2"
-							columnClasses="ui-grid-4,ui-grid-8"
-							layout="grid"
-							styleClass="ui-noborder"
-							>
-							<p:outputLabel
-								for="globalFilter"
-								value="#{msg.SEARCH_ALL_FIELDS}"
-								style="float: right"
-								/>
-
-							<p:inputText
-								id="globalFilter"
-								onkeyup="PF('receiptItemList').filter()"
-								placeholder="#{msg.ENTER_KEYWORD}"
-								/>
-						</p:panelGrid>
-
-						<p:outputPanel>
-							<p:spacer height="4" />
-
-							<p:commandButton
-								id="toggler"
-								type="button"
-								value="#{msg.SELECT_SHOWN_COLUMNS}"
-								styleClass="column-selector"
-								/>
-
-							<p:columnToggler datasource="receiptItemList" trigger="toggler" />
-						</p:outputPanel>
-					</p:panelGrid>
-				</f:facet>
-
-				<p:ajax
-					event="rowSelect"
-					update="form-list-financial-receipt-items:receipt-item-details"
-					oncomplete="PF('receiptItemDialog').show()"
-					/>
-
-				<p:column
-					headerText="#{msg.ID_HEADER}"
-					sortBy="#{receiptItem.itemId}"
-					filterBy="#{receiptItem.itemId}"
-					>
-					<p:link
-						outcome="admin_show_receipt_item"
-						value="#{receiptItem.itemId}"
-						title="#{project.ADMIN_LINK_SHOW_RECEIPT_ITEM_TITLE}"
-						>
-						<f:param name="receiptItemId" value="#{receiptItem.itemId}" />
-					</p:link>
-				</p:column>
-
-				<p:column
-					headerText="#{product.BRAND_NAME_HEADER}"
-					sortBy="#{receiptItem.itemBrandName}"
-					filterBy="#{receiptItem.itemBrandName}"
-					>
-					<h:outputText value="#{receiptItem.itemBrandName}" />
-				</p:column>
-
-				<p:column
-					headerText="#{project.RECIPIENT_ITEM_COUPON_NUMBER_HEADER}"
-					sortBy="#{receiptItem.itemCouponNumber}"
-					filterBy="#{receiptItem.itemCouponNumber}"
-					>
-					<h:outputText value="#{receiptItem.itemCouponNumber}" />
-				</p:column>
-
-				<p:column
-					headerText="#{project.GROSS_PRICE_HEADER}"
-					sortBy="#{receiptItem.itemGrossPrice}"
-					filterBy="#{receiptItem.itemGrossPrice}"
-					filterFunction="#{productListController.filterByPrice}"
-					>
-					<h:outputText value="#{receiptItem.itemGrossPrice}" />
-				</p:column>
-
-				<p:column
-					headerText="#{project.NET_PRICE_HEADER}"
-					sortBy="#{receiptItem.itemNetPrice}"
-					filterBy="#{receiptItem.itemNetPrice}"
-					filterFunction="#{productListController.filterByPrice}"
-					>
-					<h:outputText value="#{receiptItem.itemNetPrice}">
-						<!-- @TODO Hard-coded EUR again -->
-						<f:convertNumber type="currency" currencyCode="EUR" />
-					</h:outputText>
-				</p:column>
-
-				<p:column
-					headerText="#{project.TAX_RATE_HEADER}"
-					sortBy="#{receiptItem.itemTaxRate}"
-					filterBy="#{receiptItem.itemTaxRate}"
-					>
-					<h:outputText value="#{receiptItem.itemTaxRate}">
-						<!-- @TODO No real percentage number, 7.0 means 7.0%, not 700% -->
-						<f:convertNumber type="number" />
-					</h:outputText>
-				</p:column>
-
-				<p:column
-					headerText="#{project.IS_DISCOUNT_HEADER}"
-					sortBy="#{receiptItem.itemIsDiscount}"
-					filterBy="#{receiptItem.itemIsDiscount}"
-					filterMatchMode="exact"
-					>
-					<f:facet name="filter">
-						<p:selectOneMenu onchange="PF('receiptItemList').filter()">
-							<f:converter converterId="javax.faces.Boolean" />
-							<f:selectItem itemLabel="#{msg.CHOICE_ALL}" itemValue="#{null}" />
-							<f:selectItem itemLabel="#{msg.CHOICE_YES}" itemValue="true" />
-							<f:selectItem itemLabel="#{msg.CHOICE_NO}" itemValue="false" />
-						</p:selectOneMenu>
-					</f:facet>
-
-					<h:outputText value="#{receiptItem.itemIsDiscount ? msg.CHOICE_YES : msg.CHOICE_NO}" />
-				</p:column>
-
-				<p:column
-					headerText="#{project.IS_REFUND_HEADER}"
-					sortBy="#{receiptItem.itemIsRefund}"
-					filterBy="#{receiptItem.itemIsRefund}"
-					filterMatchMode="exact"
-					>
-					<f:facet name="filter">
-						<p:selectOneMenu onchange="PF('receiptItemList').filter()">
-							<f:converter converterId="javax.faces.Boolean" />
-							<f:selectItem itemLabel="#{msg.CHOICE_ALL}" itemValue="#{null}" />
-							<f:selectItem itemLabel="#{msg.CHOICE_YES}" itemValue="true" />
-							<f:selectItem itemLabel="#{msg.CHOICE_NO}" itemValue="false" />
-						</p:selectOneMenu>
-					</f:facet>
-
-					<h:outputText value="#{receiptItem.itemIsRefund ? msg.CHOICE_YES : msg.CHOICE_NO}" />
-				</p:column>
-
-				<p:column
-					headerText="#{project.RECEIPT_ITEM_NUMBER_HEADER}"
-					sortBy="#{receiptItem.itemNumber}"
-					filterBy="#{receiptItem.itemNumber}"
-					>
-					<h:outputText value="#{receiptItem.itemNumber}" />
-				</p:column>
-
-				<p:column
-					headerText="#{project.ADMIN_RECEIPT_HEADER}"
-					sortBy="#{receiptItem.itemReceipt}"
-					filterBy="#{receiptItem.itemReceipt}"
-					filterMatchMode="in"
-					>
-					<f:facet name="filter">
-						<p:selectCheckboxMenu
-							filter="true"
-							filterMatchMode="contains"
-							label="#{project.LABEL_RECEIPTS}"
-							onchange="PF('receiptItemList').filter()"
-							updateLabel="true"
-							title="#{project.FILTER_BY_MULTIPLE_RECEIPTS_TITLE}"
-							>
-							<f:converter converterId="ReceiptConverter" />
-
-							<f:selectItems
-								value="#{receiptListController.allReceipts}"
-								var="receipt"
-								itemValue="#{receipt}"
-								itemLabel="#{receiptBeanHelper.renderReceipt(receipt, false)}"
-								/>
-						</p:selectCheckboxMenu>
-					</f:facet>
-
-					<p:link
-						outcome="admin_show_receipt"
-						value="#{receiptBeanHelper.renderReceipt(receiptItem.itemReceipt, false)}"
-						title="#{project.ADMIN_LINK_SHOW_RECEIPT_TITLE}"
-						>
-						<f:param name="receiptId" value="#{receiptItem.itemReceipt.receiptId}" />
-					</p:link>
-				</p:column>
-
-				<p:column
-					headerText="#{product.ADMIN_PRODUCT_HEADER}"
-					sortBy="#{receiptItem.itemProduct}"
-					filterBy="#{receiptItem.itemProduct}"
-					filterMatchMode="in"
-					>
-					<f:facet name="filter">
-						<p:selectCheckboxMenu
-							filter="true"
-							filterMatchMode="contains"
-							label="#{product.LABEL_PRODUCTS}"
-							onchange="PF('receiptItemList').filter()"
-							updateLabel="true"
-							title="#{product.FILTER_BY_MULTIPLE_GENERIC_PRODUCTS_TITLE}"
-							>
-							<f:converter converterId="GenericProductConverter" />
-
-							<f:selectItems
-								value="#{productListController.allProducts}"
-								var="genericProduct"
-								itemValue="#{genericProduct}"
-								itemLabel="#{productBeanHelper.renderGenericProduct(genericProduct)}"
-								/>
-						</p:selectCheckboxMenu>
-					</f:facet>
-
-					<p:link
-						outcome="admin_show_generic_product"
-						value="#{productBeanHelper.renderGenericProduct(receiptItem.itemProduct)}"
-						title="#{project.ADMIN_LINK_SHOW_RECEIPT_ITEM_PRODUCT_TITLE}"
-						>
-						<f:param name="productId" value="#{receiptItem.itemProduct.productId}" />
-					</p:link>
-				</p:column>
-
-				<p:column
-					headerText="#{project.RECEIPT_ITEM_PRODUCT_QUANTITY_HEADER}"
-					sortBy="#{receiptItem.itemProductQuantity}"
-					filterBy="#{receiptItem.itemProductQuantity}"
-					>
-					<h:outputText value="#{receiptItem.itemProductQuantity}" />
-				</p:column>
-
-				<p:column
-					headerText="#{product.ADMIN_PRODUCT_MANUFACTURER_HEADER}"
-					sortBy="#{receiptItem.itemManufacturer.companyName}"
-					filterBy="#{receiptItem.itemManufacturer}"
-					filterMatchMode="in"
-					>
-					<f:facet name="filter">
-						<p:selectCheckboxMenu
-							filter="true"
-							filterMatchMode="contains"
-							label="#{msg.LABEL_COMPANIES}"
-							onchange="PF('receiptItemList').filter()"
-							updateLabel="true"
-							title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}"
-							>
-							<f:converter converterId="BasicCompanyDataConverter" />
-
-							<f:selectItems
-								value="#{basicDataListController.allBasicData}"
-								var="basicData"
-								itemValue="#{basicData}"
-								itemLabel="#{beanHelper.renderBasicData(basicData, true, false)}"
-								/>
-						</p:selectCheckboxMenu>
-					</f:facet>
-
-					<p:link
-						outcome="admin_show_basic_data"
-						value="#{beanHelper.renderBasicData(receiptItem.itemManufacturer, true, false)}"
-						title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}"
-						rendered="#{not empty receiptItem.itemManufacturer}"
-						>
-						<f:param name="basicDataId" value="#{receiptItem.itemManufacturer.basicDataId}" />
-					</p:link>
-
-					<h:outputText
-						value="#{msg.ADMIN_NOT_ASSIGNED}"
-						title="#{project.ADMIN_NO_RECEIPT_ITEM_MANUFACTURER_ASSIGNED_TITLE}"
-						rendered="#{empty receiptItem.itemManufacturer}"
-						/>
-				</p:column>
-
-				<p:column
-					headerText="#{msg.ENTRY_CREATED_HEADER}"
-					sortBy="#{receiptItem.itemEntryCreated}"
-					filterable="false"
-					>
-					<h:outputText value="#{receiptItem.itemEntryCreated}">
-						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
-					</h:outputText>
-				</p:column>
-
-				<p:column
-					headerText="#{msg.ENTRY_UPDATED_HEADER}"
-					sortBy="#{receiptItem.itemEntryUpdated}"
-					filterable="false"
-					>
-					<h:outputText value="#{receiptItem.itemEntryUpdated}">
-						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
-					</h:outputText>
-				</p:column>
-
-				<p:column
-					headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
-					sortable="false"
-					>
-					<p:menuButton value="#{msg.OPTIONS}">
-						<p:menuitem
-							outcome="admin_show_receipt_item"
-							value="#{msg.ADMIN_LINK_SHOW_SHORT}"
-							title="#{project.ADMIN_LINK_SHOW_RECEIPT_ITEM_TITLE}"
-							>
-							<f:param name="receiptItemId" value="#{receiptItem.itemId}" />
-						</p:menuitem>
-
-						<p:menuitem
-							outcome="admin_edit_receipt_item"
-							value="#{msg.ADMIN_LINK_EDIT_SHORT}"
-							title="#{project.ADMIN_LINK_EDIT_RECEIPT_ITEM_TITLE}"
-							>
-							<f:param name="receiptItemId" value="#{receiptItem.itemId}" />
-						</p:menuitem>
-
-						<p:menuitem outcome="admin_delete_receipt_item">
-							<h:outputText
-								styleClass="link-danger"
-								value="#{msg.ADMIN_LINK_DELETE_SHORT}"
-								title="#{project.ADMIN_LINK_DELETE_RECEIPT_ITEM_TITLE}"
-								/>
-							<f:param name="receiptId" value="#{receiptItem.itemId}" />
-						</p:menuitem>
-					</p:menuButton>
-				</p:column>
-			</p:dataTable>
-
-			<p:dialog
-				dynamic="true"
-				modal="true"
-				resizable="false"
-				header="#{project.ADMIN_SINGLE_RECEIPT_ITEM_DETAILS_HEADER}"
-				hideEffect="fade"
-				showEffect="fade"
-				widgetVar="receiptItemDialog"
-				position="top"
-				responsive="true"
-				closeOnEscape="true"
-				>
-				<p:outputPanel id="receipt-item-details">
-					<p:panelGrid columns="2" rendered="#{not empty receiptItemListController.selectedReceiptItem}">
-						<f:facet name="header">
-							<h:outputFormat value="#{project.ADMIN_RECEIPT_ITEM_DETAILS_HEADER}">
-								<f:param value="#{receiptItemListController.selectedReceiptItem.itemId}" />
-							</h:outputFormat>
-						</f:facet>
-
-						<p:outputLabel value="#{msg.ID_HEADER}" title="#{project.RECEIPT_ITEM_ID_NUMBER_TITLE}" />
-						<h:outputText value="#{receiptItemListController.selectedReceiptItem.itemId}" />
-
-						<p:outputLabel value="#{project.RECEIPT_ITEM_NUMBER_HEADER}" title="#{project.RECEIPT_ITEM_NUMBER_TITLE}" />
-						<h:outputText value="#{receiptItemListController.selectedReceiptItem.itemNumber}" />
-
-						<p:outputLabel value="#{project.RECEIPT_ITEM_PRODUCT_QUANTITY_HEADER}" title="#{project.RECEIPT_ITEM_PRODUCT_QUANTITY_TITLE}" />
-						<h:outputText value="#{receiptItemListController.selectedReceiptItem.itemProductQuantity}" />
-
-						<p:outputLabel value="#{project.BRAND_NAME_HEADER}" title="#{project.RECEIPT_ITEM_BRAND_NAME_TITLE}" />
-						<h:outputText value="#{receiptItemListController.selectedReceiptItem.itemBrandName}" />
-
-						<p:outputLabel value="#{product.GENERIC_PRODUCT_I18N_KEY_HEADER}" title="#{product.GENERIC_PRODUCT_I18N_KEY_TITLE}" />
-						<p:link
-							outcome="admin_show_generic_product"
-							value="#{productBeanHelper.renderGenericProduct(receiptItemListController.selectedReceiptItem.itemProduct)}"
-							title="#{project.ADMIN_LINK_SHOW_RECEIPT_ITEM_PRODUCT_TITLE}"
-							>
-							<f:param name="productId" value="#{receiptItemListController.selectedReceiptItem.itemProduct.productId}" />
-						</p:link>
-
-						<p:outputLabel value="#{msg.ADMIN_MANUFACTURER_HEADER}" title="#{project.ADMIN_ASSIGNED_RECEIPT_ITEM_MANUFACTURER_TITLE}" />
-						<p:link
-							outcome="admin_show_basic_data"
-							title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}"
-							rendered="#{not empty receiptItemListController.selectedReceiptItem.itemManufacturer}"
-							>
-							<h:outputText value="#{beanHelper.renderBasicData(receiptItemListController.selectedReceiptItem.itemManufacturer, false, true)}" />
-						</p:link>
-						<h:outputText value="#{project.RECEIPT_ITEM_HAS_NO_MANUFACTURER_ASSIGNED}" rendered="#{empty receiptItemListController.selectedReceiptItem.itemManufacturer}" />
-
-						<p:outputLabel value="#{project.GROSS_PRICE_HEADER}" title="#{project.RECEIPT_ITEM_GROSS_PRICE_TITLE}" />
-						<h:outputText value="#{receiptItemListController.selectedReceiptItem.itemGrossPrice}">
-							<!-- @TODO Hard-coded EUR again -->
-							<f:convertNumber type="currency" currencyCode="EUR" />
-						</h:outputText>
-
-						<p:outputLabel value="#{project.NET_PRICE_HEADER}" title="#{project.RECEIPT_ITEM_NET_PRICE_TITLE}" />
-						<h:outputText value="#{receiptItemListController.selectedReceiptItem.itemNetPrice}">
-							<!-- @TODO Hard-coded EUR again -->
-							<f:convertNumber type="currency" currencyCode="EUR" />
-						</h:outputText>
-
-						<p:outputLabel value="#{project.TAX_RATE_HEADER}" title="#{project.RECEIPT_ITEM_TAX_RATE_TITLE}" />
-						<h:outputText value="#{receiptItemListController.selectedReceiptItem.itemTaxRate}">
-							<!-- @TODO No real percentage number, 7.0 means 7.0%, not 700% -->
-							<f:convertNumber type="number" />
-						</h:outputText>
-
-						<p:outputLabel value="#{project.IS_DISCOUNT_HEADER}" title="#{project.RECEIPT_ITEM_IS_DISCOUNT_TITLE}" />
-						<h:outputText value="#{receiptItemListController.selectedReceiptItem.itemIsDiscount ? msg.CHOICE_YES : msg.CHOICE_NO}" />
-
-						<p:outputLabel value="#{project.IS_REFUND_HEADER}" title="#{project.RECEIPT_ITEM_IS_REFUND_TITLE}" />
-						<h:outputText value="#{receiptItemListController.selectedReceiptItem.itemIsRefund ? msg.CHOICE_YES : msg.CHOICE_NO}" />
-
-						<p:outputLabel value="#{project.ASSIGNED_RECEIPT_HEADER}" title="#{project.RECEIPT_ITEM_ASSIGNED_RECEIPT_TITLE}" />
-						<p:link
-							outcome="admin_show_receipt"
-							value="#{receiptBeanHelper.renderReceipt(receiptItemListController.selectedReceiptItem.itemReceipt, true)}"
-							title="#{project.ADMIN_LINK_SHOW_RECEIPT_TITLE}"
-							>
-							<f:param name="receiptId" value="#{receiptItemListController.selectedReceiptItem.itemReceipt.receiptId}" />
-						</p:link>
-
-						<p:outputLabel value="#{msg.ENTRY_CREATED_HEADER}" title="#{project.RECEIPT_ITEM_CREATED_TITLE}" />
-						<h:outputText value="#{receiptItemListController.selectedReceiptItem.itemEntryCreated}">
-							<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
-						</h:outputText>
-
-						<p:outputLabel value="#{msg.ENTRY_UPDATED_HEADER}" title="#{project.RECEIPT_ITEM_UPDATED_TITLE}" />
-						<h:outputText value="#{receiptItemListController.selectedReceiptItem.itemEntryUpdated}">
-							<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
-						</h:outputText>
-					</p:panelGrid>
-				</p:outputPanel>
-			</p:dialog>
-		</h:form>
-
-		<h:form>
-			<p:panelGrid
-				columns="1"
-				layout="grid"
-				>
-				<h:panelGroup styleClass="table-header" layout="block">
-					<h4>
-						<h:outputText value="#{project.ADMIN_ADD_RECEIPT_ITEM_TITLE}" />
-					</h4>
-				</h:panelGroup>
-
-				<ui:include src="/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl" />
-
-				<p:panelGrid columns="2" layout="grid">
-					<p:commandButton
-						styleClass="reset"
-						type="reset"
-						value="#{msg.BUTTON_RESET_FORM}"
-						/>
-
-					<p:commandButton
-						type="submit"
-						value="#{project.BUTTON_ADMIN_ADD_RECEIPT_TEM}"
-						action="#{adminReceiptItemActionController.addReceiptItem()}"
-						update="form-list-financial-receipt-items:receiptItemList"
-						/>
-				</p:panelGrid>
-			</p:panelGrid>
-		</h:form>
-	</ui:define>
-</ui:composition>
diff --git a/web/resources/css/custom.css b/web/resources/css/custom.css
new file mode 100644
index 00000000..3f53589a
--- /dev/null
+++ b/web/resources/css/custom.css
@@ -0,0 +1,235 @@
+body {
+	font-size: 0.9em !important;
+	font-family: sans-serif !important;
+	margin: 0px;
+}
+
+.page-header > h1 {
+	margin: 2px;
+}
+
+a:link, a:visited {
+	color: #045491;
+	text-decoration: none;
+}
+
+a:link:hover, a:visited:hover {
+	color: #045491;
+	text-decoration : underline;
+}
+
+.page-header {
+	background-color: steelblue;
+	color: white;
+	padding: 5px;
+}
+
+.page-content-gap {
+	height: 0.35em;
+	background-image: linear-gradient(steelblue, white);
+}
+
+.page-footer {
+	background-color: lightblue;
+	overflow: auto;
+}
+
+.page-header a:link, .page-header a:visited {
+	color: white;
+	font-weight : bold;
+	text-decoration: none;
+}
+
+.page-header a:link:hover, .page-header a:visited:hover  {
+	color: black;
+	font-weight : bold;
+	text-decoration : underline;
+}
+
+.table-row {
+	width: 100%;
+	min-height: 20px;
+	margin: 2px;
+	overflow: auto;
+}
+
+.para {
+	padding: 5px;
+}
+
+.table-header {
+	text-align: center;
+	font-weight: bold;
+}
+
+.table-data-label, .table-data-field {
+	display: block;
+	border: 1px solid #aaaaaa;
+	border-top-right-radius: 8px;
+	border-bottom-left-radius: 8px;
+}
+
+.table-data-label {
+	font-weight: bold;
+	background-image: linear-gradient(#eeeeee, #aaaaaa);
+	height: 16px;
+	padding-left: 4px;
+}
+
+.table-data-field {
+	background-color: #f5f5f5;
+	vertical-align: top;
+	padding-top: 1px;
+	padding-bottom: 1px;
+	padding-left: 2px;
+	padding-right: 1px;
+	margin-top: 2px;
+	min-height: 15px;
+}
+
+#content-header {
+	border-color: grey;
+	background-image: linear-gradient(#eeeeee, #aaaaaa);
+	font-weight: bold;
+	font-size: 18px;
+	margin-bottom: 20px;
+	padding-left: 5px;
+	line-height: 20px;
+}
+
+.table-header-column {
+	width: 100px;
+}
+
+.table-header-column25 {
+	width: 25%;
+}
+
+.table-data-column {
+	width: 100px;
+}
+
+.item_price, .item_total_price {
+	text-align: right;
+}
+
+.alert-danger {
+	color: red;
+}
+
+.alert-danger:hover {
+	cursor: not-allowed;
+}
+
+.alert-warning {
+	color: orange;
+}
+
+.alert-info {
+	color: cornflowerblue;
+}
+
+.message-container {
+	border: 1px solid grey;
+	border-top-right-radius: 8px;
+	border-bottom-left-radius: 8px;
+	background-color: ghostwhite;
+}
+
+.message-medium {
+	width: 400px;
+}
+
+.message-auto {
+	margin: auto 0px;
+}
+
+.message-mini {
+	width: 160px;
+}
+
+.message-header {
+	border-bottom: 1px solid grey;
+	background-image: linear-gradient(#eeeeee, #aaaaaa);
+	border-top-right-radius: 8px;
+	line-height: 18px;
+	text-align: center;
+	font-weight: bold;
+}
+
+.user-status-confirmed, .customer-status-confirmed {
+	color: #00aa00;
+}
+
+.user-status-unconfirmed, .customer-status-unconfirmed {
+	color: #00aaaa;
+}
+
+.user-status-locked, .customer-status-locked {
+	color: #aa0000;
+}
+
+.link-warning {
+	color: #aaaa00;
+}
+
+.link-danger {
+	color: #aa0000;
+}
+
+#content-header {
+	border: 1px solid grey;
+}
+
+#menu-content-wrapper {
+	overflow: auto;
+}
+
+.button-danger {
+	border-color: #ee0000;
+	background-color: #880000;
+	color: white;
+}
+
+.button-warning {
+	border-color: #eeee00;
+	background-color: #aaaa00;
+	color: white;
+}
+
+.button-danger:hover {
+	border-color: #dd0000;
+	background-color: #aa0000;
+	color: #eeeeee;
+}
+
+.button-warning:hover {
+	border-color: #dddd00;
+	background-color: #cccc00;
+	color: #eeeeee;
+}
+
+#menu-content-wrapper::after {
+	clear: both;
+}
+
+.table-row::after {
+	clear: both;
+}
+
+#footer::after {
+	clear: both;
+}
+
+.column-selector {
+	float: right;
+}
+
+.ui-noborder {
+	border: initial;
+}
+
+.ui-transparent-widget > div {
+	background-color: transparent;
+	background-image: initial;
+}
diff --git a/web/resources/css/layout.css b/web/resources/css/layout.css
deleted file mode 100644
index 3f53589a..00000000
--- a/web/resources/css/layout.css
+++ /dev/null
@@ -1,235 +0,0 @@
-body {
-	font-size: 0.9em !important;
-	font-family: sans-serif !important;
-	margin: 0px;
-}
-
-.page-header > h1 {
-	margin: 2px;
-}
-
-a:link, a:visited {
-	color: #045491;
-	text-decoration: none;
-}
-
-a:link:hover, a:visited:hover {
-	color: #045491;
-	text-decoration : underline;
-}
-
-.page-header {
-	background-color: steelblue;
-	color: white;
-	padding: 5px;
-}
-
-.page-content-gap {
-	height: 0.35em;
-	background-image: linear-gradient(steelblue, white);
-}
-
-.page-footer {
-	background-color: lightblue;
-	overflow: auto;
-}
-
-.page-header a:link, .page-header a:visited {
-	color: white;
-	font-weight : bold;
-	text-decoration: none;
-}
-
-.page-header a:link:hover, .page-header a:visited:hover  {
-	color: black;
-	font-weight : bold;
-	text-decoration : underline;
-}
-
-.table-row {
-	width: 100%;
-	min-height: 20px;
-	margin: 2px;
-	overflow: auto;
-}
-
-.para {
-	padding: 5px;
-}
-
-.table-header {
-	text-align: center;
-	font-weight: bold;
-}
-
-.table-data-label, .table-data-field {
-	display: block;
-	border: 1px solid #aaaaaa;
-	border-top-right-radius: 8px;
-	border-bottom-left-radius: 8px;
-}
-
-.table-data-label {
-	font-weight: bold;
-	background-image: linear-gradient(#eeeeee, #aaaaaa);
-	height: 16px;
-	padding-left: 4px;
-}
-
-.table-data-field {
-	background-color: #f5f5f5;
-	vertical-align: top;
-	padding-top: 1px;
-	padding-bottom: 1px;
-	padding-left: 2px;
-	padding-right: 1px;
-	margin-top: 2px;
-	min-height: 15px;
-}
-
-#content-header {
-	border-color: grey;
-	background-image: linear-gradient(#eeeeee, #aaaaaa);
-	font-weight: bold;
-	font-size: 18px;
-	margin-bottom: 20px;
-	padding-left: 5px;
-	line-height: 20px;
-}
-
-.table-header-column {
-	width: 100px;
-}
-
-.table-header-column25 {
-	width: 25%;
-}
-
-.table-data-column {
-	width: 100px;
-}
-
-.item_price, .item_total_price {
-	text-align: right;
-}
-
-.alert-danger {
-	color: red;
-}
-
-.alert-danger:hover {
-	cursor: not-allowed;
-}
-
-.alert-warning {
-	color: orange;
-}
-
-.alert-info {
-	color: cornflowerblue;
-}
-
-.message-container {
-	border: 1px solid grey;
-	border-top-right-radius: 8px;
-	border-bottom-left-radius: 8px;
-	background-color: ghostwhite;
-}
-
-.message-medium {
-	width: 400px;
-}
-
-.message-auto {
-	margin: auto 0px;
-}
-
-.message-mini {
-	width: 160px;
-}
-
-.message-header {
-	border-bottom: 1px solid grey;
-	background-image: linear-gradient(#eeeeee, #aaaaaa);
-	border-top-right-radius: 8px;
-	line-height: 18px;
-	text-align: center;
-	font-weight: bold;
-}
-
-.user-status-confirmed, .customer-status-confirmed {
-	color: #00aa00;
-}
-
-.user-status-unconfirmed, .customer-status-unconfirmed {
-	color: #00aaaa;
-}
-
-.user-status-locked, .customer-status-locked {
-	color: #aa0000;
-}
-
-.link-warning {
-	color: #aaaa00;
-}
-
-.link-danger {
-	color: #aa0000;
-}
-
-#content-header {
-	border: 1px solid grey;
-}
-
-#menu-content-wrapper {
-	overflow: auto;
-}
-
-.button-danger {
-	border-color: #ee0000;
-	background-color: #880000;
-	color: white;
-}
-
-.button-warning {
-	border-color: #eeee00;
-	background-color: #aaaa00;
-	color: white;
-}
-
-.button-danger:hover {
-	border-color: #dd0000;
-	background-color: #aa0000;
-	color: #eeeeee;
-}
-
-.button-warning:hover {
-	border-color: #dddd00;
-	background-color: #cccc00;
-	color: #eeeeee;
-}
-
-#menu-content-wrapper::after {
-	clear: both;
-}
-
-.table-row::after {
-	clear: both;
-}
-
-#footer::after {
-	clear: both;
-}
-
-.column-selector {
-	float: right;
-}
-
-.ui-noborder {
-	border: initial;
-}
-
-.ui-transparent-widget > div {
-	background-color: transparent;
-	background-image: initial;
-}