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

Merge release-7.1 into master

This commit is contained in:
Carlos Ruiz 2020-01-12 22:51:04 +01:00
parent 1520dd79e8 0d239fbacf
commit 44fd0fe898
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
org.adempiere.base/src/org/compiere/model/MMatchInv.java
View File

@ -129,6 +129,7 @@ public class MMatchInv extends X_M_MatchInv
+" WHERE M_MatchInv.C_InvoiceLine_ID=il.C_InvoiceLine_ID AND il.C_Invoice_ID=?)"; +" WHERE M_MatchInv.C_InvoiceLine_ID=il.C_InvoiceLine_ID AND il.C_Invoice_ID=?)";
List<MMatchInv> list = new Query(ctx, I_M_MatchInv.Table_Name, whereClause, trxName) List<MMatchInv> list = new Query(ctx, I_M_MatchInv.Table_Name, whereClause, trxName)
.setParameters(C_Invoice_ID) .setParameters(C_Invoice_ID)
.setOrderBy(COLUMNNAME_ProcessedOn)
.list(); .list();
return list.toArray (new MMatchInv[list.size()]); return list.toArray (new MMatchInv[list.size()]);
} // getInvoice } // getInvoice

18
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoGeneralPanel.java
View File

@ -38,6 +38,7 @@ import org.adempiere.webui.window.FDialog;
import org.compiere.minigrid.ColumnInfo; import org.compiere.minigrid.ColumnInfo;
import org.compiere.minigrid.IDColumn; import org.compiere.minigrid.IDColumn;
import org.compiere.model.I_C_ElementValue; import org.compiere.model.I_C_ElementValue;
import org.compiere.model.MColumn;
import org.compiere.model.MLookupFactory; import org.compiere.model.MLookupFactory;
import org.compiere.model.MTable; import org.compiere.model.MTable;
import org.compiere.util.DB; import org.compiere.util.DB;
@ -513,9 +514,9 @@ public class InfoGeneralPanel extends InfoPanel implements EventListener<Event>
list.add(new ColumnInfo(Msg.translate(Env.getCtx(), columnName), colSql.toString(), colClass)); list.add(new ColumnInfo(Msg.translate(Env.getCtx(), columnName), colSql.toString(), colClass));
if (log.isLoggable(Level.FINEST)) log.finest("Added Column=" + columnName); if (log.isLoggable(Level.FINEST)) log.finest("Added Column=" + columnName);
} }
else if (DisplayType.isLookup(displayType)) else if (isDisplayed && DisplayType.isLookup(displayType))
{ {
ColumnInfo colInfo = createLookupColumnInfo(Msg.translate(Env.getCtx(), columnName), columnName, displayType, AD_Reference_Value_ID, AD_Column_ID); ColumnInfo colInfo = createLookupColumnInfo(Msg.translate(Env.getCtx(), columnName), columnName, displayType, AD_Reference_Value_ID, AD_Column_ID, colSql.toString());
if (colInfo != null) if (colInfo != null)
{ {
list.add(colInfo); list.add(colInfo);
@ -630,18 +631,25 @@ public class InfoGeneralPanel extends InfoPanel implements EventListener<Event>
} }
} }
protected ColumnInfo createLookupColumnInfo(String name, String columnName, int AD_Reference_ID, int AD_Reference_Value_ID, int AD_Column_ID) { protected ColumnInfo createLookupColumnInfo(String name, String columnName, int AD_Reference_ID, int AD_Reference_Value_ID, int AD_Column_ID, String columnSql) {
// MLookupInfo lookupInfo = MLookupFactory.getLookupInfo(Env.getCtx(), p_WindowNo, AD_Column_ID, AD_Reference_ID, Env.getLanguage(Env.getCtx()), columnName, // MLookupInfo lookupInfo = MLookupFactory.getLookupInfo(Env.getCtx(), p_WindowNo, AD_Column_ID, AD_Reference_ID, Env.getLanguage(Env.getCtx()), columnName,
// AD_Reference_Value_ID, false, null); // AD_Reference_Value_ID, false, null);
// String displayColumn = lookupInfo.DisplayColumn; // String displayColumn = lookupInfo.DisplayColumn;
// String keyColumn = lookupInfo.KeyColumn; // String keyColumn = lookupInfo.KeyColumn;
MTable table = MTable.get(Env.getCtx(), p_tableName);
MColumn column = table.getColumn(columnName);
String baseColumn = column.isVirtualColumn() ? columnSql : columnName;
String embedded = AD_Reference_Value_ID > 0 ? MLookupFactory.getLookup_TableEmbed(Env.getLanguage(Env.getCtx()), columnName, p_tableName, AD_Reference_Value_ID) String embedded = AD_Reference_Value_ID > 0 ? MLookupFactory.getLookup_TableEmbed(Env.getLanguage(Env.getCtx()), columnName, p_tableName, AD_Reference_Value_ID)
: MLookupFactory.getLookup_TableDirEmbed(Env.getLanguage(Env.getCtx()), columnName, p_tableName); : MLookupFactory.getLookup_TableDirEmbed(Env.getLanguage(Env.getCtx()), columnName, p_tableName, baseColumn);
embedded = "(" + embedded + ")"; embedded = "(" + embedded + ")";
if (embedded.contains("@"))
embedded = "NULL";
ColumnInfo columnInfo = null; ColumnInfo columnInfo = null;
if (columnName.endsWith("_ID")) if (columnName.endsWith("_ID") && !column.isVirtualColumn())
columnInfo = new ColumnInfo(name, embedded, KeyNamePair.class, p_tableName+"."+columnName); columnInfo = new ColumnInfo(name, embedded, KeyNamePair.class, p_tableName+"."+columnName);
else else
columnInfo = new ColumnInfo(name, embedded, String.class, null); columnInfo = new ColumnInfo(name, embedded, String.class, null);