FINERACT-2520: Add disbursement charges to total repayment expected

Signed-off-by: Wiki05 <vigneshdev1022@gmail.com>
Signed-off-by: Vignesh <vigneshdev1022@gmail.com>

Author: Wiki05

fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/ProgressiveLoanScheduleGenerator.java

@@ -144,6 +144,10 @@ public LoanScheduleModel generate(final MathContext mc, final LoanApplicationTer
             scheduleParams.incrementPeriodNumber();
         }
 
+        if (chargesDueAtTimeOfDisbursement.compareTo(BigDecimal.ZERO) > 0) {
+            scheduleParams.addTotalRepaymentExpected(Money.of(currency, chargesDueAtTimeOfDisbursement, mc));
+        }
+
         if (loanApplicationTerms.isMultiDisburseLoan()) {
             processDisbursements(loanApplicationTerms, disbursementDataList, scheduleParams, interestScheduleModel, periods,
                     chargesDueAtTimeOfDisbursement, true, mc);
@@ -317,6 +321,8 @@ private void processDisbursements(final LoanApplicationTerms loanApplicationTerm
                     .disbursement(disbursementData.disbursementDate(), disbursedAmount, chargesDueAtTimeOfDisbursement);
             periods.add(disbursementPeriod);
 
+            scheduleParams.addTotalRepaymentExpected(Money.of(loanApplicationTerms.getCurrency(), chargesDueAtTimeOfDisbursement, mc));
+
             // validation check for amount not exceeds specified max
             // amount as per the configuration
             if (loanApplicationTerms.isMultiDisburseLoan() && loanApplicationTerms.getMaxOutstandingBalance() != null) {