From c600cea235c50f2a4d6ee315d84bfb218e062a67 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 19 Feb 2016 17:13:33 +0100 Subject: [PATCH] IDEMPIERE-3035 Potential data corruption selection sales order line on shipment --- .../src/org/compiere/model/CalloutInOut.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutInOut.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutInOut.java index a7d2df2b0d..6765e674dd 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutInOut.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutInOut.java @@ -417,10 +417,13 @@ public class CalloutInOut extends CalloutEngine { if (ol.getC_Charge_ID() > 0 && ol.getM_Product_ID() <= 0) { mTab.setValue("C_Charge_ID", new Integer(ol.getC_Charge_ID())); + mTab.setValue("M_Product_ID", null); + mTab.setValue("M_AttributeSetInstance_ID", null); } else { mTab.setValue("M_Product_ID", new Integer(ol.getM_Product_ID())); mTab.setValue("M_AttributeSetInstance_ID", new Integer(ol.getM_AttributeSetInstance_ID())); + mTab.setValue("C_Charge_ID", null); } // mTab.setValue("C_UOM_ID", new Integer(ol.getC_UOM_ID())); @@ -472,10 +475,13 @@ public class CalloutInOut extends CalloutEngine { if (rl.getC_Charge_ID() > 0 && rl.getM_Product_ID() <= 0) { mTab.setValue("C_Charge_ID", new Integer(rl.getC_Charge_ID())); + mTab.setValue("M_Product_ID", null); + mTab.setValue("M_AttributeSetInstance_ID", null); } else { mTab.setValue("M_Product_ID", new Integer(rl.getM_Product_ID())); mTab.setValue("M_AttributeSetInstance_ID", new Integer(rl.getM_AttributeSetInstance_ID())); + mTab.setValue("C_Charge_ID", null); } // mTab.setValue("C_UOM_ID", new Integer(rl.getC_UOM_ID()));