From b375650101b66b463ab5b2c6834c5094660b4821 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 20 May 2015 18:44:08 -0500 Subject: [PATCH] IDEMPIERE-2594 RMA does not allow repeat returns on same shipment. / based on patch provided by Redhuan (red1) --- org.adempiere.ui/src/org/compiere/grid/CreateFromRMA.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.adempiere.ui/src/org/compiere/grid/CreateFromRMA.java b/org.adempiere.ui/src/org/compiere/grid/CreateFromRMA.java index e25d66206f..444de85e38 100644 --- a/org.adempiere.ui/src/org/compiere/grid/CreateFromRMA.java +++ b/org.adempiere.ui/src/org/compiere/grid/CreateFromRMA.java @@ -73,7 +73,7 @@ public abstract class CreateFromRMA extends CreateFrom { sqlStmt.append("SELECT iol.M_InOutLine_ID, iol.Line, "); sqlStmt.append("COALESCE(p.Name, c.Name) AS ProductName, "); sqlStmt.append("iol.QtyEntered, "); - sqlStmt.append("iol.movementQty, "); + sqlStmt.append("iol.movementQty-(SELECT COALESCE((SELECT SUM(rmal.qty) FROM M_RMALine rmal JOIN M_RMA rma ON rma.M_RMA_ID=rmal.M_RMA_ID WHERE rmal.M_InOutLine_ID=iol.M_InOutLine_ID AND rma.DocStatus IN ('CO','CL')),0)) AS MovementQty, "); sqlStmt.append("CASE WHEN iol.M_AttributeSetInstance_ID IS NOT NULL THEN (SELECT SerNo FROM M_AttributeSetInstance asi WHERE asi.M_AttributeSetInstance_ID=iol.M_AttributeSetInstance_ID) END as ASI "); sqlStmt.append("FROM M_InOutLine iol "); sqlStmt.append("LEFT JOIN M_Product p ON p.M_Product_ID = iol.M_Product_ID "); @@ -136,7 +136,7 @@ public abstract class CreateFromRMA extends CreateFrom { miniTable.setColumnClass(2, String.class, true); // 2-Product miniTable.setColumnClass(3, String.class, true); // 3-ASI miniTable.setColumnClass(4, BigDecimal.class, true); // 4-Qty - miniTable.setColumnClass(5, BigDecimal.class, true); // 5-Delivered Qty + miniTable.setColumnClass(5, BigDecimal.class, false); // 5-Delivered Qty // Table UI miniTable.autoSize();