From e27b588754f63150337bad1bbe9e7fb2c9f0caa0 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Sun, 1 Oct 2023 21:04:50 +0700
Subject: [PATCH] IDEMPIERE-5867:autocomplete show different list for table and
 table dir (#2028)

* IDEMPIERE-5867:autocomplete show difference list for table and table dir

* IDEMPIERE-5867:fix for IDEMPIERE-5866

test case:
    go to "Reference" window and choose for record "M_Product BOM (stocked)"
    go to "Table Validation" tab and choose "Display Value" = true
---
 .../src/org/compiere/model/MLookupFactory.java         | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/org.adempiere.base/src/org/compiere/model/MLookupFactory.java b/org.adempiere.base/src/org/compiere/model/MLookupFactory.java
index c10a114d6b..e4fa9613e5 100644
--- a/org.adempiere.base/src/org/compiere/model/MLookupFactory.java
+++ b/org.adempiere.base/src/org/compiere/model/MLookupFactory.java
@@ -604,7 +604,9 @@ public class MLookupFactory
 		lookupDisplayColumns.add(lookupDisplayColumn != null ? lookupDisplayColumn : DisplayColumn);
 		retValue.lookupDisplayColumns = lookupDisplayColumns;
 		if(list != null) {
-			retValue.lookupDisplayColumnNames = new ArrayList<>();
+			retValue.lookupDisplayColumnNames = new ArrayList<>();
+			if (isValueDisplayed)
+				retValue.lookupDisplayColumnNames.add("Value");
 			for (LookupDisplayColumn ldc : list) {
 				retValue.lookupDisplayColumnNames.add(ldc.ColumnName);
 			}
@@ -856,6 +858,12 @@ public class MLookupFactory
 			lookupDisplayColumns.add(ldc.ColumnName);
 		}
 		lInfo.lookupDisplayColumns = lookupDisplayColumns;
+		if(list != null) {
+			lInfo.lookupDisplayColumnNames = new ArrayList<>();
+			for (LookupDisplayColumn ldc : list) {
+				lInfo.lookupDisplayColumnNames.add(ldc.ColumnName);
+			}
+		}
 		s_cacheRefTable.put(cacheKey.toString(), lInfo.cloneIt());
 		return lInfo;
 	}	//	getLookup_TableDir