From 083b9dfc4921b45b146d19914141f9e755a923fa Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Tue, 27 Sep 2011 10:07:37 -0500 Subject: [PATCH] IDEMPIERE-75 Process Reset Accounting - Parameter DateTo not used if DateFrom is null --- .../src/org/compiere/process/AllocationReset.java | 2 +- .../src/org/compiere/process/ExpenseAPInvoice.java | 2 +- .../src/org/compiere/process/ExpenseSOrder.java | 2 +- .../src/org/compiere/process/FactAcctReset.java | 2 +- .../src/org/compiere/process/InvoicePrint.java | 2 +- .../src/org/compiere/process/InvoiceWriteOff.java | 2 +- .../src/org/compiere/process/OrderBatchProcess.java | 2 +- .../src/org/compiere/process/OrderPOCreate.java | 2 +- .../src/org/compiere/process/RequisitionPOCreate.java | 2 +- org.adempiere.base/src/org/compiere/report/FinStatement.java | 2 +- org.adempiere.base/src/org/compiere/report/TrialBalance.java | 2 +- .../WEB-INF/src/org/adempiere/webui/process/InvoicePrint.java | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/org.adempiere.base.process/src/org/compiere/process/AllocationReset.java b/org.adempiere.base.process/src/org/compiere/process/AllocationReset.java index a61bfea2ee..ed3be596c5 100644 --- a/org.adempiere.base.process/src/org/compiere/process/AllocationReset.java +++ b/org.adempiere.base.process/src/org/compiere/process/AllocationReset.java @@ -61,7 +61,7 @@ public class AllocationReset extends SvrProcess { log.fine("prepare - " + para[i]); String name = para[i].getParameterName(); - if (para[i].getParameter() == null) + if (para[i].getParameter() == null && para[i].getParameter_To() == null) ; else if (name.equals("C_BP_Group_ID")) p_C_BP_Group_ID = para[i].getParameterAsInt(); diff --git a/org.adempiere.base.process/src/org/compiere/process/ExpenseAPInvoice.java b/org.adempiere.base.process/src/org/compiere/process/ExpenseAPInvoice.java index b03f0ed242..536baaf001 100644 --- a/org.adempiere.base.process/src/org/compiere/process/ExpenseAPInvoice.java +++ b/org.adempiere.base.process/src/org/compiere/process/ExpenseAPInvoice.java @@ -54,7 +54,7 @@ public class ExpenseAPInvoice extends SvrProcess for (int i = 0; i < para.length; i++) { String name = para[i].getParameterName(); - if (para[i].getParameter() == null) + if (para[i].getParameter() == null && para[i].getParameter_To() == null) ; else if (name.equals("C_BPartner_ID")) m_C_BPartner_ID = para[i].getParameterAsInt(); diff --git a/org.adempiere.base.process/src/org/compiere/process/ExpenseSOrder.java b/org.adempiere.base.process/src/org/compiere/process/ExpenseSOrder.java index 8b57c52c98..55b339ab55 100644 --- a/org.adempiere.base.process/src/org/compiere/process/ExpenseSOrder.java +++ b/org.adempiere.base.process/src/org/compiere/process/ExpenseSOrder.java @@ -62,7 +62,7 @@ public class ExpenseSOrder extends SvrProcess for (int i = 0; i < para.length; i++) { String name = para[i].getParameterName(); - if (para[i].getParameter() == null) + if (para[i].getParameter() == null && para[i].getParameter_To() == null) ; else if (name.equals("C_BPartner_ID")) p_C_BPartner_ID = para[i].getParameterAsInt(); diff --git a/org.adempiere.base.process/src/org/compiere/process/FactAcctReset.java b/org.adempiere.base.process/src/org/compiere/process/FactAcctReset.java index 70bec4ba60..667429a51c 100644 --- a/org.adempiere.base.process/src/org/compiere/process/FactAcctReset.java +++ b/org.adempiere.base.process/src/org/compiere/process/FactAcctReset.java @@ -75,7 +75,7 @@ public class FactAcctReset extends SvrProcess for (int i = 0; i < para.length; i++) { String name = para[i].getParameterName(); - if (para[i].getParameter() == null) + if (para[i].getParameter() == null && para[i].getParameter_To() == null) ; else if (name.equals("AD_Client_ID")) p_AD_Client_ID = ((BigDecimal)para[i].getParameter()).intValue(); diff --git a/org.adempiere.base.process/src/org/compiere/process/InvoicePrint.java b/org.adempiere.base.process/src/org/compiere/process/InvoicePrint.java index e5c19a4907..e45ea6e790 100644 --- a/org.adempiere.base.process/src/org/compiere/process/InvoicePrint.java +++ b/org.adempiere.base.process/src/org/compiere/process/InvoicePrint.java @@ -69,7 +69,7 @@ public class InvoicePrint extends SvrProcess for (int i = 0; i < para.length; i++) { String name = para[i].getParameterName(); - if (para[i].getParameter() == null) + if (para[i].getParameter() == null && para[i].getParameter_To() == null) ; else if (name.equals("DateInvoiced")) { diff --git a/org.adempiere.base.process/src/org/compiere/process/InvoiceWriteOff.java b/org.adempiere.base.process/src/org/compiere/process/InvoiceWriteOff.java index 63329fbaaf..d8cde01540 100644 --- a/org.adempiere.base.process/src/org/compiere/process/InvoiceWriteOff.java +++ b/org.adempiere.base.process/src/org/compiere/process/InvoiceWriteOff.java @@ -79,7 +79,7 @@ public class InvoiceWriteOff extends SvrProcess for (int i = 0; i < para.length; i++) { String name = para[i].getParameterName(); - if (para[i].getParameter() == null) + if (para[i].getParameter() == null && para[i].getParameter_To() == null) ; else if (name.equals("C_BPartner_ID")) p_C_BPartner_ID = para[i].getParameterAsInt(); 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 890117e011..cda54a9546 100644 --- a/org.adempiere.base.process/src/org/compiere/process/OrderBatchProcess.java +++ b/org.adempiere.base.process/src/org/compiere/process/OrderBatchProcess.java @@ -54,7 +54,7 @@ public class OrderBatchProcess extends SvrProcess for (int i = 0; i < para.length; i++) { String name = para[i].getParameterName(); - if (para[i].getParameter() == null) + if (para[i].getParameter() == null && para[i].getParameter_To() == null) ; else if (name.equals("C_DocTypeTarget_ID")) p_C_DocTypeTarget_ID = para[i].getParameterAsInt(); diff --git a/org.adempiere.base.process/src/org/compiere/process/OrderPOCreate.java b/org.adempiere.base.process/src/org/compiere/process/OrderPOCreate.java index 5f6679d015..258c54131e 100644 --- a/org.adempiere.base.process/src/org/compiere/process/OrderPOCreate.java +++ b/org.adempiere.base.process/src/org/compiere/process/OrderPOCreate.java @@ -62,7 +62,7 @@ public class OrderPOCreate extends SvrProcess for (int i = 0; i < para.length; i++) { String name = para[i].getParameterName(); - if (para[i].getParameter() == null) + if (para[i].getParameter() == null && para[i].getParameter_To() == null) ; else if (name.equals("DateOrdered")) { diff --git a/org.adempiere.base.process/src/org/compiere/process/RequisitionPOCreate.java b/org.adempiere.base.process/src/org/compiere/process/RequisitionPOCreate.java index 7f44fe979a..cdb8c36ecd 100644 --- a/org.adempiere.base.process/src/org/compiere/process/RequisitionPOCreate.java +++ b/org.adempiere.base.process/src/org/compiere/process/RequisitionPOCreate.java @@ -99,7 +99,7 @@ public class RequisitionPOCreate extends SvrProcess for (int i = 0; i < para.length; i++) { String name = para[i].getParameterName(); - if (para[i].getParameter() == null) + if (para[i].getParameter() == null && para[i].getParameter_To() == null) ; else if (name.equals("AD_Org_ID")) p_AD_Org_ID = para[i].getParameterAsInt(); diff --git a/org.adempiere.base/src/org/compiere/report/FinStatement.java b/org.adempiere.base/src/org/compiere/report/FinStatement.java index f71c7a3230..2cdffac4e1 100644 --- a/org.adempiere.base/src/org/compiere/report/FinStatement.java +++ b/org.adempiere.base/src/org/compiere/report/FinStatement.java @@ -109,7 +109,7 @@ public class FinStatement extends SvrProcess for (int i = 0; i < para.length; i++) { String name = para[i].getParameterName(); - if (para[i].getParameter() == null) + if (para[i].getParameter() == null && para[i].getParameter_To() == null) ; else if (name.equals("C_AcctSchema_ID")) p_C_AcctSchema_ID = ((BigDecimal)para[i].getParameter()).intValue(); diff --git a/org.adempiere.base/src/org/compiere/report/TrialBalance.java b/org.adempiere.base/src/org/compiere/report/TrialBalance.java index f446c35654..1a3a22d167 100644 --- a/org.adempiere.base/src/org/compiere/report/TrialBalance.java +++ b/org.adempiere.base/src/org/compiere/report/TrialBalance.java @@ -114,7 +114,7 @@ public class TrialBalance extends SvrProcess for (int i = 0; i < para.length; i++) { String name = para[i].getParameterName(); - if (para[i].getParameter() == null) + if (para[i].getParameter() == null && para[i].getParameter_To() == null) ; else if (name.equals("C_AcctSchema_ID")) p_C_AcctSchema_ID = ((BigDecimal)para[i].getParameter()).intValue(); 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 876122c64d..ea2efb21e2 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 @@ -62,7 +62,7 @@ public class InvoicePrint extends SvrProcess for (int i = 0; i < para.length; i++) { String name = para[i].getParameterName(); - if (para[i].getParameter() == null) + if (para[i].getParameter() == null && para[i].getParameter_To() == null) ; else if (name.equals("DateInvoiced")) {