From commits-return-11559-archive-asf-public=cust-asf.ponee.io@fineract.apache.org Thu Aug 13 18:58:18 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mailroute1-lw-us.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with ESMTPS id 7D1C0180644 for ; Thu, 13 Aug 2020 20:58:18 +0200 (CEST) Received: from mail.apache.org (localhost [127.0.0.1]) by mailroute1-lw-us.apache.org (ASF Mail Server at mailroute1-lw-us.apache.org) with SMTP id B0562125E3F for ; Thu, 13 Aug 2020 18:58:17 +0000 (UTC) Received: (qmail 5994 invoked by uid 500); 13 Aug 2020 18:58:17 -0000 Mailing-List: contact commits-help@fineract.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@fineract.apache.org Delivered-To: mailing list commits@fineract.apache.org Received: (qmail 5980 invoked by uid 99); 13 Aug 2020 18:58:17 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Aug 2020 18:58:17 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 4C24C8242E; Thu, 13 Aug 2020 18:58:17 +0000 (UTC) Date: Thu, 13 Aug 2020 18:58:17 +0000 To: "commits@fineract.apache.org" Subject: [fineract] branch develop updated: AL-12-month-end-dates-reschedule-issue-fix MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <159734509679.30618.18277057427413505731@gitbox.apache.org> From: avikg@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: fineract X-Git-Refname: refs/heads/develop X-Git-Reftype: branch X-Git-Oldrev: f67a6a31cc9a2f553c061769de1472e8ce1c325c X-Git-Newrev: 2a941047a2392f96127cf8c2939cb4be8d7ca716 X-Git-Rev: 2a941047a2392f96127cf8c2939cb4be8d7ca716 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 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()) {