From 10595f132f542d88db78999fdcb380c866548ec2 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sun, 25 Mar 2012 22:12:18 -0500 Subject: [PATCH] IDEMPIERE-211 Statement of Accounts - Name column not translated http://jira.idempiere.com/browse/IDEMPIERE-211 --- .../src/org/compiere/report/FinStatement.java | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/report/FinStatement.java b/org.adempiere.base/src/org/compiere/report/FinStatement.java index 2cdffac4e1..c7f98ca8fa 100644 --- a/org.adempiere.base/src/org/compiere/report/FinStatement.java +++ b/org.adempiere.base/src/org/compiere/report/FinStatement.java @@ -341,11 +341,22 @@ public class FinStatement extends SvrProcess log.finest(sb.toString()); // Set Name,Description - String sql_select = "SELECT e.Name, fa.Description " - + "FROM Fact_Acct fa" - + " INNER JOIN AD_Table t ON (fa.AD_Table_ID=t.AD_Table_ID)" - + " INNER JOIN AD_Element e ON (t.TableName||'_ID'=e.ColumnName) " - + "WHERE r.Fact_Acct_ID=fa.Fact_Acct_ID"; + String sql_select; + Language lang = Language.getLoginLanguage(); + if (Env.isBaseLanguage(lang, "AD_Element")) { + sql_select = "SELECT e.Name, fa.Description " + + "FROM Fact_Acct fa" + + " INNER JOIN AD_Table t ON (fa.AD_Table_ID=t.AD_Table_ID)" + + " INNER JOIN AD_Element e ON (t.TableName||'_ID'=e.ColumnName) " + + "WHERE r.Fact_Acct_ID=fa.Fact_Acct_ID"; + } else { + sql_select = "SELECT et.Name, fa.Description " + + "FROM Fact_Acct fa" + + " INNER JOIN AD_Table t ON (fa.AD_Table_ID=t.AD_Table_ID)" + + " INNER JOIN AD_Element e ON (t.TableName||'_ID'=e.ColumnName) " + + " INNER JOIN AD_Element_Trl et ON (e.AD_Element_ID=et.AD_Element_ID AND et.AD_Language='"+lang.getAD_Language()+"') " + + "WHERE r.Fact_Acct_ID=fa.Fact_Acct_ID"; + } // Translated Version ... sb = new StringBuffer ("UPDATE T_ReportStatement r SET (Name,Description)=(") .append(sql_select).append(") "