From e38b301b755e3cb82d96095d02ca85c0a6437220 Mon Sep 17 00:00:00 2001 From: tsvikruha Date: Sun, 20 Sep 2015 22:30:38 +0200 Subject: [PATCH] IDEMPIERE-2753 Discount is not calculated when Price List Price <1 --- .../src/org/compiere/model/CalloutInvoice.java | 4 ++-- .../src/org/compiere/model/CalloutOrder.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoice.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoice.java index 729785cbc8..35abd3717e 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoice.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoice.java @@ -624,7 +624,7 @@ public class CalloutInvoice extends CalloutEngine // calculate Discount else { - if (PriceList.intValue() == 0) + if (PriceList.compareTo(Env.ZERO) == 0) Discount = Env.ZERO; else Discount = new BigDecimal ((PriceList.doubleValue() - PriceActual.doubleValue()) / PriceList.doubleValue() * 100.0); @@ -654,7 +654,7 @@ public class CalloutInvoice extends CalloutEngine mTab.setValue ("PriceEntered", PriceEntered); mTab.fireDataStatusEEvent ("UnderLimitPrice", "", false); // Repeat Discount calc - if (PriceList.intValue() != 0) + if (PriceList.compareTo(Env.ZERO) != 0) { Discount = BigDecimal.valueOf((PriceList.doubleValue () - PriceActual.doubleValue ()) / PriceList.doubleValue () * 100.0); if (Discount.scale () > 2) diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java index 76ac20f7e6..98303c4a85 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java @@ -1148,7 +1148,7 @@ public class CalloutOrder extends CalloutEngine // calculate Discount else { - if (PriceList.intValue() == 0) + if (PriceList.compareTo(Env.ZERO) == 0) Discount = Env.ZERO; else Discount = BigDecimal.valueOf((PriceList.doubleValue() - PriceActual.doubleValue()) / PriceList.doubleValue() * 100.0); @@ -1177,7 +1177,7 @@ public class CalloutOrder extends CalloutEngine mTab.setValue ("PriceEntered", PriceEntered); mTab.fireDataStatusEEvent ("UnderLimitPrice", "", false); // Repeat Discount calc - if (PriceList.intValue() != 0) + if (PriceList.compareTo(Env.ZERO) != 0) { Discount = BigDecimal.valueOf((PriceList.doubleValue () - PriceActual.doubleValue ()) / PriceList.doubleValue () * 100.0); if (Discount.scale () > 2)