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

IDEMPIERE-3006 Reporting on a document window is not respecting the query

This commit is contained in:
Carlos Ruiz 2016-01-19 15:29:17 +01:00
parent 79ff4ff169
commit 3221fa3541
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java
View File

@ -270,19 +270,19 @@ public class ReportAction implements EventListener<Event>
int Record_ID = 0; int Record_ID = 0;
int[] RecordIDs = null; int[] RecordIDs = null;
MQuery query = new MQuery(gridTab.getTableName()); MQuery query = new MQuery(gridTab.getTableName());
String whereClause; StringBuilder whereClause = new StringBuilder("");
if (currentRowOnly) if (currentRowOnly)
{ {
Record_ID = gridTab.getRecord_ID(); Record_ID = gridTab.getRecord_ID();
whereClause = gridTab.getTableModel().getWhereClause(gridTab.getCurrentRow()); whereClause.append(gridTab.getTableModel().getWhereClause(gridTab.getCurrentRow()));
if (whereClause==null) if (whereClause.length() == 0)
whereClause = gridTab.getTableModel().getSelectWhereClause(); whereClause.append(gridTab.getTableModel().getSelectWhereClause());
} }
else else
{ {
whereClause = gridTab.getTableModel().getSelectWhereClause(); whereClause.append(gridTab.getTableModel().getSelectWhereClause());
RecordIDs = new int[gridTab.getRowCount()]; RecordIDs = new int[gridTab.getRowCount()];
for(int i = 0; i < gridTab.getRowCount(); i++) for(int i = 0; i < gridTab.getRowCount(); i++)
{ {
@ -290,24 +290,34 @@ public class ReportAction implements EventListener<Event>
} }
} }
if (whereClause!=null && whereClause.length() > 0) if (whereClause.length() > 0)
{ {
if (whereClause.indexOf('@') != -1) //replace variables in context if (whereClause.indexOf("@") != -1) //replace variables in context
{ {
String context = Env.parseContext(Env.getCtx(), panel.getWindowNo(), whereClause, false); String context = Env.parseContext(Env.getCtx(), panel.getWindowNo(), whereClause.toString(), false);
if(context != null && context.trim().length() > 0) if(context != null && context.trim().length() > 0)
{ {
whereClause = context; whereClause = new StringBuilder(context);
} }
else else
{ {
log.log(Level.WARNING, "Failed to parse where clause. whereClause= "+whereClause); log.log(Level.WARNING, "Failed to parse where clause. whereClause= "+whereClause);
whereClause = ("1 = 2"); whereClause = new StringBuilder("1 = 2");
} }
} }
} }
query.addRestriction(whereClause); if (!currentRowOnly && gridTab.isOnlyCurrentRows() && gridTab.getTabNo() == 0)
{
if (whereClause.length() > 0)
whereClause.append(" AND ");
// Show only unprocessed or the one updated within x days
whereClause.append("(").append(gridTab.getTableName()).append(".Processed='N' OR ").append(gridTab.getTableName()).append(".Updated>");
whereClause.append("SysDate-1");
whereClause.append(")");
}
query.addRestriction(whereClause.toString());
PrintInfo info = new PrintInfo(pf.getName(), pf.getAD_Table_ID(), Record_ID); PrintInfo info = new PrintInfo(pf.getName(), pf.getAD_Table_ID(), Record_ID);
info.setDescription(query.getInfo()); info.setDescription(query.getInfo());