WEB-172 Merging all changes from main branch into dev branch (#2450)

2025-05-13 20:32:32 -06:00
parent c8d857f3cb
commit e643c64711
29 changed files with 331 additions and 95 deletions
@@ -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