You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ra...@apache.org on 2016/05/06 11:23:43 UTC

[1/3] incubator-fineract git commit: [BUG-347] Stop interest posting once the loan has moved to overpaid state

Repository: incubator-fineract
Updated Branches:
  refs/heads/develop 401cad4d3 -> 318830fd4


[BUG-347] Stop interest posting once the loan has moved to overpaid state


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

Branch: refs/heads/develop
Commit: e7fbec05be0061e17aeb3f5695c2d97cb4df55a7
Parents: 401cad4
Author: Vishwa <vi...@confluxtechnologies.com>
Authored: Thu May 5 18:28:57 2016 +0530
Committer: Vishwa <vi...@confluxtechnologies.com>
Committed: Thu May 5 18:28:57 2016 +0530

----------------------------------------------------------------------
 .../fineract/portfolio/loanaccount/domain/Loan.java     | 12 ++++++++++++
 1 file changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/e7fbec05/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 822b575..386f702 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
@@ -5053,6 +5053,10 @@ public class Loan extends AbstractPersistable<Long> {
                         accrualTransaction);
                 lastCompoundingDate = compoundingDetail.getEffectiveDate();
             }
+            LoanRepaymentScheduleInstallment lastInstallment = this.repaymentScheduleInstallments.get(this.repaymentScheduleInstallments
+                    .size() - 1);
+            reverseTransactionsPostEffectiveDate(incomeTransactions, lastInstallment.getDueDate());
+            reverseTransactionsPostEffectiveDate(accrualTransactions, lastInstallment.getDueDate());
         }
     }
 
@@ -5163,6 +5167,14 @@ public class Loan extends AbstractPersistable<Long> {
         return null;
     }
 
+    private void reverseTransactionsPostEffectiveDate(List<LoanTransaction> transactions, LocalDate effectiveDate) {
+        for (LoanTransaction loanTransaction : transactions) {
+            if (loanTransaction.getTransactionDate().isAfter(effectiveDate)) {
+                loanTransaction.reverse();
+            }
+        }
+    }
+
     private List<LoanInterestRecalcualtionAdditionalDetails> extractInterestRecalculationAdditionalDetails() {
         List<LoanInterestRecalcualtionAdditionalDetails> retDetails = new ArrayList<>();
         if (null != this.repaymentScheduleInstallments && this.repaymentScheduleInstallments.size() > 0) {


[2/3] incubator-fineract git commit: FINERACT-151 : removed interest recalculation from date

Posted by ra...@apache.org.
FINERACT-151 : removed interest recalculation from date


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

Branch: refs/heads/develop
Commit: 3946d7714d4d5c0c12cf4283c423ab9816bb0a98
Parents: 401cad4
Author: pramod <pr...@confluxtechnologies.com>
Authored: Fri May 6 16:48:36 2016 +0530
Committer: pramod <pr...@confluxtechnologies.com>
Committed: Fri May 6 16:48:36 2016 +0530

----------------------------------------------------------------------
 .../service/LoanWritePlatformServiceJpaRepositoryImpl.java        | 3 ---
 1 file changed, 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/3946d771/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
index 1699182..d7aa02f 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
@@ -314,9 +314,6 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf
         
         LocalDate recalculateFrom = null;
         final LocalDate actualDisbursementDate = command.localDateValueOfParameterNamed("actualDisbursementDate");
-        if (loan.repaymentScheduleDetail().isInterestRecalculationEnabled()) {
-            recalculateFrom = actualDisbursementDate;
-        }
         ScheduleGeneratorDTO scheduleGeneratorDTO = this.loanUtilService.buildScheduleGeneratorDTO(loan, recalculateFrom);
 
         // validate actual disbursement date against meeting date


[3/3] incubator-fineract git commit: Merge branch 'PR101' into develop

Posted by ra...@apache.org.
Merge branch 'PR101' 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/318830fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/318830fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/318830fd

Branch: refs/heads/develop
Commit: 318830fd459926a3ea9d837165f252e9ba16b641
Parents: e7fbec0 3946d77
Author: Adi Narayana Raju <ad...@confluxtechnologies.com>
Authored: Fri May 6 16:51:53 2016 +0530
Committer: Adi Narayana Raju <ad...@confluxtechnologies.com>
Committed: Fri May 6 16:51:53 2016 +0530

----------------------------------------------------------------------
 .../service/LoanWritePlatformServiceJpaRepositoryImpl.java        | 3 ---
 1 file changed, 3 deletions(-)
----------------------------------------------------------------------