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

IDEMPIERE-2357 Contextual Variables on Replication Processor are missing / integrate fix thanks to Tomas Svikruha (tsvikruha)

This commit is contained in:
Carlos Ruiz 2014-12-17 18:26:14 -05:00
parent c0c7f0a0cf
commit 2c443e1bd5
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
org.adempiere.replication.server/src/org/compiere/server/ReplicationProcessor.java
View File

@ -34,7 +34,9 @@ import java.util.logging.Level;
import org.adempiere.server.rpl.IImportProcessor; import org.adempiere.server.rpl.IImportProcessor;
import org.compiere.model.AdempiereProcessor; import org.compiere.model.AdempiereProcessor;
import org.compiere.model.MClient; import org.compiere.model.MClient;
import org.compiere.model.MOrgInfo;
import org.compiere.model.X_IMP_Processor_Type; import org.compiere.model.X_IMP_Processor_Type;
import org.compiere.util.Env;
import org.compiere.util.TimeUtil; import org.compiere.util.TimeUtil;
import org.compiere.server.AdempiereServer; import org.compiere.server.AdempiereServer;
import org.compiere.model.MIMPProcessor; import org.compiere.model.MIMPProcessor;
@ -96,6 +98,16 @@ public class ReplicationProcessor extends AdempiereServer {
{ {
// process is not started! // process is not started!
// Prepare a ctx
Env.setContext(mImportProcessor.getCtx(), "#AD_Client_ID", mImportProcessor.getAD_Client_ID());
Env.setContext(mImportProcessor.getCtx(), "#AD_Org_ID", mImportProcessor.getAD_Org_ID());
if (mImportProcessor.getAD_Org_ID() != 0) {
MOrgInfo schedorg = MOrgInfo.get(getCtx(), mImportProcessor.getAD_Org_ID(), null);
if (schedorg.getM_Warehouse_ID() > 0)
Env.setContext(mImportProcessor.getCtx(), "#M_Warehouse_ID", schedorg.getM_Warehouse_ID());
}
Env.setContext(mImportProcessor.getCtx(), "#AD_User_ID", getAD_User_ID());
m_summary = new StringBuffer(); m_summary = new StringBuffer();
String trxName = mImportProcessor.get_TrxName(); String trxName = mImportProcessor.get_TrxName();
if ( trxName == null || "".equals(trxName) ) if ( trxName == null || "".equals(trxName) )
@ -148,6 +160,18 @@ public class ReplicationProcessor extends AdempiereServer {
} }
} }
protected int getAD_User_ID() {
int AD_User_ID;
if (mImportProcessor.getCreatedBy() > 0)
AD_User_ID = mImportProcessor.getCreatedBy();
else if (mImportProcessor.getUpdatedBy() > 0)
AD_User_ID = mImportProcessor.getUpdatedBy();
else
AD_User_ID = 100; //fall back to SuperUser
return AD_User_ID;
}
@Override @Override
public String getServerInfo() public String getServerInfo()
{ {