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

IDEMPIERE-1878:Printformat name in login language

This commit is contained in:
hieplq 2014-05-28 00:29:49 +07:00
parent b44121fac6
commit c6b0e769d0
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.adempiere.base/src/org/compiere/print/MPrintFormat.java
View File

@ -1166,7 +1166,6 @@ public class MPrintFormat extends X_AD_PrintFormat
String sqlWhere = " WHERE AD_Table_ID=? AND IsTableBased='Y' "; String sqlWhere = " WHERE AD_Table_ID=? AND IsTableBased='Y' ";
if (AD_Window_ID > 0) if (AD_Window_ID > 0)
sqlWhere += "AND (AD_Window_ID=? OR AD_Window_ID IS NULL) "; sqlWhere += "AND (AD_Window_ID=? OR AD_Window_ID IS NULL) ";
sqlWhere = sqlWhere + "ORDER BY AD_Client_ID DESC, IsDefault DESC, Name"; // Own First
// //
sqlWhere = MRole.getDefault().addAccessSQL ( sqlWhere = MRole.getDefault().addAccessSQL (
sqlWhere, "AD_PrintFormat", MRole.SQL_NOTQUALIFIED, MRole.SQL_RO); sqlWhere, "AD_PrintFormat", MRole.SQL_NOTQUALIFIED, MRole.SQL_RO);
@ -1186,6 +1185,8 @@ public class MPrintFormat extends X_AD_PrintFormat
query.setParameters(lsParameter); query.setParameters(lsParameter);
query.setOrderBy(" ORDER BY AD_Client_ID DESC, IsDefault DESC, Name ");
// query print fomart just in this client // query print fomart just in this client
List<MPrintFormat> lsPrintFormat = query.setClient_ID().list(); List<MPrintFormat> lsPrintFormat = query.setClient_ID().list();
MPrintFormat newPrintFormat = null; MPrintFormat newPrintFormat = null;

6
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java
View File

@ -598,7 +598,7 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
// fill Report Options // fill Report Options
String sql = MRole.getDefault().addAccessSQL( String sql = MRole.getDefault().addAccessSQL(
"SELECT AD_PrintFormat_ID, Name, Description " "SELECT * "
+ "FROM AD_PrintFormat " + "FROM AD_PrintFormat "
+ "WHERE AD_Table_ID=? " + "WHERE AD_Table_ID=? "
//Added Lines by Armen //Added Lines by Armen
@ -619,7 +619,9 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while (rs.next()) while (rs.next())
{ {
KeyNamePair pp = new KeyNamePair(rs.getInt(1), rs.getString(2)); MPrintFormat printFormat = new MPrintFormat (Env.getCtx(), rs, null);
KeyNamePair pp = new KeyNamePair(printFormat.get_ID(), printFormat.get_Translation(MPrintFormat.COLUMNNAME_Name));
Listitem li = comboReport.appendItem(pp.getName(), pp.getKey()); Listitem li = comboReport.appendItem(pp.getName(), pp.getKey());
if (rs.getInt(1) == AD_PrintFormat_ID) if (rs.getInt(1) == AD_PrintFormat_ID)
{ {