From 3dd2f8b44f94b4ce55a1b03d2ad341451100c5ae Mon Sep 17 00:00:00 2001
From: phib <devnull@localhost>
Date: Thu, 16 Jul 2009 00:56:18 +0000
Subject: [PATCH] 2354120 - bug in merge entities Merge fails on table
 referenced virtual columns

---
 client/src/org/compiere/apps/form/Merge.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/org/compiere/apps/form/Merge.java b/client/src/org/compiere/apps/form/Merge.java
index 7587272fca..eff7b123ff 100644
--- a/client/src/org/compiere/apps/form/Merge.java
+++ b/client/src/org/compiere/apps/form/Merge.java
@@ -102,13 +102,13 @@ public class Merge
 			+ "WHERE t.IsView='N'"
 				+ " AND t.TableName NOT IN ('C_TaxDeclarationAcct')"
 				+ " AND ("
-				+ "(c.ColumnName=? AND c.IsKey='N' AND c.ColumnSQL IS NULL)"		//	#1 - direct
+				+ "(c.ColumnName=? AND c.IsKey='N')"		//	#1 - direct
 			+ " OR "
 				+ "c.AD_Reference_Value_ID IN "				//	Table Reference
 					+ "(SELECT rt.AD_Reference_ID FROM AD_Ref_Table rt"
 					+ " INNER JOIN AD_Column cc ON (rt.AD_Table_ID=cc.AD_Table_ID AND rt.AD_Key=cc.AD_Column_ID) "
 					+ "WHERE cc.IsKey='Y' AND cc.ColumnName=?)"	//	#2
-			+ ") "
+			+ ") AND c.ColumnSQL IS NULL"
 			+ "ORDER BY t.LoadSeq DESC";
 		PreparedStatement pstmt = null;