From dfc49b437913381940881464dff2c7a9a5f20fa0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 31 Oct 2017 20:02:27 +0100 Subject: [PATCH] Don't cherry-pick: - added sequence number to receipt as some receipts beared it - removed CSS class "input", more will follow - generalized listing headers for administrative views: ADMIN_HEADER_FOO_BAR - added more missing i18n keys MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../FinancialAdminReceiptWebRequestBean.java | 27 +++++- .../receipt/FinancialsReceiptConverter.java | 17 +--- .../localization/project_de_DE.properties | 83 +++++++++++++++++-- .../localization/project_en_US.properties | 67 +++++++++++++-- .../receipt/admin_form_financial_receipt.tpl | 10 ++- .../admin_form_financial_receipt_item.tpl | 2 +- .../receipt/login_form_financial_receipt.tpl | 7 +- .../admin_receipt_item_list.xhtml | 10 +-- .../receipts/admin_receipt_list.xhtml | 6 +- .../login_financials_add_income.xhtml | 4 +- 10 files changed, 187 insertions(+), 46 deletions(-) diff --git a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialAdminReceiptWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialAdminReceiptWebRequestBean.java index fc178db0..7b550545 100644 --- a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialAdminReceiptWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialAdminReceiptWebRequestBean.java @@ -26,6 +26,7 @@ import javax.faces.view.facelets.FaceletException; import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; +import org.mxchange.jcontactsbusiness.model.employee.Employable; import org.mxchange.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jfinancials.events.receipt.added.ObservableReceiptAddedEvent; import org.mxchange.jfinancials.events.receipt.added.ReceiptAddedEvent; @@ -35,7 +36,6 @@ import org.mxchange.jfinancials.model.receipt.FinancialAdminReceiptSessionBeanRe import org.mxchange.jfinancials.model.receipt.FinancialReceipt; import org.mxchange.jproduct.model.payment.PaymentType; import org.mxchange.jusercore.model.user.User; -import org.mxchange.jcontactsbusiness.model.employee.Employable; /** * An administrative backing bean for receipts @@ -105,6 +105,11 @@ public class FinancialAdminReceiptWebRequestBean extends BaseFinancialsBean impl */ private Employable receiptSellerEmployee; + /** + * Sequence number + */ + private Long receiptSequenceNumber; + /** * User who "owns" this receipt */ @@ -302,6 +307,24 @@ public class FinancialAdminReceiptWebRequestBean extends BaseFinancialsBean impl this.receiptSellerEmployee = receiptSellerEmployee; } + /** + * Getter for receipt sequence number + *

