Thanks to visit codestin.com
Credit goes to github.com

Skip to content

FINERACT-59 : corrected interest calculation for flat loans #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfgit merged 1 commit into from
Mar 9, 2016
Merged

FINERACT-59 : corrected interest calculation for flat loans #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions ...a/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/LoanApplicationTerms.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ public final class LoanApplicationTerms {
private Money adjustPrincipalForFlatLoans;

private final LocalDate seedDate;

private final CalendarHistoryDataWrapper calendarHistoryDataWrapper;

public static LoanApplicationTerms assembleFrom(final ApplicationCurrency currency, final Integer loanTermFrequency,
Expand Down Expand Up @@ -235,7 +235,8 @@ public static LoanApplicationTerms assembleFrom(final ApplicationCurrency applic
loanProductRelatedDetail, multiDisburseLoan, emiAmount, disbursementDatas, maxOutstandingBalance, interestChargedFromDate,
principalThresholdForLastInstalment, installmentAmountInMultiplesOf, recalculationFrequencyType, restCalendarInstance,
compoundingMethod, compoundingCalendarInstance, compoundingFrequencyType, loanPreClosureInterestCalculationStrategy,
rescheduleStrategyMethod, loanCalendar, approvedAmount, annualNominalInterestRate, loanTermVariations, calendarHistoryDataWrapper);
rescheduleStrategyMethod, loanCalendar, approvedAmount, annualNominalInterestRate, loanTermVariations,
calendarHistoryDataWrapper);
}

public static LoanApplicationTerms assembleFrom(final ApplicationCurrency applicationCurrency, final Integer loanTermFrequency,
Expand All @@ -250,7 +251,7 @@ public static LoanApplicationTerms assembleFrom(final ApplicationCurrency applic
final CalendarInstance compoundingCalendarInstance, final RecalculationFrequencyType compoundingFrequencyType,
final LoanPreClosureInterestCalculationStrategy loanPreClosureInterestCalculationStrategy,
final LoanRescheduleStrategyMethod rescheduleStrategyMethod, final Calendar loanCalendar, BigDecimal approvedAmount,
BigDecimal annualNominalInterestRate, final List<LoanTermVariationsData> loanTermVariations,
BigDecimal annualNominalInterestRate, final List<LoanTermVariationsData> loanTermVariations,
final CalendarHistoryDataWrapper calendarHistoryDataWrapper) {

final Integer numberOfRepayments = loanProductRelatedDetail.getNumberOfRepayments();
Expand Down Expand Up @@ -326,7 +327,7 @@ public static LoanApplicationTerms assembleFrom(final ApplicationCurrency applic
interestRecalculationCompoundingMethod = interestRecalculationDetails.getInterestRecalculationCompoundingMethod();
}
final CalendarHistoryDataWrapper calendarHistoryDataWrapper = null;

return new LoanApplicationTerms(applicationCurrency, loanTermFrequency, loanTermPeriodFrequencyType, numberOfRepayments,
repaymentEvery, repaymentPeriodFrequencyType, null, null, amortizationMethod, interestMethod, interestRatePerPeriod,
interestRatePeriodFrequencyType, annualNominalInterestRate, interestCalculationPeriodMethod,
Expand Down Expand Up @@ -379,7 +380,8 @@ private LoanApplicationTerms(final ApplicationCurrency currency, final Integer l
final CalendarInstance compoundingCalendarInstance, final RecalculationFrequencyType compoundingFrequencyType,
final BigDecimal principalThresholdForLastInstalment, final Integer installmentAmountInMultiplesOf,
final LoanPreClosureInterestCalculationStrategy preClosureInterestCalculationStrategy, final Calendar loanCalendar,
BigDecimal approvedAmount, List<LoanTermVariationsData> loanTermVariations, final CalendarHistoryDataWrapper calendarHistoryDataWrapper) {
BigDecimal approvedAmount, List<LoanTermVariationsData> loanTermVariations,
final CalendarHistoryDataWrapper calendarHistoryDataWrapper) {
this.currency = currency;
this.loanTermFrequency = loanTermFrequency;
this.loanTermPeriodFrequencyType = loanTermPeriodFrequencyType;
Expand Down Expand Up @@ -709,8 +711,13 @@ private BigDecimal calculatePeriodsInLoanTerm() {
case INVALID:
break;
case SAME_AS_REPAYMENT_PERIOD:
LocalDate startDate = getExpectedDisbursementDate();
periodsInLoanTerm = calculatePeriodsBetweenDates(startDate, this.loanEndDate);
if (this.allowPartialPeriodInterestCalcualtion) {
LocalDate startDate = getExpectedDisbursementDate();
if (getInterestChargedFromDate() != null) {
startDate = getInterestChargedFromLocalDate();
}
periodsInLoanTerm = calculatePeriodsBetweenDates(startDate, this.loanEndDate);
}
break;
}

Expand Down Expand Up @@ -1429,8 +1436,8 @@ public Integer fetchNumberOfRepaymentsAfterExceptions() {
public LocalDate getSeedDate() {
return this.seedDate;
}
public CalendarHistoryDataWrapper getCalendarHistoryDataWrapper(){

public CalendarHistoryDataWrapper getCalendarHistoryDataWrapper() {
return this.calendarHistoryDataWrapper;
}

Expand Down