From e643c64711dff7982ee3f4ebae7b103fd4d9ec9e Mon Sep 17 00:00:00 2001
From: Gopi Kishan <gkishan1kyt@gmail.com>
Date: Wed, 14 May 2025 08:02:32 +0530
Subject: [PATCH] WEB-172 Merging all changes from main branch into dev branch
 (#2450)

---
 src/app/directives/directives.module.ts       |  7 +-
 .../directives/validate-on-focus.directive.ts | 18 +++++
 .../loans-account-schedule-step.component.ts  |  1 +
 .../make-repayment.component.ts               | 31 +++++--
 .../loan-tranche-details.component.ts         |  3 +-
 .../transactions-tab.component.html           | 10 +++
 .../transactions-tab.component.ts             | 80 ++++++++++++++++++-
 src/app/loans/loans.service.ts                |  5 ++
 .../models/loan-transaction-type.model.ts     |  2 +
 .../create-charge.component.html              | 17 ++--
 .../create-charge/create-charge.component.ts  | 76 ++++++++++--------
 .../edit-charge/edit-charge.component.html    | 21 ++---
 .../edit-charge/edit-charge.component.ts      | 73 +++++++++--------
 .../validators/max-number-value.validator.ts  | 26 ++++++
 .../validators/min-number-value.validator.ts  | 26 ++++++
 src/assets/translations/cs-CS.json            |  2 +
 src/assets/translations/de-DE.json            |  2 +
 src/assets/translations/en-US.json            |  2 +
 src/assets/translations/es-CL.json            |  2 +
 src/assets/translations/es-MX.json            |  2 +
 src/assets/translations/fr-FR.json            |  2 +
 src/assets/translations/it-IT.json            |  2 +
 src/assets/translations/ko-KO.json            |  2 +
 src/assets/translations/lt-LT.json            |  2 +
 src/assets/translations/lv-LV.json            |  2 +
 src/assets/translations/ne-NE.json            |  2 +
 src/assets/translations/pt-PT.json            |  2 +
 src/assets/translations/sw-SW.json            |  2 +
 src/environments/.env.ts                      |  4 +-
 29 files changed, 331 insertions(+), 95 deletions(-)
 create mode 100644 src/app/directives/validate-on-focus.directive.ts
 create mode 100644 src/app/shared/validators/max-number-value.validator.ts
 create mode 100644 src/app/shared/validators/min-number-value.validator.ts

diff --git a/src/app/directives/directives.module.ts b/src/app/directives/directives.module.ts
index 968e837fb..5bcc19a9f 100644
--- a/src/app/directives/directives.module.ts
+++ b/src/app/directives/directives.module.ts
@@ -5,6 +5,7 @@ import { CommonModule } from '@angular/common';
 /** Custom Directives */
 import { HasPermissionDirective } from './has-permission/has-permission.directive';
 import { FormatAmountDirective } from './format-amount.directive';
+import { ValidateOnFocusDirective } from './validate-on-focus.directive';
 
 /**
  *  Directives Module
@@ -17,11 +18,13 @@ import { FormatAmountDirective } from './format-amount.directive';
   ],
   declarations: [
     HasPermissionDirective,
-    FormatAmountDirective
+    FormatAmountDirective,
+    ValidateOnFocusDirective
   ],
   exports: [
     HasPermissionDirective,
-    FormatAmountDirective
+    FormatAmountDirective,
+    ValidateOnFocusDirective
   ]
 })
 export class DirectivesModule {}
diff --git a/src/app/directives/validate-on-focus.directive.ts b/src/app/directives/validate-on-focus.directive.ts
new file mode 100644
index 000000000..d5d5a9be6
--- /dev/null
+++ b/src/app/directives/validate-on-focus.directive.ts
@@ -0,0 +1,18 @@
+import { Directive, ElementRef, HostListener } from '@angular/core';
+import { NgControl } from '@angular/forms';
+
+@Directive({
+  selector: '[mifosxValidateOnFocus]'
+})
+export class ValidateOnFocusDirective {
+  constructor(
+    private control: NgControl,
+    private el: ElementRef
+  ) {}
+
+  @HostListener('focus')
+  onFocus() {
+    this.control.control?.markAsTouched();
+    this.control.control?.updateValueAndValidity();
+  }
+}
diff --git a/src/app/loans/loans-account-stepper/loans-account-schedule-step/loans-account-schedule-step.component.ts b/src/app/loans/loans-account-stepper/loans-account-schedule-step/loans-account-schedule-step.component.ts
index 466c58524..dca4c448b 100644
--- a/src/app/loans/loans-account-stepper/loans-account-schedule-step/loans-account-schedule-step.component.ts
+++ b/src/app/loans/loans-account-stepper/loans-account-schedule-step/loans-account-schedule-step.component.ts
@@ -42,6 +42,7 @@ export class LoansAccountScheduleStepComponent {
       dateFormat
     );
     delete payload['enableInstallmentLevelDelinquency'];
+    delete payload['externalId'];
 
     this.loansService.calculateLoanSchedule(payload).subscribe((response: any) => {
       this.repaymentScheduleDetails = response;
diff --git a/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.ts b/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.ts
index d9edc0d1d..ddceadfcc 100644
--- a/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.ts
+++ b/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.ts
@@ -58,6 +58,7 @@ export class MakeRepaymentComponent implements OnInit {
    * and initialize with the required values
    */
   ngOnInit() {
+    this.command = this.dataObject.type.code.split('.')[1];
     this.maxDate = this.settingsService.businessDate;
     this.createRepaymentLoanForm();
     this.setRepaymentLoanDetails();
@@ -76,14 +77,27 @@ export class MakeRepaymentComponent implements OnInit {
         this.settingsService.businessDate,
         Validators.required
       ],
-      transactionAmount: [
-        '',
-        Validators.required
-      ],
       externalId: '',
       paymentTypeId: '',
       note: ''
     });
