You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by av...@apache.org on 2018/03/09 19:44:28 UTC
[04/10] fineract git commit: Only compare Teller and Cashier endDate
if its not null
Only compare Teller and Cashier endDate if its not null
Project: http://git-wip-us.apache.org/repos/asf/fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/fineract/commit/e13616b0
Tree: http://git-wip-us.apache.org/repos/asf/fineract/tree/e13616b0
Diff: http://git-wip-us.apache.org/repos/asf/fineract/diff/e13616b0
Branch: refs/heads/1.1.0
Commit: e13616b0e9c9232cd044bdf12bf41f225c76cbb3
Parents: 8e7bd01
Author: Terence Denzil Monteiro <te...@sanjosesolutions.in>
Authored: Tue Feb 6 20:42:32 2018 +0530
Committer: Terence Denzil Monteiro <te...@sanjosesolutions.in>
Committed: Tue Feb 6 20:42:32 2018 +0530
----------------------------------------------------------------------
.../teller/data/CashierTransactionDataValidator.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/fineract/blob/e13616b0/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/data/CashierTransactionDataValidator.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/data/CashierTransactionDataValidator.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/data/CashierTransactionDataValidator.java
index a0b897e..f36bd15 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/data/CashierTransactionDataValidator.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/data/CashierTransactionDataValidator.java
@@ -95,8 +95,9 @@ public class CashierTransactionDataValidator {
*/
if (fromDate.isBefore(tellerFromDate)
|| endDate.isBefore(tellerFromDate)
- || (tellerEndDate != null && fromDate.isAfter(tellerEndDate) || endDate
- .isAfter(tellerEndDate))) {
+ || (tellerEndDate != null &&
+ (fromDate.isAfter(tellerEndDate)
+ || endDate.isAfter(tellerEndDate)))) {
throw new CashierDateRangeOutOfTellerDateRangeException();
}
/**