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 2016/02/24 07:37:15 UTC
[1/2] incubator-fineract git commit: MIFOSX-2516: fix for Floating
rates with multi tranche loan
Repository: incubator-fineract
Updated Branches:
refs/heads/0.1.0-incubating 1be4d026c -> 8d160d3e7
MIFOSX-2516: fix for Floating rates with multi tranche loan
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/331e8e4d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/331e8e4d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/331e8e4d
Branch: refs/heads/0.1.0-incubating
Commit: 331e8e4dec73ed68b3b002cfebd0647b99d652ad
Parents: 1be4d02
Author: pramod <pr...@confluxtechnologies.com>
Authored: Tue Feb 23 14:29:02 2016 +0530
Committer: pramod <pr...@confluxtechnologies.com>
Committed: Tue Feb 23 14:29:02 2016 +0530
----------------------------------------------------------------------
.../floatingrates/data/FloatingRateDTO.java | 82 ++++++++++----------
.../data/LoanTermVariationsData.java | 2 +-
.../portfolio/loanaccount/domain/Loan.java | 1 +
3 files changed, 45 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/331e8e4d/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/data/FloatingRateDTO.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/data/FloatingRateDTO.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/data/FloatingRateDTO.java
index 008e29f..0dfee5c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/data/FloatingRateDTO.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/data/FloatingRateDTO.java
@@ -25,51 +25,55 @@ import org.joda.time.LocalDate;
public class FloatingRateDTO {
- private final boolean isFloatingInterestRate;
- private final LocalDate startDate;
- private BigDecimal interestRateDiff;
- private final Collection<FloatingRatePeriodData> baseLendingRatePeriods;
+ private final boolean isFloatingInterestRate;
+ private final LocalDate startDate;
+ private BigDecimal interestRateDiff;
+ private BigDecimal actualInterestRateDiff;
+ private final Collection<FloatingRatePeriodData> baseLendingRatePeriods;
- public FloatingRateDTO(final boolean isFloatingInterestRate,
- final LocalDate startDate, final BigDecimal interestRateDiff,
- final Collection<FloatingRatePeriodData> baseLendingRatePeriods) {
- this.isFloatingInterestRate = isFloatingInterestRate;
- this.startDate = startDate;
- this.interestRateDiff = interestRateDiff;
- this.baseLendingRatePeriods = baseLendingRatePeriods;
- }
+ public FloatingRateDTO(final boolean isFloatingInterestRate, final LocalDate startDate, final BigDecimal interestRateDiff,
+ final Collection<FloatingRatePeriodData> baseLendingRatePeriods) {
+ this.isFloatingInterestRate = isFloatingInterestRate;
+ this.startDate = startDate;
+ this.interestRateDiff = interestRateDiff;
+ this.actualInterestRateDiff = interestRateDiff;
+ this.baseLendingRatePeriods = baseLendingRatePeriods;
+ }
- public BigDecimal fetchBaseRate(LocalDate date) {
- BigDecimal rate = null;
- for (FloatingRatePeriodData periodData : this.baseLendingRatePeriods) {
- final LocalDate periodFromDate = new LocalDate(periodData.getFromDate());
- if (periodFromDate.isBefore(date)
- || periodFromDate.isEqual(date)) {
- rate = periodData.getInterestRate();
- break;
- }
- }
- return rate;
- }
+ public BigDecimal fetchBaseRate(LocalDate date) {
+ BigDecimal rate = null;
+ for (FloatingRatePeriodData periodData : this.baseLendingRatePeriods) {
+ final LocalDate periodFromDate = new LocalDate(periodData.getFromDate());
+ if (periodFromDate.isBefore(date) || periodFromDate.isEqual(date)) {
+ rate = periodData.getInterestRate();
+ break;
+ }
+ }
+ return rate;
+ }
- public void addInterestRateDiff(final BigDecimal diff) {
- this.interestRateDiff = this.interestRateDiff.add(diff);
- }
+ public void addInterestRateDiff(final BigDecimal diff) {
+ this.interestRateDiff = this.interestRateDiff.add(diff);
+ }
- public boolean isFloatingInterestRate() {
- return this.isFloatingInterestRate;
- }
+ public boolean isFloatingInterestRate() {
+ return this.isFloatingInterestRate;
+ }
- public LocalDate getStartDate() {
- return this.startDate;
- }
+ public LocalDate getStartDate() {
+ return this.startDate;
+ }
- public BigDecimal getInterestRateDiff() {
- return this.interestRateDiff;
- }
+ public BigDecimal getInterestRateDiff() {
+ return this.interestRateDiff;
+ }
- public Collection<FloatingRatePeriodData> getBaseLendingRatePeriods() {
- return this.baseLendingRatePeriods;
- }
+ public Collection<FloatingRatePeriodData> getBaseLendingRatePeriods() {
+ return this.baseLendingRatePeriods;
+ }
+
+ public void resetInterestRateDiff() {
+ this.interestRateDiff = this.actualInterestRateDiff;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/331e8e4d/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanTermVariationsData.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanTermVariationsData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanTermVariationsData.java
index 2113666..f5d2cc0 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanTermVariationsData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanTermVariationsData.java
@@ -84,7 +84,7 @@ public class LoanTermVariationsData implements Comparable<LoanTermVariationsData
}
private boolean occursBefore(final LocalDate date, final LocalDate target) {
- return target != null && target.isBefore(date);
+ return target != null && !target.isAfter(date);
}
public LocalDate getDateValue() {
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/331e8e4d/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
index ac4aa45..56fd87c 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
@@ -2597,6 +2597,7 @@ public class Loan extends AbstractPersistable<Long> {
final boolean isSpecificToInstallment = false;
BigDecimal interestRate = annualNominalInterestRate;
if (loanProduct.isLinkedToFloatingInterestRate()) {
+ floatingRateDTO.resetInterestRateDiff();
Collection<FloatingRatePeriodData> applicableRates = loanProduct.fetchInterestRates(floatingRateDTO);
LocalDate interestRateStartDate = DateUtils.getLocalDateOfTenant();
for (FloatingRatePeriodData periodData : applicableRates) {
[2/2] incubator-fineract git commit: Updating release notes
Posted by na...@apache.org.
Updating release notes
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/8d160d3e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/8d160d3e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/8d160d3e
Branch: refs/heads/0.1.0-incubating
Commit: 8d160d3e7deaf1059c45c7859d801b4e5465d54c
Parents: 331e8e4
Author: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Authored: Wed Feb 24 12:06:01 2016 +0530
Committer: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Committed: Wed Feb 24 12:06:01 2016 +0530
----------------------------------------------------------------------
CHANGELOG.md | 29 +++++++++++++++++++++++++++++
api-docs/apiLive.htm | 2 +-
fineract-provider/gradle.properties | 2 +-
3 files changed, 31 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/8d160d3e/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..eacba5e
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,29 @@
+Changelog
+=====
+
+Releases
+===============
+
+1. 24 Feb 2016 - 0.1.1-incubating
+
+0.1.1-incubating
+=============
+
+This release includes following features and Bug fixes as mentioned below:
+
+Platform & API
+
+New Features & Improvements
+
+ - Renamed all Mifos related resources to apache
+ - Changed all source files to use Apache License, Version 2
+ - Replaced incompatible dependencies
+ - Switched to Java 8
+
+Bugs
+
+ - For equal principal payments loans with Floating rates, on late repayment interest calculation is not proper- [MIFOSX-2435] - After waive penalty summary page is not displaying as expected in loan account
+
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/8d160d3e/api-docs/apiLive.htm
----------------------------------------------------------------------
diff --git a/api-docs/apiLive.htm b/api-docs/apiLive.htm
index 0eec1fd..4edd5e7 100644
--- a/api-docs/apiLive.htm
+++ b/api-docs/apiLive.htm
@@ -90,7 +90,7 @@
<body>
<div id="page-wrapper">
<div id="flybar">
- <div id="nav-logo">16.01.2.RELEASE</div>
+ <div id="nav-logo">0.1.0-incubating</div>
<div class="flybar-nav">
<h2 class="flybar-button">Overview</h2>
<div class="flybar-menu-overview">
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/8d160d3e/fineract-provider/gradle.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/gradle.properties b/fineract-provider/gradle.properties
index 706f6ee..d7cdca2 100644
--- a/fineract-provider/gradle.properties
+++ b/fineract-provider/gradle.properties
@@ -1,3 +1,3 @@
-releaseVersion=16.01.2.RELEASE
+releaseVersion=0.1.0-incubating