Merge pull request apache#498 from ShruthiRajaram/FINERACT-574

FINERACT-574 share account reject issues
swagatikapanda123 · Dec 12, 2018 · 22bf2cd · 22bf2cd
2 parents b225748 + 3bdfa5a
commit 22bf2cd
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/...pache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForShares.java b/...pache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForShares.java
@@ -116,15 +116,20 @@ public void createJournalEntriesForPurchase(final Long shareAccountId, final Lon
                     CASH_ACCOUNTS_FOR_SHARES.SHARES_EQUITY.getValue(), shareProductId, paymentTypeId, shareAccountId, transactionId,
                     transactionDate, amountForJE);
         } else if (transactionDTO.getTransactionStatus().isRejected()) {
-            BigDecimal amountForJE = amount;
             if (chargeAmount != null && chargeAmount.compareTo(BigDecimal.ZERO) == 1) {
-                amountForJE = amount.subtract(chargeAmount);
-                /*this.helper.revertCashBasedJournalEntryForSharesCharges(office, currencyCode, CASH_ACCOUNTS_FOR_SHARES.INCOME_FROM_FEES,
-                        shareProductId, shareAccountId, transactionId, transactionDate, chargeAmount, feePayments);*/
+                this.helper.revertCashBasedJournalEntryForSharesCharges(office, currencyCode, CASH_ACCOUNTS_FOR_SHARES.INCOME_FROM_FEES,
+                        shareProductId, shareAccountId, transactionId, transactionDate, chargeAmount, feePayments);
+                this.helper.createDebitJournalEntryForShares(office, currencyCode, CASH_ACCOUNTS_FOR_SHARES.SHARES_SUSPENSE.getValue(), shareProductId, paymentTypeId, shareAccountId,
+                        transactionId, transactionDate, amount.subtract(chargeAmount));
+                this.helper.createCreditJournalEntryForShares(office, currencyCode, CASH_ACCOUNTS_FOR_SHARES.SHARES_REFERENCE.getValue(), shareProductId, paymentTypeId, shareAccountId,
+                        transactionId, transactionDate, amount);
+
+            }else{
+            	this.helper.createJournalEntriesForShares(office, currencyCode, CASH_ACCOUNTS_FOR_SHARES.SHARES_SUSPENSE.getValue(),
+                        CASH_ACCOUNTS_FOR_SHARES.SHARES_REFERENCE.getValue(), shareProductId, paymentTypeId, shareAccountId, transactionId,
+                        transactionDate, amount);
             }
-            this.helper.createJournalEntriesForShares(office, currencyCode, CASH_ACCOUNTS_FOR_SHARES.SHARES_SUSPENSE.getValue(),
-                    CASH_ACCOUNTS_FOR_SHARES.SHARES_REFERENCE.getValue(), shareProductId, paymentTypeId, shareAccountId, transactionId,
-                    transactionDate, amountForJE);
+
         }
     }