midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-211 Statement of Accounts - Name column not translated 

http://jira.idempiere.com/browse/IDEMPIERE-211
This commit is contained in:
Carlos Ruiz 2012-03-25 22:12:18 -05:00
parent e205bb66de
commit 10595f132f
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
org.adempiere.base/src/org/compiere/report/FinStatement.java
View File

@ -341,11 +341,22 @@ public class FinStatement extends SvrProcess
log.finest(sb.toString()); log.finest(sb.toString());
// Set Name,Description // Set Name,Description
String sql_select = "SELECT e.Name, fa.Description " String sql_select;
+ "FROM Fact_Acct fa" Language lang = Language.getLoginLanguage();
+ " INNER JOIN AD_Table t ON (fa.AD_Table_ID=t.AD_Table_ID)" if (Env.isBaseLanguage(lang, "AD_Element")) {
+ " INNER JOIN AD_Element e ON (t.TableName||'_ID'=e.ColumnName) " sql_select = "SELECT e.Name, fa.Description "
+ "WHERE r.Fact_Acct_ID=fa.Fact_Acct_ID"; + "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 ... // Translated Version ...
sb = new StringBuffer ("UPDATE T_ReportStatement r SET (Name,Description)=(") sb = new StringBuffer ("UPDATE T_ReportStatement r SET (Name,Description)=(")
.append(sql_select).append(") " .append(sql_select).append(") "