You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by na...@apache.org on 2017/05/05 12:04:19 UTC

[1/2] incubator-fineract git commit: #359 daily repayment schedule fix

Repository: incubator-fineract
Updated Branches:
  refs/heads/develop da567018c -> 00e785860


#359 daily repayment schedule fix


Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/716f09ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/716f09ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/716f09ea

Branch: refs/heads/develop
Commit: 716f09eaf0f2467edd61f6c21b71af617ac64068
Parents: 8baf9f4
Author: nazeer1100126 <na...@confluxtechnologies.com>
Authored: Mon Apr 24 16:27:23 2017 +0530
Committer: nazeer1100126 <na...@confluxtechnologies.com>
Committed: Mon Apr 24 16:27:23 2017 +0530

----------------------------------------------------------------------
 .../apache/fineract/portfolio/calendar/service/CalendarUtils.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/716f09ea/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarUtils.java
----------------------------------------------------------------------
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 84c53b1..6360380 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
@@ -485,7 +485,7 @@ public class CalendarUtils {
         if (recur == null) { return null; }
         LocalDate startDate = disbursementDate;
         final LocalDate seedDate = calendar.getStartDateLocalDate();
-        if (isValidRedurringDate(calendar.getRecurrence(), seedDate, startDate, isSkipRepaymentOnFirstDayOfMonth, numberOfDays)) {
+        if (isValidRedurringDate(calendar.getRecurrence(), seedDate, startDate, isSkipRepaymentOnFirstDayOfMonth, numberOfDays) && !frequency.equals(Recur.DAILY)) {
             startDate = startDate.plusDays(1);
         }
         // Recurring dates should follow loanRepaymentInterval.


[2/2] incubator-fineract git commit: Merge branch 'FINERACT-359' into develop

Posted by na...@apache.org.
Merge branch 'FINERACT-359' into develop


Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/00e78586
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/00e78586
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/00e78586

Branch: refs/heads/develop
Commit: 00e785860d816383ae896a5ee6d10b4645913a11
Parents: da56701 716f09e
Author: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Authored: Fri May 5 17:34:01 2017 +0530
Committer: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Committed: Fri May 5 17:34:01 2017 +0530

----------------------------------------------------------------------
 .../apache/fineract/portfolio/calendar/service/CalendarUtils.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------