+
+    if (this.isCapitalizedIncome()) {
+      this.repaymentLoanForm.addControl(
+        'transactionAmount',
+        new UntypedFormControl('', [
+          Validators.required,
+          Validators.min(0.001),
+          Validators.max(this.dataObject.amount)])
+      );
+    } else {
+      this.repaymentLoanForm.addControl(
+        'transactionAmount',
+        new UntypedFormControl('', [
+          Validators.required,
+          Validators.min(0.001)])
+      );
+    }
   }
 
   setRepaymentLoanDetails() {
@@ -114,7 +128,14 @@ export class MakeRepaymentComponent implements OnInit {
   }
 
   showDetails(): boolean {
-    return !['capitalizedIncome'].includes(this.command);
+    return !this.isCapitalizedIncome();
+  }
+
+  isCapitalizedIncome(): boolean {
+    return [
+      'capitalizedIncome',
+      'capitalizedIncomeAdjustment'
+    ].includes(this.command);
   }
 
   /** Submits the repayment form */
diff --git a/src/app/loans/loans-view/loan-tranche-details/loan-tranche-details.component.ts b/src/app/loans/loans-view/loan-tranche-details/loan-tranche-details.component.ts
index 63c2dac93..d661755a3 100644
--- a/src/app/loans/loans-view/loan-tranche-details/loan-tranche-details.component.ts
+++ b/src/app/loans/loans-view/loan-tranche-details/loan-tranche-details.component.ts
@@ -212,7 +212,8 @@ export class LoanTrancheDetailsComponent implements OnInit {
           item.expectedDisbursementDate,
           this.settingsService.dateFormat
         ),
-        principal: item.principal
+        principal: item.principal,
+        id: item.id
       });
     });
 
diff --git a/src/app/loans/loans-view/transactions-tab/transactions-tab.component.html b/src/app/loans/loans-view/transactions-tab/transactions-tab.component.html
index abcaca159..a94608338 100644
--- a/src/app/loans/loans-view/transactions-tab/transactions-tab.component.html
+++ b/src/app/loans/loans-view/transactions-tab/transactions-tab.component.html
@@ -194,6 +194,16 @@
               <span>{{ 'labels.menus.Undo Re-Amortize' | translate }}</span>
             </button>
           </span>
+          <span *ngIf="isCapitalizedIncome(transaction.type) && !transaction.manuallyReversed">
+            <button
+              mat-menu-item
+              *mifosxHasPermission="'CAPITALIZED_INCOME_LOAN'"
+              (click)="capitalizedIncomeAdjustmentTransaction(transaction, $event)"
+            >
+              <mat-icon><fa-icon icon="coins" size="sm"></fa-icon></mat-icon>
+              <span>{{ 'labels.menus.Capitalized Income Adjustment' | translate }}</span>
+            </button>
+          </span>
           <span *ngIf="viewJournalEntry(transaction.type)">
             <button
               mat-menu-item
diff --git a/src/app/loans/loans-view/transactions-tab/transactions-tab.component.ts b/src/app/loans/loans-view/transactions-tab/transactions-tab.component.ts
index a1f9a9b99..685b129ab 100644
--- a/src/app/loans/loans-view/transactions-tab/transactions-tab.component.ts
+++ b/src/app/loans/loans-view/transactions-tab/transactions-tab.component.ts
@@ -12,6 +12,11 @@ import { ConfirmationDialogComponent } from 'app/shared/confirmation-dialog/conf
 import { TranslateService } from '@ngx-translate/core';
 import { LoanTransaction } from 'app/products/loan-products/models/loan-account.model';
 import { LoanTransactionType } from 'app/loans/models/loan-transaction-type.model';
