From 96df0ce7df591f5b6a0be122cfa239ae7bf449c2 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Tue, 18 Aug 2009 01:24:12 +0000 Subject: [PATCH] [ adempiere-Bugs-2839336 ] Report Sales Invoices not working when Client use SAAS https://sourceforge.net/tracker/?func=detail&atid=879332&aid=2839336&group_id=176962 --- client/src/org/compiere/apps/ProcessParameter.java | 6 +++--- client/src/org/compiere/apps/ProcessParameterPanel.java | 6 +++--- .../src/org/adempiere/webui/apps/ProcessParameterPanel.java | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client/src/org/compiere/apps/ProcessParameter.java b/client/src/org/compiere/apps/ProcessParameter.java index 3f70160930..b43c87e86d 100644 --- a/client/src/org/compiere/apps/ProcessParameter.java +++ b/client/src/org/compiere/apps/ProcessParameter.java @@ -170,7 +170,7 @@ public class ProcessParameter extends CDialog String ASPFilter = ""; if (client.isUseASP()) ASPFilter = - " AND ( AD_Process_Para_ID IN ( " + " AND ( p.AD_Process_Para_ID IN ( " // Just ASP subscribed process parameters for client " + " SELECT pp.AD_Process_Para_ID " + " FROM ASP_Process_Para pp, ASP_Process p, ASP_Level l, ASP_ClientLevel cl " @@ -183,7 +183,7 @@ public class ProcessParameter extends CDialog + " AND l.IsActive = 'Y' " + " AND cl.IsActive = 'Y' " + " AND pp.ASP_Status = 'S') " // Show - + " OR AD_Process_Para_ID IN ( " + + " OR p.AD_Process_Para_ID IN ( " // + show ASP exceptions for client + " SELECT AD_Process_Para_ID " + " FROM ASP_ClientException ce " @@ -194,7 +194,7 @@ public class ProcessParameter extends CDialog + " AND ce.AD_Field_ID IS NULL " + " AND ce.ASP_Status = 'S') " // Show + " ) " - + " AND AD_Process_Para_ID NOT IN ( " + + " AND p.AD_Process_Para_ID NOT IN ( " // minus hide ASP exceptions for client + " SELECT AD_Process_Para_ID " + " FROM ASP_ClientException ce " diff --git a/client/src/org/compiere/apps/ProcessParameterPanel.java b/client/src/org/compiere/apps/ProcessParameterPanel.java index 4fd1cee768..bcd591525f 100644 --- a/client/src/org/compiere/apps/ProcessParameterPanel.java +++ b/client/src/org/compiere/apps/ProcessParameterPanel.java @@ -150,7 +150,7 @@ public class ProcessParameterPanel extends CPanel implements VetoableChangeListe String ASPFilter = ""; if (client.isUseASP()) ASPFilter = - " AND ( AD_Process_Para_ID IN ( " + " AND ( p.AD_Process_Para_ID IN ( " // Just ASP subscribed process parameters for client " + " SELECT pp.AD_Process_Para_ID " + " FROM ASP_Process_Para pp, ASP_Process p, ASP_Level l, ASP_ClientLevel cl " @@ -163,7 +163,7 @@ public class ProcessParameterPanel extends CPanel implements VetoableChangeListe + " AND l.IsActive = 'Y' " + " AND cl.IsActive = 'Y' " + " AND pp.ASP_Status = 'S') " // Show - + " OR AD_Process_Para_ID IN ( " + + " OR p.AD_Process_Para_ID IN ( " // + show ASP exceptions for client + " SELECT AD_Process_Para_ID " + " FROM ASP_ClientException ce " @@ -174,7 +174,7 @@ public class ProcessParameterPanel extends CPanel implements VetoableChangeListe + " AND ce.AD_Field_ID IS NULL " + " AND ce.ASP_Status = 'S') " // Show + " ) " - + " AND AD_Process_Para_ID NOT IN ( " + + " AND p.AD_Process_Para_ID NOT IN ( " // minus hide ASP exceptions for client + " SELECT AD_Process_Para_ID " + " FROM ASP_ClientException ce " diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java index 8d2ff8f156..b7e09ccbc9 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java @@ -147,7 +147,7 @@ implements ValueChangeListener, IProcessParameter String ASPFilter = ""; if (client.isUseASP()) ASPFilter = - " AND ( AD_Process_Para_ID IN ( " + " AND ( p.AD_Process_Para_ID IN ( " // Just ASP subscribed process parameters for client " + " SELECT pp.AD_Process_Para_ID " + " FROM ASP_Process_Para pp, ASP_Process p, ASP_Level l, ASP_ClientLevel cl " @@ -160,7 +160,7 @@ implements ValueChangeListener, IProcessParameter + " AND l.IsActive = 'Y' " + " AND cl.IsActive = 'Y' " + " AND pp.ASP_Status = 'S') " // Show - + " OR AD_Process_Para_ID IN ( " + + " OR p.AD_Process_Para_ID IN ( " // + show ASP exceptions for client + " SELECT AD_Process_Para_ID " + " FROM ASP_ClientException ce " @@ -171,7 +171,7 @@ implements ValueChangeListener, IProcessParameter + " AND ce.AD_Field_ID IS NULL " + " AND ce.ASP_Status = 'S') " // Show + " ) " - + " AND AD_Process_Para_ID NOT IN ( " + + " AND p.AD_Process_Para_ID NOT IN ( " // minus hide ASP exceptions for client + " SELECT AD_Process_Para_ID " + " FROM ASP_ClientException ce "