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

Proposed (but not applied yet) changes to RequestInvoice

This commit is contained in:
Carlos Ruiz 2006-12-10 18:27:02 +00:00
parent 027ac5c1ba
commit dada2247a1
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/src/org/compiere/model/MRequest.java
View File

@ -929,6 +929,8 @@ public class MRequest extends X_R_Request
setR_StandardResponse_ID(0); setR_StandardResponse_ID(0);
setR_MailText_ID(0); setR_MailText_ID(0);
setResult(null); setResult(null);
// globalqss - these fields must be cleared (waiting to open bug in sf)
// setM_ProductSpent_ID(0);
// setQtySpent(null); // setQtySpent(null);
// setQtyInvoiced(null); // setQtyInvoiced(null);
} }

7
base/src/org/compiere/process/RequestInvoice.java
View File

@ -95,6 +95,9 @@ public class RequestInvoice extends SvrProcess
+ " INNER JOIN R_Status s ON (r.R_Status_ID=s.R_Status_ID) " + " INNER JOIN R_Status s ON (r.R_Status_ID=s.R_Status_ID) "
+ "WHERE s.IsClosed='Y'" + "WHERE s.IsClosed='Y'"
+ " AND r.R_RequestType_ID=?"; + " AND r.R_RequestType_ID=?";
// globalqss -- avoid double invoicing
// + " AND EXISTS (SELECT 1 FROM R_RequestUpdate ru " +
// "WHERE ru.R_Request_ID=r.R_Request_ID AND NVL(C_InvoiceLine_ID,0)=0";
if (p_R_Group_ID != 0) if (p_R_Group_ID != 0)
sql += " AND r.R_Group_ID=?"; sql += " AND r.R_Group_ID=?";
if (p_R_Category_ID != 0) if (p_R_Category_ID != 0)
@ -204,6 +207,8 @@ public class RequestInvoice extends SvrProcess
BigDecimal qty = updates[i].getQtyInvoiced(); BigDecimal qty = updates[i].getQtyInvoiced();
if (qty == null || qty.signum() == 0) if (qty == null || qty.signum() == 0)
continue; continue;
// if (updates[i].getC_InvoiceLine_ID() > 0)
// continue;
MInvoiceLine il = new MInvoiceLine(m_invoice); MInvoiceLine il = new MInvoiceLine(m_invoice);
m_linecount++; m_linecount++;
@ -218,6 +223,8 @@ public class RequestInvoice extends SvrProcess
// //
il.setPrice(); il.setPrice();
il.save(); il.save();
// updates[i].setC_InvoiceLine_ID(il.getC_InvoiceLine_ID());
// updates[i].save();
} }
} // invoiceLine } // invoiceLine