diff --git a/org.adempiere.base.process/src/org/compiere/process/DistributionRun.java b/org.adempiere.base.process/src/org/compiere/process/DistributionRun.java index 873e7f8d4d..e64142fa69 100644 --- a/org.adempiere.base.process/src/org/compiere/process/DistributionRun.java +++ b/org.adempiere.base.process/src/org/compiere/process/DistributionRun.java @@ -114,13 +114,13 @@ public class DistributionRun extends SvrProcess } else if (name.equals("IsTest")) p_IsTest = "Y".equals(para[i].getParameter()); - else if (m_docType.getDocBaseType().equals(MDocType.DOCBASETYPE_DistributionOrder) & name.equals("M_Warehouse_ID")) + else if (m_docType.getDocBaseType().equals(MDocType.DOCBASETYPE_DistributionOrder) && name.equals("M_Warehouse_ID")) p_M_Warehouse_ID=((BigDecimal)para[i].getParameter()).intValue(); - else if (m_docType.getDocBaseType().equals(MDocType.DOCBASETYPE_DistributionOrder) & name.equals("ConsolidateDocument")) + else if (m_docType.getDocBaseType().equals(MDocType.DOCBASETYPE_DistributionOrder) && name.equals("ConsolidateDocument")) p_ConsolidateDocument="Y".equals((String)para[i].getParameter()); - else if (m_docType.getDocBaseType().equals(MDocType.DOCBASETYPE_DistributionOrder) & name.equals("M_DistributionList_ID")) + else if (m_docType.getDocBaseType().equals(MDocType.DOCBASETYPE_DistributionOrder) && name.equals("M_DistributionList_ID")) p_M_DistributionList_ID=para[i].getParameterAsInt(); - else if (m_docType.getDocBaseType().equals(MDocType.DOCBASETYPE_DistributionOrder) & name.equals("IsRequiredDRP")) + else if (m_docType.getDocBaseType().equals(MDocType.DOCBASETYPE_DistributionOrder) && name.equals("IsRequiredDRP")) p_BasedInDamnd = "Y".equals((String)para[i].getParameter()); else log.log(Level.SEVERE, "prepare - Unknown Parameter: " + name); @@ -160,7 +160,7 @@ public class DistributionRun extends SvrProcess if (p_DatePromised == null) p_DatePromised = m_DateOrdered; - if(m_docType.getDocBaseType().equals(MDocType.DOCBASETYPE_DistributionOrder) & p_M_Warehouse_ID > 0) + if(m_docType.getDocBaseType().equals(MDocType.DOCBASETYPE_DistributionOrder) && p_M_Warehouse_ID > 0) { if(p_BasedInDamnd) { diff --git a/org.adempiere.base/src/org/eevolution/process/ExportFormatGenerator.java b/org.adempiere.base/src/org/eevolution/process/ExportFormatGenerator.java index f56077e1ae..174e8ee7f9 100644 --- a/org.adempiere.base/src/org/eevolution/process/ExportFormatGenerator.java +++ b/org.adempiere.base/src/org/eevolution/process/ExportFormatGenerator.java @@ -95,7 +95,7 @@ public class ExportFormatGenerator extends SvrProcess String format = null; if(tab.isActive()) { - if(p_IsInsertRecord&tab.isInsertRecord()) + if(p_IsInsertRecord && tab.isInsertRecord()) { table = new MTable(getCtx(), tab.getAD_Table_ID(), get_TrxName()); format = createFormat(table);