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

IDEMPIERE-95 Set UserElement as new AcctDimension not apply to AcctViewer - implement for zkwebui 

http://jira.idempiere.com/browse/IDEMPIERE-95
This commit is contained in:
Carlos Ruiz 2011-11-10 15:43:59 -05:00
parent 8bc6b07588
commit 33f5898aab
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java
View File

@ -43,6 +43,7 @@ import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.window.FDialog; import org.adempiere.webui.window.FDialog;
import org.compiere.model.MAcctSchema; import org.compiere.model.MAcctSchema;
import org.compiere.model.MAcctSchemaElement; import org.compiere.model.MAcctSchemaElement;
import org.compiere.model.MColumn;
import org.compiere.model.X_C_AcctSchema_Element; import org.compiere.model.X_C_AcctSchema_Element;
import org.compiere.report.core.RModel; import org.compiere.report.core.RModel;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
@ -1117,7 +1118,7 @@ public class WAcctViewer extends Window implements EventListener
{ {
String keyColumn = button.getName(); String keyColumn = button.getName();
log.info(keyColumn); log.info(keyColumn);
String whereClause = ""; // Elaine 2008/07/28 String whereClause = "(IsSummary='N' OR IsSummary IS NULL)";
String lookupColumn = keyColumn; String lookupColumn = keyColumn;
if ("Account_ID".equals(keyColumn)) if ("Account_ID".equals(keyColumn))
@ -1151,11 +1152,26 @@ public class WAcctViewer extends Window implements EventListener
{ {
lookupColumn = "AD_Org_ID"; lookupColumn = "AD_Org_ID";
} }
else if (keyColumn.equals("UserElement1_ID")) // KTU
{
MAcctSchemaElement ase = m_data.ASchema.getAcctSchemaElement(X_C_AcctSchema_Element.ELEMENTTYPE_UserElement1);
lookupColumn = MColumn.getColumnName(Env.getCtx(), ase.getAD_Column_ID());
whereClause = "";
}
else if (keyColumn.equals("UserElement2_ID")) // KTU
{
MAcctSchemaElement ase = m_data.ASchema.getAcctSchemaElement(X_C_AcctSchema_Element.ELEMENTTYPE_UserElement2);
lookupColumn = MColumn.getColumnName(Env.getCtx(), ase.getAD_Column_ID());
whereClause = "";
}
else if (keyColumn.equals("M_Product_ID"))
{
whereClause = "";
}
else if (selDocument.isChecked()) else if (selDocument.isChecked())
whereClause = ""; whereClause = "";
String tableName = lookupColumn.substring(0, lookupColumn.length()-3); String tableName = lookupColumn.substring(0, lookupColumn.length()-3);
whereClause = tableName + ".IsSummary='N'" + whereClause; // Elaine 2008/07/28
InfoPanel info = InfoPanel.create(m_data.WindowNo, tableName, lookupColumn, "", false, whereClause); InfoPanel info = InfoPanel.create(m_data.WindowNo, tableName, lookupColumn, "", false, whereClause);