Repository: incubator-fineract Updated Branches: refs/heads/develop c7905e945 -> 9387b3efd
FINERACT-377 : Reinvesting Recurring Deposit is taking present date in stead of maturity date Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/5d1a32e6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/5d1a32e6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/5d1a32e6 Branch: refs/heads/develop Commit: 5d1a32e6f8804b5237a65c390adc735f43e574b8 Parents: b6f4230 Author: satish-conflux <satish.saj...@confluxtechnologies.com> Authored: Thu Feb 16 16:01:39 2017 +0530 Committer: satish-conflux <satish.saj...@confluxtechnologies.com> Committed: Fri Feb 17 17:22:56 2017 +0530 ---------------------------------------------------------------------- .../portfolio/savings/domain/RecurringDepositAccount.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/5d1a32e6/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/RecurringDepositAccount.java ---------------------------------------------------------------------- diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/RecurringDepositAccount.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/RecurringDepositAccount.java index d5dbc5b..76668a4 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/RecurringDepositAccount.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/RecurringDepositAccount.java @@ -600,6 +600,7 @@ public class RecurringDepositAccount extends SavingsAccount { if (interestPostingUpToDate == null) { interestPostingUpToDate = closeDate; } + this.setClosedOnDate(closeDate); final MathContext mc = MathContext.DECIMAL64; boolean isInterestTransfer = false; LocalDate postInterestOnDate = null; @@ -642,7 +643,6 @@ public class RecurringDepositAccount extends SavingsAccount { // correct. recalculateDailyBalances(Money.zero(this.currency), interestPostingUpToDate); } - this.summary.updateSummary(this.currency, this.savingsAccountTransactionSummaryWrapper, this.transactions); } @@ -1083,8 +1083,7 @@ public class RecurringDepositAccount extends SavingsAccount { final Integer lockinPeriodFrequency = this.lockinPeriodFrequency; final boolean withdrawalFeeApplicableForTransfer = false; - LocalDate now = DateUtils.getLocalDateOfTenant(); - + LocalDate now = getClosedOnDate(); newAccountTermAndPreClosure.updateExpectedFirstDepositDate(now); RecurringDepositAccount rdAccount = RecurringDepositAccount.createNewActivatedAccount(client, group, product, savingsOfficer, @@ -1120,6 +1119,10 @@ public class RecurringDepositAccount extends SavingsAccount { this.activatedOnDate = now.toDate(); } + + public void setClosedOnDate(final LocalDate closedOnDate) { + this.closedOnDate = closedOnDate.toDate(); + } @Override protected boolean isTransferInterestToOtherAccount() {
