From: Roland Häder <roland@mxchange.org>
Date: Tue, 12 Mar 2019 13:16:24 +0000 (+0100)
Subject: Don't cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9644cb269350a651bf7e6acfa4663d4e141def03;p=jfinancials-war.git
Don't cherry-pick:
- renamed more i18n strings to follow naming-convention
- rewrote p:link and p:column to have each attribute in separate line which
helps reading JSF views/templates
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 e1e3a28a..2cc0e805 100644
--- a/src/java/org/mxchange/localization/project_de_DE.properties
+++ b/src/java/org/mxchange/localization/project_de_DE.properties
@@ -64,7 +64,7 @@ ADMIN_RECEIPT_OTHER_LEGEND=Sonstige Daten des Kassenbons eingeben:
ADMIN_RECEIPT_OTHER_LEGEND_TITLE=Geben Sie hier weitere Daten an, die Sie auf dem Kassenbon finden koennen.
ADMIN_LINK_SHOW_RECEIPT_OWNER_USER_TITLE=Zeigt zugewiesenen Benutzer des Kassenbons an.
#@TODO Please fix German umlauts!
-ADMIN_ASSIGNED_RECEIPT_SELLER=Zugewiesener Verkaeufer:
+ADMIN_SELLER_HEADER=Verkaeufer:
#@TODO Please fix German umlauts!
ADMIN_LINK_LIST_RECEIPT_ITEMS=Eintraege auflisten
#@TODO Please fix German umlauts!
@@ -80,7 +80,7 @@ CONTENT_TITLE_ADMIN_FINANCIALS_RECEIPT_ITEM_LIST=Artikel auflisten:
TABLE_SUMMARY_ADMIN_LIST_RECEIPT_ITEMS=Diese Tabelle listet alle eingetragenen Artikel auf.
#@TODO Please fix German umlauts!
ADMIN_EMPTY_LIST_RECEIPT_ITEM=Es befinden sich keine Artikel in der Datenbank. Oder Ihre Suche ergab keine Uebereinstimmungen.
-ADMIN_ASSIGNED_ITEM_RECEIPT=Zugewiesener Kassenbon:
+ADMIN_RECEIPT_HEADER=Kassenbon:
#@TODO Please fix German umlauts!
ADMIN_ADD_RECEIPT_ITEM_TITLE=Neuen Artikel hinzufuegen
ADMIN_RECEIPT_ITEM_LEGEND=Daten des Artikels:
@@ -96,7 +96,6 @@ ENTER_RECEIPT_ITEM_QUANTITY_TITLE=Geben Sie hier die Stueckanzahl an, wie sie au
ENTER_RECEIPT_SEQUENCE_NUMBER=Sequenznummer eingeben:
#@TODO Please fix German umlauts!
SELECT_RECEIPT_ITEM_MANUFACTURER=Hersteller zum Kassenboneintrah auswaehlen:
-ADMIN_RECEIPT_ITEM_MANUFACTURER_NAME_HEADER=Hersteller des Boneintrages:
ENTER_RAND_NAME=Warenzeichen/Marke eingeben:
ENTER_RAND_NAME_TITLE=Geben Sie das Warenzeichen ein, dass Sie auf dem Kassenbon finden.
RECEIPT_ISSUED=Ausgestellt:
@@ -153,7 +152,6 @@ RECEIPT_ITEM_PRODUCT_QUANTITY_TITLE=Menge des Kassenboneintrages.
RECEIPT_ITEM_BRAND_NAME_TITLE=Warenzeichen des Kassenboneintrages.
RECEIPT_ITEM_GROSS_PRICE_TITLE=Gesamtbruttopreis eines einzelnen Kassenboneintrages.
RECEIPT_ITEM_NET_PRICE_TITLE=GesamtNettopreis eines einzelnen Kassenboneintrages.
-ADMIN_ASSIGNED_MANUFACTURER_HEADER=Zugewiesener Hersteller:
ADMIN_ASSIGNED_RECEIPT_ITEM_MANUFACTURER_TITLE=Zum Kassenboneintrag zugewiesene Grunddaten des Herstellers (optional).
RECEIPT_ITEM_HAS_NO_MANUFACTURER_ASSIGNED=Dieser Kassenboneintrag hat keinen Hersteller zugewiesen.
GROSS_PRICE_HEADER=Bruttopreis:
diff --git a/src/java/org/mxchange/localization/project_en_US.properties b/src/java/org/mxchange/localization/project_en_US.properties
index 3d7a3aed..4d66884e 100644
--- a/src/java/org/mxchange/localization/project_en_US.properties
+++ b/src/java/org/mxchange/localization/project_en_US.properties
@@ -49,7 +49,7 @@ ENTER_RECEIPT_BARCODE_NUMBER=Enter bar code number:
ADMIN_RECEIPT_OTHER_LEGEND=Enter other data of receipt:
ADMIN_RECEIPT_OTHER_LEGEND_TITLE=Enter other additional data you can find on the receipt.
ADMIN_LINK_SHOW_RECEIPT_OWNER_USER_TITLE=Shows assigned user of receipt.
-ADMIN_ASSIGNED_RECEIPT_SELLER=Assigned seller:
+ADMIN_SELLER_HEADER=Seller:
ADMIN_LINK_LIST_RECEIPT_ITEMS=Receipt items
ADMIN_LINK_LIST_RECEIPT_ITEMS_TITLE=Lists all receipt items.
ADMIN_LINK_SHOW_RECEIPT_TITLE=Shows receipt data.
@@ -60,8 +60,7 @@ PAGE_TITLE_ADMIN_FINANCIALS_RECEIPT_ITEM_LIST=List receipt items
CONTENT_TITLE_ADMIN_FINANCIALS_RECEIPT_ITEM_LIST=List receipt items:
TABLE_SUMMARY_ADMIN_LIST_RECEIPT_ITEMS=This table lists all registered receipt items.
ADMIN_EMPTY_LIST_RECEIPT_ITEM=There are no receipt items in database. Or your search criteria doesn't match anything.
-ADMIN_ASSIGNED_ITEM_RECEIPT=Assigned item's receipt:
-ADMIN_ASSIGNED_ITEM_PRODUCT=Assigned product:
+ADMIN_RECEIPT_HEADER=Receipt:
ADMIN_ADD_RECEIPT_ITEM_TITLE=Add new receipt item
ADMIN_RECEIPT_ITEM_LEGEND=Data of receipt item:
ADMIN_RECEIPT_ITEM_BASIC_LEGEND_TITLE=Please enter here data of the new receipt item.
@@ -73,7 +72,6 @@ ADMIN_RECEIPT_ITEM_QUANTITY_REQUIRED=Please enter product quantity.
ENTER_RECEIPT_ITEM_QUANTITY_TITLE=Enter here the amount of the choosen product that is shown on the receipt.
ENTER_RECEIPT_SEQUENCE_NUMBER=Enter sequence number:
SELECT_RECEIPT_ITEM_MANUFACTURER=Choose manufacturer for receipt item:
-ADMIN_RECEIPT_ITEM_MANUFACTURER_NAME_HEADER=Manufacturer of product item:
RECEIPT_ISSUED=Issued at:
RECEIPT_NUMBER_HEADER=Receipt number:
ENTER_RECEIPT_ITEM_NUMBER=Item number:
@@ -116,7 +114,6 @@ RECEIPT_ITEM_PRODUCT_QUANTITY_TITLE=Quantity of the receipt item.
RECEIPT_ITEM_BRAND_NAME_TITLE=Brand name of 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:
ADMIN_ASSIGNED_RECEIPT_ITEM_MANUFACTURER_TITLE=Manufacturer (basic data) assigned to receipt item (optional).
RECEIPT_ITEM_HAS_NO_MANUFACTURER_ASSIGNED=This receipt item has no manufacturer assigned.
GROSS_PRICE_HEADER=Gross price:
diff --git a/web/admin/financial/receipt/admin_receipt_list.xhtml b/web/admin/financial/receipt/admin_receipt_list.xhtml
index 7d631c23..a2e69f23 100644
--- a/web/admin/financial/receipt/admin_receipt_list.xhtml
+++ b/web/admin/financial/receipt/admin_receipt_list.xhtml
@@ -76,18 +76,35 @@
oncomplete="PF('receiptDialog').show()"
/>
- <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}">
+ <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}">
+ <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_ASSIGNED_BRANCH_OFFICE}" sortBy="#{receipt.receiptBranchOffice}" filterBy="#{receipt.receiptBranchOffice}" filterMatchMode="in">
+ <p:column
+ headerText="#{msg.ADMIN_BRANCH_OFFICE_HEADER}"
+ sortBy="#{receipt.receiptBranchOffice}"
+ filterBy="#{receipt.receiptBranchOffice}"
+ filterMatchMode="in"
+ >
<f:facet name="filter">
<p:selectCheckboxMenu
filter="true"
@@ -108,12 +125,21 @@
</p:selectCheckboxMenu>
</f:facet>
- <p:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" value="#{beanHelper.renderBranchOffice(receipt.receiptBranchOffice)}">
+ <p:link
+ outcome="admin_show_branch_office"
+ value="#{beanHelper.renderBranchOffice(receipt.receiptBranchOffice)}"
+ 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_ASSIGNED_RECEIPT_SELLER}" sortBy="#{receipt.receiptUser}" filterBy="#{receipt.receiptUser}" filterMatchMode="in">
+ <p:column
+ headerText="#{project.ADMIN_SELLER_HEADER}"
+ sortBy="#{receipt.receiptUser}"
+ filterBy="#{receipt.receiptUser}"
+ filterMatchMode="in"
+ >
<f:facet name="filter">
<p:selectCheckboxMenu
filter="true"
@@ -136,16 +162,31 @@
</p:selectCheckboxMenu>
</f:facet>
- <p:link outcome="admin_show_employee" title="#{project.ADMIN_LINK_SHOW_RECEIPT_SELLER_EMPLOYEE_TITLE}" value="#{beanHelper.renderEmployee(receipt.receiptSellerEmployee)}" rendered="#{not empty receipt.receiptSellerEmployee}">
+ <p:link
+ outcome="admin_show_employee"
+ value="#{beanHelper.renderEmployee(receipt.receiptSellerEmployee)}"
+ 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" title="#{project.ADMIN_LINK_ASSIGN_RECEIPT_SELLER_EMPLOYEE_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty receipt.receiptSellerEmployee}">
+ <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_ASSIGNED_USER_HEADER}" sortBy="#{receipt.receiptUser}" filterBy="#{receipt.receiptUser}" filterMatchMode="in">
+ <p:column
+ headerText="#{msg.ADMIN_USER_HEADER}"
+ sortBy="#{receipt.receiptUser}"
+ filterBy="#{receipt.receiptUser}"
+ filterMatchMode="in"
+ >
<f:facet name="filter">
<p:selectCheckboxMenu
filter="true"
@@ -168,22 +209,41 @@
</p:selectCheckboxMenu>
</f:facet>
- <p:link outcome="admin_show_user" title="#{project.ADMIN_LINK_SHOW_RECEIPT_OWNER_USER_TITLE}" value="#{beanHelper.renderUser(receipt.receiptUser)}" rendered="#{not empty receipt.receiptUser}">
+ <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" title="#{project.ADMIN_LINK_ASSIGN_RECEIPT_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty receipt.receiptUser}">
+ <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="#{msg.ADMIN_DATE_OF_ISSUE}" sortBy="#{receipt.receiptIssued}" filterBy="#{receipt.receiptIssued}">
+ <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">
+ <p:column
+ headerText="#{msg.ADMIN_PAYMENT_TYPE}"
+ sortBy="#{receipt.receiptPaymentType}"
+ filterBy="#{receipt.receiptPaymentType}"
+ filterMatchMode="in"
+ >
<f:facet name="filter">
<p:selectCheckboxMenu
filter="true"
@@ -206,7 +266,10 @@
<h:outputText value="#{msg[receipt.receiptPaymentType.i18nKey]}" />
</p:column>
- <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false">
+ <p:column
+ headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+ sortable="false"
+ >
<pl:outputReceiptAdminDropdownMenu receipt="#{receipt}" />
</p:column>
</p:dataTable>
@@ -242,18 +305,32 @@
</h:outputText>
<p:outputLabel value="#{msg.BRANCH_OFFICE}" title="#{project.ASSIGNED_RECEIPT_BRANCH_OFFICE_TITLE}" />
- <p:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" value="#{beanHelper.renderBranchOffice(receiptListController.selectedReceipt.receiptBranchOffice)}">
+ <p:link
+ outcome="admin_show_branch_office"
+ value="#{beanHelper.renderBranchOffice(receiptListController.selectedReceipt.receiptBranchOffice)}"
+ 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" title="#{project.ADMIN_LINK_SHOW_RECEIPT_SELLER_EMPLOYEE_TITLE}" value="#{beanHelper.renderEmployee(receiptListController.selectedReceipt.receiptSellerEmployee)}" rendered="#{not empty receiptListController.selectedReceipt.receiptSellerEmployee}">
+ <p:link
+ outcome="admin_show_employee"
+ value="#{beanHelper.renderEmployee(receiptListController.selectedReceipt.receiptSellerEmployee)}"
+ 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" title="#{project.ADMIN_LINK_SHOW_RECEIPT_USER_EMPLOYEE_TITLE}" value="#{beanHelper.renderUser(receiptListController.selectedReceipt.receiptUser)}" rendered="#{not empty receiptListController.selectedReceipt.receiptUser}">
+ <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}" />
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 3b2c1444..58b8e257 100644
--- a/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
+++ b/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
@@ -77,13 +77,26 @@
oncomplete="PF('receiptItemDialog').show()"
/>
- <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}">
+ <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="#{project.ADMIN_ASSIGNED_ITEM_RECEIPT}" sortBy="#{receiptItem.itemReceipt}" filterBy="#{receiptItem.itemReceipt}" filterMatchMode="in">
+ <p:column
+ headerText="#{project.ADMIN_RECEIPT_HEADER}"
+ sortBy="#{receiptItem.itemReceipt}"
+ filterBy="#{receiptItem.itemReceipt}"
+ filterMatchMode="in"
+ >
<f:facet name="filter">
<p:selectCheckboxMenu
filter="true"
@@ -104,38 +117,56 @@
</p:selectCheckboxMenu>
</f:facet>
- <p:link outcome="admin_show_receipt" title="#{project.ADMIN_LINK_SHOW_RECEIPT_TITLE}" value="#{receiptBeanHelper.renderReceipt(receiptItem.itemReceipt)}">
+ <p:link
+ outcome="admin_show_receipt"
+ value="#{receiptBeanHelper.renderReceipt(receiptItem.itemReceipt)}"
+ title="#{project.ADMIN_LINK_SHOW_RECEIPT_TITLE}"
+ >
<f:param name="receiptId" value="#{receiptItem.itemReceipt.receiptId}" />
</p:link>
</p:column>
- <p:column headerText="#{project.ADMIN_ASSIGNED_ITEM_PRODUCT}" sortBy="#{receiptItem.itemProduct}" filterBy="#{receiptItem.itemProduct}" filterMatchMode="in">
+ <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="#{project.LABEL_PRODUCTS}"
+ label="#{product.LABEL_PRODUCTS}"
onchange="PF('receiptItemList').filter()"
updateLabel="true"
- title="#{project.FILTER_BY_MULTIPLE_ITEM_PRODUCTS_TITLE}"
+ title="#{product.FILTER_BY_MULTIPLE_GENERIC_PRODUCTS_TITLE}"
>
<f:converter converterId="GenericProductConverter" />
<f:selectItems
value="#{productListController.allProducts}"
- var="product"
- itemValue="#{product}"
- itemLabel="#{productBeanHelper.renderGenericProduct(product)}"
+ var="genericProduct"
+ itemValue="#{genericProduct}"
+ itemLabel="#{productBeanHelper.renderGenericProduct(genericProduct)}"
/>
</p:selectCheckboxMenu>
</f:facet>
- <p:link outcome="admin_show_generic_product" title="#{project.ADMIN_LINK_SHOW_RECEIPT_ITEM_PRODUCT_TITLE}" value="#{productBeanHelper.renderGenericProduct(receiptItem.itemProduct)}">
+ <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.ADMIN_RECEIPT_ITEM_MANUFACTURER_NAME_HEADER}" sortBy="#{receiptItem.itemManufacturer.companyName}" filterBy="#{receiptItem.itemManufacturer}" filterMatchMode="in">
+ <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"
@@ -168,13 +199,20 @@
<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="#{receipt.receiptCreated}" filterable="false">
+ <p:column
+ headerText="#{msg.ENTRY_CREATED_HEADER}"
+ sortBy="#{receipt.receiptCreated}"
+ filterable="false"
+ >
<h:outputText id="itemCreated" value="#{receiptItem.itemCreated}">
<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
</h:outputText>
</p:column>
- <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false">
+ <p:column
+ headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+ sortable="false"
+ >
<pl:outputReceiptItemAdminDropdownMenu receiptItem="#{receiptItem}" />
</p:column>
</p:dataTable>
@@ -211,11 +249,15 @@
<h:outputText value="#{receiptItemListController.selectedReceiptItem.itemBrandName}" />
<p:outputLabel value="#{project.PRODUCT_I18N_KEY_HEADER}" title="#{project.PRODUCT_I18N_KEY_TITLE}" />
- <p:link outcome="admin_show_generic_product" title="#{project.ADMIN_LINK_SHOW_RECEIPT_ITEM_PRODUCT_TITLE}" value="#{local[receiptItemListController.selectedReceiptItem.itemProduct.productI18nKey]}">
+ <p:link
+ outcome="admin_show_generic_product"
+ value="#{local[receiptItemListController.selectedReceiptItem.itemProduct.productI18nKey]}"
+ title="#{project.ADMIN_LINK_SHOW_RECEIPT_ITEM_PRODUCT_TITLE}"
+ >
<f:param name="productId" value="#{receiptItemListController.selectedReceiptItem.itemProduct.productId}" />
</p:link>
- <p:outputLabel value="#{project.ADMIN_ASSIGNED_MANUFACTURER_HEADER}" title="#{project.ADMIN_ASSIGNED_RECEIPT_ITEM_MANUFACTURER_TITLE}" />
+ <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}"
@@ -254,7 +296,11 @@
<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" title="#{project.ADMIN_LINK_SHOW_RECEIPT_TITLE}" value="#{receiptBeanHelper.renderReceipt(receiptItemListController.selectedReceiptItem.itemReceipt)}">
+ <p:link
+ outcome="admin_show_receipt"
+ value="#{receiptBeanHelper.renderReceipt(receiptItemListController.selectedReceiptItem.itemReceipt)}"
+ title="#{project.ADMIN_LINK_SHOW_RECEIPT_TITLE}"
+ >
<f:param name="receiptId" value="#{receiptItemListController.selectedReceiptItem.itemReceipt.receiptId}" />
</p:link>
diff --git a/web/user/financials/login_financials_overview.xhtml b/web/user/financials/login_financials_overview.xhtml
index 5b92d7a2..6102ef6a 100644
--- a/web/user/financials/login_financials_overview.xhtml
+++ b/web/user/financials/login_financials_overview.xhtml
@@ -38,7 +38,12 @@
<p:column>
<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="#{fn:length(financialIncomeController.incomes)}" />
+ <h:outputLink
+ id="totalReceipts"
+ styleClass="data_field"
+ target="list_user_financial_income"
+ value="#{fn:length(financialIncomeController.incomes)}"
+ />
</p:column>
</p:panelGrid>
</h:panelGroup>
@@ -48,15 +53,27 @@
<ul>
<li>
- <p:link title="#{project.LINK_USER_FINANCIAL_ADD_RECEIPT_TITLE}" outcome="add_user_fiancial_receipt" value="#{project.LINK_USER_FINANCIAL_ADD_RECEIPT}" />
+ <p:link
+ outcome="add_user_fiancial_receipt"
+ value="#{project.LINK_USER_FINANCIAL_ADD_RECEIPT}"
+ title="#{project.LINK_USER_FINANCIAL_ADD_RECEIPT_TITLE}"
+ />
</li>
<li>
- <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}" />
+ <p:link
+ outcome="add_user_fiancial_other_expenses"
+ value="#{project.LINK_USER_FINANCIAL_ADD_OTHER_EXPENSES}"
+ title="#{project.LINK_USER_FINANCIAL_ADD_OTHER_EXPENSES_TITLE}"
+ />
</li>
<li>
- <p:link title="#{project.LINK_USER_FINANCIAL_ADD_INCOME_TITLE}" outcome="add_user_fiancial_income" value="#{project.LINK_USER_FINANCIAL_ADD_INCOME}" />
+ <p:link
+ outcome="add_user_fiancial_income"
+ value="#{project.LINK_USER_FINANCIAL_ADD_INCOME}"
+ title="#{project.LINK_USER_FINANCIAL_ADD_INCOME_TITLE}"
+ />
</li>
</ul>
</h:panelGroup>