This is an automated email from the ASF dual-hosted git repository. adamsaghy pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git
commit 49e8475bbe4140a1dd6e139a1d11192074a8d58a Merge: d43a0e61dd 078d1e6491 Author: Adam Saghy <[email protected]> AuthorDate: Wed Nov 11 10:36:00 2026 +0000 Merge pull request #6768 from openMF/FINERACT-2972/progressive-loan-non-working-day-shift-for-repayment-schedule FINERACT-2972: Fix Progressive Loan Schedule Generator For Non-Working Days .../test/stepdef/common/OfficeStepDef.java | 19 ++ .../resources/features/LoanWorkingDays.feature | 109 +++++++++++ .../domain/DefaultScheduledDateGenerator.java | 63 ++++--- .../domain/DefaultScheduledDateGeneratorTest.java | 203 ++++++++++++++++++++- 4 files changed, 361 insertions(+), 33 deletions(-) diff --cc fineract-provider/src/test/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/DefaultScheduledDateGeneratorTest.java index 9df2d5f231,bf86f64721..e108d2f15a --- a/fineract-provider/src/test/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/DefaultScheduledDateGeneratorTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/DefaultScheduledDateGeneratorTest.java @@@ -231,9 -365,19 +366,19 @@@ public class DefaultScheduledDateGenera final LocalDate expectedDisbursementDate, final LocalDate submittedOnDate, final LocalDate calculatedFirstRepaymentDate, final int numberOfRepayments, final PeriodFrequencyType repaymentFrequency, final Integer fixedLength, final MonthEndDueDateStrategy monthEndDueDateStrategy, final HolidayDetailDTO holidayDetailDTO) { + return createLoanApplicationTerms(currency, principalAmount, expectedDisbursementDate, submittedOnDate, + calculatedFirstRepaymentDate, numberOfRepayments, repaymentFrequency, fixedLength, monthEndDueDateStrategy, + holidayDetailDTO, CUMULATIVE); + } + + private LoanApplicationTerms createLoanApplicationTerms(final ApplicationCurrency currency, final Money principalAmount, + final LocalDate expectedDisbursementDate, final LocalDate submittedOnDate, final LocalDate calculatedFirstRepaymentDate, + final int numberOfRepayments, final PeriodFrequencyType repaymentFrequency, final Integer fixedLength, + final MonthEndDueDateStrategy monthEndDueDateStrategy, final HolidayDetailDTO holidayDetailDTO, + final LoanScheduleType loanScheduleType) { return LoanApplicationTerms.assembleFrom(currency.toData(), 1, repaymentFrequency, numberOfRepayments, 1, repaymentFrequency, null, - INVALID, EQUAL_PRINCIPAL, FLAT, ZERO, repaymentFrequency, ZERO, SAME_AS_REPAYMENT_PERIOD, false, principalAmount, - expectedDisbursementDate, null, calculatedFirstRepaymentDate, null, null, null, null, null, + null, null, INVALID, EQUAL_PRINCIPAL, FLAT, ZERO, repaymentFrequency, ZERO, SAME_AS_REPAYMENT_PERIOD, false, + principalAmount, expectedDisbursementDate, null, calculatedFirstRepaymentDate, null, null, null, null, null, Money.of(fromApplicationCurrency(currency), ZERO), false, null, EMPTY_LIST, BigDecimal.valueOf(36_000L), null, DaysInMonthType.ACTUAL, DaysInYearType.ACTUAL, false, null, null, null, null, null, ZERO, null, NONE, null, ZERO, EMPTY_LIST, true, 0, false, holidayDetailDTO, false, false, false, null, false, false, null, false, DISBURSEMENT_DATE,
