Merge branch 'PR422' into develop

MaheshSundaramurthy · Nov 20, 2017 · a5a88dc · a5a88dc
2 parents e23ff94 + 7eea2dc
commit a5a88dc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...r/src/integrationTest/java/org/apache/fineract/integrationtests/common/HolidayHelper.java b/...r/src/integrationTest/java/org/apache/fineract/integrationtests/common/HolidayHelper.java
@@ -59,7 +59,7 @@ public static String getCreateHolidayDataAsJSON() {
         map.put("fromDate", "01 April 2013");
         map.put("toDate", "01 April 2013");
         map.put("repaymentsRescheduledTo", "08 April 2013");
-
+        map.put("reschedulingType", 2);
         String HolidayCreateJson = new Gson().toJson(map);
         System.out.println(HolidayCreateJson);
         return HolidayCreateJson;

diff --git a/...ovider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanRepository.java b/...ovider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanRepository.java
@@ -29,10 +29,10 @@
 
 public interface LoanRepository extends JpaRepository<Loan, Long>, JpaSpecificationExecutor<Loan> {
 
-    public static final String FIND_GROUP_LOANS_DISBURSED_AFTER = "select l from Loan l where l.actualDisbursementDate > :disbursementDate and "
+    public static final String FIND_GROUP_LOANS_DISBURSED_AFTER = "select l from Loan l where ( l.actualDisbursementDate IS NOT NULL and l.actualDisbursementDate > :disbursementDate) and "
             + "l.group.id = :groupId and l.loanType = :loanType order by l.actualDisbursementDate";
 
-    public static final String FIND_CLIENT_OR_JLG_LOANS_DISBURSED_AFTER = "select l from Loan l where l.actualDisbursementDate > :disbursementDate and "
+    public static final String FIND_CLIENT_OR_JLG_LOANS_DISBURSED_AFTER = "select l from Loan l where (l.actualDisbursementDate IS NOT NULL and l.actualDisbursementDate > :disbursementDate) and "
             + "l.client.id = :clientId order by l.actualDisbursementDate";
 
     public static final String FIND_MAX_GROUP_LOAN_COUNTER_QUERY = "Select MAX(l.loanCounter) from Loan l where l.group.id = :groupId "