+import { FormfieldBase } from 'app/shared/form-dialog/formfield/model/formfield-base';
+import { InputBase } from 'app/shared/form-dialog/formfield/model/input-base';
+import { FormDialogComponent } from 'app/shared/form-dialog/form-dialog.component';
+import { AlertService } from 'app/core/alert/alert.service';
+import { DatepickerBase } from 'app/shared/form-dialog/formfield/model/datepicker-base';
 
 @Component({
   selector: 'mifosx-transactions-tab',
@@ -80,7 +85,8 @@ export class TransactionsTabComponent implements OnInit {
     private dialog: MatDialog,
     private loansService: LoansService,
     private translateService: TranslateService,
-    private settingsService: SettingsService
+    private settingsService: SettingsService,
+    private alertService: AlertService
   ) {
     this.route.parent.parent.data.subscribe((data: { loanDetailsData: any }) => {
       this.transactionsData = data.loanDetailsData.transactions;
@@ -332,6 +338,10 @@ export class TransactionsTabComponent implements OnInit {
     return transactionType.reAmortize || transactionType.code === 'loanTransactionType.reAmortize';
   }
 
+  private isCapitalizedIncome(transactionType: LoanTransactionType): boolean {
+    return transactionType.capitalizedIncome || transactionType.code === 'loanTransactionType.capitalizedIncome';
+  }
+
   private isReAgoeOrReAmortize(transactionType: LoanTransactionType): boolean {
     return this.isReAmortize(transactionType) || this.isReAge(transactionType);
   }
@@ -354,4 +364,72 @@ export class TransactionsTabComponent implements OnInit {
     }
     return true;
   }
+
+  capitalizedIncomeAdjustmentTransaction(transaction: LoanTransaction) {
+    const accountId = `${this.loanId}`;
+    this.loansService
+      .getLoanTransactionActionTemplate(accountId, 'capitalizedIncomeAdjustment', `${transaction.id}`)
+      .subscribe((response: any) => {
+        const transactionDate = response.date || transaction.date;
+        const transactionAmount = response.amount || transaction.amount;
+        const formfields: FormfieldBase[] = [
+          new DatepickerBase({
+            controlName: 'transactionDate',
+            label: 'Date',
+            value: this.dateUtils.parseDate(transactionDate),
+            type: 'datetime-local',
+            required: true,
+            minDate: transaction.date,
+            order: 1
+          }),
+          new InputBase({
+            controlName: 'amount',
+            label: 'Amount',
+            value: transactionAmount,
+            type: 'number',
+            required: true,
+            max: transactionAmount,
+            min: 0.001,
+            order: 2
+          })
+
+        ];
+        const data = {
+          title: `Adjustment ${transaction.type.value} Transaction`,
+          layout: { addButtonText: 'Adjustment' },
+          formfields: formfields
+        };
+        const chargebackDialogRef = this.dialog.open(FormDialogComponent, { data });
+        chargebackDialogRef.afterClosed().subscribe((response: { data: any }) => {
+          if (response.data) {
+            const dateFormat = this.settingsService.dateFormat;
+
+            if (response.data.value.amount <= transactionAmount) {
+              const locale = this.settingsService.language.code;
+              const payload = {
+                transactionDate: this.dateUtils.formatDate(response.data.value.transactionDate, dateFormat),
+                transactionAmount: response.data.value.amount,
+                locale,
+                dateFormat
+              };
+              this.loansService
+                .executeLoansAccountTransactionsCommand(
+                  accountId,
+                  'capitalizedIncomeAdjustment',
+                  payload,
+                  transaction.id
+                )
+                .subscribe(() => {
+                  this.router.navigate(['../'], { relativeTo: this.route });
+                });
+            } else {
+              this.alertService.alert({
+                type: 'BusinessRule',
+                message: 'Chargeback amount must be lower or equal to: ' + transaction.amount
+              });
+            }
+          }
+        });
+      });
+  }
 }
diff --git a/src/app/loans/loans.service.ts b/src/app/loans/loans.service.ts
index f505b3486..02a4a0a8b 100644
--- a/src/app/loans/loans.service.ts
+++ b/src/app/loans/loans.service.ts
@@ -32,6 +32,11 @@ export class LoansService {
     return this.http.get(`/loans/${loanId}/transactions/template`, { params: httpParams });
   }
 
+  getLoanTransactionActionTemplate(loanId: string, command: string, transactionId: string): Observable<any> {
+    const httpParams = new HttpParams().set('command', command).set('transactionId', transactionId);
+    return this.http.get(`/loans/${loanId}/transactions/template`, { params: httpParams });
+  }
+
   getLoanPrepayLoanActionTemplate(loanId: string, transactionDate: string): Observable<any> {
     if (!transactionDate) {
       transactionDate = this.dateUtils.formatDate(this.settingsService.businessDate, this.settingsService.dateFormat);
diff --git a/src/app/loans/models/loan-transaction-type.model.ts b/src/app/loans/models/loan-transaction-type.model.ts
index 7fd5487d6..abe22b9f4 100644
--- a/src/app/loans/models/loan-transaction-type.model.ts
+++ b/src/app/loans/models/loan-transaction-type.model.ts
@@ -32,4 +32,6 @@ export interface LoanTransactionType {
   downPayment: boolean;
   reAge: boolean;
   reAmortize: boolean;
+  capitalizedIncome: boolean;
+  capitalizedIncomeAdjustment: boolean;
 }
diff --git a/src/app/products/charges/create-charge/create-charge.component.html b/src/app/products/charges/create-charge/create-charge.component.html
index a02f78055..603d5f147 100644
--- a/src/app/products/charges/create-charge/create-charge.component.html
+++ b/src/app/products/charges/create-charge/create-charge.component.html
@@ -200,15 +200,22 @@
   -->
             <mat-form-field fxFlex="48%" *ngIf="showMinMaxCap()">
               <mat-label>{{ 'labels.inputs.Minimum Charge Cap' | translate }}</mat-label>
-              <input matInput formControlName="minCap" />
+              <input matInput autofocus formControlName="minCap" mifosxValidateOnFocus />
+              <mat-error *ngIf="chargeForm.controls.minCap.hasError('maxValue')">
+                {{ 'errors.validation.msg.loanproduct.maximumGap.not.greater.than.specified.number' | translate }} ({{
+                  chargeForm.controls.maxCap.value
+                }})
+              </mat-error>
             </mat-form-field>
 
             <mat-form-field fxFlex="48%" *ngIf="showMinMaxCap()">
               <mat-label>{{ 'labels.inputs.Maximum Charge Cap' | translate }}</mat-label>
-              <input matInput [min]="chargeForm.value.minCap" formControlName="maxCap" />
-              <mat-error *ngIf="chargeForm.errors?.minGreaterThanMax">
-                {{ 'labels.inputs.Maximum Charge Cap' | translate }} ({{ repeatEveryLabel }})
-                <strong>{{ 'labels.commons.must higher than Minimum Charge Cap' | translate }}</strong>
+              <input matInput autofocus formControlName="maxCap" mifosxValidateOnFocus />
+
+              <mat-error *ngIf="chargeForm.controls.maxCap.hasError('minValue')">
+                {{ 'errors.validation.msg.loanproduct.maximumGap.not.greater.than.specified.number' | translate }} ({{
+                  chargeForm.controls.minCap.value
+                }})
               </mat-error>
             </mat-form-field>
 
diff --git a/src/app/products/charges/create-charge/create-charge.component.ts b/src/app/products/charges/create-charge/create-charge.component.ts
index ce1b0d7a4..3b24ab293 100644
--- a/src/app/products/charges/create-charge/create-charge.component.ts
+++ b/src/app/products/charges/create-charge/create-charge.component.ts
@@ -7,7 +7,8 @@ import { Router, ActivatedRoute } from '@angular/router';
 import { ProductsService } from '../../products.service';
 import { SettingsService } from 'app/settings/settings.service';
 import { Dates } from 'app/core/utils/dates';
-import { minLessThanOrEqualMaxValidator } from 'app/shared/validators/min-max-values.validator';
+import { minNumberValueValidator } from 'app/shared/validators/min-number-value.validator';
+import { maxNumberValueValidator } from 'app/shared/validators/max-number-value.validator';
 
 /**
  * Create charge component.
@@ -80,40 +81,45 @@ export class CreateChargeComponent implements OnInit {
    * Creates the charge form.
    */
   createChargeForm() {
-    this.chargeForm = this.formBuilder.group(
-      {
-        chargeAppliesTo: [
-          '',
-          Validators.required
-        ],
-        name: [
-          '',
-          Validators.required
-        ],
-        currencyCode: [
-          '',
-          Validators.required
-        ],
-        chargeTimeType: [
-          '',
-          Validators.required
-        ],
-        chargeCalculationType: [
-          '',
-          Validators.required
-        ],
-        amount: [
-          '',
-          Validators.required
-        ],
-        active: [false],
-        penalty: [false],
-        taxGroupId: [''],
-        minCap: [''],
-        maxCap: ['']
-      },
-      { validators: minLessThanOrEqualMaxValidator('minCap', 'maxCap') }
-    );
+    this.chargeForm = this.formBuilder.group({
+      chargeAppliesTo: [
+        '',
+        Validators.required
+      ],
+      name: [
+        '',
+        Validators.required
+      ],
+      currencyCode: [
+        '',
+        Validators.required
+      ],
+      chargeTimeType: [
+        '',
+        Validators.required
+      ],
+      chargeCalculationType: [
+        '',
+        Validators.required
+      ],
+      amount: [
+        '',
+        [
+          Validators.required,
+          Validators.pattern('^\\s*(?=.*[1-9])\\d*(?:\\.\\d+)?\\s*$')]
+      ],
+      active: [false],
+      penalty: [false],
+      taxGroupId: [null],
+      minCap: [
+        null,
+        [maxNumberValueValidator('maxCap')]
+      ],
+      maxCap: [
+        null,
+        [minNumberValueValidator('minCap')]
+      ]
+    });
   }
 
   /**
diff --git a/src/app/products/charges/edit-charge/edit-charge.component.html b/src/app/products/charges/edit-charge/edit-charge.component.html
index 10260d889..75f62a3b8 100644
--- a/src/app/products/charges/edit-charge/edit-charge.component.html
+++ b/src/app/products/charges/edit-charge/edit-charge.component.html
@@ -112,12 +112,11 @@
             "
           >
             <mat-label>{{ 'labels.inputs.Minimum Charge Cap' | translate }}</mat-label>
-            <input matInput autofocus formControlName="minCap" />
-            <mat-error
-              *ngIf="chargeForm.controls.maxCap.hasError('minGreaterThanMax') || chargeForm.errors?.minGreaterThanMax"
-            >
-              {{ 'labels.inputs.Minimum Charge Cap' | translate }} ({{ repeatEveryLabel }})
-              <strong>{{ 'labels.commons.must lower than Maximum Charge Cap' | translate }}</strong>
+            <input matInput autofocus formControlName="minCap" mifosxValidateOnFocus />
+            <mat-error *ngIf="chargeForm.controls.minCap.hasError('maxValue')">
+              {{ 'errors.validation.msg.loanproduct.maximumGap.not.greater.than.specified.number' | translate }} ({{
+                chargeForm.controls.maxCap.value
+              }})
             </mat-error>
           </mat-form-field>
           <mat-form-field
@@ -137,10 +136,12 @@
             "
           >
             <mat-label>{{ 'labels.inputs.Maximum Charge Cap' | translate }}</mat-label>
-            <input matInput [min]="chargeForm.value.minCap" autofocus formControlName="maxCap" />
-            <mat-error *ngIf="chargeForm.hasError('minGreaterThanMax') || chargeForm.errors?.minGreaterThanMax">
-              {{ 'labels.inputs.Maximum Charge Cap' | translate }} ({{ repeatEveryLabel }})
-              <strong>{{ 'labels.commons.must be equal or greater than Minimum Charge Cap' | translate }}</strong>
+            <input matInput autofocus formControlName="maxCap" mifosxValidateOnFocus />
+
+            <mat-error *ngIf="chargeForm.controls.maxCap.hasError('minValue')">
+              {{ 'errors.validation.msg.loanproduct.maximumGap.not.greater.than.specified.number' | translate }} ({{
+                chargeForm.controls.minCap.value
+              }})
             </mat-error>
           </mat-form-field>
 
diff --git a/src/app/products/charges/edit-charge/edit-charge.component.ts b/src/app/products/charges/edit-charge/edit-charge.component.ts
index 4340497bd..f91cfa203 100644
--- a/src/app/products/charges/edit-charge/edit-charge.component.ts
+++ b/src/app/products/charges/edit-charge/edit-charge.component.ts
@@ -6,7 +6,8 @@ import { ActivatedRoute, Router } from '@angular/router';
 /** Custom Services */
 import { ProductsService } from 'app/products/products.service';
 import { SettingsService } from 'app/settings/settings.service';
-import { minLessThanOrEqualMaxValidator } from 'app/shared/validators/min-max-values.validator';
+import { maxNumberValueValidator } from 'app/shared/validators/max-number-value.validator';
+import { minNumberValueValidator } from 'app/shared/validators/min-number-value.validator';
 
 /**
  * Edit Charge component.
@@ -74,39 +75,43 @@ export class EditChargeComponent implements OnInit {
   editChargeForm() {
     this.showFeeOptions = this.chargeData.feeInterval && this.chargeData.feeInterval > 0;
 
-    this.chargeForm = this.formBuilder.group(
-      {
-        name: [
-          this.chargeData.name,
-          Validators.required
-        ],
-        chargeAppliesTo: [
-          { value: this.chargeData.chargeAppliesTo.id, disabled: true },
-          Validators.required
-        ],
-        currencyCode: [
-          this.chargeData.currency.code,
-          Validators.required
-        ],
-        amount: [
-          this.chargeData.amount,
-          Validators.required
-        ],
-        active: [this.chargeData.active],
-        penalty: [this.chargeData.penalty],
-        minCap: [this.chargeData.minCap],
-        maxCap: [this.chargeData.maxCap],
-        chargeTimeType: [
-          this.chargeData.chargeTimeType.id,
-          Validators.required
-        ],
-        chargeCalculationType: [
-          this.chargeData.chargeCalculationType.id,
-          Validators.required
-        ]
-      },
-      { validators: minLessThanOrEqualMaxValidator('minCap', 'maxCap') }
-    );
+    this.chargeForm = this.formBuilder.group({
+      name: [
+        this.chargeData.name,
+        Validators.required
+      ],
+      chargeAppliesTo: [
+        { value: this.chargeData.chargeAppliesTo.id, disabled: true },
+        Validators.required
+      ],
+      currencyCode: [
+        this.chargeData.currency.code,
+        Validators.required
+      ],
+      amount: [
+        this.chargeData.amount,
+        Validators.required
+      ],
+      active: [this.chargeData.active],
+      penalty: [this.chargeData.penalty],
+      minCap: [
+        this.chargeData.minCap || null,
+        ,
+        [maxNumberValueValidator('maxCap')]
+      ],
+      maxCap: [
+        this.chargeData.maxCap || null,
+        [minNumberValueValidator('minCap')]
+      ],
+      chargeTimeType: [
+        this.chargeData.chargeTimeType.id,
+        Validators.required
+      ],
+      chargeCalculationType: [
+        this.chargeData.chargeCalculationType.id,
+        Validators.required
+      ]
+    });
     switch (this.chargeData.chargeAppliesTo.value) {
       case 'Loan': {
         this.chargeTimeTypeOptions = this.chargeData.loanChargeTimeTypeOptions;
diff --git a/src/app/shared/validators/max-number-value.validator.ts b/src/app/shared/validators/max-number-value.validator.ts
new file mode 100644
index 000000000..3b0aa7a6a
--- /dev/null
+++ b/src/app/shared/validators/max-number-value.validator.ts
@@ -0,0 +1,26 @@
+import { AbstractControl, ValidatorFn } from '@angular/forms';
+
+export function maxNumberValueValidator(maxControlName: string): ValidatorFn {
+  return (control: AbstractControl): { [key: string]: any } | null => {
+    const maxControl = control.parent?.get(maxControlName);
+    if (!maxControl || !control.value) {
+      return null;
+    }
+
+    let maxValue = maxControl.value;
+    if (typeof maxValue === 'undefined') {
+      return null;
+    }
+    if (typeof maxValue !== 'number') {
+      maxValue = maxValue * 1;
+    }
+    let controlValue = control.value;
+    if (typeof controlValue !== 'number') {
+      controlValue = controlValue * 1;
+    }
+    if (controlValue > maxValue) {
+      return { maxValue: { requiredMax: maxValue, actual: controlValue } };
+    }
+    return null;
+  };
+}
diff --git a/src/app/shared/validators/min-number-value.validator.ts b/src/app/shared/validators/min-number-value.validator.ts
new file mode 100644
index 000000000..23bfb727a
--- /dev/null
+++ b/src/app/shared/validators/min-number-value.validator.ts
@@ -0,0 +1,26 @@
+import { AbstractControl, ValidatorFn } from '@angular/forms';
+
+export function minNumberValueValidator(minControlName: string): ValidatorFn {
+  return (control: AbstractControl): { [key: string]: any } | null => {
+    const minControl = control.parent?.get(minControlName);
+    if (!minControl || !control.value) {
+      return null;
+    }
+
+    let minValue = minControl.value;
+    if (typeof minValue === 'undefined') {
+      return null;
+    }
+    if (typeof minValue !== 'number') {
+      minValue = minValue * 1;
+    }
+    let controlValue = control.value;
+    if (typeof controlValue !== 'number') {
+      controlValue = controlValue * 1;
+    }
+    if (controlValue < minValue) {
+      return { minValue: { requiredMin: minValue, actual: controlValue } };
+    }
+    return null;
+  };
+}
diff --git a/src/assets/translations/cs-CS.json b/src/assets/translations/cs-CS.json
index b10bd7354..f095e2a2b 100644
--- a/src/assets/translations/cs-CS.json
+++ b/src/assets/translations/cs-CS.json
@@ -808,6 +808,7 @@
       "Add Role": "Přidat roli",
       "Add/Edit Currency": "Přidat/upravit měnu",
       "Address": "Adresa",
+      "Adjustment Capitalized Income Transaction": "Úprava Transakce s kapitalizovaným příjmem",
       "Advanced Accounting Rules": "Pokročilá účetní pravidla",
       "All Charges": "Všechny poplatky",
       "All Dividends": "Všechny dividendy",
@@ -2502,6 +2503,7 @@
       "Breadcrumbs": "Strouhanka",
       "Calculate Interest": "Vypočítejte úrok",
       "Capitalized Income": "Kapitalizovaný příjem",
+      "Capitalized Income Adjustment": "Úprava kapitalizovaného příjmu",
       "Centers": "Střediska",
       "Charge-Off": "Charge-Off",
       "Chart of Accounts": "Graf účtů",
diff --git a/src/assets/translations/de-DE.json b/src/assets/translations/de-DE.json
index e49f4a6c4..bae3d6e18 100644
--- a/src/assets/translations/de-DE.json
+++ b/src/assets/translations/de-DE.json
@@ -809,6 +809,7 @@
       "Add Role": "Rolle hinzufügen",
       "Add/Edit Currency": "Währung hinzufügen/bearbeiten",
       "Address": "Adresse",
+      "Adjustment Capitalized Income Transaction": "Anpassung der kapitalisierten Einkommenstransaktion",
       "Advanced Accounting Rules": "Erweiterte Buchhaltungsregeln",
       "All Charges": "Alle Anklagen",
       "All Dividends": "Alle Dividenden",
@@ -2502,6 +2503,7 @@
       "Breadcrumbs": "Semmelbrösel",
       "Calculate Interest": "Zinsen berechnen",
       "Capitalized Income": "Kapitalisiertes Einkommen",
+      "Capitalized Income Adjustment": "Anpassung des kapitalisierten Einkommens",
       "Centers": "Zentren",
       "Charge-Off": "Abladen",
       "Chart of Accounts": "Kontenplan",
diff --git a/src/assets/translations/en-US.json b/src/assets/translations/en-US.json
index cd5ad1f27..4f573fb4c 100644
--- a/src/assets/translations/en-US.json
+++ b/src/assets/translations/en-US.json
@@ -814,6 +814,7 @@
       "Add Role": "Add Role",
       "Add/Edit Currency": "Add/Edit Currency",
       "Address": "Address",
+      "Adjustment Capitalized Income Transaction": "Adjustment Capitalized Income Transaction",
       "Advanced Accounting Rules": "Advanced Accounting Rules",
       "All Charges": "All Charges",
       "All Dividends": "All Dividends",
@@ -2509,6 +2510,7 @@
       "Breadcrumbs": "Breadcrumbs",
       "Calculate Interest": "Calculate Interest",
       "Capitalized Income": "Capitalized Income",
+      "Capitalized Income Adjustment": "Capitalized Income Adjustment",
       "Centers": "Centers",
       "Charge-Off": "Charge-Off",
       "Chart of Accounts": "Chart of Accounts",
diff --git a/src/assets/translations/es-CL.json b/src/assets/translations/es-CL.json
index 5dc283577..eafdd544f 100644
--- a/src/assets/translations/es-CL.json
+++ b/src/assets/translations/es-CL.json
@@ -808,6 +808,7 @@
       "Add Role": "Agregar rol",
       "Add/Edit Currency": "Agregar/Editar moneda",
       "Address": "Domicilio",
+      "Adjustment Capitalized Income Transaction": "Ajuste de Transacción de Ingreso Capitalizado",
       "Advanced Accounting Rules": "Reglas de contabilidad avanzadas",
       "All Charges": "Todos los cargos",
       "All Dividends": "Todos los dividendos",
@@ -2502,6 +2503,7 @@
       "Breadcrumbs": "Migas de pan",
       "Calculate Interest": "Calcular interés",
       "Capitalized Income": "Ingreso capitalizado",
+      "Capitalized Income Adjustment": "Ajuste de ingresos capitalizados",
       "Centers": "Centros",
       "Charge-Off": "Cancelación",
       "Chart of Accounts": "Catálogo de cuentas",
diff --git a/src/assets/translations/es-MX.json b/src/assets/translations/es-MX.json
index fe15506a6..afde0cf0f 100644
--- a/src/assets/translations/es-MX.json
+++ b/src/assets/translations/es-MX.json
@@ -808,6 +808,7 @@
       "Add Role": "Agregar rol",
       "Add/Edit Currency": "Agregar/Editar moneda",
       "Address": "Domicilio",
+      "Adjustment Capitalized Income Transaction": "Ajuste Transacción de Ingreso Capitalizado",
       "Advanced Accounting Rules": "Reglas de contabilidad avanzadas",
       "All Charges": "Todos los cargos",
       "All Dividends": "Todos los dividendos",
@@ -2502,6 +2503,7 @@
       "Breadcrumbs": "Migas de pan",
       "Calculate Interest": "Calcular interés",
       "Capitalized Income": "Ingreso capitalizado",
+      "Capitalized Income Adjustment": "Ajuste de ingresos capitalizados",
       "Centers": "Centros",
       "Charge-Off": "Cancelación",
       "Chart of Accounts": "Catálogo de cuentas",
diff --git a/src/assets/translations/fr-FR.json b/src/assets/translations/fr-FR.json
index d2fd30036..273cc451d 100644
--- a/src/assets/translations/fr-FR.json
+++ b/src/assets/translations/fr-FR.json
@@ -809,6 +809,7 @@
       "Add Role": "Ajouter un rôle",
       "Add/Edit Currency": "Ajouter/Modifier une devise",
       "Address": "Adresse",
+      "Adjustment Capitalized Income Transaction": "Transaction de revenu capitalisé d’ajustement",
       "Advanced Accounting Rules": "Règles comptables avancées",
       "All Charges": "Tous les frais",
       "All Dividends": "Tous les dividendes",
@@ -2502,6 +2503,7 @@
       "Breadcrumbs": "Chapelure",
       "Calculate Interest": "Calculer les intérêts",
       "Capitalized Income": "Revenu capitalisé",
+      "Capitalized Income Adjustment": "Ajustement du revenu capitalisé",
       "Centers": "Centres",
       "Charge-Off": "Amortir",
       "Chart of Accounts": "Plan comptable",
diff --git a/src/assets/translations/it-IT.json b/src/assets/translations/it-IT.json
index d9ff351bc..659c5ddec 100644
--- a/src/assets/translations/it-IT.json
+++ b/src/assets/translations/it-IT.json
@@ -809,6 +809,7 @@
       "Add Role": "Aggiungi ruolo",
       "Add/Edit Currency": "Aggiungi/modifica valuta",
       "Address": "Indirizzo",
+      "Adjustment Capitalized Income Transaction": "Operazione di reddito capitalizzato di aggiustamento",
       "Advanced Accounting Rules": "Regole contabili avanzate",
       "All Charges": "Tutte le spese",
       "All Dividends": "Tutti i dividendi",
@@ -2502,6 +2503,7 @@
       "Breadcrumbs": "Briciole di pane",
       "Calculate Interest": "Calcola gli interessi",
       "Capitalized Income": "Reddito capitalizzato",
+      "Capitalized Income Adjustment": "Adeguamento del reddito capitalizzato",
       "Centers": "Centri",
       "Charge-Off": "Addebito",
       "Chart of Accounts": "Piano dei conti",
diff --git a/src/assets/translations/ko-KO.json b/src/assets/translations/ko-KO.json
index de831d7d8..6899cb6ac 100644
--- a/src/assets/translations/ko-KO.json
+++ b/src/assets/translations/ko-KO.json
@@ -809,6 +809,7 @@
       "Add Role": "역할 추가",
       "Add/Edit Currency": "통화 추가/수정",
       "Address": "주소",
+      "Adjustment Capitalized Income Transaction": "조정 자본화 소득 거래",
       "Advanced Accounting Rules": "고급 회계 규칙",
       "All Charges": "모든 요금",
       "All Dividends": "모든 배당금",
@@ -2503,6 +2504,7 @@
       "Breadcrumbs": "빵 부스러기",
       "Calculate Interest": "이자 계산",
       "Capitalized Income": "자본화 소득",
+      "Capitalized Income Adjustment": "자본화 소득 조정",
       "Centers": "센터",
       "Charge-Off": "상각",
       "Chart of Accounts": "계정 목록",
diff --git a/src/assets/translations/lt-LT.json b/src/assets/translations/lt-LT.json
index 109c18915..bf5940a6c 100644
--- a/src/assets/translations/lt-LT.json
+++ b/src/assets/translations/lt-LT.json
@@ -809,6 +809,7 @@
       "Add Role": "Pridėti vaidmenį",
       "Add/Edit Currency": "Pridėti / redaguoti valiutą",
       "Address": "Adresas",
+      "Adjustment Capitalized Income Transaction": "Koregavimo kapitalizuotų pajamų sandoris",
       "Advanced Accounting Rules": "Išplėstinės apskaitos taisyklės",
       "All Charges": "Visi mokesčiai",
       "All Dividends": "Visi dividendai",
@@ -2502,6 +2503,7 @@
       "Breadcrumbs": "Duonos trupiniai",
       "Calculate Interest": "Apskaičiuokite palūkanas",
       "Capitalized Income": "Kapitalizuotos pajamos",
+      "Capitalized Income Adjustment": "Kapitalizuotų pajamų koregavimas",
       "Centers": "Centrai",
       "Charge-Off": "Atsakingas už",
       "Chart of Accounts": "Sąskaitų planas",
diff --git a/src/assets/translations/lv-LV.json b/src/assets/translations/lv-LV.json
index 1ffea86b1..b6491b28b 100644
--- a/src/assets/translations/lv-LV.json
+++ b/src/assets/translations/lv-LV.json
@@ -809,6 +809,7 @@
       "Add Role": "Pievienot lomu",
       "Add/Edit Currency": "Pievienot/rediģēt valūtu",
       "Address": "Adrese",
+      "Adjustment Capitalized Income Transaction": "Korekcija Kapitalizētā ienākuma darījums",
       "Advanced Accounting Rules": "Uzlaboti grāmatvedības noteikumi",
       "All Charges": "Visas maksas",
       "All Dividends": "Visas dividendes",
@@ -2502,6 +2503,7 @@
       "Breadcrumbs": "Maizes drupačas",
       "Calculate Interest": "Aprēķināt procentus",
       "Capitalized Income": "Kapitalizētie ienākumi",
+      "Capitalized Income Adjustment": "Kapitalizēto ienākumu korekcija",
       "Centers": "Centri",
       "Charge-Off": "Charge-Off",
       "Chart of Accounts": "Kontu plāns",
diff --git a/src/assets/translations/ne-NE.json b/src/assets/translations/ne-NE.json
index fabce9d4a..beb7deb8f 100644
--- a/src/assets/translations/ne-NE.json
+++ b/src/assets/translations/ne-NE.json
@@ -809,6 +809,7 @@
       "Add Role": "भूमिका थप्नुहोस्",
       "Add/Edit Currency": "मुद्रा थप्नुहोस्/सम्पादन गर्नुहोस्",
       "Address": "ठेगाना",
+      "Adjustment Capitalized Income Transaction": "समायोजन पूंजीकृत आय लेनदेन",
       "Advanced Accounting Rules": "उन्नत लेखा नियमहरू",
       "All Charges": "सबै शुल्कहरू",
       "All Dividends": "सबै लाभांश",
@@ -2502,6 +2503,7 @@
       "Breadcrumbs": "ब्रेडक्रम्ब्स",
       "Calculate Interest": "ब्याज गणना गर्नुहोस्",
       "Capitalized Income": "पुँजीगत आय",
+      "Capitalized Income Adjustment": "पूंजीकृत आय समायोजन",
       "Centers": "केन्द्रहरू",
       "Charge-Off": "चार्ज-अफ",
       "Chart of Accounts": "लेखाको चार्ट",
diff --git a/src/assets/translations/pt-PT.json b/src/assets/translations/pt-PT.json
index 6605cc30d..d84418418 100644
--- a/src/assets/translations/pt-PT.json
+++ b/src/assets/translations/pt-PT.json
@@ -809,6 +809,7 @@
       "Add Role": "Adicionar função",
       "Add/Edit Currency": "Adicionar/editar moeda",
       "Address": "Endereço",
+      "Adjustment Capitalized Income Transaction": "Transação de Renda Capitalizada de Ajuste",
       "Advanced Accounting Rules": "Regras de contabilidade avançada",
       "All Charges": "Todas as cobranças",
       "All Dividends": "Todos os dividendos",
@@ -2502,6 +2503,7 @@
       "Breadcrumbs": "Migalhas de pão",
       "Calculate Interest": "Calcular juros",
       "Capitalized Income": "Renda Capitalizada",
+      "Capitalized Income Adjustment": "Ajuste de Renda Capitalizada",
       "Centers": "Centros",
       "Charge-Off": "Cobrança",
       "Chart of Accounts": "Plano de contas",
diff --git a/src/assets/translations/sw-SW.json b/src/assets/translations/sw-SW.json
index b99f3eb4e..b45ae3ada 100644
--- a/src/assets/translations/sw-SW.json
+++ b/src/assets/translations/sw-SW.json
@@ -809,6 +809,7 @@
       "Add Role": "Ongeza Jukumu",
       "Add/Edit Currency": "Ongeza/Hariri Sarafu",
       "Address": "Anwani",
+      "Adjustment Capitalized Income Transaction": "Marekebisho ya Muamala wa Mapato ya Mtaji",
       "Advanced Accounting Rules": "Sheria za Juu za Uhasibu",
       "All Charges": "Malipo Yote",
       "All Dividends": "Gawio Zote",
@@ -2502,6 +2503,7 @@
       "Breadcrumbs": "Makombo ya mkate",
       "Calculate Interest": "Hesabu Riba",
       "Capitalized Income": "Mapato ya Mtaji",
+      "Capitalized Income Adjustment": "Marekebisho ya Mapato ya Mtaji",
       "Centers": "Vituo",
       "Charge-Off": "Chaji-Zima",
       "Chart of Accounts": "Chati ya Hesabu",
diff --git a/src/environments/.env.ts b/src/environments/.env.ts
index 284f3d0f9..d559224e0 100644
--- a/src/environments/.env.ts
+++ b/src/environments/.env.ts
@@ -2,8 +2,8 @@
 /* tslint:disable */
 export default {
   'mifos_x': {
-    'version': '250403',
-    'hash': '66449454'
+    'version': '250508',
+    'hash': '3c6b70ad'
   },
   'allow_switching_backend_instance': true
 };