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

IDEMPIERE-5037 PackOut/PackIn must treat EE01/2/4/5 entries as official dictionary (#975)

This commit is contained in:
Carlos Ruiz 2021-11-12 03:47:54 +01:00 committed by GitHub
parent f937cdbf35
commit 2888a27fec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java
View File

@ -22,6 +22,8 @@ import java.io.FileOutputStream;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Properties; import java.util.Properties;
@ -29,11 +31,11 @@ import java.util.logging.Level;
import javax.xml.transform.sax.TransformerHandler; import javax.xml.transform.sax.TransformerHandler;
import org.adempiere.pipo2.exception.DatabaseAccessException;
import org.compiere.model.MColumn; import org.compiere.model.MColumn;
import org.compiere.model.MTable; import org.compiere.model.MTable;
import org.compiere.model.PO; import org.compiere.model.PO;
import org.compiere.model.POInfo; import org.compiere.model.POInfo;
import org.compiere.model.X_AD_EntityType;
import org.compiere.model.X_AD_Package_Imp_Backup; import org.compiere.model.X_AD_Package_Imp_Backup;
import org.compiere.model.X_AD_Package_Imp_Detail; import org.compiere.model.X_AD_Package_Imp_Detail;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
@ -43,11 +45,6 @@ import org.compiere.util.Util;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl; import org.xml.sax.helpers.AttributesImpl;
import java.sql.ResultSet;
import java.sql.PreparedStatement;
import org.adempiere.pipo2.exception.DatabaseAccessException;
/** /**
* *
* @author hengsin * @author hengsin
@ -315,7 +312,11 @@ public abstract class AbstractElementHandler implements ElementHandler {
* @return boolean * @return boolean
*/ */
protected boolean isProcessElement(Properties ctx, String entityType) { protected boolean isProcessElement(Properties ctx, String entityType) {
if ("D".equals(entityType) || "C".equals(entityType)) { if (PO.ENTITYTYPE_Dictionary.equals(entityType)
|| "EE01".equals(entityType)
|| "EE02".equals(entityType)
|| "EE04".equals(entityType)
|| "EE05".equals(entityType)) {
return "Y".equalsIgnoreCase(getUpdateMode(ctx)); return "Y".equalsIgnoreCase(getUpdateMode(ctx));
} else { } else {
return true; return true;
@ -551,7 +552,11 @@ public abstract class AbstractElementHandler implements ElementHandler {
} }
if (!ctx.packOut.isExportDictionaryEntity() && element.get_ColumnIndex("EntityType") >= 0) { if (!ctx.packOut.isExportDictionaryEntity() && element.get_ColumnIndex("EntityType") >= 0) {
Object entityType = element.get_Value("EntityType"); Object entityType = element.get_Value("EntityType");
if (X_AD_EntityType.ENTITYTYPE_Dictionary.equals(entityType)) { if (PO.ENTITYTYPE_Dictionary.equals(entityType)
|| "EE01".equals(entityType)
|| "EE02".equals(entityType)
|| "EE04".equals(entityType)
|| "EE05".equals(entityType)) {
return false; return false;
} }
} }