From ac460b523af6f61254e86c7c6e101a2db9ef670c Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 13 May 2015 11:18:09 -0500 Subject: [PATCH] IDEMPIERE-2605 Bypass Product Qty checks/warnings in CalloutOrder when order is DropShip / based on patch from Carlin Reed (creed.gds) --- .../src/org/compiere/model/CalloutOrder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 515ab3419c..7405e8f07f 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java @@ -837,7 +837,7 @@ public class CalloutOrder extends CalloutEngine if (Env.isSOTrx(ctx, WindowNo)) { MProduct product = MProduct.get (ctx, M_Product_ID.intValue()); - if (product.isStocked()) + if (product.isStocked() && Env.getContext(ctx, WindowNo, "IsDropShip").equals("N")) { BigDecimal QtyOrdered = (BigDecimal)mTab.getValue("QtyOrdered"); int M_Warehouse_ID = Env.getContextAsInt(ctx, WindowNo, "M_Warehouse_ID"); @@ -1324,7 +1324,7 @@ public class CalloutOrder extends CalloutEngine && QtyOrdered.signum() > 0) // no negative (returns) { MProduct product = MProduct.get (ctx, M_Product_ID); - if (product.isStocked()) + if (product.isStocked() && Env.getContext(ctx, WindowNo, "IsDropShip").equals("N")) { int M_Warehouse_ID = Env.getContextAsInt(ctx, WindowNo, "M_Warehouse_ID"); int M_AttributeSetInstance_ID = Env.getContextAsInt(ctx, WindowNo, mTab.getTabNo(), "M_AttributeSetInstance_ID");