Skip to content

Commit 13d4f1e

Browse files
authored
Merge pull request #5712
FINERACT-2561: Move organisation currency validation outside loop in saveAllDebitOrCreditEntries
2 parents e73cf7e + 9a1105c commit 13d4f1e

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformServiceJpaRepositoryImpl.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -652,6 +652,10 @@ private void saveAllDebitOrCreditEntries(final JournalEntryCommand command, fina
652652
final SingleDebitOrCreditEntryCommand[] singleDebitOrCreditEntryCommands, final String transactionId,
653653
final JournalEntryType type, final String referenceNumber, final ExternalAssetOwner externalAssetOwner) {
654654
final boolean manualEntry = true;
655+
656+
/** Validate current code is appropriate **/
657+
this.organisationCurrencyRepository.findOneWithNotFoundDetection(currencyCode);
658+
655659
for (final SingleDebitOrCreditEntryCommand singleDebitOrCreditEntryCommand : singleDebitOrCreditEntryCommands) {
656660
final GLAccount glAccount = this.glAccountRepository.findById(singleDebitOrCreditEntryCommand.getGlAccountId())
657661
.orElseThrow(() -> new GLAccountNotFoundException(singleDebitOrCreditEntryCommand.getGlAccountId()));
@@ -663,9 +667,6 @@ private void saveAllDebitOrCreditEntries(final JournalEntryCommand command, fina
663667
comments = singleDebitOrCreditEntryCommand.getComments();
664668
}
665669

666-
/** Validate current code is appropriate **/
667-
this.organisationCurrencyRepository.findOneWithNotFoundDetection(currencyCode);
668-
669670
final JournalEntry glJournalEntry = JournalEntry.createNew(office, paymentDetail, glAccount, currencyCode, transactionId,
670671
manualEntry, transactionDate, type, singleDebitOrCreditEntryCommand.getAmount(), comments, null, null, referenceNumber,
671672
null, null, null, null);

0 commit comments

Comments
 (0)