From commits-return-9967-archive-asf-public=cust-asf.ponee.io@fineract.apache.org Mon Jun 8 01:32:42 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id E6CE4180675 for ; Mon, 8 Jun 2020 03:32:41 +0200 (CEST) Received: (qmail 4744 invoked by uid 500); 8 Jun 2020 01:32:41 -0000 Mailing-List: contact commits-help@fineract.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@fineract.apache.org Delivered-To: mailing list commits@fineract.apache.org Received: (qmail 4683 invoked by uid 99); 8 Jun 2020 01:32:40 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Jun 2020 01:32:40 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id C7F9B814A3; Mon, 8 Jun 2020 01:32:40 +0000 (UTC) Date: Mon, 08 Jun 2020 01:32:42 +0000 To: "commits@fineract.apache.org" Subject: [fineract] 02/02: FINERACT-822 enable OperatorPrecedence error MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: kaze@apache.org In-Reply-To: <159157996054.20228.16931828316046407460@gitbox.apache.org> References: <159157996054.20228.16931828316046407460@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: fineract X-Git-Refname: refs/heads/develop X-Git-Reftype: branch X-Git-Rev: cfe5848a025d99d0c68c828788e1e30be75d9d68 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20200608013240.C7F9B814A3@gitbox.apache.org> 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 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) ;