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

Merge fcbc65ffd837

This commit is contained in:
Heng Sin Low 2013-07-12 15:38:12 +08:00
parent 2a0d47b90c c5dfae200f
commit 35c0c89fb6
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.base/src/org/compiere/model/MColumn.java
View File

@ -691,7 +691,7 @@ public class MColumn extends X_AD_Column
if (rt != null) if (rt != null)
foreignTable = rt.getAD_Table().getTableName(); foreignTable = rt.getAD_Table().getTableName();
} }
} else if (DisplayType.List == refid) { } else if (DisplayType.List == refid || DisplayType.Payment == refid) {
foreignTable = "AD_Ref_List"; foreignTable = "AD_Ref_List";
} else if (DisplayType.Location == refid) { } else if (DisplayType.Location == refid) {
foreignTable = "C_Location"; foreignTable = "C_Location";

8
org.adempiere.base/src/org/compiere/model/MProcess.java
View File

@ -323,8 +323,12 @@ public class MProcess extends X_AD_Process
private boolean startClass (ProcessInfo pi, Trx trx, boolean managedTrx) private boolean startClass (ProcessInfo pi, Trx trx, boolean managedTrx)
{ {
if (log.isLoggable(Level.INFO)) log.info(pi.getClassName()); 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 } // startClass

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java
View File

@ -276,6 +276,9 @@ public final class WAccountDialog extends Window
GridWindowVO wVO = AEnv.getMWindowVO (m_WindowNo, AD_Window_ID, 0); GridWindowVO wVO = AEnv.getMWindowVO (m_WindowNo, AD_Window_ID, 0);
if (wVO == null) if (wVO == null)
return false; 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_mWindow = new GridWindow (wVO);
m_mTab = m_mWindow.getTab(0); m_mTab = m_mWindow.getTab(0);
// Make sure is the tab is loaded - teo_sarca [ 1659124 ] // Make sure is the tab is loaded - teo_sarca [ 1659124 ]

1
org.adempiere.ui.zk/theme/default/preference.zul
View File

@ -10,7 +10,6 @@
import org.compiere.util.Env; import org.compiere.util.Env;
Env.setContext(Env.getCtx(), "#ZK_Toolbar_Button_Size", "24"); Env.setContext(Env.getCtx(), "#ZK_Toolbar_Button_Size", "24");
Env.setContext(Env.getCtx(), "#ZK_BROWSER_TITLE", "iDempiere");
]]> ]]>
</zscript> </zscript>
</zk> </zk>

2
org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java
View File

@ -229,7 +229,7 @@ public class AbstractService {
req.setAttribute("MWebServiceType", m_webservicetype); req.setAttribute("MWebServiceType", m_webservicetype);
// Check if role has access on web-service // 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()), Env.getAD_Role_ID( m_cs.getCtx()),
m_webservicetype.get_ID()); m_webservicetype.get_ID());