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

IDEMPIERE-5271 : Can't override reference in AD_UserDef_Proc_Parameter to use ChosenMultipleSelectionTable as report parameter (#1295)

This commit is contained in:
Nicolas Micoud 2022-04-20 12:41:19 +02:00 committed by GitHub
parent 41c3e115b1
commit e9ab40a18f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
org.adempiere.base/src/org/compiere/model/MQuery.java
View File

@ -92,7 +92,8 @@ public class MQuery implements Serializable, Cloneable
SQL = "SELECT ip.ParameterName,ip.P_String,ip.P_String_To," // 1..3 SQL = "SELECT ip.ParameterName,ip.P_String,ip.P_String_To," // 1..3
+ "ip.P_Number,ip.P_Number_To," // 4..5 + "ip.P_Number,ip.P_Number_To," // 4..5
+ "ip.P_Date,ip.P_Date_To, ip.Info,ip.Info_To, " // 6..9 + "ip.P_Date,ip.P_Date_To, ip.Info,ip.Info_To, " // 6..9
+ "pp.Name, pp.IsRange, pp.AD_Reference_ID, pp.Query " // 10..13 + "pp.Name, pp.IsRange, pp.AD_Reference_ID, pp.Query, " // 10..13
+ "pp.AD_Process_ID, pp.AD_Process_Para_ID " // 14..15
+ "FROM AD_PInstance_Para ip, AD_PInstance i, AD_Process_Para pp " + "FROM AD_PInstance_Para ip, AD_PInstance i, AD_Process_Para pp "
+ "WHERE i.AD_PInstance_ID=ip.AD_PInstance_ID" + "WHERE i.AD_PInstance_ID=ip.AD_PInstance_ID"
+ " AND pp.AD_Process_ID=i.AD_Process_ID" + " AND pp.AD_Process_ID=i.AD_Process_ID"
@ -103,7 +104,8 @@ public class MQuery implements Serializable, Cloneable
else else
SQL = "SELECT ip.ParameterName,ip.P_String,ip.P_String_To, ip.P_Number,ip.P_Number_To," SQL = "SELECT ip.ParameterName,ip.P_String,ip.P_String_To, ip.P_Number,ip.P_Number_To,"
+ "ip.P_Date,ip.P_Date_To, ip.Info,ip.Info_To, " + "ip.P_Date,ip.P_Date_To, ip.Info,ip.Info_To, "
+ "ppt.Name, pp.IsRange, pp.AD_Reference_ID, pp.Query " + "ppt.Name, pp.IsRange, pp.AD_Reference_ID, pp.Query, "
+ "pp.AD_Process_ID, pp.AD_Process_Para_ID "
+ "FROM AD_PInstance_Para ip, AD_PInstance i, AD_Process_Para pp, AD_Process_Para_Trl ppt " + "FROM AD_PInstance_Para ip, AD_PInstance i, AD_Process_Para pp, AD_Process_Para_Trl ppt "
+ "WHERE i.AD_PInstance_ID=ip.AD_PInstance_ID" + "WHERE i.AD_PInstance_ID=ip.AD_PInstance_ID"
+ " AND pp.AD_Process_ID=i.AD_Process_ID" + " AND pp.AD_Process_ID=i.AD_Process_ID"
@ -155,6 +157,11 @@ public class MQuery implements Serializable, Cloneable
boolean isRange = "Y".equals(rs.getString(11)); boolean isRange = "Y".equals(rs.getString(11));
// //
int Reference_ID = rs.getInt(12); int Reference_ID = rs.getInt(12);
MUserDefProcParameter udpp = MUserDefProcParameter.get(ctx, rs.getInt(15), rs.getInt(14));
if (udpp != null)
Reference_ID = udpp.getAD_Reference_ID();
String P_Query = rs.getString(13); String P_Query = rs.getString(13);
// //
if (s_log.isLoggable(Level.FINE)) s_log.fine(ParameterName + " S=" + P_String + "-" + P_String_To if (s_log.isLoggable(Level.FINE)) s_log.fine(ParameterName + " S=" + P_String + "-" + P_String_To