]> git.mxchange.org Git - jfinancials-war.git/commitdiff
Don't cherry-pick:
authorRoland Häder <roland@mxchange.org>
Tue, 31 Oct 2017 19:02:27 +0000 (20:02 +0100)
committerRoland Häder <roland@mxchange.org>
Tue, 31 Oct 2017 19:02:27 +0000 (20:02 +0100)
- 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

Signed-off-by: Roland Häder <roland@mxchange.org>
src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialAdminReceiptWebRequestBean.java
src/java/org/mxchange/jfinancials/converter/financial/receipt/FinancialsReceiptConverter.java
src/java/org/mxchange/localization/project_de_DE.properties
src/java/org/mxchange/localization/project_en_US.properties
web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl
web/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl
web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl
web/admin/financial/receipt_items/admin_receipt_item_list.xhtml
web/admin/financial/receipts/admin_receipt_list.xhtml
web/user/financials/login_financials_add_income.xhtml

index fc178db0f916139ad4b59b7f865c28fdfb89453a..7b5505455cd0101a56c3d36f202c66e2423981b1 100644 (file)
@@ -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
+        * <p>
+        * @return Receipt sequence number
+        */
+       public Long getReceiptSequenceNumber () {
+               return this.receiptSequenceNumber;
+       }
+
+       /**
+        * Setter for receipt sequence number
+        * <p>
+        * @param receiptSequenceNumber Receipt sequence number
+        */
+       public void setReceiptSequenceNumber (final Long receiptSequenceNumber) {
+               this.receiptSequenceNumber = receiptSequenceNumber;
+       }
+
        /**
         * Getter for user instance
         * <p>
@@ -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;
index 768cd7265fdf334261d5ee18705fbe61a688d527..5881e619086b8af83f394d917112ed225f3855c5 100644 (file)
  */
 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<BillableReceipt> {
        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?
index 5f498c6e253525eb7363d9014be70625b25c573f..c9baf0b3fcd5291ac17bc90e939a348ce0fc1ebf 100644 (file)
@@ -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:
index 5ca04273c1ceb7836237efdb8c190838d2c0bd73..001d3195a1e7dc224253cd493ee39fcba8736837 100644 (file)
@@ -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:
index 72c5341baaac9b445c70b53829b1f2e904c66a43..72ac9d9cdcb0f9bd27cf3929f47a6ae2d6ed1b83 100644 (file)
@@ -33,7 +33,6 @@
                                pattern="#{msg.DATE_PATTERN}"
                                navigator="true"
                                maskAutoClear="true"
-                               styleClass="input"
                                title="#{project.ADMIN_RECEIPT_DATE_OF_ISSUE_TITLE}"
                                />
 
                -->
                <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
                        <p:outputLabel for="receiptNumber" value="#{project.ENTER_RECEIPT_NUMBER}" />
-                       <p:inputText styleClass="input" id="receiptNumber" size="10" maxlength="20" value="#{adminReceiptController.receiptNumber}" validatorMessage="#{msg.ENTERED_RECEIPT_NUMBER_INVALID}">
+                       <p:inputText id="receiptNumber" size="10" maxlength="20" value="#{adminReceiptController.receiptNumber}" validatorMessage="#{msg.ENTERED_RECEIPT_NUMBER_INVALID}">
                                <f:validateLongRange minimum="1" maximum="9999999999" />
                        </p:inputText>
 
                        <p:outputLabel for="receiptRegisterNumber" value="#{project.ENTER_RECEIPT_REGISTER_NUMBER}" />
-                       <p:inputText styleClass="input" id="receiptRegisterNumber" size="3" maxlength="10" value="#{adminReceiptController.receiptRegisterNumber}" validatorMessage="#{msg.ENTERED_RECEIPT_REGISTER_NUMBER_INVALID}">
+                       <p:inputText id="receiptRegisterNumber" size="3" maxlength="10" value="#{adminReceiptController.receiptRegisterNumber}" validatorMessage="#{msg.ENTERED_RECEIPT_REGISTER_NUMBER_INVALID}">
                                <f:validateLongRange minimum="1" maximum="999" />
                        </p:inputText>
 
                        <p:outputLabel for="receiptBarCodeNumber" value="#{project.ENTER_RECEIPT_BARCODE_NUMBER}" />
-                       <p:inputText styleClass="input" id="receiptBarCodeNumber" size="24" maxlength="24" value="#{adminReceiptController.receiptBarCodeNumber}" />
+                       <p:inputText id="receiptBarCodeNumber" size="24" maxlength="24" value="#{adminReceiptController.receiptBarCodeNumber}" />
+
+                       <p:outputLabel for="receiptSequenceNumber" value="#{project.ENTER_RECEIPT_SEQUENCE_NUMBER}" />
+                       <p:inputText id="receiptSequenceNumber" size="24" maxlength="24" value="#{adminReceiptController.receiptSequenceNumber}" />
                </p:panelGrid>
        </p:fieldset>
 </ui:composition>
index 9b7486c3910ac2a0b9f79ebd9a708b54401efad3..5fdc4297f199b43476dd9cb5de8987ebe03f4bcf 100644 (file)
@@ -23,7 +23,7 @@
                                >
                                <f:converter converterId="GenericProductConverter" />
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-                               <f:selectItems value="#{productController.allProducts()}" var="product" itemValue="#{product}" itemLabel="#{beanHelper.renderProduct(product)}" />
+                               <f:selectItems value="#{productController.allProducts()}" var="product" itemValue="#{product}" itemLabel="#{beanHelper.renderGenericProduct(product)}" />
                        </p:selectOneMenu>
 
                        <p:outputLabel for="itemQuantity" value="#{project.ENTER_RECEIPT_ITEM_QUANTITY}" />
index d2d12b0e7c2e8517218c3d10a87c958674538751..850312b28747b06012e30633aadd14aa04e081fd 100644 (file)
@@ -37,7 +37,6 @@
                                pattern="#{msg.DATE_PATTERN}"
                                navigator="true"
                                maskAutoClear="true"
-                               styleClass="input"
                                title="#{project.LOGIN_RECEIPT_DATE_OF_ISSUE_TITLE}"
                                />
                        <p:message for="receiptIssued" />
 
                <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full">
                        <p:outputLabel for="receiptNumber" value="#{project.RECEIPT_NUMBER}" />
-                       <p:inputText styleClass="input" id="receiptNumber" size="10" maxlength="20" value="#{receiptController.receiptNumber}" validatorMessage="#{msg.ENTERED_RECEIPT_NUMBER_INVALID}">
+                       <p:inputText id="receiptNumber" size="10" maxlength="20" value="#{receiptController.receiptNumber}" validatorMessage="#{msg.ENTERED_RECEIPT_NUMBER_INVALID}">
                                <f:validateLongRange minimum="1" maximum="9999999999" />
                        </p:inputText>
                        <p:message for="receiptNumber" />
 
                        <p:outputLabel for="receiptRegisterNumber" value="#{project.RECEIPT_REGISTER_NUMBER}" />
-                       <p:inputText styleClass="input" id="receiptRegisterNumber" size="3" maxlength="10" value="#{receiptController.receiptRegisterNumber}" validatorMessage="#{msg.ENTERED_RECEIPT_REGISTER_NUMBER_INVALID}">
+                       <p:inputText id="receiptRegisterNumber" size="3" maxlength="10" value="#{receiptController.receiptRegisterNumber}" validatorMessage="#{msg.ENTERED_RECEIPT_REGISTER_NUMBER_INVALID}">
                                <f:validateLongRange minimum="1" maximum="999" />
                        </p:inputText>
                        <p:message for="receiptRegisterNumber" />
 
                        <p:outputLabel for="receiptBarCodeNumber" value="#{project.RECEIPT_BARCODE_NUMBER}" />
-                       <p:inputText styleClass="input" id="receiptBarCodeNumber" size="24" maxlength="24" value="#{receiptController.receiptBarCodeNumber}" />
+                       <p:inputText id="receiptBarCodeNumber" size="24" maxlength="24" value="#{receiptController.receiptBarCodeNumber}" />
                        <p:message for="receiptBarCodeNumber" />
                </p:panelGrid>
        </fieldset>
index 71c0cb735a121202f3ac3e0ef6fd4233014998b4..2ba805a7da721f5fadc6a21b1c771ccaad5d6bfc 100644 (file)
@@ -48,7 +48,7 @@
                                        </p:panelGrid >
                                </f:facet>
 
-                               <p:column headerText="#{msg.ADMIN_ID_NUMBER}" sortBy="#{receiptItem.itemId}" filterBy="#{receiptItem.itemId}">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ID_NUMBER}" sortBy="#{receiptItem.itemId}" filterBy="#{receiptItem.itemId}">
                                        <p:link outcome="admin_show_receipt_item" title="#{project.ADMIN_LINK_SHOW_RECEIPT_ITEM_TITLE}" value="#{receiptItem.itemId}">
                                                <f:param name="receiptId" value="#{receiptItem.itemId}" />
                                        </p:link>
                                                        >
                                                        <f:converter converterId="GenericProductConverter" />
                                                        <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                                       <f:selectItems value="#{productController.allProducts()}" var="product" itemValue="#{product}" itemLabel="#{beanHelper.renderProduct(product)}" />
