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

https://sourceforge.net/tracker/?func=detail&aid=2800169&group_id=176962&atid=955896 

- sql exception in Info Invoice
This commit is contained in:
Heng Sin Low 2009-06-20 00:04:20 +00:00
parent 79d295a252
commit a2c0f8308f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java
View File

@ -298,15 +298,15 @@ public class InfoInvoicePanel extends InfoPanel implements ValueChangeListener
} }
if (fromDate == null && toDate != null) if (fromDate == null && toDate != null)
{ {
sql.append(" AND TRUNC(o.DateOrdered) <= ?"); sql.append(" AND TRUNC(i.DateInvoiced) <= ?");
} }
else if (fromDate != null && toDate == null) else if (fromDate != null && toDate == null)
{ {
sql.append(" AND TRUNC(o.DateOrdered) >= ?"); sql.append(" AND TRUNC(i.DateInvoiced) >= ?");
} }
else if (fromDate != null && toDate != null) else if (fromDate != null && toDate != null)
{ {
sql.append(" AND TRUNC(o.DateOrdered) BETWEEN ? AND ?"); sql.append(" AND TRUNC(i.DateInvoiced) BETWEEN ? AND ?");
} }
// //
Double fromAmount = null; Double fromAmount = null;
@ -335,15 +335,15 @@ public class InfoInvoicePanel extends InfoPanel implements ValueChangeListener
} }
if (fromAmount == null && toAmount != null) if (fromAmount == null && toAmount != null)
{ {
sql.append(" AND o.GrandTotal <= ?"); sql.append(" AND i.GrandTotal <= ?");
} }
else if (fromAmount != null && toAmount == null) else if (fromAmount != null && toAmount == null)
{ {
sql.append(" AND o.GrandTotal >= ?"); sql.append(" AND i.GrandTotal >= ?");
} }
else if (fromAmount != null && toAmount != null) else if (fromAmount != null && toAmount != null)
{ {
sql.append(" AND o.GrandTotal BETWEEN ? AND ?"); sql.append(" AND i.GrandTotal BETWEEN ? AND ?");
} }
sql.append(" AND i.IsPaid=? AND i.IsSOTrx=?"); sql.append(" AND i.IsPaid=? AND i.IsSOTrx=?");