Merge branch 'i601-create-cashier-teller-end-date' into develop

swagatikapanda123 · Feb 6, 2018 · 8ac5485 · 8ac5485
2 parents 8e7bd01 + e13616b
commit 8ac5485
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...in/java/org/apache/fineract/organisation/teller/data/CashierTransactionDataValidator.java b/...in/java/org/apache/fineract/organisation/teller/data/CashierTransactionDataValidator.java
@@ -95,8 +95,9 @@ public void validateCashierAllowedDateAndTime(final Cashier cashier,
 		 */
 		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();
 		}
 		/**