fineract-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vorbur...@apache.org
Subject [fineract] branch develop updated: Fixed Accounting findProductIdAndProductTypeAndFinancialAccountTypeAndChargeId
Date Sun, 24 May 2020 08:43:38 GMT
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 <marktwain@gmx.us>
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<Produ
     ProductToGLAccountMapping findByProductIdAndProductTypeAndFinancialAccountTypeAndPaymentTypeId(Long
productId, int productType,
             int financialAccountType, Long paymentType);
 
-    ProductToGLAccountMapping findByProductIdAndProductTypeAndFinancialAccountTypeAndChargeId(Long
productId, int productType,
-            int financialAccountType, Long chargeId);
+    @Query("select mapping from ProductToGLAccountMapping mapping where mapping.productId=
:productId and mapping.productType= :productType and mapping.financialAccountType= :financialAccountType
and mapping.charge.id= :chargeId")
+    ProductToGLAccountMapping findProductIdAndProductTypeAndFinancialAccountTypeAndChargeId(@Param("productId")
Long productId, @Param("productType") int productType,
+            @Param("financialAccountType") int financialAccountType, @Param("chargeId") Long
ChargeId);
 
     @Query("select mapping from ProductToGLAccountMapping mapping where mapping.productId
=:productId and mapping.productType =:productType and mapping.financialAccountType=:financialAccountType
and mapping.paymentType is NULL and mapping.charge is NULL")
     ProductToGLAccountMapping findCoreProductToFinAccountMapping(@Param("productId") Long
productId, @Param("productType") int productType,


Mime
View raw message