From cfe5848a025d99d0c68c828788e1e30be75d9d68 Mon Sep 17 00:00:00 2001
From: percyashu <percyayukashu@gmail.com>
Date: Mon, 8 Jun 2020 01:29:02 +0100
Subject: [PATCH] FINERACT-822 enable OperatorPrecedence error

---
 .../configuration/domain/GlobalConfigurationProperty.java     | 2 +-
 .../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 cdba5670b..6eb0ed46f 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 9e0455324..af09fe99d 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) ;