+                                                       <f:selectItems value="#{productController.allProducts()}" var="product" itemValue="#{product}" itemLabel="#{beanHelper.renderGenericProduct(product)}" />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
-                                       <p:link outcome="admin_show_product" title="#{msg.ADMIN_LINK_SHOW_RECEIPT_ITEM_PRODUCT_TITLE}" value="#{receiptItem.itemProduct.productId}">
+                                       <p:link outcome="admin_show_generic_product" title="#{msg.ADMIN_LINK_SHOW_RECEIPT_ITEM_PRODUCT_TITLE}" value="#{receiptItem.itemProduct.productId}">
                                                <f:param name="productId" value="#{receiptItem.itemProduct.productId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_LIST_ENTRY_CREATED}" sortBy="#{receipt.receiptCreated}" filterable="false">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ENTRY_CREATED}" sortBy="#{receipt.receiptCreated}" filterable="false">
                                        <h:outputText id="itemCreated" value="#{receiptItem.itemCreated.time}">
                                                <f:convertDateTime for="itemCreated" type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS}" sortable="false">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ACTION_LINKS}" sortable="false">
                                        <pl:outputReceiptItemAdminMiniLinks receiptItem="#{receiptItem}" />
                                </p:column>
                        </p:dataTable>
index f847ef8db33b7daeb1f0b1c55f50366b0c16276c..937878267211baae0bb7aaacb56d176c0cd5aa94 100644 (file)
@@ -47,7 +47,7 @@
                                        </p:panelGrid >
                                </f:facet>
 
