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

IDEMPIERE-3559 DrillDown report didn't work because of two bug / integrate suggestions from Denis Kuznetsov

This commit is contained in:
Carlos Ruiz 2017-11-15 10:46:11 +01:00
parent fbb260a1ea
commit b689ad0495
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/WReport.java
View File

@ -167,8 +167,20 @@ public class WReport implements EventListener<Event> {
private void launchReport (MPrintFormat pf)
{
int Record_ID = 0;
if (m_query.getRestrictionCount()==1 && m_query.getCode(0) instanceof Integer)
Record_ID = ((Integer)m_query.getCode(0)).intValue();
if (m_query.getRestrictionCount() == 1) {
if (m_query.getColumnName(0).equals(m_query.getTableName()+"_ID")) {
Object vrec = m_query.getCode(0);
if (vrec instanceof Integer) {
Record_ID = ((Integer)m_query.getCode(0)).intValue();
} else {
try {
Record_ID = Integer.parseInt(m_query.getCode(0).toString());
} catch (NumberFormatException e) {
log.info(e.getMessage());
}
}
}
}
PrintInfo info = new PrintInfo(
pf.getName(),
pf.getAD_Table_ID(),

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java
View File

@ -996,7 +996,7 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
return;
}
if (AD_Table_ID != 0)
new WReport (AD_Table_ID, query, component, 0);
new WReport (AD_Table_ID, query, component, m_WindowNo);
else
log.warning("No Table found for " + query.getWhereClause(true));
} // executeDrill