You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by av...@apache.org on 2021/01/20 23:37:30 UTC
[fineract] branch develop updated: FIN-1290 (#1586)
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 505c351 FIN-1290 (#1586)
505c351 is described below
commit 505c351cd60ee0225e6ccba0c2ab25f191a8bebe
Author: Avik Ganguly <av...@apache.org>
AuthorDate: Thu Jan 21 05:07:18 2021 +0530
FIN-1290 (#1586)
---
build.gradle | 1 +
.../java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/build.gradle b/build.gradle
index 2d01b27..7ae9eca 100644
--- a/build.gradle
+++ b/build.gradle
@@ -353,6 +353,7 @@ configure(project.fineractJavaProjects) {
apply plugin: 'java-library'
apply plugin: 'idea'
+ apply plugin: 'eclipse'
apply plugin: 'checkstyle'
apply plugin: 'jacoco'
apply plugin: "net.ltgt.errorprone"
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 cf595ce..1e62691 100644
--- 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
@@ -2366,8 +2366,8 @@ public class Loan extends AbstractPersistableCustom {
* cash based accounting is selected
**/
- if ((isNoneOrCashOrUpfrontAccrualAccountingEnabledOnLoanProduct() && isMultiDisburmentLoan()
- && getDisbursedLoanDisbursementDetails().size() == 1) || !isMultiDisburmentLoan()) {
+ if (((isMultiDisburmentLoan() && getDisbursedLoanDisbursementDetails().size() == 1) || !isMultiDisburmentLoan())
+ && isNoneOrCashOrUpfrontAccrualAccountingEnabledOnLoanProduct()) {
final LoanTransaction interestAppliedTransaction = LoanTransaction.accrueInterest(getOffice(), this, interestApplied,
actualDisbursementDate, createdDate, currentUser);
addLoanTransaction(interestAppliedTransaction);