Merge branch 'dev' into angular20

src/app/products/loan-products/loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component.ts

@@ -146,6 +146,7 @@ export class LoanProductSettingsStepComponent implements OnInit {
       multiDisburseLoan: this.loanProductsTemplate.multiDisburseLoan,
       maxTrancheCount: this.loanProductsTemplate.maxTrancheCount,
       outstandingLoanBalance: this.loanProductsTemplate.outstandingLoanBalance,
+      allowFullTermForTranche: this.loanProductsTemplate.allowFullTermForTranche,
       enableDownPayment: this.loanProductsTemplate.enableDownPayment,
       enableInstallmentLevelDelinquency: this.loanProductsTemplate.enableInstallmentLevelDelinquency,
       loanScheduleType: this.loanProductsTemplate.loanScheduleType.code,
@@ -314,6 +315,7 @@ export class LoanProductSettingsStepComponent implements OnInit {
       isInterestRecalculationEnabled: [false],
       holdGuaranteeFunds: [false],
       multiDisburseLoan: [false],
+      allowFullTermForTranche: [false],
       allowAttributeConfiguration: [true],
       allowPartialPeriodInterestCalculation: [false],
       allowAttributeOverrides: this.formBuilder.group({
@@ -553,7 +555,10 @@ export class LoanProductSettingsStepComponent implements OnInit {
       } else {
         this.loanProductSettingsForm.removeControl('maxTrancheCount');
         this.loanProductSettingsForm.removeControl('outstandingLoanBalance');
-        this.loanProductSettingsForm.patchValue({ disallowExpectedDisbursements: false });
+        this.loanProductSettingsForm.patchValue({
+          disallowExpectedDisbursements: false,
+          allowFullTermForTranche: false
+        });
       }
     });
 
@@ -647,6 +652,7 @@ export class LoanProductSettingsStepComponent implements OnInit {
         this.advancedTransactionProcessingStrategyDisabled = false;
         this.isAdvancedTransactionProcessingStrategy = false;
         this.loanProductSettingsForm.removeControl('chargeOffBehaviour');
+        this.loanProductSettingsForm.patchValue({ allowFullTermForTranche: false });
       } else {
         // Only Advanced Payment Allocation Strategy
         this.transactionProcessingStrategyDataBase.some((cn: CodeName) => {

src/app/products/loan-products/models/loan-product.model.ts

@@ -97,6 +97,7 @@ export interface LoanProduct {
   creditAllocationAllocationTypes: OptionData[];
   multiDisburseLoan: boolean;
   maxTrancheCount: number;
+  allowFullTermForTranche: boolean;
   disallowExpectedDisbursements: boolean;
   allowApprovedDisbursedAmountsOverApplied: boolean;
   overAppliedNumber: number;