CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases Wiki Activity

Merge branch 'FINERACT-377' into develop

Browse Source
This commit is contained in:
Nazeer Hussain Shaik
2017-02-17 17:25:31 +05:30
parent c7905e945b 5d1a32e6f8
commit 9387b3efd5
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/RecurringDepositAccount.java
+6 -3
View File
@@ -600,6 +600,7 @@ public class RecurringDepositAccount extends SavingsAccount {
if (interestPostingUpToDate == null) { if (interestPostingUpToDate == null) {
interestPostingUpToDate = closeDate; interestPostingUpToDate = closeDate;
} }
this.setClosedOnDate(closeDate);
final MathContext mc = MathContext.DECIMAL64; final MathContext mc = MathContext.DECIMAL64;
boolean isInterestTransfer = false; boolean isInterestTransfer = false;
LocalDate postInterestOnDate = null; LocalDate postInterestOnDate = null;
@@ -642,7 +643,6 @@ public class RecurringDepositAccount extends SavingsAccount {
// correct. // correct.
recalculateDailyBalances(Money.zero(this.currency), interestPostingUpToDate); recalculateDailyBalances(Money.zero(this.currency), interestPostingUpToDate);
} }
this.summary.updateSummary(this.currency, this.savingsAccountTransactionSummaryWrapper, this.transactions); this.summary.updateSummary(this.currency, this.savingsAccountTransactionSummaryWrapper, this.transactions);
} }
@@ -1083,8 +1083,7 @@ public class RecurringDepositAccount extends SavingsAccount {
final Integer lockinPeriodFrequency = this.lockinPeriodFrequency; final Integer lockinPeriodFrequency = this.lockinPeriodFrequency;
final boolean withdrawalFeeApplicableForTransfer = false; final boolean withdrawalFeeApplicableForTransfer = false;
LocalDate now = DateUtils.getLocalDateOfTenant(); LocalDate now = getClosedOnDate();
newAccountTermAndPreClosure.updateExpectedFirstDepositDate(now); newAccountTermAndPreClosure.updateExpectedFirstDepositDate(now);
RecurringDepositAccount rdAccount = RecurringDepositAccount.createNewActivatedAccount(client, group, product, savingsOfficer, RecurringDepositAccount rdAccount = RecurringDepositAccount.createNewActivatedAccount(client, group, product, savingsOfficer,
@@ -1121,6 +1120,10 @@ public class RecurringDepositAccount extends SavingsAccount {
this.activatedOnDate = now.toDate(); this.activatedOnDate = now.toDate();
} }
public void setClosedOnDate(final LocalDate closedOnDate) {
this.closedOnDate = closedOnDate.toDate();
}
@Override @Override
protected boolean isTransferInterestToOtherAccount() { protected boolean isTransferInterestToOtherAccount() {
return this.accountTermAndPreClosure.isTransferInterestToLinkedAccount(); return this.accountTermAndPreClosure.isTransferInterestToLinkedAccount();