From dd61cfc99fbb01a85e000957084e2d773256a0e4 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Tue, 13 Jan 2015 10:09:51 -0500 Subject: [PATCH] IDEMPIERE-2161 DiscountSchema works with every CumulativeLevel value / fix broken when DiscountType is FlatPercent --- org.adempiere.base/src/org/compiere/model/MProductPricing.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.adempiere.base/src/org/compiere/model/MProductPricing.java b/org.adempiere.base/src/org/compiere/model/MProductPricing.java index 199430e0d6..71ad2c4998 100644 --- a/org.adempiere.base/src/org/compiere/model/MProductPricing.java +++ b/org.adempiere.base/src/org/compiere/model/MProductPricing.java @@ -781,7 +781,7 @@ public class MProductPricing return; MDiscountSchema sd = MDiscountSchema.get(Env.getCtx(), M_DiscountSchema_ID); // not correct - if (sd.get_ID() == 0 || MDiscountSchema.CUMULATIVELEVEL_Line.equals(sd.getCumulativeLevel())) + if (sd.get_ID() == 0 || (MDiscountSchema.DISCOUNTTYPE_Breaks.equals(sd.getDiscountType()) && MDiscountSchema.CUMULATIVELEVEL_Line.equals(sd.getCumulativeLevel()))) return; // m_discountSchema = true;