+ * @return Receipt sequence number + */ + public Long getReceiptSequenceNumber () { + return this.receiptSequenceNumber; + } + + /** + * Setter for receipt sequence number + *

+ * @param receiptSequenceNumber Receipt sequence number + */ + public void setReceiptSequenceNumber (final Long receiptSequenceNumber) { + this.receiptSequenceNumber = receiptSequenceNumber; + } + /** * Getter for user instance *

@@ -332,6 +355,7 @@ public class FinancialAdminReceiptWebRequestBean extends BaseFinancialsBean impl this.setReceiptPaymentType(null); this.setReceiptRegisterNumber(null); this.setReceiptSellerEmployee(null); + this.setReceiptSequenceNumber(null); this.setReceiptUser(null); } @@ -350,6 +374,7 @@ public class FinancialAdminReceiptWebRequestBean extends BaseFinancialsBean impl receipt.setReceiptBarCodeNumber(this.getReceiptBarCodeNumber()); receipt.setReceiptRegisterNumber(this.getReceiptRegisterNumber()); receipt.setReceiptSellerEmployee(this.getReceiptSellerEmployee()); + receipt.setReceiptSequenceNumber(this.getReceiptSequenceNumber()); // Return prepared instance return receipt; diff --git a/src/java/org/mxchange/jfinancials/converter/financial/receipt/FinancialsReceiptConverter.java b/src/java/org/mxchange/jfinancials/converter/financial/receipt/FinancialsReceiptConverter.java index 768cd726..5881e619 100644 --- a/src/java/org/mxchange/jfinancials/converter/financial/receipt/FinancialsReceiptConverter.java +++ b/src/java/org/mxchange/jfinancials/converter/financial/receipt/FinancialsReceiptConverter.java @@ -16,15 +16,12 @@ */ package org.mxchange.jfinancials.converter.financial.receipt; -import javax.faces.application.FacesMessage; +import javax.enterprise.inject.spi.CDI; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; import javax.faces.convert.FacesConverter; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; import org.mxchange.jfinancials.beans.financial.model.receipt.FinancialsReceiptWebRequestBean; import org.mxchange.jfinancials.beans.financial.model.receipt.FinancialsReceiptWebRequestController; import org.mxchange.jfinancials.exceptions.receipt.ReceiptNotFoundException; @@ -47,16 +44,8 @@ public class FinancialsReceiptConverter implements Converter { public BillableReceipt getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) { // Is the instance there? if (RECEIPT_CONTROLLER == null) { - try { - // Not yet, attempt lookup - final Context initial = new InitialContext(); - - // Lookup EJB - RECEIPT_CONTROLLER = (FinancialsReceiptWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsReceiptWebRequestBean.class.getSimpleName())); //NOI18N - } catch (final NamingException ex) { - // Throw it again - throw new ConverterException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); //NOI18N - } + // Get bean from CDI directly + RECEIPT_CONTROLLER = CDI.current().select(FinancialsReceiptWebRequestBean.class).get(); } // Is the value null or empty? diff --git a/src/java/org/mxchange/localization/project_de_DE.properties b/src/java/org/mxchange/localization/project_de_DE.properties index 5f498c6e..c9baf0b3 100644 --- a/src/java/org/mxchange/localization/project_de_DE.properties +++ b/src/java/org/mxchange/localization/project_de_DE.properties @@ -47,7 +47,8 @@ ADMIN_ADD_RECEIPT_TITLE=Neuen Kassenbon hinzufuegen #@TODO Please fix German umlauts! BUTTON_ADMIN_ADD_RECEIPT=Kassenbon hinzufuegen ADMIN_RECEIPT_ISSUE_DATE_REQUIRED=Bitte geben Sie das Ausstellungsdatum des Kassenbons ein. -ADMIN_MENU_RECEIPTS_TITLE=Kassenbons +#@TODO Please fix German umlauts! +ADMIN_MENU_RECEIPTS_TITLE=Kassenbons & Eintraege ADMIN_LINK_LIST_RECEIPTS_TITLE=Listet alle registrierten Kassenbons/Rechnungen auf.. ADMIN_LINK_LIST_RECEIPTS=Kassenbons/Rechnungen auflisten ADMIN_LIST_RECEIPTS_HEADER=Alle Kassenbons/Rechnungen auflisten @@ -64,7 +65,6 @@ ADMIN_RECEIPT_OTHER_LEGEND_TITLE=Geben Sie hier weitere Daten an, die Sie auf de ADMIN_LINK_SHOW_RECEIPT_OWNER_USER_TITLE=Zeigt zugewiesenen Benutzer des Kassenbons an. #@TODO Please fix German umlauts! ADMIN_ASSIGNED_RECEIPT_SELLER=Zugewiesener Verkaeufer: -DEPARTMENT_NAME_SALES=Verkauf #@TODO Please fix German umlauts! ADMIN_LINK_LIST_RECEIPT_ITEMS=Eintraege auflisten #@TODO Please fix German umlauts! @@ -74,11 +74,11 @@ ADMIN_LINK_SHOW_RECEIPT_ITEM_TITLE=Zeigt Daten eines Eintrages eines Kassenbons #@TODO Please fix German umlauts! PRODUCT_GROSS_PRICE_REQUIRED=Bitte geben Sie den Bruttopreis des Produktes ein. #@TODO Please fix German umlauts! -ENTER_PRODUCT_NET_PRICE_TITLE=Nettopreis fuer Produkt eingeben: +ENTER_PRODUCT_NET_PRICE_TITLE=Nettopreis fuer Produkt eingeben. #@TODO Please fix German umlauts! -ENTER_PRODUCT_TAX_RATE_TITLE=Steuersatz fuer Produkt eingeben: +ENTER_PRODUCT_TAX_RATE_TITLE=Steuersatz fuer Produkt eingeben. #@TODO Please fix German umlauts! -ENTER_PRODUCT_GROSS_PRICE_TITLE=Brutto-Preis fuer Produkt eingeben: +ENTER_PRODUCT_GROSS_PRICE_TITLE=Brutto-Preis fuer Produkt eingeben. ADMIN_ENTER_PRODUCT_PRICE=Preis des Produktes eingeben: ENTER_NET_PRICE=Nettopreis: ENTER_TAX_RATE=Steuersatz: @@ -116,3 +116,76 @@ ADMIN_PRODUCT_REQUIRED=Bitte waehlen Sie ein Produkt aus. ADMIN_RECEIPT_REQUIRED=Bitte waehlen Sie einen Kassenbon aus. ADMIN_RECEIPT_ITEM_QUANTITY_REQUIRED=Bitte geben Sie die gekaufte Produktmenge ein. ENTER_RECEIPT_ITEM_QUANTITY_TITLE=Geben Sie hier die Stueckanzahl an, wie sie auf dem Kassenbon steht. +ADMIN_MENU_PRODUCTS_CATEGORIES_TITLE=Produkte & Kategorien +ADMIN_LINK_LIST_GENERIC_PRODUCTS=Produkte auflisten +ADMIN_LINK_LIST_GENERIC_PRODUCTS_TITLE=Auflisten und verwalten von allgemeinen Produkten. +ADMIN_LINK_LIST_CATEGORIES=Produktkategorien +ADMIN_LINK_LIST_CATEGORIES_TITLE=Auflisten und verwalten von Produktkategorien. +PAGE_TITLE_ADMIN_LIST_GENERIC_PRODUCT=Produkte auflisten +CONTENT_TITLE_ADMIN_LIST_GENERIC_PRODUCT=Produkte auflisten: +TABLE_SUMMARY_ADMIN_LIST_GENERIC_PRODUCTS=Diese Tabelle listet alle eingetragenen Produkte auf. +#@TODO Please fix German umlauts! +ADMIN_EMPTY_LIST_GENERIC_PRODUCTS=Es befinden sich keine Produkte in der Datenbank. Oder Ihre Suche ergab keine Uebereinstimmungen. +ADMIN_LIST_GENERIC_PRODUCTS_HEADER=Alle Produkte auflisten +ADMIN_LINK_SHOW_GENERIC_PRODUCT_TITLE=Zeigt Daten des Produktes an. +ADMIN_HEADER_ASSIGNED_PRODUCT_CATEGORY=Zugewiesene Produktkategorie: +LABEL_PRODUCT_CATEGORIES=Produktkategorien +FILTER_BY_MULTIPLE_PRODUCT_CATEGORIES_TITLE=Liste durch Auswahl von ein oder mehr Produktkategorien filtern. +ADMIN_LINK_SHOW_GENERIC_PRODUCT_CATEGORY_TITLE=Zeigt Daten der Produktkategorie an. +ADMIN_HEADER_PRODUCT_GROSS_PRICE=Bruttopreis: +#@TODO Please fix German umlauts! +ADMIN_HEADER_PRODUCT_AVAILABILITY=Produkt verfuegbar: +#@TODO Please fix German umlauts! +ADMIN_ADD_GENERIC_PRODUCT_TITLE=Neues Produkt hinzufuegen +#@TODO Please fix German umlauts! +ADMIN_ADD_GENERIC_PRODUCT_MINIMUM_DATA=Bitte waehlen Sie eine Produktkategorie aus und geben Sie Produkttitel, sowie Stueckzahl (meistens 1), Einheit, Bruttopreis und Waehrungscode (EUR z.B.) ein. +ADMIN_GENERIC_PRODUCT_DATA_LEGEND=Produktdaten eingeben: +ADMIN_ASSIGN_PRODUCT_CATEGORY=Zum Produkt zugewiesene Kategorie: +#@TODO Please fix German umlauts! +ADMIN_ENTER_PRODUCT_I18N_KEY=Uebersetzungsschluessel zum Produkt eingeben: +#@TODO Please fix German umlauts! +ADMIN_ENABLE_PRODUCT_AVAILABILITY=Ist das Produkt verfuegbar: +ADMIN_ASSIGN_PRODUCT_CATEGORY_TITLE=Waehlen Sie die Produktkategorie zum neu hinzuzufuegenden Produkt aus. +#@TODO Please fix German umlauts! +ADMIN_ENTER_PRODUCT_I18N_KEY_TITLE=Geben Sie den Uebersetzungsschluessel zum Produkt ein. Dieser darf nur einmal existieren. +#@TODO Please fix German umlauts! +ADMIN_ENABLE_PRODUCT_AVAILABILITY_TITLE=Waehlen Sie aus, ob das Produkt verfuegbar/aktiv ist. +#@TODO Please fix German umlauts! +ADMIN_ENTER_PRODUCT_CURRENCY_CODE=Waehrungscode eingeben: +#@TODO Please fix German umlauts! +ADMIN_ENTER_PRODUCT_UNIT_AMOUNT=Produktstueckzahl eingeben: +ADMIN_ENTER_PRODUCT_UNIT_AMOUNT_TITLE=Geben Sie hier die Stueckzahl des Produktes ein. Zum Beispiel 500 fuer 500 Gramm. Unter Stueckzahleinheit geben Sie dann einfach nur "g" ein. +#@TODO Please fix German umlauts! +BUTTON_ADMIN_ADD_GENERIC_PRODUCT=Produkt hinzufuegen +#@TODO Please fix German umlauts! +ADMIN_PRODUCT_CATEGORY_REQUIRED=Bitte waehlen Sie eine Produktkategorie aus. +#@TODO Please fix German umlauts! +ADMIN_PRODUCT_I18N_KEY_REQUIRED=Bitte geben Sie einen Uebersetzungsschluessel fuer das Produkt ein. +PAGE_TITLE_ADMIN_LIST_PRODUCT_CATEGORY=Produktkategorien auflisten +CONTENT_TITLE_ADMIN_LIST_PRODUCT_CATEGORY=Produktkategorien auflisten: +TABLE_SUMMARY_ADMIN_LIST_PRODUCT_CATEGORIES=Diese Tabelle listet alle eingetragenen Produktkategorien auf. +#@TODO Please fix German umlauts! +ADMIN_EMPTY_LIST_PRODUCT_CATEGORIES=Es befinden sich keine Produktkategorien in der Datenbank. Oder Ihre Suche ergab keine Uebereinstimmungen. +ADMIN_LIST_PRODUCT_CATEGORIES_HEADER=Alle Produktkategorien auflisten +ADMIN_HEADER_ASSIGNED_PARENT_CATEGORY=Zugewiesene Elternkategorie: +ADMIN_LINK_SHOW_PRODUCT_CATEGORY_TITLE=Zeigt Daten der Produktkategorie an. +ADMIN_LINK_ASSIGN_PARENT_CATEGORY_TITLE=Elternkategorie zuweisen. +#@TODO Please fix German umlauts! +ADMIN_ADD_PRODUCT_CATEGORY_TITLE=Neue Produktkategorie hinzufuegen +#@TODO Please fix German umlauts! +ADMIN_ADD_PRODUCT_CATEGORY_MINIMUM_DATA=Bitte geben Sie den Titel fuer die Kategorie ein. Sie koennen optional eine Elternkategorie fuer diese neue auswaehlen. +#@TODO Please fix German umlauts! +BUTTON_ADMIN_ADD_PRODUCT_CATEGORY=Produktkategorie hinzufuegen +ADMIN_PRODUCT_CATEGORY_DATA_LEGEND=Daten zur Produktkategorie: +ADMIN_ASSIGN_PARENT_CATEGORY=Elternkategorie zuweisen: +ADMIN_ASSIGN_PARENT_CATEGORY_TITLE=Weisen Sie eine andere Produktkategorie als Elternkategorie zu dieser neuen zu. +#@TODO Please fix German umlauts! +ADMIN_ENTER_CATEGORY_I18N_KEY=I18N-Schluessel fuer Kategorie eingeben: +#@TODO Please fix German umlauts! +ADMIN_ENTER_CATEGORY_I18N_KEY_TITLE=Geben Sie den I18N-Schluessel zur Produktkategorie ein (Beispiel: CATEGORY_CONSUMABLES). +#@TODO Please fix German umlauts! +ADMIN_CATEGORY_I18N_KEY_REQUIRED=Bitte geben Sie den I18N-Schluessel zur Produktkategorie ein. +ADMIN_ENABLE_CATEGORY_IN_STATISTICS=Soll die Kategorie in Statistiken auftauchen: +ADMIN_ENABLE_CATEGORY_IN_STATISTICS_TITLE=Waehlen Sie aus, ob diese Kategorie in Statistiken aufytauchen soll. +ADMIN_ENABLE_CATEGORY_IN_STATISTICS_REQUIRED=Bitte waehlen Sie aus, ob diese Kategorie in Statistiken auftauchen soll. +ENTER_RECEIPT_SEQUENCE_NUMBER=Sequenznummer eingeben: diff --git a/src/java/org/mxchange/localization/project_en_US.properties b/src/java/org/mxchange/localization/project_en_US.properties index 5ca04273..001d3195 100644 --- a/src/java/org/mxchange/localization/project_en_US.properties +++ b/src/java/org/mxchange/localization/project_en_US.properties @@ -35,9 +35,9 @@ ADMIN_EMPTY_LIST_RECEIPT=There are no receipts in database. Or your search crite ADMIN_ADD_RECEIPT_TITLE=Add new receipt BUTTON_ADMIN_ADD_RECEIPT=Add receipt ADMIN_RECEIPT_ISSUE_DATE_REQUIRED=Please enter date of issue of receipt. -ADMIN_MENU_RECEIPTS_TITLE=Receipts +ADMIN_MENU_RECEIPTS_TITLE=Receipts & Items ADMIN_LINK_LIST_RECEIPTS_TITLE=Lists all registered receipts. -ADMIN_LINK_LIST_RECEIPTS=List receipts +ADMIN_LINK_LIST_RECEIPTS=Receipts ADMIN_LIST_RECEIPTS_HEADER=List all receipts ADMIN_RECEIPT_BASIC_LEGEND=Basic data of receipt: ADMIN_RECEIPT_BASIC_LEGEND_TITLE=Enter here basic data of the new receipt. @@ -51,15 +51,14 @@ 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: -DEPARTMENT_NAME_SALES=Sales -ADMIN_LINK_LIST_RECEIPT_ITEMS=List receipt items +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. ADMIN_LINK_SHOW_RECEIPT_ITEM_TITLE=Shows receipt item data. PRODUCT_GROSS_PRICE_REQUIRED=Please enter product's gross price. -ENTER_PRODUCT_NET_PRICE_TITLE=Enter product net price: -ENTER_PRODUCT_TAX_RATE_TITLE=Enter product tax rate: -ENTER_PRODUCT_GROSS_PRICE_TITLE=Enter product gross price: +ENTER_PRODUCT_NET_PRICE_TITLE=Enter product net price. +ENTER_PRODUCT_TAX_RATE_TITLE=Enter product tax rate. +ENTER_PRODUCT_GROSS_PRICE_TITLE=Enter product gross price. ADMIN_ENTER_PRODUCT_PRICE=Enter product's price: ENTER_NET_PRICE=Net price: ENTER_TAX_RATE=Tax rate: @@ -88,3 +87,57 @@ ADMIN_PRODUCT_REQUIRED=Please choose a product. ADMIN_RECEIPT_REQUIRED=Please choose a receipt. 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. +ADMIN_MENU_PRODUCTS_CATEGORIES_TITLE=Products & Categories +ADMIN_LINK_LIST_GENERIC_PRODUCTS=Products +ADMIN_LINK_LIST_GENERIC_PRODUCTS_TITLE=Lists and manages generic products. +ADMIN_LINK_LIST_CATEGORIES=Product categories +ADMIN_LINK_LIST_CATEGORIES_TITLE=Lists and manages product categories. +PAGE_TITLE_ADMIN_LIST_GENERIC_PRODUCT=List products +CONTENT_TITLE_ADMIN_LIST_GENERIC_PRODUCT=List products: +TABLE_SUMMARY_ADMIN_LIST_GENERIC_PRODUCTS=This table lists all products. +ADMIN_EMPTY_LIST_GENERIC_PRODUCTS=There are no products in database. Or your search criteria doesn't match anything. +ADMIN_LIST_GENERIC_PRODUCTS_HEADER=List all products +ADMIN_LINK_SHOW_GENERIC_PRODUCT_TITLE=Shows product data. +ADMIN_HEADER_ASSIGNED_PRODUCT_CATEGORY=Assigned product category: +LABEL_PRODUCT_CATEGORIES=Product categories +FILTER_BY_MULTIPLE_PRODUCT_CATEGORIES_TITLE=Filter list by selecting one or more product categories. +ADMIN_LINK_SHOW_GENERIC_PRODUCT_CATEGORY_TITLE=Shows product category data. +ADMIN_HEADER_PRODUCT_GROSS_PRICE=Gross price: +ADMIN_HEADER_PRODUCT_AVAILABILITY=Product available: +ADMIN_ADD_GENERIC_PRODUCT_TITLE=Add new product +ADMIN_ADD_GENERIC_PRODUCT_MINIMUM_DATA=Please choose a product category and enter product title, unit amount and type, gross price and currency code (e.g. USD). +ADMIN_GENERIC_PRODUCT_DATA_LEGEND=Product data: +ADMIN_ASSIGN_PRODUCT_CATEGORY=Assign category to product: +ADMIN_ENTER_PRODUCT_I18N_KEY=Enter product's i8n key: +ADMIN_ENABLE_PRODUCT_AVAILABILITY=Is the product available: +ADMIN_ASSIGN_PRODUCT_CATEGORY_TITLE=Choose the product category for the to be added product. +ADMIN_ENTER_PRODUCT_I18N_KEY_TITLE=Enter product's i18n key. This must be unique. +ADMIN_ENABLE_PRODUCT_AVAILABILITY_TITLE=Choose if the product is available/active. +ADMIN_ENTER_PRODUCT_CURRENCY_CODE=Enter currency code: +ADMIN_ENTER_PRODUCT_UNIT_AMOUNT=Enter product's unit amount: +#Geben Sie hier die Stueckzahl des Produktes ein. Zum Beispiel 500 fuer 500 Gramm. Unter Stueckzahleinheit geben Sie dann einfach nur "g" ein. +ADMIN_ENTER_PRODUCT_UNIT_AMOUNT_TITLE=Enter the product's unit amount. For example 500 for 500 grams. Under unit type, then just enter "g". +BUTTON_ADMIN_ADD_GENERIC_PRODUCT=Add product +ADMIN_PRODUCT_CATEGORY_REQUIRED=Please choose a product category. +ADMIN_PRODUCT_I18N_KEY_REQUIRED=Please enter a product i18n key. +PAGE_TITLE_ADMIN_LIST_PRODUCT_CATEGORY=List product categories +CONTENT_TITLE_ADMIN_LIST_PRODUCT_CATEGORY=List product categories: +TABLE_SUMMARY_ADMIN_LIST_PRODUCT_CATEGORIES=This table lists all product categories. +ADMIN_EMPTY_LIST_PRODUCT_CATEGORIES=There are no product categories in database. Or your search criteria doesn't match anything. +ADMIN_LIST_PRODUCT_CATEGORIES_HEADER=List all product categories +ADMIN_HEADER_ASSIGNED_PARENT_CATEGORY=Assigned parent category: +ADMIN_LINK_SHOW_PRODUCT_CATEGORY_TITLE=Shows product category data. +ADMIN_LINK_ASSIGN_PARENT_CATEGORY_TITLE=Assign parent cateogory. +ADMIN_ADD_PRODUCT_CATEGORY_TITLE=Add new product category +ADMIN_ADD_PRODUCT_CATEGORY_MINIMUM_DATA=Please enter a title for adding new category. You can optionally choose a parent category of the new one. +BUTTON_ADMIN_ADD_PRODUCT_CATEGORY=Add product category +ADMIN_PRODUCT_CATEGORY_DATA_LEGEND=Data of product category: +ADMIN_ASSIGN_PARENT_CATEGORY=Assign parent category: +ADMIN_ASSIGN_PARENT_CATEGORY_TITLE=Assign an other product category as parent category for the new one. +ADMIN_ENTER_CATEGORY_I18N_KEY=Enter category i18n key: +ADMIN_ENTER_CATEGORY_I18N_KEY_TITLE=Enter i18n key for this new product category (example: CATEGORY_CONSUMABLES). +ADMIN_CATEGORY_I18N_KEY_REQUIRED=Please enter i18n key of product category. +ADMIN_ENABLE_CATEGORY_IN_STATISTICS=Enable whether category is in statistics: +ADMIN_ENABLE_CATEGORY_IN_STATISTICS_TITLE=Choose if this category is enlisted in any kind of statistics. +ADMIN_ENABLE_CATEGORY_IN_STATISTICS_REQUIRED=Please choose if this category should be shown in any statistics. +ENTER_RECEIPT_SEQUENCE_NUMBER=Enter sequence number: 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 72c5341b..72ac9d9c 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 @@ -33,7 +33,6 @@ pattern="#{msg.DATE_PATTERN}" navigator="true" maskAutoClear="true" - styleClass="input" title="#{project.ADMIN_RECEIPT_DATE_OF_ISSUE_TITLE}" /> @@ -83,17 +82,20 @@ --> - + - + - + + + + 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 9b7486c3..5fdc4297 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 @@ -23,7 +23,7 @@ > - + 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 d2d12b0e..850312b2 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 @@ -37,7 +37,6 @@ pattern="#{msg.DATE_PATTERN}" navigator="true" maskAutoClear="true" - styleClass="input" title="#{project.LOGIN_RECEIPT_DATE_OF_ISSUE_TITLE}" /> @@ -79,19 +78,19 @@ - + - + - + diff --git a/web/admin/financial/receipt_items/admin_receipt_item_list.xhtml b/web/admin/financial/receipt_items/admin_receipt_item_list.xhtml index 71c0cb73..2ba805a7 100644 --- a/web/admin/financial/receipt_items/admin_receipt_item_list.xhtml +++ b/web/admin/financial/receipt_items/admin_receipt_item_list.xhtml @@ -48,7 +48,7 @@ - + @@ -87,22 +87,22 @@ > - + - + - + - + diff --git a/web/admin/financial/receipts/admin_receipt_list.xhtml b/web/admin/financial/receipts/admin_receipt_list.xhtml index f847ef8d..93787826 100644 --- a/web/admin/financial/receipts/admin_receipt_list.xhtml +++ b/web/admin/financial/receipts/admin_receipt_list.xhtml @@ -47,7 +47,7 @@ - + @@ -99,7 +99,7 @@ - + - + diff --git a/web/user/financials/login_financials_add_income.xhtml b/web/user/financials/login_financials_add_income.xhtml index 610d6733..ef54df58 100644 --- a/web/user/financials/login_financials_add_income.xhtml +++ b/web/user/financials/login_financials_add_income.xhtml @@ -27,7 +27,7 @@

- +
@@ -59,7 +59,7 @@
- +
-- 2.39.5