Merge pull request #26 from FITER1/UC-41-add-accrual-on-fixed-recurri…

…ng-product UC-41 Add Accrual accounting on recuring deposit
FITER1 · Nov 17, 2022 · 8914e1c · 8914e1c
2 parents ae03c48 + 75e660f
commit 8914e1c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/...ng/producttoaccountmapping/service/ProductToGLAccountMappingWritePlatformServiceImpl.java b/...ng/producttoaccountmapping/service/ProductToGLAccountMappingWritePlatformServiceImpl.java
@@ -206,7 +206,7 @@ private void cashBasedSavingsAccountProductGLTracking(Long savingProductId, Json
                 SavingProductAccountingParams.SAVINGS_REFERENCE.getValue(), savingProductId,
                 CashAccountsForSavings.SAVINGS_REFERENCE.getValue());
 
-        if (!accountType.equals(DepositAccountType.RECURRING_DEPOSIT) && !accountType.equals(DepositAccountType.FIXED_DEPOSIT)) {
+        if (!accountType.equals(DepositAccountType.FIXED_DEPOSIT)) {
             this.savingsProductToGLAccountMappingHelper.saveSavingsToAssetAccountMapping(element,
                     SavingProductAccountingParams.OVERDRAFT_PORTFOLIO_CONTROL.getValue(), savingProductId,
                     CashAccountsForSavings.OVERDRAFT_PORTFOLIO_CONTROL.getValue());
@@ -221,7 +221,7 @@ private void cashBasedSavingsAccountProductGLTracking(Long savingProductId, Json
                 SavingProductAccountingParams.INCOME_FROM_PENALTIES.getValue(), savingProductId,
                 CashAccountsForSavings.INCOME_FROM_PENALTIES.getValue());
 
-        if (!accountType.equals(DepositAccountType.RECURRING_DEPOSIT) && !accountType.equals(DepositAccountType.FIXED_DEPOSIT)) {
+        if (!accountType.equals(DepositAccountType.FIXED_DEPOSIT)) {
             this.savingsProductToGLAccountMappingHelper.saveSavingsToIncomeAccountMapping(element,
                     SavingProductAccountingParams.INCOME_FROM_INTEREST.getValue(), savingProductId,
                     CashAccountsForSavings.INCOME_FROM_INTEREST.getValue());
@@ -232,7 +232,7 @@ private void cashBasedSavingsAccountProductGLTracking(Long savingProductId, Json
                 SavingProductAccountingParams.INTEREST_ON_SAVINGS.getValue(), savingProductId,
                 CashAccountsForSavings.INTEREST_ON_SAVINGS.getValue());
 
-        if (!accountType.equals(DepositAccountType.RECURRING_DEPOSIT) && !accountType.equals(DepositAccountType.FIXED_DEPOSIT)) {
+        if (!accountType.equals(DepositAccountType.FIXED_DEPOSIT)) {
             this.savingsProductToGLAccountMappingHelper.saveSavingsToExpenseAccountMapping(element,
                     SavingProductAccountingParams.LOSSES_WRITTEN_OFF.getValue(), savingProductId,
                     CashAccountsForSavings.LOSSES_WRITTEN_OFF.getValue());

diff --git a/...ct-provider/src/main/java/org/apache/fineract/portfolio/savings/DepositsApiConstants.java b/...ct-provider/src/main/java/org/apache/fineract/portfolio/savings/DepositsApiConstants.java
@@ -222,7 +222,11 @@ private DepositsApiConstants() {
             SavingProductAccountingParams.SAVINGS_CONTROL.getValue(), SavingProductAccountingParams.TRANSFERS_SUSPENSE.getValue(),
             SavingProductAccountingParams.SAVINGS_REFERENCE.getValue(), SavingProductAccountingParams.FEE_INCOME_ACCOUNT_MAPPING.getValue(),
             SavingProductAccountingParams.PENALTY_INCOME_ACCOUNT_MAPPING.getValue(), chartsParamName,
-            SavingsApiConstants.withHoldTaxParamName, SavingsApiConstants.taxGroupIdParamName));
+            SavingsApiConstants.withHoldTaxParamName, SavingsApiConstants.taxGroupIdParamName,
+            SavingProductAccountingParams.INTEREST_RECEIVABLE.getValue(), SavingProductAccountingParams.PENALTIES_RECEIVABLE.getValue(),
+            SavingProductAccountingParams.OVERDRAFT_PORTFOLIO_CONTROL.getValue(), SavingProductAccountingParams.FEES_RECEIVABLE.getValue(),
+            SavingProductAccountingParams.INTEREST_PAYABLE.getValue(), SavingProductAccountingParams.LOSSES_WRITTEN_OFF.getValue(),
+            SavingProductAccountingParams.INCOME_FROM_INTEREST.getValue()));
 
     private static final Set<String> PRECLOSURE_REQUEST_DATA_PARAMETERS = new HashSet<>(
             Arrays.asList(preClosurePenalApplicableParamName, preClosurePenalInterestParamName, preClosurePenalInterestOnTypeIdParamName));