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

Merge branch 'FINERACT-117' into develop

Browse Source
This commit is contained in:
Nazeer Hussain Shaik
2017-03-13 17:29:04 +05:30
parent 121df4eb08 d32aeabe66
commit b5c130736c
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
+7 -6
View File
@@ -2570,14 +2570,15 @@ public class Loan extends AbstractPersistableCustom<Long> {
* Ability to regenerate the repayment schedule based on the loans current * Ability to regenerate the repayment schedule based on the loans current
* details/state. * details/state.
*/ */
public void regenerateRepaymentSchedule(final ScheduleGeneratorDTO scheduleGeneratorDTO, AppUser currentUser) { public void regenerateRepaymentSchedule(final ScheduleGeneratorDTO scheduleGeneratorDTO, final AppUser currentUser) {
final LoanScheduleModel loanSchedule = regenerateScheduleModel(scheduleGeneratorDTO); final LoanScheduleModel loanSchedule = regenerateScheduleModel(scheduleGeneratorDTO);
if (loanSchedule == null) { return; }
updateLoanSchedule(loanSchedule, currentUser); updateLoanSchedule(loanSchedule, currentUser);
Set<LoanCharge> charges = this.charges(); final Set<LoanCharge> charges = this.charges();
for (LoanCharge loanCharge : charges) { for (final LoanCharge loanCharge : charges) {
recalculateLoanCharge(loanCharge, scheduleGeneratorDTO.getPenaltyWaitPeriod()); if (!loanCharge.isWaived()) {
recalculateLoanCharge(loanCharge, scheduleGeneratorDTO.getPenaltyWaitPeriod());
}
} }
} }