From: Roland Häder <roland@mxchange.org>
Date: Thu, 26 Oct 2017 19:19:08 +0000 (+0200)
Subject: Don't cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8cae395640338e7d11da45f6384767afaaaae2d2;p=jfinancials-war.git

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 b9d399c8..a71396e3 100644
--- 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 a9c24374..3eb30101 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
@@ -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>