From e13616b0e9c9232cd044bdf12bf41f225c76cbb3 Mon Sep 17 00:00:00 2001
From: Terence Denzil Monteiro <terence@sanjosesolutions.in>
Date: Tue, 6 Feb 2018 20:42:32 +0530
Subject: [PATCH] Only compare Teller and Cashier endDate if its not null

---
 .../teller/data/CashierTransactionDataValidator.java         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 a0b897e81..f36bd15c4 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();
 		}
 		/**