This is an automated email from the ASF dual-hosted git repository.

adamsaghy pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git

commit 7f93dbfe048824af33d2aef2d28f0da81edca4fc
Merge: 2f70f4c971 fb522b4e88
Author: Adam Saghy <[email protected]>
AuthorDate: Wed Nov 18 20:16:07 2026 +0000

    Merge pull request #6944 from 
foodeveloper/port/FINERACT-3297-journal-entry-same-debit-credit-account
    
    FINERACT-3297: Reject journal entries with the same GL account on debit and 
credit

 .../exception/JournalEntryInvalidException.java    |  7 +-
 .../api/JournalEntriesApiResource.java             |  4 +-
 .../JournalEntryWritePlatformServiceImpl.java      | 12 +++
 .../JournalEntryWritePlatformServiceImplTest.java  | 98 ++++++++++++++++++++++
 4 files changed, 119 insertions(+), 2 deletions(-)

diff --cc 
fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformServiceImpl.java
index c9ed971914,50bd1a7414..e737324cc0
--- 
a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformServiceImpl.java
+++ 
b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformServiceImpl.java
@@@ -132,8 -132,9 +132,9 @@@ public class JournalEntryWritePlatformS
              final String currencyCode = 
command.stringValueOfParameterNamed(JournalEntryJsonInputParams.CURRENCY_CODE.getValue());
  
              validateBusinessRulesForJournalEntries(journalEntryCommand);
+             
checkDebitAndCreditAccountsDiffer(journalEntryCommand.getCredits(), 
journalEntryCommand.getDebits());
  
 -            /** Capture payment details **/
 +            // Capture payment details
              final Map<String, Object> changes = new LinkedHashMap<>();
              final PaymentDetail paymentDetail = 
this.paymentDetailWritePlatformService.createAndPersistPaymentDetail(command, 
changes);
  
@@@ -302,8 -303,21 +303,19 @@@
          }
      }
  
+     private void checkDebitAndCreditAccountsDiffer(final 
SingleDebitOrCreditEntryCommand[] credits,
+             final SingleDebitOrCreditEntryCommand[] debits) {
+         for (final SingleDebitOrCreditEntryCommand credit : credits) {
+             for (final SingleDebitOrCreditEntryCommand debit : debits) {
+                 if (Objects.equals(credit.getGlAccountId(), 
debit.getGlAccountId())) {
+                     throw new 
JournalEntryInvalidException(GlJournalEntryInvalidReason.DEBIT_CREDIT_SAME_ACCOUNT,
 null, null, null);
+                 }
+             }
+         }
+     }
+ 
      private void validateGLAccountForTransaction(final GLAccount 
creditOrDebitAccountHead) {
 -        /***
 -         * validate that the account allows manual adjustments and is not 
disabled
 -         **/
 +        // validate that the account allows manual adjustments and is not 
disabled
          if (creditOrDebitAccountHead.isDisabled()) {
              throw new 
JournalEntryInvalidException(GlJournalEntryInvalidReason.GL_ACCOUNT_DISABLED, 
null,
                      creditOrDebitAccountHead.getName(), 
creditOrDebitAccountHead.getGlCode());

Reply via email to