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

IDEMPIERE-3529 - Add parameters to InvoicePrint process / peer review

This commit is contained in:
Carlos Ruiz 2017-10-25 18:41:23 +02:00
parent dae313ae78
commit 267fab419a
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
migration/i4.1/oracle/201710251241_IDEMPIERE-3529.sql
View File

@ -3,7 +3,7 @@ SET DEFINE OFF
-- IDEMPIERE-3529 - Add parameters to InvoicePrint process -- IDEMPIERE-3529 - Add parameters to InvoicePrint process
-- Oct 25, 2017 12:09:30 PM CEST -- 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 -- Oct 25, 2017 12:16:28 PM CEST

2
migration/i4.1/postgresql/201710251241_IDEMPIERE-3529.sql
View File

@ -1,6 +1,6 @@
-- IDEMPIERE-3529 - Add parameters to InvoicePrint process -- IDEMPIERE-3529 - Add parameters to InvoicePrint process
-- Oct 25, 2017 12:09:30 PM CEST -- 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 -- Oct 25, 2017 12:16:28 PM CEST

2
org.adempiere.base.process/src/org/compiere/process/OrderBatchProcess.java
View File

@ -105,7 +105,7 @@ public class OrderBatchProcess extends SvrProcess
StringBuilder sql = new StringBuilder("SELECT * FROM C_Order o ") StringBuilder sql = new StringBuilder("SELECT * FROM C_Order o ")
.append(" WHERE o.C_DocTypeTarget_ID=? AND o.DocStatus=? "); .append(" WHERE o.C_DocTypeTarget_ID=? AND o.DocStatus=? ");
if (p_IsSelfService != null && p_IsSelfService.length() == 1) 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) if (p_C_BPartner_ID != 0)
sql.append(" AND o.C_BPartner_ID=").append(p_C_BPartner_ID); sql.append(" AND o.C_BPartner_ID=").append(p_C_BPartner_ID);
if (p_DateOrdered_From != null) if (p_DateOrdered_From != null)

6
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/InvoicePrint.java
View File

@ -387,11 +387,13 @@ public class InvoicePrint extends SvrProcess
} }
if (p_IsPaid != null && p_IsPaid.length() == 1) 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) 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); String orgWhere = MRole.getDefault(getCtx(), false).getOrgWhere(MRole.SQL_RO);