midsuit
/
core-jgi
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-5026 Create from Invoice showing already invoiced RMA's (#970) 

* IDEMPIERE-5026 Create from Invoice showing already invoiced Return to Vendor docs

* IDEMPIERE-5026 fix Create from Invoice showing already Invoiced RMA's and not allowing more than one Credit Memo for a single RMA
This commit is contained in:
Tony Snook 2021-11-10 12:45:02 +11:00 committed by GitHub
parent 0f31a07f43
commit ae7f71c9cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
org.adempiere.ui/src/org/compiere/grid/CreateFromInvoice.java
View File

@ -103,9 +103,9 @@ public abstract class CreateFromInvoice extends CreateFrom
sql.append(" LEFT OUTER JOIN M_MatchInv mi ON (sl.M_InOutLine_ID=mi.M_InOutLine_ID) " sql.append(" LEFT OUTER JOIN M_MatchInv mi ON (sl.M_InOutLine_ID=mi.M_InOutLine_ID) "
+ " JOIN M_InOut s2 ON (sl.M_InOut_ID=s2.M_InOut_ID) " + " JOIN M_InOut s2 ON (sl.M_InOut_ID=s2.M_InOut_ID) "
+ " WHERE s2.C_BPartner_ID=? AND s2.IsSOTrx=? AND s2.DocStatus IN ('CL','CO') " + " WHERE s2.C_BPartner_ID=? AND s2.IsSOTrx=? AND s2.DocStatus IN ('CL','CO') "
+ " GROUP BY sl.M_InOut_ID,sl.MovementQty,mi.M_InOutLine_ID" + " GROUP BY sl.M_InOut_ID,sl.MovementQty,s2.MovementType,mi.M_InOutLine_ID"
+ " HAVING (sl.MovementQty<>SUM(mi.Qty) AND mi.M_InOutLine_ID IS NOT NULL)" + " HAVING (sl.MovementQty <> SUM(mi.Qty) * CASE WHEN s2.MovementType = 'V-' THEN -1 ELSE 1 END"
+ " OR mi.M_InOutLine_ID IS NULL "); + " AND mi.M_InOutLine_ID IS NOT NULL) OR mi.M_InOutLine_ID IS NULL ");
else else
sql.append(" INNER JOIN M_InOut s2 ON (sl.M_InOut_ID=s2.M_InOut_ID)" sql.append(" INNER JOIN M_InOut s2 ON (sl.M_InOut_ID=s2.M_InOut_ID)"
+ " LEFT JOIN C_InvoiceLine il ON sl.M_InOutLine_ID = il.M_InOutLine_ID" + " LEFT JOIN C_InvoiceLine il ON sl.M_InOutLine_ID = il.M_InOutLine_ID"
@ -150,10 +150,10 @@ public abstract class CreateFromInvoice extends CreateFrom
ArrayList<KeyNamePair> list = new ArrayList<KeyNamePair>(); ArrayList<KeyNamePair> list = new ArrayList<KeyNamePair>();
String sqlStmt = "SELECT r.M_RMA_ID, r.DocumentNo || '-' || r.Amt from M_RMA r " String sqlStmt = "SELECT r.M_RMA_ID, r.DocumentNo || '-' || r.Amt from M_RMA r "
+ "INNER JOIN M_RMALine l ON (l.M_RMA_ID = r.M_RMA_ID) "
+ "WHERE ISSOTRX='N' AND r.DocStatus in ('CO', 'CL') " + "WHERE ISSOTRX='N' AND r.DocStatus in ('CO', 'CL') "
+ "AND r.C_BPartner_ID=? " + "AND r.C_BPartner_ID=? "
+ "AND NOT EXISTS (SELECT * FROM C_Invoice inv " + "AND COALESCE(l.QtyInvoiced,0) < l.Qty ";
+ "WHERE inv.M_RMA_ID=r.M_RMA_ID AND inv.DocStatus IN ('CO', 'CL'))";
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
@ -195,7 +195,7 @@ public abstract class CreateFromInvoice extends CreateFrom
Vector<Vector<Object>> data = new Vector<Vector<Object>>(); Vector<Vector<Object>> data = new Vector<Vector<Object>>();
StringBuilder sql = new StringBuilder("SELECT "); // QtyEntered StringBuilder sql = new StringBuilder("SELECT "); // QtyEntered
if(!isSOTrx) if(!isSOTrx)
sql.append("l.MovementQty-SUM(COALESCE(mi.Qty, 0)),"); sql.append("l.Movementqty-SUM(COALESCE(mi.Qty, 0))*CASE WHEN io.MovementType = 'V-' THEN -1 ELSE 1 END,");
else else
sql.append("l.MovementQty-SUM(COALESCE(il.QtyInvoiced,0)),"); sql.append("l.MovementQty-SUM(COALESCE(il.QtyInvoiced,0)),");
sql.append(" l.QtyEntered/l.MovementQty," sql.append(" l.QtyEntered/l.MovementQty,"
@ -221,7 +221,7 @@ public abstract class CreateFromInvoice extends CreateFrom
.append(" WHERE l.M_InOut_ID=? AND l.MovementQty<>0 ") .append(" WHERE l.M_InOut_ID=? AND l.MovementQty<>0 ")
.append("GROUP BY l.MovementQty, l.QtyEntered/l.MovementQty, " .append("GROUP BY l.MovementQty, l.QtyEntered/l.MovementQty, "
+ "l.C_UOM_ID, COALESCE(uom.UOMSymbol, uom.Name), " + "l.C_UOM_ID, COALESCE(uom.UOMSymbol, uom.Name), "
+ "l.M_Product_ID, p.Name, po.VendorProductNo, l.M_InOutLine_ID, l.Line, l.C_OrderLine_ID "); + "l.M_Product_ID, p.Name, po.VendorProductNo, l.M_InOutLine_ID, l.Line, l.C_OrderLine_ID, io.MovementType ");
if(!isSOTrx) if(!isSOTrx)
sql.append(" HAVING l.MovementQty-SUM(COALESCE(mi.Qty, 0)) <>0"); sql.append(" HAVING l.MovementQty-SUM(COALESCE(mi.Qty, 0)) <>0");
else else
@ -527,7 +527,8 @@ public abstract class CreateFromInvoice extends CreateFrom
for (int j = 0; j < lines.length; j++) for (int j = 0; j < lines.length; j++)
{ {
MInOutLine line = lines[j]; MInOutLine line = lines[j];
if (rmaLine.getQty().compareTo(QtyEntered) == 0) BigDecimal alreadyInvoiced = rmaLine.getQtyInvoiced() != null ? rmaLine.getQtyInvoiced() : BigDecimal.ZERO;
if (rmaLine.getQty().subtract(alreadyInvoiced).compareTo(QtyEntered) >= 0)
{ {
inoutLine = line; inoutLine = line;
M_InOutLine_ID = inoutLine.getM_InOutLine_ID(); M_InOutLine_ID = inoutLine.getM_InOutLine_ID();