From ba0cc46c6cadf6c02a5dd12c90a470325cfb63db Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 15 Mar 2021 14:20:38 +0100 Subject: [PATCH] IDEMPIERE-4731 No default salesrep_id in PO/SO,Invoice when using 'Change Role' (#631) --- .../src/org/adempiere/webui/AdempiereWebUI.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java index 602de2af1c..153c0cb001 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java @@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import org.adempiere.util.ServerContext; +import org.adempiere.util.ServerContextURLHandler; import org.adempiere.webui.apps.AEnv; import org.adempiere.webui.component.DrillCommand; import org.adempiere.webui.component.TokenCommand; @@ -524,9 +525,14 @@ public class AdempiereWebUI extends Window implements EventListener, IWeb //save context for re-login Properties properties = new Properties(); Env.setContext(properties, Env.AD_CLIENT_ID, Env.getAD_Client_ID(Env.getCtx())); + Env.setContext(properties, Env.AD_CLIENT_NAME, Env.getContext(Env.getCtx(), Env.AD_CLIENT_NAME)); Env.setContext(properties, Env.AD_ORG_ID, Env.getAD_Org_ID(Env.getCtx())); Env.setContext(properties, Env.AD_USER_ID, user.getAD_User_ID()); + Env.setContext(properties, Env.SALESREP_ID, user.getAD_User_ID()); + Env.setContext(properties, Env.AD_USER_NAME, Env.getContext(Env.getCtx(), Env.AD_USER_NAME)); Env.setContext(properties, Env.AD_ROLE_ID, Env.getAD_Role_ID(Env.getCtx())); + Env.setContext(properties, Env.AD_ROLE_NAME, Env.getContext(Env.getCtx(), Env.AD_ROLE_NAME)); + Env.setContext(properties, Env.USER_LEVEL, Env.getContext(Env.getCtx(), Env.USER_LEVEL)); Env.setContext(properties, Env.AD_ORG_NAME, Env.getContext(Env.getCtx(), Env.AD_ORG_NAME)); Env.setContext(properties, Env.M_WAREHOUSE_ID, Env.getContext(Env.getCtx(), Env.M_WAREHOUSE_ID)); Env.setContext(properties, UserPreference.LANGUAGE_NAME, Env.getContext(Env.getCtx(), UserPreference.LANGUAGE_NAME)); @@ -544,7 +550,9 @@ public class AdempiereWebUI extends Window implements EventListener, IWeb Locale locale = (Locale) desktop.getSession().getAttribute(Attributes.PREFERRED_LOCALE); HttpServletRequest httpRequest = (HttpServletRequest) Executions.getCurrent().getNativeRequest(); Env.setContext(properties, SessionContextListener.SERVLET_SESSION_ID, httpRequest.getSession().getId()); - + if (Env.getCtx().get(ServerContextURLHandler.SERVER_CONTEXT_URL_HANDLER) != null) + properties.put(ServerContextURLHandler.SERVER_CONTEXT_URL_HANDLER, Env.getCtx().get(ServerContextURLHandler.SERVER_CONTEXT_URL_HANDLER)); + //stop key listener if (keyListener != null) { keyListener.detach();