FINERACT-2421: Disbursement charge amount incorrect calculation

Jose Alberto Hernandez · adamsaghy · commit 1d1876edfd45 · 2026-02-05T10:41:19.000+01:00
diff --git a/fineract-core/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargeTimeType.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargeTimeType.java
@@ -221,4 +221,9 @@ public boolean isSharesPurchase() {
     public boolean isSharesRedeem() {
         return this.equals(ChargeTimeType.SHARE_REDEEM);
     }
+
+    public boolean isDisbursementOrTrancheDisbursementCharge() {
+        return isTimeOfDisbursement() || isTrancheDisbursement();
+    }
+
 }
diff --git a/fineract-e2e-tests-runner/src/test/resources/features/LoanCharge.feature b/fineract-e2e-tests-runner/src/test/resources/features/LoanCharge.feature
diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/service/DelinquencyReadPlatformServiceImpl.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/service/DelinquencyReadPlatformServiceImpl.java
@@ -216,7 +216,7 @@ public BigDecimal calculateAvailableDisbursementAmountWithOverApplied(@NonNull f
         // Calculate available amount: (approved + over applied) - expected tranches - disbursed - capitalized income
         if (loan.isMultiDisburmentLoan() && loan.getDisbursementDetails() != null) {
             final BigDecimal expectedDisbursementAmount = loan.getDisbursementDetails().stream()
-                    .filter(detail -> detail.actualDisbursementDate() == null).map(LoanDisbursementDetails::principal)
+                    .filter(detail -> detail.actualDisbursementDate() == null).map(LoanDisbursementDetails::getPrincipal)
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
             approvedWithOverApplied = approvedWithOverApplied.subtract(expectedDisbursementAmount);
         }
diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/data/DisbursementData.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/data/DisbursementData.java
@@ -22,6 +22,8 @@
 import java.time.LocalDate;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.Accessors;
 import org.apache.fineract.infrastructure.core.service.DateUtils;
 import org.apache.fineract.portfolio.loanaccount.loanschedule.domain.LoanScheduleType;
 
@@ -30,6 +32,7 @@
  */
 @RequiredArgsConstructor
 @Getter
+@Accessors(chain = true)
 public final class DisbursementData implements LoanPrincipalRelatedDataHolder, Comparable<DisbursementData> {
 
     private final Long id;
@@ -41,6 +44,8 @@ public final class DisbursementData implements LoanPrincipalRelatedDataHolder, C
     private final String loanChargeId;
     private final BigDecimal chargeAmount;
     private final BigDecimal waivedChargeAmount;
+    @Setter
+    private BigDecimal disburseChargeAmount;
 
     // import fields
     private transient Integer rowIndex;
diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
@@ -814,7 +814,7 @@ public BigDecimal getDisbursedAmount() {
         if (isMultiDisburmentLoan()) {
             for (LoanDisbursementDetails disbursementDetail : getDisbursementDetails()) {
                 if (disbursementDetail.actualDisbursementDate() != null) {
-                    principal = principal.add(disbursementDetail.principal());
+                    principal = principal.add(disbursementDetail.getPrincipal());
                 }
             }
             return principal;
@@ -999,7 +999,7 @@ public BigDecimal getDisburseAmountForTemplate() {
         if (!details.isEmpty()) {
             principal = BigDecimal.ZERO;
             for (LoanDisbursementDetails disbursementDetails : details) {
-                principal = principal.add(disbursementDetails.principal());
+                principal = principal.add(disbursementDetails.getPrincipal());
             }
         }
         return principal;
@@ -1303,7 +1303,7 @@ public void clearDisbursementDetails() {
     public LoanDisbursementDetails getDisbursementDetails(final LocalDate transactionDate, final BigDecimal transactionAmount) {
         for (LoanDisbursementDetails disbursementDetail : this.disbursementDetails) {
             if (!disbursementDetail.isReversed() && disbursementDetail.getDisbursementDate().equals(transactionDate)
-                    && (disbursementDetail.principal().compareTo(transactionAmount) == 0)) {
+                    && (disbursementDetail.getPrincipal().compareTo(transactionAmount) == 0)) {
                 return disbursementDetail;
             }
         }
@@ -1317,7 +1317,7 @@ public BigDecimal getPrincipalAmountForRepaymentSchedule() {
             Collection<LoanDisbursementDetails> loanDisburseDetails = this.getDisbursementDetails();
             for (LoanDisbursementDetails details : loanDisburseDetails) {
                 if (details.actualDisbursementDate() != null) {
-                    principalAmount = principalAmount.add(details.principal());
+                    principalAmount = principalAmount.add(details.getPrincipal());
                 }
             }
         } else if (isApproved()) {
diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanDisbursementDetails.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanDisbursementDetails.java
@@ -26,10 +26,12 @@
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.Objects;
+import lombok.Getter;
 import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
 import org.apache.fineract.infrastructure.core.service.DateUtils;
 import org.apache.fineract.portfolio.loanaccount.data.DisbursementData;
 
+@Getter
 @Entity
 @Table(name = "m_loan_disbursement_detail")
 public class LoanDisbursementDetails extends AbstractPersistableCustom<Long> {
@@ -107,10 +109,6 @@ public LocalDate actualDisbursementDate() {
         return this.actualDisbursementDate;
     }
 
-    public BigDecimal principal() {
-        return this.principal;
-    }
-
     public void updatePrincipal(BigDecimal principal) {
         this.principal = principal;
     }
diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanRepaymentScheduleProcessingWrapper.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanRepaymentScheduleProcessingWrapper.java
@@ -108,7 +108,7 @@ private Money cumulativeFeeChargesDueWithin(final LocalDate periodStart, final L
                                 && loanCharge.getLoan().isMultiDisburmentLoan()) {
                             for (final LoanDisbursementDetails loanDisbursementDetails : loanCharge.getLoan().getDisbursementDetails()) {
                                 if (!DateUtils.isAfter(loanDisbursementDetails.expectedDisbursementDate(), loanCharge.getDueDate())) {
-                                    amount = amount.add(loanDisbursementDetails.principal());
+                                    amount = amount.add(loanDisbursementDetails.getPrincipal());
                                 }
                             }
                         } else {
diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/SingleLoanChargeRepaymentScheduleProcessingWrapper.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/SingleLoanChargeRepaymentScheduleProcessingWrapper.java
@@ -132,7 +132,7 @@ private Money calcChargeDue(final LocalDate periodStart, final LocalDate periodE
             // Then we need to get as of this loan charge due date how much amount disbursed.
             for (final LoanDisbursementDetails loanDisbursementDetails : loan.getDisbursementDetails()) {
                 if (!DateUtils.isAfter(loanDisbursementDetails.expectedDisbursementDate(), loanCharge.getDueDate())) {
-                    baseAmount = MathUtil.add(baseAmount, loanDisbursementDetails.principal());
+                    baseAmount = MathUtil.add(baseAmount, loanDisbursementDetails.getPrincipal());
                 }
             }
         } else {
diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/mapper/LoanMapper.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/mapper/LoanMapper.java
@@ -94,7 +94,7 @@ public List<DisbursementData> getDisbursementData(final Loan loan) {
             BigDecimal waivedChargeAmount = null;
             disbursementData.add(
                     new DisbursementData(loanDisbursementDetails.getId(), loan.getId(), expectedDisbursementDate, actualDisbursementDate,
-                            loanDisbursementDetails.principal(), loan.getNetDisbursalAmount(), null, null, waivedChargeAmount));
+                            loanDisbursementDetails.getPrincipal(), loan.getNetDisbursalAmount(), null, null, waivedChargeAmount));
         }
 
         return disbursementData;
diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanApprovedAmountWritePlatformServiceImpl.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanApprovedAmountWritePlatformServiceImpl.java
@@ -88,7 +88,7 @@ public CommandProcessingResult modifyLoanAvailableDisbursementAmount(Long loanId
         changes.put("oldApprovedAmount", loan.getApprovedPrincipal());
 
         BigDecimal expectedDisbursementAmount = loan.getDisbursementDetails().stream().filter(t -> t.actualDisbursementDate() == null)
-                .map(LoanDisbursementDetails::principal).reduce(BigDecimal.ZERO, BigDecimal::add);
+                .map(LoanDisbursementDetails::getPrincipal).reduce(BigDecimal.ZERO, BigDecimal::add);
 
         BigDecimal oldAvailableDisbursement = loan.getApprovedPrincipal().subtract(loan.getSummary().getTotalPrincipal())
                 .subtract(expectedDisbursementAmount);
diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanBalanceService.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanBalanceService.java
@@ -187,7 +187,7 @@ public void updateLoanToLastDisbursalState(final Loan loan, final LoanDisburseme
                 charge.resetToOriginal(loan.getCurrency());
             }
         }
-        loan.getLoanRepaymentScheduleDetail().setPrincipal(loan.getDisbursedAmount().subtract(disbursementDetail.principal()));
+        loan.getLoanRepaymentScheduleDetail().setPrincipal(loan.getDisbursedAmount().subtract(disbursementDetail.getPrincipal()));
         disbursementDetail.updateActualDisbursementDate(null);
         disbursementDetail.reverse();
         updateLoanSummaryDerivedFields(loan);
diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeService.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeService.java
@@ -251,15 +251,17 @@ public BigDecimal calculateAmountPercentageAppliedTo(final Loan loan, final Loan
             case PERCENT_OF_AMOUNT_AND_INTEREST -> {
                 final BigDecimal totalInterestCharged = loan.getTotalInterest();
                 if (loan.isMultiDisburmentLoan() && loanCharge.isDisbursementCharge()) {
-                    yield getTotalAllTrancheDisbursementAmount(loan).getAmount().add(totalInterestCharged);
+                    yield sumMultiDisbursementAmounts(loan, false).getAmount().add(totalInterestCharged);
+                } else if (loan.isMultiDisburmentLoan() && loanCharge.isTrancheDisbursementCharge()) {
+                    yield sumMultiDisbursementAmounts(loan, true).getAmount().add(totalInterestCharged);
                 } else {
                     yield loan.getPrincipal().getAmount().add(totalInterestCharged);
                 }
             }
             case PERCENT_OF_INTEREST -> loan.getTotalInterest();
             case PERCENT_OF_DISBURSEMENT_AMOUNT -> {
                 if (loanCharge.getTrancheDisbursementCharge() != null) {
-                    yield loanCharge.getTrancheDisbursementCharge().getloanDisbursementDetails().principal();
+                    yield loanCharge.getTrancheDisbursementCharge().getloanDisbursementDetails().getPrincipal();
                 } else {
                     yield loan.getPrincipal().getAmount();
                 }
@@ -449,7 +451,7 @@ public void update(final LoanCharge loanCharge, final BigDecimal amount, final L
                     if (loanCharge.getLoan().isMultiDisburmentLoan() && loanCharge.isSpecifiedDueDate()) {
                         for (final LoanDisbursementDetails loanDisbursementDetails : loanCharge.getLoan().getDisbursementDetails()) {
                             if (!DateUtils.isAfter(loanDisbursementDetails.expectedDisbursementDate(), loanCharge.getDueDate())) {
-                                amountPercentageAppliedTo = amountPercentageAppliedTo.add(loanDisbursementDetails.principal());
+                                amountPercentageAppliedTo = amountPercentageAppliedTo.add(loanDisbursementDetails.getPrincipal());
                             }
                         }
                     } else {
@@ -465,7 +467,7 @@ public void update(final LoanCharge loanCharge, final BigDecimal amount, final L
                 break;
                 case PERCENT_OF_DISBURSEMENT_AMOUNT:
                     LoanTrancheDisbursementCharge loanTrancheDisbursementCharge = loanCharge.getLoanTrancheDisbursementCharge();
-                    amountPercentageAppliedTo = loanTrancheDisbursementCharge.getloanDisbursementDetails().principal();
+                    amountPercentageAppliedTo = loanTrancheDisbursementCharge.getloanDisbursementDetails().getPrincipal();
                 break;
                 default:
                 break;
@@ -850,14 +852,23 @@ private void update(final LoanCharge loanCharge, final BigDecimal amount, final
         }
     }
 
-    private Money getTotalAllTrancheDisbursementAmount(final Loan loan) {
-        Money amount = Money.zero(loan.getCurrency());
+    private Money sumMultiDisbursementAmounts(final Loan loan, final boolean isTrancheDisbursement) {
         if (loan.isMultiDisburmentLoan()) {
-            for (final LoanDisbursementDetails loanDisbursementDetail : loan.getDisbursementDetails()) {
-                amount = amount.plus(loanDisbursementDetail.principal());
+            final List<LoanDisbursementDetails> loanDisbursementDetails = loan.getDisbursementDetails();
+            if (loan.isOpen() || !loanDisbursementDetails.isEmpty()) {
+                if (isTrancheDisbursement) {
+                    return Money.of(loan.getCurrency(), loanDisbursementDetails.stream() //
+                            .map(LoanDisbursementDetails::getPrincipal) //
+                            .reduce(BigDecimal.ZERO, BigDecimal::add));
+                }
+                return Money.of(loan.getCurrency(), loanDisbursementDetails.get(0).getPrincipal());
+            } else if (loan.isSubmittedAndPendingApproval()) {
+                return Money.of(loan.getCurrency(), loan.getProposedPrincipal());
+            } else if (loan.isApproved()) {
+                return Money.of(loan.getCurrency(), loan.getApprovedPrincipal());
             }
         }
-        return amount;
+        return Money.zero(loan.getCurrency());
     }
 
     private List<Long> fetchAllLoanChargeIds(final Loan loan) {
@@ -884,15 +895,16 @@ private Money calculateInstallmentChargeAmount(final Loan loan, final ChargeCalc
 
     private BigDecimal getDerivedAmountForCharge(final Loan loan, final LoanCharge loanCharge) {
         BigDecimal amount = BigDecimal.ZERO;
-        if (loan.isMultiDisburmentLoan() && loanCharge.getCharge().getChargeTimeType().equals(ChargeTimeType.DISBURSEMENT.getValue())) {
-            amount = loan.getApprovedPrincipal();
+        final ChargeTimeType chargeTimeType = ChargeTimeType.fromInt(loanCharge.getCharge().getChargeTimeType());
+        if (loan.isMultiDisburmentLoan() && chargeTimeType.isDisbursementOrTrancheDisbursementCharge()) {
+            return sumMultiDisbursementAmounts(loan, chargeTimeType.isTrancheDisbursement()).getAmount();
         } else {
             // If charge type is specified due date and loan is multi disburment loan.
             // Then we need to get as of this loan charge due date how much amount disbursed.
             if (loanCharge.isSpecifiedDueDate() && loan.isMultiDisburmentLoan()) {
                 for (final LoanDisbursementDetails loanDisbursementDetails : loan.getDisbursementDetails()) {
                     if (!DateUtils.isAfter(loanDisbursementDetails.expectedDisbursementDate(), loanCharge.getDueDate())) {
-                        amount = amount.add(loanDisbursementDetails.principal());
+                        amount = amount.add(loanDisbursementDetails.getPrincipal());
                     }
                 }
             } else {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanAccountDomainServiceJpa.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanAccountDomainServiceJpa.java
@@ -962,7 +962,7 @@ private void updateInstallmentsPostDate(final Loan loan, final LocalDate transac
 
         for (LoanDisbursementDetails loanDisbursementDetails : loan.getDisbursementDetails()) {
             if (loanDisbursementDetails.actualDisbursementDate() == null) {
-                totalPrincipal = Money.of(currency, totalPrincipal.getAmount().subtract(loanDisbursementDetails.principal()));
+                totalPrincipal = Money.of(currency, totalPrincipal.getAmount().subtract(loanDisbursementDetails.getPrincipal()));
             }
         }
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleCalculationPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleCalculationPlatformServiceImpl.java
@@ -175,8 +175,8 @@ private LoanScheduleData constructLoanScheduleData(Loan loan) {
         for (LoanRepaymentScheduleInstallment installment : installments) {
             if (loanDisbursementDetails != null
                     && !DateUtils.isAfter(loanDisbursementDetails.expectedDisbursementDateAsLocalDate(), installment.getDueDate())) {
-                outstanding = outstanding.plus(loanDisbursementDetails.principal());
-                principal = principal.plus(loanDisbursementDetails.principal());
+                outstanding = outstanding.plus(loanDisbursementDetails.getPrincipal());
+                principal = principal.plus(loanDisbursementDetails.getPrincipal());
                 if (disbursementItr.hasNext()) {
                     loanDisbursementDetails = disbursementItr.next();
                 } else {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/serialization/LoanApprovedAmountValidatorImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/serialization/LoanApprovedAmountValidatorImpl.java
@@ -97,7 +97,7 @@ public void validateLoanApprovedAmountModification(JsonCommand command) {
 
             BigDecimal totalPrincipalOnLoan = loan.getSummary().getTotalPrincipal();
             BigDecimal totalExpectedPrincipal = loan.getDisbursementDetails().stream().filter(t -> t.actualDisbursementDate() == null)
-                    .map(LoanDisbursementDetails::principal).reduce(BigDecimal.ZERO, BigDecimal::add);
+                    .map(LoanDisbursementDetails::getPrincipal).reduce(BigDecimal.ZERO, BigDecimal::add);
             if (MathUtil.isLessThan(newApprovedAmount, totalPrincipalOnLoan.add(totalExpectedPrincipal))) {
                 baseDataValidator.reset().parameter(LoanApiConstants.amountParameterName)
                         .failWithCode("less.than.disbursed.principal.and.capitalized.income");
@@ -145,7 +145,7 @@ public void validateLoanAvailableDisbursementAmountModification(final JsonComman
             }
 
             BigDecimal expectedDisbursementAmount = loan.getDisbursementDetails().stream().filter(t -> t.actualDisbursementDate() == null)
-                    .map(LoanDisbursementDetails::principal).reduce(BigDecimal.ZERO, BigDecimal::add);
+                    .map(LoanDisbursementDetails::getPrincipal).reduce(BigDecimal.ZERO, BigDecimal::add);
 
             BigDecimal maximumAvailableDisbursementThreshold = maximumThresholdForApprovedAmount
                     .subtract(loan.getSummary().getTotalPrincipal()).subtract(expectedDisbursementAmount);
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeAssembler.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeAssembler.java
@@ -174,7 +174,7 @@ public Set<LoanCharge> fromParsedJson(final JsonElement element, List<LoanDisbur
                                         } else {
                                             if (disbursementDetail.expectedDisbursementDateAsLocalDate().equals(expectedDisbursementDate)) {
                                                 final LoanCharge loanCharge = createNewWithoutLoan(chargeDefinition,
-                                                        disbursementDetail.principal(), amount, chargeTime, chargeCalculation,
+                                                        disbursementDetail.getPrincipal(), amount, chargeTime, chargeCalculation,
                                                         disbursementDetail.expectedDisbursementDateAsLocalDate(), chargePaymentModeEnum,
                                                         numberOfRepayments, externalId);
                                                 loanCharges.add(loanCharge);
@@ -191,8 +191,8 @@ public Set<LoanCharge> fromParsedJson(final JsonElement element, List<LoanDisbur
                                 LoanTrancheDisbursementCharge loanTrancheDisbursementCharge = null;
                                 for (LoanDisbursementDetails disbursementDetail : disbursementDetails) {
                                     if (ChargeTimeType.TRANCHE_DISBURSEMENT.getValue().equals(chargeDefinition.getChargeTimeType())) {
-                                        final LoanCharge loanCharge = createNewWithoutLoan(chargeDefinition, disbursementDetail.principal(),
-                                                amount, chargeTime, chargeCalculation,
+                                        final LoanCharge loanCharge = createNewWithoutLoan(chargeDefinition,
+                                                disbursementDetail.getPrincipal(), amount, chargeTime, chargeCalculation,
                                                 disbursementDetail.expectedDisbursementDateAsLocalDate(), chargePaymentModeEnum,
                                                 numberOfRepayments, externalId);
                                         loanCharges.add(loanCharge);
@@ -309,7 +309,7 @@ public LoanCharge createNewFromJson(final Loan loan, final Charge chargeDefiniti
             amountPercentageAppliedTo = BigDecimal.ZERO;
             for (final LoanDisbursementDetails loanDisbursementDetails : loan.getDisbursementDetails()) {
                 if (!DateUtils.isAfter(loanDisbursementDetails.expectedDisbursementDate(), dueDate)) {
-                    amountPercentageAppliedTo = amountPercentageAppliedTo.add(loanDisbursementDetails.principal());
+                    amountPercentageAppliedTo = amountPercentageAppliedTo.add(loanDisbursementDetails.getPrincipal());
                 }
             }
         }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeWritePlatformServiceImpl.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanDisbursementService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanDisbursementService.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanRepaymentScheduleService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanRepaymentScheduleService.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
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/starter/LoanAccountConfiguration.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/starter/LoanAccountConfiguration.java

Original file line number	Diff line number	Diff line change
`@@ -221,4 +221,9 @@ public boolean isSharesPurchase() {`
`221`	`221`	`public boolean isSharesRedeem() {`
`222`	`222`	`return this.equals(ChargeTimeType.SHARE_REDEEM);`
`223`	`223`	`}`
	`224`	`+`
	`225`	`+ public boolean isDisbursementOrTrancheDisbursementCharge() {`
	`226`	`+ return isTimeOfDisbursement() \|\| isTrancheDisbursement();`
	`227`	`+ }`
	`228`	`+`
`224`	`229`	`}`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ public BigDecimal calculateAvailableDisbursementAmountWithOverApplied(@NonNull f`
`216`	`216`	`// Calculate available amount: (approved + over applied) - expected tranches - disbursed - capitalized income`
`217`	`217`	`if (loan.isMultiDisburmentLoan() && loan.getDisbursementDetails() != null) {`
`218`	`218`	`final BigDecimal expectedDisbursementAmount = loan.getDisbursementDetails().stream()`
`219`		`- .filter(detail -> detail.actualDisbursementDate() == null).map(LoanDisbursementDetails::principal)`
	`219`	`+ .filter(detail -> detail.actualDisbursementDate() == null).map(LoanDisbursementDetails::getPrincipal)`
`220`	`220`	`.reduce(BigDecimal.ZERO, BigDecimal::add);`
`221`	`221`	`approvedWithOverApplied = approvedWithOverApplied.subtract(expectedDisbursementAmount);`
`222`	`222`	`}`
Original file line number	Diff line number	Diff line change
`@@ -814,7 +814,7 @@ public BigDecimal getDisbursedAmount() {`
`814`	`814`	`if (isMultiDisburmentLoan()) {`
`815`	`815`	`for (LoanDisbursementDetails disbursementDetail : getDisbursementDetails()) {`
`816`	`816`	`if (disbursementDetail.actualDisbursementDate() != null) {`
`817`		`- principal = principal.add(disbursementDetail.principal());`
	`817`	`+ principal = principal.add(disbursementDetail.getPrincipal());`
`818`	`818`	`}`
`819`	`819`	`}`
`820`	`820`	`return principal;`
`@@ -999,7 +999,7 @@ public BigDecimal getDisburseAmountForTemplate() {`
`999`	`999`	`if (!details.isEmpty()) {`
`1000`	`1000`	`principal = BigDecimal.ZERO;`
`1001`	`1001`	`for (LoanDisbursementDetails disbursementDetails : details) {`
`1002`		`- principal = principal.add(disbursementDetails.principal());`
	`1002`	`+ principal = principal.add(disbursementDetails.getPrincipal());`
`1003`	`1003`	`}`
`1004`	`1004`	`}`
`1005`	`1005`	`return principal;`
`@@ -1303,7 +1303,7 @@ public void clearDisbursementDetails() {`
`1303`	`1303`	`public LoanDisbursementDetails getDisbursementDetails(final LocalDate transactionDate, final BigDecimal transactionAmount) {`
`1304`	`1304`	`for (LoanDisbursementDetails disbursementDetail : this.disbursementDetails) {`
`1305`	`1305`	`if (!disbursementDetail.isReversed() && disbursementDetail.getDisbursementDate().equals(transactionDate)`
`1306`		`- && (disbursementDetail.principal().compareTo(transactionAmount) == 0)) {`
	`1306`	`+ && (disbursementDetail.getPrincipal().compareTo(transactionAmount) == 0)) {`
`1307`	`1307`	`return disbursementDetail;`
`1308`	`1308`	`}`
`1309`	`1309`	`}`
`@@ -1317,7 +1317,7 @@ public BigDecimal getPrincipalAmountForRepaymentSchedule() {`
`1317`	`1317`	`Collection<LoanDisbursementDetails> loanDisburseDetails = this.getDisbursementDetails();`
`1318`	`1318`	`for (LoanDisbursementDetails details : loanDisburseDetails) {`
`1319`	`1319`	`if (details.actualDisbursementDate() != null) {`
`1320`		`- principalAmount = principalAmount.add(details.principal());`
	`1320`	`+ principalAmount = principalAmount.add(details.getPrincipal());`
`1321`	`1321`	`}`
`1322`	`1322`	`}`
`1323`	`1323`	`} else if (isApproved()) {`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ private Money cumulativeFeeChargesDueWithin(final LocalDate periodStart, final L`
`108`	`108`	`&& loanCharge.getLoan().isMultiDisburmentLoan()) {`
`109`	`109`	`for (final LoanDisbursementDetails loanDisbursementDetails : loanCharge.getLoan().getDisbursementDetails()) {`
`110`	`110`	`if (!DateUtils.isAfter(loanDisbursementDetails.expectedDisbursementDate(), loanCharge.getDueDate())) {`
`111`		`- amount = amount.add(loanDisbursementDetails.principal());`
	`111`	`+ amount = amount.add(loanDisbursementDetails.getPrincipal());`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ private Money calcChargeDue(final LocalDate periodStart, final LocalDate periodE`
`132`	`132`	`// Then we need to get as of this loan charge due date how much amount disbursed.`
`133`	`133`	`for (final LoanDisbursementDetails loanDisbursementDetails : loan.getDisbursementDetails()) {`
`134`	`134`	`if (!DateUtils.isAfter(loanDisbursementDetails.expectedDisbursementDate(), loanCharge.getDueDate())) {`
`135`		`- baseAmount = MathUtil.add(baseAmount, loanDisbursementDetails.principal());`
	`135`	`+ baseAmount = MathUtil.add(baseAmount, loanDisbursementDetails.getPrincipal());`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public List<DisbursementData> getDisbursementData(final Loan loan) {`
`94`	`94`	`BigDecimal waivedChargeAmount = null;`
`95`	`95`	`disbursementData.add(`
`96`	`96`	`new DisbursementData(loanDisbursementDetails.getId(), loan.getId(), expectedDisbursementDate, actualDisbursementDate,`
`97`		`- loanDisbursementDetails.principal(), loan.getNetDisbursalAmount(), null, null, waivedChargeAmount));`
	`97`	`+ loanDisbursementDetails.getPrincipal(), loan.getNetDisbursalAmount(), null, null, waivedChargeAmount));`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`return disbursementData;`