This is an automated email from the ASF dual-hosted git repository. kaze pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git
commit cfe5848a025d99d0c68c828788e1e30be75d9d68 Author: percyashu <[email protected]> AuthorDate: Mon Jun 8 01:29:02 2020 +0100 FINERACT-822 enable OperatorPrecedence error --- .../configuration/domain/GlobalConfigurationProperty.java | 2 +- .../java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/domain/GlobalConfigurationProperty.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/domain/GlobalConfigurationProperty.java index cdba567..6eb0ed4 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/domain/GlobalConfigurationProperty.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/domain/GlobalConfigurationProperty.java @@ -114,7 +114,7 @@ public class GlobalConfigurationProperty extends AbstractPersistableCustom { final String passwordPropertyName = "force-password-reset-days"; if (this.name.equalsIgnoreCase(passwordPropertyName)) { - if (((this.enabled == true) && command.hasParameter(valueParamName) && (this.value == 0)) || ((this.enabled == true) + if ((this.enabled == true && command.hasParameter(valueParamName) && (this.value == 0)) || (this.enabled == true && !command.hasParameter(valueParamName) && (previousValue == 0))) { throw new ForcePasswordResetException(); } } 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 9e04553..af09fe9 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 @@ -2383,8 +2383,8 @@ public class Loan extends AbstractPersistableCustom { * selected **/ - if (isNoneOrCashOrUpfrontAccrualAccountingEnabledOnLoanProduct() - && ((isMultiDisburmentLoan() && getDisbursedLoanDisbursementDetails().size() == 1) || !isMultiDisburmentLoan())) { + if ((isNoneOrCashOrUpfrontAccrualAccountingEnabledOnLoanProduct() + && isMultiDisburmentLoan() && getDisbursedLoanDisbursementDetails().size() == 1) || !isMultiDisburmentLoan()) { final LoanTransaction interestAppliedTransaction = LoanTransaction.accrueInterest(getOffice(), this, interestApplied, actualDisbursementDate, createdDate, currentUser); addLoanTransaction(interestAppliedTransaction) ;
