From 40984c23e7533c6964807e334e2b3daeba3e3b8e Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Tue, 23 Apr 2013 15:51:48 -0500
Subject: [PATCH] IDEMPIERE-844 Trial Balance displaying account names only in
 system language / Thanks to Richard Morales

---
 .../src/org/compiere/print/DataEngine.java    | 35 +++++--------------
 1 file changed, 9 insertions(+), 26 deletions(-)

diff --git a/org.adempiere.base/src/org/compiere/print/DataEngine.java b/org.adempiere.base/src/org/compiere/print/DataEngine.java
index c9e84fca85..09065e2ad2 100644
--- a/org.adempiere.base/src/org/compiere/print/DataEngine.java
+++ b/org.adempiere.base/src/org/compiere/print/DataEngine.java
@@ -369,10 +369,6 @@ public class DataEngine
 						eSql = MLookupFactory.getLookup_TableDirEmbed(m_language, ColumnName, tableName);
 					}
 
-					//	TableName
-					String table = ColumnName;
-					if (table.endsWith("_ID"))
-						table = table.substring(0, table.length()-3);
 					//  DisplayColumn
 					String display = ColumnName;
 					//	=> (..) AS AName, Table.ID,
@@ -394,31 +390,18 @@ public class DataEngine
 					{
 						lookupSQL = ColumnSQL;
 					}
-					if (AD_Reference_Value_ID <= 0)
-					{
-						log.warning(ColumnName + " - AD_Reference_Value_ID not set");
-						continue;
-					}
-					TableReference tr = getTableReference(AD_Reference_Value_ID);
-					String display = tr.DisplayColumn;
-					//	=> A.Name AS AName, Table.ID,
-					if (tr.IsValueDisplayed)
-						sqlSELECT.append(m_synonym).append(".Value||'-'||");
-					sqlSELECT.append(m_synonym).append(".").append(display);
-					sqlSELECT.append(" AS ").append(m_synonym).append(display).append(",")
+
+					String eSql;
+
+					eSql = MLookupFactory.getLookup_TableEmbed(m_language, ColumnName, tableName, AD_Reference_Value_ID);
+
+					//  DisplayColumn
+					String display = ColumnName;
+					//	=> (..) AS AName, Table.ID,
+					sqlSELECT.append("(").append(eSql).append(") AS ").append(m_synonym).append(display).append(",")
 						.append(lookupSQL).append(" AS ").append(ColumnName).append(",");
 					groupByColumns.add(m_synonym+display);
 					groupByColumns.add(lookupSQL);
-					orderName = m_synonym + display;
-
-					//	=> x JOIN table A ON (x.KeyColumn=A.Key)
-					if (IsMandatory)
-						sqlFROM.append(" INNER JOIN ");
-					else
-						sqlFROM.append(" LEFT OUTER JOIN ");
-					sqlFROM.append(tr.TableName).append(" ").append(m_synonym).append(" ON (")
-						.append(lookupSQL).append("=")
-						.append(m_synonym).append(".").append(tr.KeyColumn).append(")");
 					//
 					pdc = new PrintDataColumn(AD_Column_ID, ColumnName, AD_Reference_ID, FieldLength, orderName, isPageBreak);
 					synonymNext();