MIFOSX-867 - Fixed disbursement or submit date after repayment startdate by adding validations

mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java

@@ -1650,6 +1650,14 @@ public class Loan extends AbstractPersistable<Long> {
                     getApprovedOnDate());
         }
         
+        if(getExpectedFirstRepaymentOnDate() != null && disbursedOn.isAfter(getExpectedFirstRepaymentOnDate()))
+        {
+            final String errorMessage =  "submittedOnDate cannot be after the loans  expectedFirstRepaymentOnDate: " + getExpectedFirstRepaymentOnDate().toString();
+            throw new InvalidLoanStateTransitionException("disbursal", "cannot.be.after.expected.first.repayment.date", errorMessage, disbursedOn,
+                    getExpectedFirstRepaymentOnDate());
+        }
+        
+
         validateActivityNotBeforeClientOrGroupTransferDate(LoanEvent.LOAN_DISBURSED, disbursedOn);
 
         if (disbursedOn.isAfter(new LocalDate())) {
@@ -2924,6 +2932,8 @@ public class Loan extends AbstractPersistable<Long> {
         }
     }
     
+
+
     public Group group() {
         return this.group;
     }

mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java

@@ -712,6 +712,7 @@ public class LoanApplicationWritePlatformServiceJpaRepositoryImpl implements Loa
     private void validateSubmittedOnDate(final Loan loan) {
         final LocalDate startDate = loan.loanProduct().getStartDate();
         final LocalDate closeDate = loan.loanProduct().getCloseDate();
+        final LocalDate expectedFirstRepaymentOnDate = loan.getExpectedFirstRepaymentOnDate();
         final LocalDate submittedOnDate = loan.getSubmittedOnDate();
 
         String defaultUserMessage = "";
@@ -726,8 +727,18 @@ public class LoanApplicationWritePlatformServiceJpaRepositoryImpl implements Loa
             throw new LoanApplicationDateException("submitted.on.date.cannot.be.after.the.loan.product.close.date", defaultUserMessage,
                     submittedOnDate.toString(), closeDate.toString());
         }
+        
+        if(expectedFirstRepaymentOnDate != null && submittedOnDate.isAfter(expectedFirstRepaymentOnDate))
+        {
+            defaultUserMessage = "submittedOnDate cannot be after the loans  expectedFirstRepaymentOnDate.";
+            throw new LoanApplicationDateException("submitted.on.date.cannot.be.after.the.loan.expected.first.repayment.date", defaultUserMessage,
+                    submittedOnDate.toString(), expectedFirstRepaymentOnDate.toString());
+        }
     }
     
+    
+    
+
     private void checkClientOrGroupActive(final Loan loan) {
         final Client client = loan.client();
         if (client != null) {