From 35e289c3b2f5a8892c20751019cba0dcb58aec44 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Thu, 11 Jul 2013 10:31:21 -0500 Subject: [PATCH 1/5] IDEMPIERE-1165 #resolve Fitnesse and Web Services cannot run script processes --- org.adempiere.base/src/org/compiere/model/MProcess.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MProcess.java b/org.adempiere.base/src/org/compiere/model/MProcess.java index a3f87f95ee..cad10b3dad 100644 --- a/org.adempiere.base/src/org/compiere/model/MProcess.java +++ b/org.adempiere.base/src/org/compiere/model/MProcess.java @@ -323,8 +323,12 @@ public class MProcess extends X_AD_Process private boolean startClass (ProcessInfo pi, Trx trx, boolean managedTrx) { if (log.isLoggable(Level.INFO)) log.info(pi.getClassName()); - - return ProcessUtil.startJavaProcess(getCtx(), pi, trx, managedTrx); + + if (pi.getClassName().toLowerCase().startsWith(MRule.SCRIPT_PREFIX)) { + return ProcessUtil.startScriptProcess(getCtx(), pi, trx); + } else { + return ProcessUtil.startJavaProcess(getCtx(), pi, trx, managedTrx); + } } // startClass From d9f24a308d49a5d3449d5df75f7610b64bb3b493 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Thu, 11 Jul 2013 18:15:23 -0500 Subject: [PATCH 2/5] 1002538 fitnesse improvements / include Payment displaytype as suggested by Heng Sin --- org.adempiere.base/src/org/compiere/model/MColumn.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.adempiere.base/src/org/compiere/model/MColumn.java b/org.adempiere.base/src/org/compiere/model/MColumn.java index 8e41f62b01..9efc475638 100644 --- a/org.adempiere.base/src/org/compiere/model/MColumn.java +++ b/org.adempiere.base/src/org/compiere/model/MColumn.java @@ -691,7 +691,7 @@ public class MColumn extends X_AD_Column if (rt != null) foreignTable = rt.getAD_Table().getTableName(); } - } else if (DisplayType.List == refid) { + } else if (DisplayType.List == refid || DisplayType.Payment == refid) { foreignTable = "AD_Ref_List"; } else if (DisplayType.Location == refid) { foreignTable = "C_Location"; From 193797174b391784544e44af635f6bfc45fa3235 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Thu, 11 Jul 2013 18:33:12 -0500 Subject: [PATCH 3/5] IDEMPIERE-724 Make default usage of sysconfig variable ZK_BROWSER_TITLE for default theme --- org.adempiere.ui.zk/theme/default/preference.zul | 1 - 1 file changed, 1 deletion(-) diff --git a/org.adempiere.ui.zk/theme/default/preference.zul b/org.adempiere.ui.zk/theme/default/preference.zul index ddc9f3af03..d38e83039a 100644 --- a/org.adempiere.ui.zk/theme/default/preference.zul +++ b/org.adempiere.ui.zk/theme/default/preference.zul @@ -10,7 +10,6 @@ import org.compiere.util.Env; Env.setContext(Env.getCtx(), "#ZK_Toolbar_Button_Size", "24"); - Env.setContext(Env.getCtx(), "#ZK_BROWSER_TITLE", "iDempiere"); ]]> From 1f635fcbcb1e826c4fc8e32b2efb3e78a156d139 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Thu, 11 Jul 2013 18:34:34 -0500 Subject: [PATCH 4/5] IDEMPIERE-1163 Web service role access control not working. --- .../WEB-INF/src/org/idempiere/webservices/AbstractService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java index 97823999a7..8e9a3e98fc 100644 --- a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java +++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java @@ -229,7 +229,7 @@ public class AbstractService { req.setAttribute("MWebServiceType", m_webservicetype); // Check if role has access on web-service - String hasAccess = DB.getSQLValueString(null, ROLE_ACCESS_SQL, + String hasAccess = DB.getSQLValueStringEx(null, ROLE_ACCESS_SQL, Env.getAD_Role_ID( m_cs.getCtx()), m_webservicetype.get_ID()); From c5dfae200fa065b62c2678c62d91a68709191c32 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Thu, 11 Jul 2013 23:50:56 -0500 Subject: [PATCH 5/5] IDEMPIERE-1169 WAccountDialog misbehaving if Account Combination is read/write --- .../WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java index 0ed5651d06..4e809eaa00 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java @@ -276,6 +276,9 @@ public final class WAccountDialog extends Window GridWindowVO wVO = AEnv.getMWindowVO (m_WindowNo, AD_Window_ID, 0); if (wVO == null) return false; + // Force window/tab to be read-only + wVO.WindowType = GridWindowVO.WINDOWTYPE_QUERY; + wVO.Tabs.get(0).IsReadOnly = true; m_mWindow = new GridWindow (wVO); m_mTab = m_mWindow.getTab(0); // Make sure is the tab is loaded - teo_sarca [ 1659124 ]