SU-530 (#1434)

* SU-503
fiterlatam · Dec 24, 2024 · 6045929 · 6045929
1 parent 017ef75
commit 6045929
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
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
@@ -1179,11 +1179,11 @@ public BigDecimal getTotalInterest() {
 
     private BigDecimal calculatePerInstallmentChargeAmount(final LoanCharge loanCharge) {
         return calculatePerInstallmentChargeAmount(loanCharge.getChargeCalculation(), loanCharge.getPercentage(),
-                loanCharge.amountOrPercentage(), loanCharge.getCharge().getParentChargeId());
+                loanCharge.amountOrPercentage(), loanCharge.getCharge().getParentChargeId(), loanCharge);
     }
 
     public BigDecimal calculatePerInstallmentChargeAmount(final ChargeCalculationType calculationType, final BigDecimal percentage,
-            BigDecimal chargeAmount, Long parentChargeId) {
+            BigDecimal chargeAmount, Long parentChargeId, LoanCharge loanCharge) {
         Money amount = Money.zero(getCurrency());
         if (calculationType.isCustomPercentageBasedDistributedCharge()) { // Disbursement based mandatory insurance or
                                                                           // aval
@@ -1207,7 +1207,8 @@ public BigDecimal calculatePerInstallmentChargeAmount(final ChargeCalculationTyp
         this.outstandingBalance = this.loanRepaymentScheduleDetail.getPrincipal();
         List<LoanRepaymentScheduleInstallment> installments = getRepaymentScheduleInstallmentsIgnoringTotalGrace();
         for (final LoanRepaymentScheduleInstallment installment : installments) {
-            amount = amount.plus(calculateInstallmentChargeAmount(calculationType, percentage, installment, chargeAmount, parentChargeId));
+            amount = amount.plus(
+                    calculateInstallmentChargeAmount(calculationType, percentage, installment, chargeAmount, parentChargeId, loanCharge));
         }
         return amount.getAmount();
     }
@@ -1226,7 +1227,7 @@ public BigDecimal getTotalWrittenOff() {
     private Money outstandingBalance = null;
 
     private Money calculateInstallmentChargeAmount(final ChargeCalculationType calculationType, final BigDecimal percentage,
-            final LoanRepaymentScheduleInstallment installment, BigDecimal chargeAmount, Long parentChargeId) {
+            final LoanRepaymentScheduleInstallment installment, BigDecimal chargeAmount, Long parentChargeId, LoanCharge loanCharge) {
         Money amount = Money.zero(getCurrency());
         Money percentOf = Money.zero(getCurrency());
         switch (calculationType) {
@@ -1279,7 +1280,11 @@ private Money calculateInstallmentChargeAmount(final ChargeCalculationType calcu
         } else if (calculationType.isPercentageOfAnotherCharge() && calculationType.equals(ChargeCalculationType.ACHG)) { // Term/VAT
                                                                                                                           // on
                                                                                                                           // insurance
-            amount = amount.plus(percentOf.getAmount().multiply(percentage).divide(BigDecimal.valueOf(100), 0, RoundingMode.HALF_UP));
+            if (loanCharge != null && loanCharge.isVatChargeOfHonoCharge()) {
+                amount = amount.plus(Money.of(getCurrency(), loanCharge.getVatAmountOfHonoCharge(installment.getInstallmentNumber())));
+            } else {
+                amount = amount.plus(percentOf.getAmount().multiply(percentage).divide(BigDecimal.valueOf(100), 0, RoundingMode.HALF_UP));
+            }
         } else if (calculationType.isCustomPercentageOfOutstandingPrincipalCharge()) {
             Integer numberOfRepayments = this.getLoanProductRelatedDetail().getNumberOfRepayments();
             List<LoanRepaymentScheduleInstallment> graceInstallments = this.getRepaymentScheduleInstallments().stream()
@@ -5834,7 +5839,7 @@ public List<LoanInstallmentCharge> generateInstallmentLoanCharges(final LoanChar
                     }
                 } else {
                     amount = calculateInstallmentChargeAmount(loanCharge.getChargeCalculation(), loanCharge.getPercentage(), installment,
-                            loanCharge.amountOrPercentage(), loanCharge.getCharge().getParentChargeId()).getAmount();
+                            loanCharge.amountOrPercentage(), loanCharge.getCharge().getParentChargeId(), loanCharge).getAmount();
                 }
                 if (((loanCharge.isCustomFlatDistributedCharge() || loanCharge.isCustomPercentageBasedDistributedCharge()
                         || loanCharge.isCustomPercentageOfOutstandingPrincipalCharge())

diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanCharge.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanCharge.java
@@ -641,7 +641,7 @@ public Map<String, Object> update(final JsonCommand command, final BigDecimal am
                     loanCharge = BigDecimal.ZERO;
                     if (isInstalmentFee()) {
                         loanCharge = this.loan.calculatePerInstallmentChargeAmount(ChargeCalculationType.fromInt(this.chargeCalculation),
-                                this.percentage, this.amountOrPercentage, this.getCharge().getParentChargeId());
+                                this.percentage, this.amountOrPercentage, this.getCharge().getParentChargeId(), this);
                     }
                     if (loanCharge.compareTo(BigDecimal.ZERO) == 0) {
                         loanCharge = percentageOf(this.amountPercentageAppliedTo);

diff --git a/.../src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeAssembler.java b/.../src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeAssembler.java
@@ -493,7 +493,7 @@ public LoanCharge createNewFromJson(final Loan loan, final Charge chargeDefiniti
             } else {
                 loanCharge = loan.calculatePerInstallmentChargeAmount(
                         ChargeCalculationType.fromInt(chargeDefinition.getChargeCalculation()), percentage, null,
-                        chargeDefinition.getParentChargeId());
+                        chargeDefinition.getParentChargeId(), null);
             }
         }