-                               <p:column headerText="#{msg.ADMIN_ID_NUMBER}" sortBy="#{receipt.receiptId}" filterBy="#{receipt.receiptId}">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ID_NUMBER}" sortBy="#{receipt.receiptId}" filterBy="#{receipt.receiptId}">
                                        <p:link outcome="admin_show_receipt" title="#{project.ADMIN_LINK_SHOW_RECEIPT_TITLE}" value="#{receipt.receiptId}">
                                                <f:param name="receiptId" value="#{receipt.receiptId}" />
                                        </p:link>
@@ -99,7 +99,7 @@
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ASSIGNED_USER}" sortBy="#{receipt.receiptUser.userName}" filterBy="#{receipt.receiptUser}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{receipt.receiptUser.userName}" filterBy="#{receipt.receiptUser}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                        <h:outputText value="#{msg[receipt.receiptPaymentType.i18nKey]}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS}" sortable="false">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ACTION_LINKS}" sortable="false">
                                        <pl:outputReceiptAdminMiniLinks receipt="#{receipt}" />
                                </p:column>
                        </p:dataTable>
index 610d67331de184294b9d41c6bb14b221674fb7e7..ef54df581fdf17322446be136370731d179f10a9 100644 (file)
@@ -27,7 +27,7 @@
                                        </div>
 
                                        <div class="table-right-medium">
-                                               <p:inputText styleClass="input" id="incomeTitle" size="2" maxlength="10" value="#{financialIncomeController.incomeTitle}" required="true" requiredMessage="#{project.FIELD_FINANCIAL_INCOME_TITLE_REQUIRED}">
+                                               <p:inputText id="incomeTitle" size="2" maxlength="10" value="#{financialIncomeController.incomeTitle}" required="true" requiredMessage="#{project.FIELD_FINANCIAL_INCOME_TITLE_REQUIRED}">
                                                        <f:validator validatorId="IncomeTitleValidator" />
                                                </p:inputText>
                                        </div>
@@ -59,7 +59,7 @@
                                        </div>
 
                                        <div class="table-right-medium">
-                                               <p:inputText styleClass="input" id="incomeSingleValue" size="5" maxlength="20" value="#{financialIncomeController.incomeSingleAmount}" required="true" requiredMessage="#{project.FIELD_FINANCIAL_INCOME_SINGLE_VALUE_REQUIRED}">
+                                               <p:inputText id="incomeSingleValue" size="5" maxlength="20" value="#{financialIncomeController.incomeSingleAmount}" required="true" requiredMessage="#{project.FIELD_FINANCIAL_INCOME_SINGLE_VALUE_REQUIRED}">
                                                        <f:validator validatorId="CurrencyAmountValidator" />
                                                </p:inputText>
                                        </div>