From 8cae395640338e7d11da45f6384767afaaaae2d2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 26 Oct 2017 21:19:08 +0200 Subject: [PATCH] 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- ...nancialAdminReceiptItemWebRequestBean.java | 6 +++--- .../admin_form_financial_receipt_item.tpl | 20 ------------------- 2 files changed, 3 insertions(+), 23 deletions(-) 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 *

* @return Item quantity */ - public Long getItemQuantity () { + public Short getItemQuantity () { return this.itemQuantity; } @@ -186,7 +186,7 @@ public class FinancialAdminReceiptItemWebRequestBean extends BaseFinancialsBean *

* @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 @@ - - - - - - - - - - - - - - - - - - -- 2.39.5