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

BF #2041226 BP Open Balance should count only Completed Invoice

This commit is contained in:
armenrz 2008-09-21 09:13:01 +00:00
parent 6472ec1691
commit 1878089641
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
base/src/org/compiere/model/MBPartner.java
View File

@ -739,7 +739,7 @@ public class MBPartner extends X_C_BPartner
{ {
BigDecimal SO_CreditUsed = null; BigDecimal SO_CreditUsed = null;
BigDecimal TotalOpenBalance = null; BigDecimal TotalOpenBalance = null;
//AZ Goodwill -> BF: only count completed/closed docs. //AZ Goodwill -> BF2041226 : only count completed/closed docs.
String sql = "SELECT " String sql = "SELECT "
// SO Credit Used // SO Credit Used
+ "COALESCE((SELECT SUM(currencyBase(invoiceOpen(i.C_Invoice_ID,i.C_InvoicePaySchedule_ID),i.C_Currency_ID,i.DateInvoiced, i.AD_Client_ID,i.AD_Org_ID)) FROM C_Invoice_v i " + "COALESCE((SELECT SUM(currencyBase(invoiceOpen(i.C_Invoice_ID,i.C_InvoicePaySchedule_ID),i.C_Currency_ID,i.DateInvoiced, i.AD_Client_ID,i.AD_Org_ID)) FROM C_Invoice_v i "
@ -796,9 +796,10 @@ public class MBPartner extends X_C_BPartner
public void setActualLifeTimeValue() public void setActualLifeTimeValue()
{ {
BigDecimal ActualLifeTimeValue = null; BigDecimal ActualLifeTimeValue = null;
//AZ Goodwill -> BF2041226 : only count completed/closed docs.
String sql = "SELECT " String sql = "SELECT "
+ "COALESCE ((SELECT SUM(currencyBase(i.GrandTotal,i.C_Currency_ID,i.DateInvoiced, i.AD_Client_ID,i.AD_Org_ID)) FROM C_Invoice_v i " + "COALESCE ((SELECT SUM(currencyBase(i.GrandTotal,i.C_Currency_ID,i.DateInvoiced, i.AD_Client_ID,i.AD_Org_ID)) FROM C_Invoice_v i "
+ "WHERE i.C_BPartner_ID=bp.C_BPartner_ID AND i.IsSOTrx='Y'),0) " + "WHERE i.C_BPartner_ID=bp.C_BPartner_ID AND i.IsSOTrx='Y' AND i.DocStatus IN ('CO','CL')),0) "
+ "FROM C_BPartner bp " + "FROM C_BPartner bp "
+ "WHERE C_BPartner_ID=?"; + "WHERE C_BPartner_ID=?";
PreparedStatement pstmt = null; PreparedStatement pstmt = null;