You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ra...@apache.org on 2016/05/11 07:52:22 UTC
[1/4] incubator-fineract git commit: FINERACT-155 issue fixed
Repository: incubator-fineract
Updated Branches:
refs/heads/develop 9353a5201 -> b4a43e6e9
FINERACT-155 issue fixed
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/3c254f94
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/3c254f94
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/3c254f94
Branch: refs/heads/develop
Commit: 3c254f94e4396d35c1a7cf395dac4af8fc81404b
Parents: d2b8535
Author: venkatconflux <ve...@confluxtechnologies.com>
Authored: Wed May 11 09:54:43 2016 +0530
Committer: venkatconflux <ve...@confluxtechnologies.com>
Committed: Wed May 11 09:54:43 2016 +0530
----------------------------------------------------------------------
...anWritePlatformServiceJpaRepositoryImpl.java | 22 ++++++++++++--------
1 file changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/3c254f94/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
index d7aa02f..760c6d9 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
@@ -154,6 +154,7 @@ import org.apache.fineract.portfolio.loanaccount.loanschedule.domain.LoanSchedul
import org.apache.fineract.portfolio.loanaccount.loanschedule.domain.LoanScheduleModelPeriod;
import org.apache.fineract.portfolio.loanaccount.loanschedule.domain.ScheduledDateGenerator;
import org.apache.fineract.portfolio.loanaccount.loanschedule.service.LoanScheduleHistoryWritePlatformService;
+import org.apache.fineract.portfolio.loanaccount.rescheduleloan.domain.LoanRescheduleRequest;
import org.apache.fineract.portfolio.loanaccount.serialization.LoanApplicationCommandFromApiJsonHelper;
import org.apache.fineract.portfolio.loanaccount.serialization.LoanEventApiJsonValidator;
import org.apache.fineract.portfolio.loanaccount.serialization.LoanUpdateCommandFromApiJsonDeserializer;
@@ -362,8 +363,7 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf
regenerateScheduleOnDisbursement(command, loan, recalculateSchedule, scheduleGeneratorDTO, nextPossibleRepaymentDate, rescheduledRepaymentDate);
if (loan.repaymentScheduleDetail().isInterestRecalculationEnabled()) {
- this.loanScheduleHistoryWritePlatformService.createAndSaveLoanScheduleArchive(loan.fetchRepaymentScheduleInstallments(),
- loan, null);
+ createAndSaveLoanScheduleArchive(loan, scheduleGeneratorDTO);
}
if (isPaymnetypeApplicableforDisbursementCharge) {
changedTransactionDetail = loan.disburse(currentUser, command, changes, scheduleGeneratorDTO, paymentDetail);
@@ -433,6 +433,14 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf
.build();
}
+ private void createAndSaveLoanScheduleArchive(final Loan loan, ScheduleGeneratorDTO scheduleGeneratorDTO) {
+ LoanRescheduleRequest loanRescheduleRequest = null;
+ LoanScheduleModel loanScheduleModel = loan.regenerateScheduleModel(scheduleGeneratorDTO);
+ List<LoanRepaymentScheduleInstallment> installments = retrieveRepaymentScheduleFromModel(loanScheduleModel);
+ this.loanScheduleHistoryWritePlatformService.createAndSaveLoanScheduleArchive(installments,
+ loan, loanRescheduleRequest);
+ }
+
/**
* create standing instruction for disbursed loan
*
@@ -599,8 +607,7 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf
regenerateScheduleOnDisbursement(command, loan, recalculateSchedule, scheduleGeneratorDTO, nextPossibleRepaymentDate,
rescheduledRepaymentDate);
if (loan.repaymentScheduleDetail().isInterestRecalculationEnabled()) {
- this.loanScheduleHistoryWritePlatformService.createAndSaveLoanScheduleArchive(
- loan.fetchRepaymentScheduleInstallments(), loan, null);
+ createAndSaveLoanScheduleArchive(loan, scheduleGeneratorDTO);
}
if (configurationDomainService.isPaymnetypeApplicableforDisbursementCharge()) {
changedTransactionDetail = loan.disburse(currentUser, command, changes, scheduleGeneratorDTO, paymentDetail);
@@ -2011,8 +2018,7 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf
loan.setHelpers(null, this.loanSummaryWrapper, this.transactionProcessingStrategy);
loan.recalculateScheduleFromLastTransaction(scheduleGeneratorDTO, existingTransactionIds,
existingReversedTransactionIds, currentUser);
- this.loanScheduleHistoryWritePlatformService.createAndSaveLoanScheduleArchive(
- loan.fetchRepaymentScheduleInstallments(), loan, null);
+ createAndSaveLoanScheduleArchive(loan, scheduleGeneratorDTO);
} else if (reschedulebasedOnMeetingDates != null && reschedulebasedOnMeetingDates) {
loan.updateLoanRepaymentScheduleDates(calendar.getStartDateLocalDate(), calendar.getRecurrence(), isHolidayEnabled,
holidays, workingDays, reschedulebasedOnMeetingDates, presentMeetingDate, newMeetingDate,
@@ -2724,9 +2730,7 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf
}
private void createLoanScheduleArchive(final Loan loan, final ScheduleGeneratorDTO scheduleGeneratorDTO) {
- LoanScheduleModel loanScheduleModel = loan.regenerateScheduleModel(scheduleGeneratorDTO);
- List<LoanRepaymentScheduleInstallment> installments = retrieveRepaymentScheduleFromModel(loanScheduleModel);
- this.loanScheduleHistoryWritePlatformService.createAndSaveLoanScheduleArchive(installments, loan, null);
+ createAndSaveLoanScheduleArchive(loan, scheduleGeneratorDTO);
}
[2/4] incubator-fineract git commit: MIFOSX-2565 : fixed prepay with
floating rates
Posted by ra...@apache.org.
MIFOSX-2565 : fixed prepay with floating rates
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/72a1fff6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/72a1fff6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/72a1fff6
Branch: refs/heads/develop
Commit: 72a1fff6454b76514da45efb9f0ce7fc1e5d22e1
Parents: d2b8535
Author: pramod <pr...@confluxtechnologies.com>
Authored: Wed May 11 11:39:15 2016 +0530
Committer: pramod <pr...@confluxtechnologies.com>
Committed: Wed May 11 11:39:15 2016 +0530
----------------------------------------------------------------------
.../domain/AbstractLoanScheduleGenerator.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/72a1fff6/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/AbstractLoanScheduleGenerator.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/AbstractLoanScheduleGenerator.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/AbstractLoanScheduleGenerator.java
index d06b3f1..474b852 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/AbstractLoanScheduleGenerator.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/AbstractLoanScheduleGenerator.java
@@ -547,12 +547,24 @@ public abstract class AbstractLoanScheduleGenerator implements LoanScheduleGener
updateFixedInstallmentAmount(mc, loanApplicationTerms, scheduleParams.getPeriodNumber(), loanApplicationTerms
.getPrincipal().minus(scheduleParams.getTotalCumulativePrincipal()));
}
+
+ // this is to make sure we are recalculating using correct interest rate
+ // once calculation is done system will set the actual interest rate
+ BigDecimal currentInterestRate = loanApplicationTerms.getAnnualNominalInterestRate();
+ for(LoanTermVariationsData interestRate : interestRates){
+ if(interestRate.isApplicable(periodStartDateApplicableForInterest)){
+ loanApplicationTerms.updateAnnualNominalInterestRate(interestRate.getDecimalValue());
+ }
+ }
+
PrincipalInterest interestTillDate = calculatePrincipalInterestComponentsForPeriod(this.paymentPeriodsInOneYearCalculator,
interestCalculationGraceOnRepaymentPeriodFraction, scheduleParams.getTotalCumulativePrincipal(),
scheduleParams.getTotalCumulativeInterest(), totalInterestChargedForFullLoanTerm,
lastTotalOutstandingInterestPaymentDueToGrace, scheduleParams.getOutstandingBalanceAsPerRest(), loanApplicationTerms,
scheduleParams.getPeriodNumber(), mc, mergeVariationsToMap(scheduleParams), scheduleParams.getCompoundingMap(),
periodStartDateApplicableForInterest, calculateTill, interestRates);
+ loanApplicationTerms.updateAnnualNominalInterestRate(currentInterestRate);
+
// applies charges for the period
final ScheduleCurrentPeriodParams tempPeriod = new ScheduleCurrentPeriodParams(
totalInterestChargedForFullLoanTerm.getCurrency(), interestCalculationGraceOnRepaymentPeriodFraction);
[4/4] incubator-fineract git commit: Merge branch 'PR112' into develop
Posted by ra...@apache.org.
Merge branch 'PR112' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/b4a43e6e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/b4a43e6e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/b4a43e6e
Branch: refs/heads/develop
Commit: b4a43e6e98ea195fe4a769ca43f0671350a81434
Parents: 76e4886 72a1fff
Author: Adi Narayana Raju <ad...@confluxtechnologies.com>
Authored: Wed May 11 13:21:36 2016 +0530
Committer: Adi Narayana Raju <ad...@confluxtechnologies.com>
Committed: Wed May 11 13:21:36 2016 +0530
----------------------------------------------------------------------
.../domain/AbstractLoanScheduleGenerator.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
[3/4] incubator-fineract git commit: Merge branch 'PR111' into develop
Posted by ra...@apache.org.
Merge branch 'PR111' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/76e48869
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/76e48869
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/76e48869
Branch: refs/heads/develop
Commit: 76e488692e6b6b578de7bed6285fb87d2e290145
Parents: 9353a52 3c254f9
Author: Adi Narayana Raju <ad...@confluxtechnologies.com>
Authored: Wed May 11 13:21:29 2016 +0530
Committer: Adi Narayana Raju <ad...@confluxtechnologies.com>
Committed: Wed May 11 13:21:29 2016 +0530
----------------------------------------------------------------------
...anWritePlatformServiceJpaRepositoryImpl.java | 22 ++++++++++++--------
1 file changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------