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

IDEMPIERE-1096 CreateFromStatement not working with currency conversion

This commit is contained in:
Carlos Ruiz 2013-06-21 18:57:54 -05:00
parent 8660a34ae5
commit ab31459efb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org.adempiere.ui/src/org/compiere/grid/CreateFromBatch.java
View File

@ -94,13 +94,13 @@ public abstract class CreateFromBatch extends CreateFrom
throws SQLException throws SQLException
{ {
// Get StatementDate // Get StatementDate
Timestamp ts = (Timestamp) getGridTab().getValue("StatementDate"); //Timestamp ts = (Timestamp) getGridTab().getValue("StatementDate");
if (ts == null) //if (ts == null)
ts = new Timestamp(System.currentTimeMillis()); //ts = new Timestamp(System.currentTimeMillis());
int index = 1; int index = 1;
pstmt.setTimestamp(index++, ts); //pstmt.setTimestamp(index++, ts);
pstmt.setInt(index++, BankAccount != null ? (Integer) BankAccount : (Integer) getGridTab().getValue("C_BankAccount_ID")); pstmt.setInt(index++, BankAccount != null ? (Integer) BankAccount : (Integer) getGridTab().getValue("C_BankAccount_ID"));
if(DocType != null) if(DocType != null)

2
org.adempiere.ui/src/org/compiere/grid/CreateFromStatement.java
View File

@ -59,7 +59,7 @@ public abstract class CreateFromStatement extends CreateFromBatch
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
sql.append("SELECT p.DateTrx,p.C_Payment_ID,p.DocumentNo, p.C_Currency_ID,c.ISO_Code, p.PayAmt,"); sql.append("SELECT p.DateTrx,p.C_Payment_ID,p.DocumentNo, p.C_Currency_ID,c.ISO_Code, p.PayAmt,");
sql.append("currencyConvert(p.PayAmt,p.C_Currency_ID,ba.C_Currency_ID,?,null,p.AD_Client_ID,p.AD_Org_ID), bp.Name "); sql.append("currencyConvert(p.PayAmt,p.C_Currency_ID,ba.C_Currency_ID,p.DateAcct,p.C_ConversionType_ID,p.AD_Client_ID,p.AD_Org_ID), bp.Name ");
sql.append("FROM C_BankAccount ba"); sql.append("FROM C_BankAccount ba");
sql.append(" INNER JOIN C_Payment_v p ON (p.C_BankAccount_ID=ba.C_BankAccount_ID)"); sql.append(" INNER JOIN C_Payment_v p ON (p.C_BankAccount_ID=ba.C_BankAccount_ID)");
sql.append(" INNER JOIN C_Currency c ON (p.C_Currency_ID=c.C_Currency_ID)"); sql.append(" INNER JOIN C_Currency c ON (p.C_Currency_ID=c.C_Currency_ID)");