From b1b6d8ba0b0d1b722f66d5f8031d6b1a5fc3d232 Mon Sep 17 00:00:00 2001
From: Richard Morales <richard.morales@globalqss.com>
Date: Wed, 19 Jun 2013 19:44:43 -0500
Subject: [PATCH] IDEMPIERE-1071 Problem with using Report in tab Export Format
 Line

---
 .../src/org/compiere/model/MLookupFactory.java | 18 +++++++++++-------
 .../src/org/compiere/print/DataEngine.java     |  1 +
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/org.adempiere.base/src/org/compiere/model/MLookupFactory.java b/org.adempiere.base/src/org/compiere/model/MLookupFactory.java
index b3f1967920..faabcfb338 100644
--- a/org.adempiere.base/src/org/compiere/model/MLookupFactory.java
+++ b/org.adempiere.base/src/org/compiere/model/MLookupFactory.java
@@ -634,10 +634,11 @@ public class MLookupFactory
 		}
 
 		StringBuilder embedSQL = new StringBuilder("SELECT ");
-
+		boolean translated = false; 
 		//	Translated
 		if (IsTranslated && !Env.isBaseLanguage(language, TableName))
 		{
+			translated = true;
 			if (isValueDisplayed)
 				embedSQL.append(TableNameAlias).append(".Value||'-'||");
 			embedSQL.append(TableName).append("_Trl.").append(DisplayColumn);
@@ -660,16 +661,19 @@ public class MLookupFactory
 		}
 
 		embedSQL.append(" WHERE ");
+		
+		int Column_ID = MColumn.getColumn_ID(BaseTable, BaseColumn);
+		MColumn column = MColumn.get(Env.getCtx(), Column_ID);
 		// If is not virtual column - teo_sarca [ 1739530 ]
-		if (! BaseColumn.trim().startsWith("("))
+		if (!column.isVirtualColumn())
 		{
 			embedSQL.append(BaseTable).append(".").append(BaseColumn);
+			embedSQL.append("=").append(TableNameAlias).append(".").append(KeyColumn);
+		} else if (translated) {
+			embedSQL.append(TableNameAlias).append(".").append(BaseColumn).append("=").append(column.getColumnSQL());
+		} else {
+			embedSQL.append(BaseColumn).append("=").append(column.getColumnSQL());
 		}
-		else
-		{
-			embedSQL.append(BaseColumn);
-		}
-		embedSQL.append("=").append(TableNameAlias).append(".").append(KeyColumn);
 
 		return embedSQL.toString();
 	}	//	getLookup_TableEmbed
diff --git a/org.adempiere.base/src/org/compiere/print/DataEngine.java b/org.adempiere.base/src/org/compiere/print/DataEngine.java
index 0489bf31d8..00c82ca7b4 100644
--- a/org.adempiere.base/src/org/compiere/print/DataEngine.java
+++ b/org.adempiere.base/src/org/compiere/print/DataEngine.java
@@ -406,6 +406,7 @@ public class DataEngine
 						.append(lookupSQL).append(" AS ").append(ColumnName).append(",");
 					groupByColumns.add(m_synonym+display);
 					groupByColumns.add(lookupSQL);
+					orderName = m_synonym + display;
 					//
 					TableReference tr = getTableReference(AD_Reference_Value_ID);
 					String foreignColumnName = tr.KeyColumn;