[fineract] branch develop updated: AL-12-month-end-dates-reschedule-issue-fix

[av...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

avikg pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git


The following commit(s) were added to refs/heads/develop by this push:
     new 2a94104  AL-12-month-end-dates-reschedule-issue-fix
     new 2e6a7e9  Merge pull request #1210 from fynmanoj/AL-12
2a94104 is described below

commit 2a941047a2392f96127cf8c2939cb4be8d7ca716
Author: admin <ad...@admins-MacBook-Pro.local>
AuthorDate: Mon Jul 27 16:57:33 2020 +0530

    AL-12-month-end-dates-reschedule-issue-fix
---
 .../org/apache/fineract/portfolio/calendar/service/CalendarUtils.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarUtils.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarUtils.java
index 4e16eef..972e5fc 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarUtils.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarUtils.java
@@ -74,7 +74,7 @@ public class CalendarUtils {
 
     public static LocalDate adjustDate(final LocalDate date, final LocalDate seedDate, final PeriodFrequencyType frequencyType) {
         LocalDate adjustedVal = date;
-        if (frequencyType.isMonthly() && seedDate.getDayOfMonth() > 28) {
+        if (frequencyType.isMonthly() && seedDate.getDayOfMonth() > 28 && date.getDayOfMonth() > 28) {
             switch (date.getMonthOfYear()) {
                 case 2:
                     if (date.year().isLeap()) {