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

IDEMPIERE-1536 Error running a report with SQL columns / thanks to Antonio Cañaveral for suggested patch

This commit is contained in:
Carlos Ruiz 2014-03-12 15:59:58 -05:00
parent ea3620f953
commit f3321a3eba
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.adempiere.base/src/org/compiere/model/MLookupFactory.java
View File

@ -675,9 +675,9 @@ public class MLookupFactory
embedSQL.append(BaseTable).append(".").append(BaseColumn); embedSQL.append(BaseTable).append(".").append(BaseColumn);
embedSQL.append("=").append(TableNameAlias).append(".").append(KeyColumn); embedSQL.append("=").append(TableNameAlias).append(".").append(KeyColumn);
} else if (translated) { } else if (translated) {
embedSQL.append(TableNameAlias).append(".").append(BaseColumn).append("=").append(column.getColumnSQL()); embedSQL.append(TableNameAlias).append(".").append(KeyColumn).append("=").append(column.getColumnSQL());
} else { } else {
embedSQL.append(BaseColumn).append("=").append(column.getColumnSQL()); embedSQL.append(KeyColumn).append("=").append(column.getColumnSQL());
} }
return embedSQL.toString(); return embedSQL.toString();

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/report/HTMLExtension.java
View File

@ -61,7 +61,7 @@ public class HTMLExtension implements IHTMLExtension {
href.setStyle("text-decoration: none; font-size: 11px; vertical-align: middle;"); href.setStyle("text-decoration: none; font-size: 11px; vertical-align: middle;");
href.addAttribute("onclick", "parent.zoom('" href.addAttribute("onclick", "parent.zoom('"
+ componentId + "', '" + componentId + "', '"
+ dataElement.getColumnName() + "', '" + dataElement.getForeignColumnName() + "', '"
+ dataElement.getValueAsString() + "')"); + dataElement.getValueAsString() + "')");
window.addElement(href); window.addElement(href);
menu.addElement(window); menu.addElement(window);