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

IDEMPIERE-2797 Import CSV not able to complete a sales order

This commit is contained in:
Carlos Ruiz 2015-08-26 15:39:25 -05:00
parent 5b0d9768aa
commit 6ccc971cfe
2 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
org.adempiere.base.process/src/org/idempiere/process/ImportCSVProcess.java
View File

@ -35,17 +35,22 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
import org.adempiere.base.Core;
import org.adempiere.base.IGridTabImporter; import org.adempiere.base.IGridTabImporter;
import org.adempiere.base.equinox.EquinoxExtensionLocator; import org.adempiere.base.equinox.EquinoxExtensionLocator;
import org.adempiere.exceptions.AdempiereException; import org.adempiere.exceptions.AdempiereException;
import org.compiere.model.DataStatusEvent;
import org.compiere.model.DataStatusListener;
import org.compiere.model.GridField;
import org.compiere.model.GridTab; import org.compiere.model.GridTab;
import org.compiere.model.GridWindow; import org.compiere.model.GridWindow;
import org.compiere.model.MImportTemplate; import org.compiere.model.MImportTemplate;
import org.compiere.model.MLookup;
import org.compiere.process.ProcessInfoParameter; import org.compiere.process.ProcessInfoParameter;
import org.compiere.process.SvrProcess; import org.compiere.process.SvrProcess;
import org.compiere.util.Env; import org.compiere.util.Env;
public class ImportCSVProcess extends SvrProcess { public class ImportCSVProcess extends SvrProcess implements DataStatusListener {
private InputStream m_file_istream = null; private InputStream m_file_istream = null;
private int p_AD_ImportTemplate_ID = 0; private int p_AD_ImportTemplate_ID = 0;
@ -112,6 +117,7 @@ public class ImportCSVProcess extends SvrProcess {
if (m_gridTab == null) if (m_gridTab == null)
throw new Exception("No Active Tab"); throw new Exception("No Active Tab");
m_gridTab.addDataStatusListener(this);
} }
protected IGridTabImporter initImporter() throws Exception { protected IGridTabImporter initImporter() throws Exception {
@ -142,4 +148,44 @@ public class ImportCSVProcess extends SvrProcess {
m_file_istream.close(); m_file_istream.close();
} }
/**
* @param e
* @see DataStatusListener#dataStatusChanged(DataStatusEvent)
*/
public void dataStatusChanged(DataStatusEvent e)
{
int col = e.getChangedColumn();
if (log.isLoggable(Level.CONFIG)) log.config("(" + m_gridTab + ") Col=" + col + ": " + e.toString());
// Process Callout
GridField mField = m_gridTab.getField(col);
if (mField != null
&& (mField.getCallout().length() > 0
|| (Core.findCallout(m_gridTab.getTableName(), mField.getColumnName())).size()>0
|| m_gridTab.hasDependants(mField.getColumnName())))
{
String msg = m_gridTab.processFieldChange(mField); // Dependencies & Callout
if (msg.length() > 0)
{
log.warning(msg);
}
// Refresh the list on dependant fields
for (GridField dependentField : m_gridTab.getDependantFields(mField.getColumnName()))
{
// if the field has a lookup
if (dependentField != null && dependentField.getLookup() instanceof MLookup)
{
MLookup mLookup = (MLookup)dependentField.getLookup();
// if the lookup is dynamic (i.e. contains this columnName as variable)
if (mLookup.getValidation().indexOf("@"+mField.getColumnName()+"@") != -1)
{
mLookup.refresh();
}
}
} // for all dependent fields
}
}
} }

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

@ -1145,7 +1145,7 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
if (log.isLoggable(Level.FINE)) log.fine("#" + m_vo.TabNo); if (log.isLoggable(Level.FINE)) log.fine("#" + m_vo.TabNo);
if (!isInsertRecord()) if (!isInsertRecord())
{ {
log.warning ("Inset Not allowed in TabNo=" + m_vo.TabNo); log.warning ("Insert Not allowed in TabNo=" + m_vo.TabNo);
return false; return false;
} }
// Prevent New Where Main Record is processed // Prevent New Where Main Record is processed