From e9ab40a18ff1ac99646f27755e70a5ad5ef7d6ef Mon Sep 17 00:00:00 2001
From: Nicolas Micoud <58596990+nmicoud@users.noreply.github.com>
Date: Wed, 20 Apr 2022 12:41:19 +0200
Subject: [PATCH] IDEMPIERE-5271 : Can't override reference in
 AD_UserDef_Proc_Parameter to use ChosenMultipleSelectionTable as report
 parameter (#1295)

---
 org.adempiere.base/src/org/compiere/model/MQuery.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/org.adempiere.base/src/org/compiere/model/MQuery.java b/org.adempiere.base/src/org/compiere/model/MQuery.java
index 48bda7e121..8d868411c2 100644
--- a/org.adempiere.base/src/org/compiere/model/MQuery.java
+++ b/org.adempiere.base/src/org/compiere/model/MQuery.java
@@ -92,7 +92,8 @@ public class MQuery implements Serializable, Cloneable
 			SQL = "SELECT ip.ParameterName,ip.P_String,ip.P_String_To,"			//	1..3
 				+ "ip.P_Number,ip.P_Number_To,"									//	4..5
 				+ "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 "
 				+ "WHERE i.AD_PInstance_ID=ip.AD_PInstance_ID"
 				+ " AND pp.AD_Process_ID=i.AD_Process_ID"
@@ -103,7 +104,8 @@ public class MQuery implements Serializable, Cloneable
 		else
 			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, "
-				+ "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 "
 				+ "WHERE i.AD_PInstance_ID=ip.AD_PInstance_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));
 				//
 				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);
 				//
 				if (s_log.isLoggable(Level.FINE)) s_log.fine(ParameterName + " S=" + P_String + "-" + P_String_To