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

IDEMPIERE-100 Translation Export should not export UUID. Incorporate patch from Dirk Niemeyer 

(transplanted from 0f43751bda91d7a9287c63d62866983cf7b4196d)
This commit is contained in:
Dirk Niemeyer 2011-12-11 10:14:44 +08:00
parent 6ff4f0aea3
commit 75d51968cd
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.adempiere.ui/src/org/compiere/install/Translation.java
View File

@ -39,6 +39,7 @@ import javax.xml.transform.stream.StreamResult;
import org.compiere.Adempiere; import org.compiere.Adempiere;
import org.compiere.model.MLanguage; import org.compiere.model.MLanguage;
import org.compiere.model.PO;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
import org.compiere.util.DB; import org.compiere.util.DB;
import org.compiere.util.Env; import org.compiere.util.Env;
@ -303,6 +304,7 @@ public class Translation
+ "FROM AD_Column c" + "FROM AD_Column c"
+ " INNER JOIN AD_Table t ON (c.AD_Table_ID=t.AD_Table_ID) " + " INNER JOIN AD_Table t ON (c.AD_Table_ID=t.AD_Table_ID) "
+ "WHERE t.TableName=?" + "WHERE t.TableName=?"
+ " AND c.ColumnName NOT LIKE ? "
+ " AND c.AD_Reference_ID IN (10,14) " + " AND c.AD_Reference_ID IN (10,14) "
+ "ORDER BY IsMandatory DESC, ColumnName"; + "ORDER BY IsMandatory DESC, ColumnName";
ArrayList<String> list = new ArrayList<String>(); ArrayList<String> list = new ArrayList<String>();
@ -310,6 +312,7 @@ public class Translation
{ {
PreparedStatement pstmt = DB.prepareStatement(sql, null); PreparedStatement pstmt = DB.prepareStatement(sql, null);
pstmt.setString(1, Base_Table + "_Trl"); pstmt.setString(1, Base_Table + "_Trl");
pstmt.setString(2, PO.getUUIDColumnName(Base_Table));
ResultSet rs = pstmt.executeQuery(); ResultSet rs = pstmt.executeQuery();
while (rs.next()) while (rs.next())
{ {