Don't cherry-pick:

- added/change net and gross price and tax rate
- remove wrong JSF code as it was copied from receipt template and is not
  needed/wanted in receipt items

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

diff --git a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/FinancialAdminReceiptItemWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/FinancialAdminReceiptItemWebRequestBean.java
index b9d399c8a16c781591619f3a80cb5db3b0c16b0e..a71396e3595c8225494868439c45a5722b5bc878 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/FinancialAdminReceiptItemWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/FinancialAdminReceiptItemWebRequestBean.java
@@ -74,7 +74,7 @@ public class FinancialAdminReceiptItemWebRequestBean extends BaseFinancialsBean
        /**
         * Quantity of item
         */
-       private Long itemQuantity;
+       private Short itemQuantity;
 
        /**
         * Assigned receipt
@@ -177,7 +177,7 @@ public class FinancialAdminReceiptItemWebRequestBean extends BaseFinancialsBean
         * <p>
         * @return Item quantity
         */
-       public Long getItemQuantity () {
+       public Short getItemQuantity () {
                return this.itemQuantity;
        }
 
@@ -186,7 +186,7 @@ public class FinancialAdminReceiptItemWebRequestBean extends BaseFinancialsBean
         * <p>
         * @param itemQuantity Item quantity
         */
-       public void setItemQuantity (final Long itemQuantity) {
+       public void setItemQuantity (final Short itemQuantity) {
                this.itemQuantity = itemQuantity;
        }
 

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 a9c243745ff5d74afa2591d90426dc914bfbc008..3eb3010176b3db04ddaf71b7106ccb24cf63f1b7 100644 (file)
--- 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
@@ -55,24 +55,4 @@
                        </p:selectOneMenu>
                </p:panelGrid>
        </p:fieldset>
-
-       <p:fieldset legend="#{project.ADMIN_RECEIPT_ITEM_OTHER_LEGEND}">
-               <!--
-               @TODO: title="#{project.ADMIN_RECEIPT_ITEM_OTHER_LEGEND_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_ITEM_NUMBER}" />
-                       <p:inputText styleClass="input" id="receiptNumber" size="10" maxlength="20" value="#{adminReceiptItemController.receiptNumber}" validatorMessage="#{msg.ENTERED_RECEIPT_ITEM_NUMBER_INVALID}">
-                               <f:validateLongRange minimum="1" maximum="9999999999" />
-                       </p:inputText>
-
-                       <p:outputLabel for="receiptRegisterNumber" value="#{project.ENTER_RECEIPT_ITEM_REGISTER_NUMBER}" />
-                       <p:inputText styleClass="input" id="receiptRegisterNumber" size="3" maxlength="10" value="#{adminReceiptItemController.receiptRegisterNumber}" validatorMessage="#{msg.ENTERED_RECEIPT_ITEM_REGISTER_NUMBER_INVALID}">
-                               <f:validateLongRange minimum="1" maximum="999" />
-                       </p:inputText>
-
-                       <p:outputLabel for="receiptBarCodeNumber" value="#{project.ENTER_RECEIPT_ITEM_BARCODE_NUMBER}" />
-                       <p:inputText styleClass="input" id="receiptBarCodeNumber" size="24" maxlength="24" value="#{adminReceiptItemController.receiptBarCodeNumber}" />
-               </p:panelGrid>
-       </p:fieldset>
 </ui:composition>