From commits-return-9422-archive-asf-public=cust-asf.ponee.io@fineract.apache.org Sun May 24 08:43:40 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 AA50F18066D for ; Sun, 24 May 2020 10:43:39 +0200 (CEST) Received: (qmail 57914 invoked by uid 500); 24 May 2020 08:43:39 -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 57905 invoked by uid 99); 24 May 2020 08:43:39 -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; Sun, 24 May 2020 08:43:39 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 9A467819F5; Sun, 24 May 2020 08:43:38 +0000 (UTC) Date: Sun, 24 May 2020 08:43:38 +0000 To: "commits@fineract.apache.org" Subject: [fineract] branch develop updated: Fixed Accounting findProductIdAndProductTypeAndFinancialAccountTypeAndChargeId MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <159030981833.11379.8612447264558525018@gitbox.apache.org> From: vorburger@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: fineract X-Git-Refname: refs/heads/develop X-Git-Reftype: branch X-Git-Oldrev: 81fc89c58c537ccec183cc9c4dc3c4114700e091 X-Git-Newrev: ce570b4b332f2d053e7a5f604aff7c7ae090e045 X-Git-Rev: ce570b4b332f2d053e7a5f604aff7c7ae090e045 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. vorburger 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 ce570b4 Fixed Accounting findProductIdAndProductTypeAndFinancialAccountTypeAndChargeId ce570b4 is described below commit ce570b4b332f2d053e7a5f604aff7c7ae090e045 Author: Saransh Sharma AuthorDate: Fri May 22 21:53:23 2020 +0530 Fixed Accounting findProductIdAndProductTypeAndFinancialAccountTypeAndChargeId --- .../accounting/journalentry/service/AccountingProcessorHelper.java | 6 +++--- .../domain/ProductToGLAccountMappingRepository.java | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccountingProcessorHelper.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccountingProcessorHelper.java index 210b75e..ab44a19 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccountingProcessorHelper.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccountingProcessorHelper.java @@ -1124,7 +1124,7 @@ public class AccountingProcessorHelper { if (accountMappingTypeId == CashAccountsForLoan.INCOME_FROM_FEES.getValue() || accountMappingTypeId == CashAccountsForLoan.INCOME_FROM_PENALTIES.getValue()) { final ProductToGLAccountMapping chargeSpecificIncomeAccountMapping = this.accountMappingRepository - .findByProductIdAndProductTypeAndFinancialAccountTypeAndChargeId(loanProductId, PortfolioProductType.LOAN.getValue(), + .findProductIdAndProductTypeAndFinancialAccountTypeAndChargeId(loanProductId, PortfolioProductType.LOAN.getValue(), accountMappingTypeId, chargeId); if (chargeSpecificIncomeAccountMapping != null) { accountMapping = chargeSpecificIncomeAccountMapping; @@ -1147,7 +1147,7 @@ public class AccountingProcessorHelper { if (accountMappingTypeId == CashAccountsForSavings.INCOME_FROM_FEES.getValue() || accountMappingTypeId == CashAccountsForLoan.INCOME_FROM_PENALTIES.getValue()) { final ProductToGLAccountMapping chargeSpecificIncomeAccountMapping = this.accountMappingRepository - .findByProductIdAndProductTypeAndFinancialAccountTypeAndChargeId(savingsProductId, + .findProductIdAndProductTypeAndFinancialAccountTypeAndChargeId(savingsProductId, PortfolioProductType.SAVING.getValue(), accountMappingTypeId, chargeId); if (chargeSpecificIncomeAccountMapping != null) { accountMapping = chargeSpecificIncomeAccountMapping; @@ -1218,7 +1218,7 @@ public class AccountingProcessorHelper { *****/ final ProductToGLAccountMapping chargeSpecificIncomeAccountMapping = this.accountMappingRepository - .findByProductIdAndProductTypeAndFinancialAccountTypeAndChargeId(shareProductId, PortfolioProductType.SHARES.getValue(), + .findProductIdAndProductTypeAndFinancialAccountTypeAndChargeId(shareProductId, PortfolioProductType.SHARES.getValue(), accountMappingTypeId, chargeId); if (chargeSpecificIncomeAccountMapping != null) { accountMapping = chargeSpecificIncomeAccountMapping; diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/domain/ProductToGLAccountMappingRepository.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/domain/ProductToGLAccountMappingRepository.java index eec140a..39fde10 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/domain/ProductToGLAccountMappingRepository.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/domain/ProductToGLAccountMappingRepository.java @@ -30,8 +30,9 @@ public interface ProductToGLAccountMappingRepository extends JpaRepository