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

IDEMPIERE-3279 Implement configurable Write-Off in Payment Selection / multicurrency

This commit is contained in:
Carlos Ruiz 2017-01-13 19:32:41 +01:00
parent 503ec9d9e2
commit 0525d03dd0
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
org.adempiere.base.callout/src/org/compiere/model/CalloutPaySelection.java
View File

@ -104,9 +104,14 @@ public class CalloutPaySelection extends CalloutEngine
BigDecimal OpenAmt = Env.ZERO; BigDecimal OpenAmt = Env.ZERO;
BigDecimal DiscountAmt = Env.ZERO; BigDecimal DiscountAmt = Env.ZERO;
Boolean IsSOTrx = Boolean.FALSE; Boolean IsSOTrx = Boolean.FALSE;
String sql = "SELECT currencyConvert(invoiceOpen(i.C_Invoice_ID, 0), i.C_Currency_ID," String sql = "SELECT"
+ "ba.C_Currency_ID, i.DateInvoiced, i.C_ConversionType_ID, i.AD_Client_ID, i.AD_Org_ID)," + " currencyConvert("
+ " paymentTermDiscount(i.GrandTotal,i.C_Currency_ID,i.C_PaymentTerm_ID,i.DateInvoiced, ?), i.IsSOTrx " + "invoiceOpen(i.C_Invoice_ID, 0)"
+ ", i.C_Currency_ID,ba.C_Currency_ID, i.DateInvoiced, i.C_ConversionType_ID, i.AD_Client_ID, i.AD_Org_ID),"
+ " currencyConvert("
+ "paymentTermDiscount(i.GrandTotal,i.C_Currency_ID,i.C_PaymentTerm_ID,i.DateInvoiced, ?)"
+ ", i.C_Currency_ID, ba.C_Currency_ID, i.DateInvoiced, i.C_ConversionType_ID, i.AD_Client_ID, i.AD_Org_ID)"
+ ", i.IsSOTrx "
+ "FROM C_Invoice_v i, C_BankAccount ba " + "FROM C_Invoice_v i, C_BankAccount ba "
+ "WHERE i.C_Invoice_ID=? AND ba.C_BankAccount_ID=?"; // #1..2 + "WHERE i.C_Invoice_ID=? AND ba.C_BankAccount_ID=?"; // #1..2
ResultSet rs = null; ResultSet rs = null;