diff --git a/migration/i4.1/oracle/201710251241_IDEMPIERE-3529.sql b/migration/i4.1/oracle/201710251241_IDEMPIERE-3529.sql index e2d6ee3dad..d4434c7ef0 100644 --- a/migration/i4.1/oracle/201710251241_IDEMPIERE-3529.sql +++ b/migration/i4.1/oracle/201710251241_IDEMPIERE-3529.sql @@ -3,7 +3,7 @@ SET DEFINE OFF -- IDEMPIERE-3529 - Add parameters to InvoicePrint process -- Oct 25, 2017 12:09:30 PM CEST -INSERT INTO AD_Process_Para (AD_Process_Para_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,Name,Description,Help,AD_Process_ID,SeqNo,AD_Reference_ID,AD_Reference_Value_ID,IsRange,AD_Val_Rule_ID,FieldLength,IsMandatory,ColumnName,IsCentrallyMaintained,EntityType,AD_Element_ID,AD_Process_Para_UU,IsEncrypted) VALUES (200219,0,0,'Y',TO_DATE('2017-10-25 12:09:30','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2017-10-25 12:09:30','YYYY-MM-DD HH24:MI:SS'),100,'Document Type','Document type or rules','The Document Type determines document sequence and processing rules',200,60,19,170,'N',200097,0,'N','C_DocType_ID','Y','D',196,'554013bb-d6c0-4795-a9c6-aa2cb6dfc2bf','N') +INSERT INTO AD_Process_Para (AD_Process_Para_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,Name,Description,Help,AD_Process_ID,SeqNo,AD_Reference_ID,AD_Reference_Value_ID,IsRange,AD_Val_Rule_ID,FieldLength,IsMandatory,ColumnName,IsCentrallyMaintained,EntityType,AD_Element_ID,AD_Process_Para_UU,IsEncrypted) VALUES (200219,0,0,'Y',TO_DATE('2017-10-25 12:09:30','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2017-10-25 12:09:30','YYYY-MM-DD HH24:MI:SS'),100,'Document Type','Document type or rules','The Document Type determines document sequence and processing rules',200,60,19,170,'N',124,0,'N','C_DocType_ID','Y','D',196,'554013bb-d6c0-4795-a9c6-aa2cb6dfc2bf','N') ; -- Oct 25, 2017 12:16:28 PM CEST diff --git a/migration/i4.1/postgresql/201710251241_IDEMPIERE-3529.sql b/migration/i4.1/postgresql/201710251241_IDEMPIERE-3529.sql index 7eba976b0d..b2f1b7d9c8 100644 --- a/migration/i4.1/postgresql/201710251241_IDEMPIERE-3529.sql +++ b/migration/i4.1/postgresql/201710251241_IDEMPIERE-3529.sql @@ -1,6 +1,6 @@ -- IDEMPIERE-3529 - Add parameters to InvoicePrint process -- Oct 25, 2017 12:09:30 PM CEST -INSERT INTO AD_Process_Para (AD_Process_Para_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,Name,Description,Help,AD_Process_ID,SeqNo,AD_Reference_ID,AD_Reference_Value_ID,IsRange,AD_Val_Rule_ID,FieldLength,IsMandatory,ColumnName,IsCentrallyMaintained,EntityType,AD_Element_ID,AD_Process_Para_UU,IsEncrypted) VALUES (200219,0,0,'Y',TO_TIMESTAMP('2017-10-25 12:09:30','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2017-10-25 12:09:30','YYYY-MM-DD HH24:MI:SS'),100,'Document Type','Document type or rules','The Document Type determines document sequence and processing rules',200,60,19,170,'N',200097,0,'N','C_DocType_ID','Y','D',196,'554013bb-d6c0-4795-a9c6-aa2cb6dfc2bf','N') +INSERT INTO AD_Process_Para (AD_Process_Para_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,Name,Description,Help,AD_Process_ID,SeqNo,AD_Reference_ID,AD_Reference_Value_ID,IsRange,AD_Val_Rule_ID,FieldLength,IsMandatory,ColumnName,IsCentrallyMaintained,EntityType,AD_Element_ID,AD_Process_Para_UU,IsEncrypted) VALUES (200219,0,0,'Y',TO_TIMESTAMP('2017-10-25 12:09:30','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2017-10-25 12:09:30','YYYY-MM-DD HH24:MI:SS'),100,'Document Type','Document type or rules','The Document Type determines document sequence and processing rules',200,60,19,170,'N',124,0,'N','C_DocType_ID','Y','D',196,'554013bb-d6c0-4795-a9c6-aa2cb6dfc2bf','N') ; -- Oct 25, 2017 12:16:28 PM CEST diff --git a/org.adempiere.base.process/src/org/compiere/process/OrderBatchProcess.java b/org.adempiere.base.process/src/org/compiere/process/OrderBatchProcess.java index 1016fbbde4..9cc884d1dc 100644 --- a/org.adempiere.base.process/src/org/compiere/process/OrderBatchProcess.java +++ b/org.adempiere.base.process/src/org/compiere/process/OrderBatchProcess.java @@ -105,7 +105,7 @@ public class OrderBatchProcess extends SvrProcess StringBuilder sql = new StringBuilder("SELECT * FROM C_Order o ") .append(" WHERE o.C_DocTypeTarget_ID=? AND o.DocStatus=? "); if (p_IsSelfService != null && p_IsSelfService.length() == 1) - sql.append(" AND o.IsSelfService='").append(p_IsSelfService).append("'"); + sql.append(" AND o.IsSelfService=").append(DB.TO_STRING(p_IsSelfService)); if (p_C_BPartner_ID != 0) sql.append(" AND o.C_BPartner_ID=").append(p_C_BPartner_ID); if (p_DateOrdered_From != null) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/InvoicePrint.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/InvoicePrint.java index 768c5ecab4..b87a0adbe4 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/InvoicePrint.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/InvoicePrint.java @@ -387,11 +387,13 @@ public class InvoicePrint extends SvrProcess } if (p_IsPaid != null && p_IsPaid.length() == 1) { - sql.append(" AND i.IsPaid='").append(p_IsPaid).append("'"); + sql.append(" AND i.IsPaid=?"); + params.add(p_IsPaid); } if (m_C_DocType_ID != 0) { - sql.append (" AND i.C_DocTypeTarget_ID=").append(m_C_DocType_ID); + sql.append (" AND i.C_DocTypeTarget_ID=?"); + params.add(m_C_DocType_ID); } } String orgWhere = MRole.getDefault(getCtx(), false).getOrgWhere(MRole.SQL_RO);