Merge branch 'master' into develop

CHANGELOG.md

@@ -6,6 +6,7 @@ See VERSIONING (https://github.com/openMF/mifosx/blob/master/VERSIONING.md) for
 Releases
 ===============
 
+1. 18 Mar 2014 - 1.20.1.RELEASE
 1. 16 Mar 2014 - 1.20.0.RELEASE
 1. 04 Mar 2014 - 1.19.0.RELEASE
 1. 23 Feb 2014 - 1.18.0.RELEASE
@@ -61,6 +62,13 @@ Releases
 1. 05 April 2013 - 0.11.0.beta
 
 
+1.20.1.RELEASE
+=============
+Bug Release
+
+Bugs
+ - [MIFOSX-995] - Grace periods not working when actualDisbursementDate != expectedDisbursementDate
+
 1.20.0.RELEASE
 =============
 Feature Release

api-docs/apiLive.htm

@@ -90,7 +90,7 @@
 <body>
 	<div id="page-wrapper">
 		<div id="flybar">
-			<div id="nav-logo">1.20.0.RELEASE</div>
+			<div id="nav-logo">1.20.1.RELEASE</div>
 			<div class="flybar-nav">
 				<h2 class="flybar-button">Overview</h2>
 				<div class="flybar-menu-overview">

mifosng-provider/gradle.properties

@@ -1,4 +1,4 @@
-releaseVersion=1.20.0.RELEASE
+releaseVersion=1.20.1.RELEASE
 
 
 

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

@@ -1940,11 +1940,11 @@ public class Loan extends AbstractPersistable<Long> {
             loanVariationTermsData.add(data);
         }
 
-        final LoanApplicationTerms loanApplicationTerms = LoanApplicationTerms.assembleFrom(applicationCurrency, loanTermFrequency,
+        final LoanApplicationTerms loanApplicationTerms = LoanApplicationTerms
-                loanTermPeriodFrequencyType, getDisbursementDate(), getExpectedFirstRepaymentOnDate(),
+                .assembleFrom(applicationCurrency, loanTermFrequency, loanTermPeriodFrequencyType, getDisbursementDate(),
-                calculatedRepaymentsStartingFromDate, getInArrearsTolerance(), this.loanRepaymentScheduleDetail,
+                        getExpectedFirstRepaymentOnDate(), calculatedRepaymentsStartingFromDate, getInArrearsTolerance(),
-                this.loanProduct.isMultiDisburseLoan(), this.fixedEmiAmount, disbursementData, this.maxOutstandingLoanBalance,
+                        this.loanRepaymentScheduleDetail, this.loanProduct.isMultiDisburseLoan(), this.fixedEmiAmount, disbursementData,
-                loanVariationTermsData);
+                        this.maxOutstandingLoanBalance,loanVariationTermsData, getInterestChargedFromDate());
 
         final LoanScheduleModel loanSchedule = loanScheduleGenerator.generate(mc, applicationCurrency, loanApplicationTerms, charges(),
                 isHolidayEnabled, holidays, workingDays);

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

@@ -126,9 +126,9 @@ public final class LoanApplicationTerms {
     public static LoanApplicationTerms assembleFrom(final ApplicationCurrency applicationCurrency, final Integer loanTermFrequency,
             final PeriodFrequencyType loanTermPeriodFrequencyType, final LocalDate expectedDisbursementDate,
             final LocalDate repaymentsStartingFromDate, final LocalDate calculatedRepaymentsStartingFromDate,
-            final Money inArrearsTolerance, final LoanProductRelatedDetail loanProductRelatedDetail, final boolean multiDisburseLoan,
+            final Money inArrearsTolerance, final LoanProductRelatedDetail loanProductRelatedDetail,
-            final BigDecimal emiAmount, final List<DisbursementData> disbursementDatas, final BigDecimal maxOutstandingBalance,
+            final boolean multiDisburseLoan,final BigDecimal emiAmount,final List<DisbursementData> disbursementDatas, 
-            final List<LoanTermVariationsData> emiAmountVariations) {
+            final BigDecimal maxOutstandingBalance,final List<LoanTermVariationsData> emiAmountVariations, final LocalDate interestChargedFromDate) {
 
         final Integer numberOfRepayments = loanProductRelatedDetail.getNumberOfRepayments();
         final Integer repaymentEvery = loanProductRelatedDetail.getRepayEvery();
@@ -143,10 +143,9 @@ public final class LoanApplicationTerms {
         final Money principalMoney = loanProductRelatedDetail.getPrincipal();
 
         //
-        final Integer graceOnPrincipalPayment = 0;
+        final Integer graceOnPrincipalPayment = loanProductRelatedDetail.graceOnPrincipalPayment() ;
-        final Integer graceOnInterestPayment = 0;
+        final Integer graceOnInterestPayment = loanProductRelatedDetail.graceOnInterestPayment() ;
-        final Integer graceOnInterestCharged = 0;
+        final Integer graceOnInterestCharged = loanProductRelatedDetail.graceOnInterestCharged();
-        final LocalDate interestChargedFromDate = null;
 
         return new LoanApplicationTerms(applicationCurrency, loanTermFrequency, loanTermPeriodFrequencyType, numberOfRepayments,
                 repaymentEvery, repaymentPeriodFrequencyType, amortizationMethod, interestMethod, interestRatePerPeriod,

mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanProductRelatedDetail.java

@@ -163,6 +163,18 @@ public class LoanProductRelatedDetail implements LoanProductMinimumRepaymentSche
     public void setPrincipal(BigDecimal principal) {
         this.principal = principal;
     }
+    
+    public Integer graceOnInterestCharged() {
+        return this.graceOnInterestCharged;
+    }
+    
+    public Integer graceOnInterestPayment() {
+        return this.graceOnInterestPayment;
+    }
+    
+    public Integer graceOnPrincipalPayment() {
+        return this.graceOnPrincipalPayment;
+    }
 
     public Money getInArrearsTolerance() {
         return Money.of(this.currency, this.inArrearsTolerance);