kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-03 19:41:54 +00:00
Code Issues Projects Releases Wiki Activity

Fix #11054

Browse Source
This commit is contained in:
James Cole
2025-10-12 12:25:21 +02:00
parent 7c4ada458e
commit df3e4a6554
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Factory/TransactionJournalFactory.php
View File

@@ -225,6 +225,11 @@ class TransactionJournalFactory
$destinationAccount = $this->getAccount($type->type, 'destination', $destInfo, $sourceAccount); $destinationAccount = $this->getAccount($type->type, 'destination', $destInfo, $sourceAccount);
Log::debug('Done with getAccount(2x)'); Log::debug('Done with getAccount(2x)');
// there is a safety catch here. If either account is NULL, they will be replaced with the cash account.
if(null === $destinationAccount) {
Log::warning('Destination account is NULL, will replace with cash account.');
$destinationAccount = $this->accountRepository->getCashAccount();
}
// this is the moment for a reconciliation sanity check (again). // this is the moment for a reconciliation sanity check (again).
if (TransactionTypeEnum::RECONCILIATION->value === $type->type) { if (TransactionTypeEnum::RECONCILIATION->value === $type->type) {

3
app/Services/Internal/Support/JournalServiceTrait.php
View File

@@ -88,6 +88,7 @@ trait JournalServiceTrait
// the account that Firefly III creates must be "creatable", aka select the one we can create from the list just in case // the account that Firefly III creates must be "creatable", aka select the one we can create from the list just in case
$creatableType = $this->getCreatableType($expectedTypes[$transactionType]); $creatableType = $this->getCreatableType($expectedTypes[$transactionType]);
Log::debug(sprintf('Creatable type is "%s"', $creatableType ), $expectedTypes[$transactionType]);
// if the result is NULL but the ID is set, an account could exist of the wrong type. // if the result is NULL but the ID is set, an account could exist of the wrong type.
// that data can be used to create a new account of the right type. // that data can be used to create a new account of the right type.
@@ -227,9 +228,11 @@ trait JournalServiceTrait
} }
// find by preferred type. // find by preferred type.
Log::debug('Find by preferred type.');
$result = $this->accountRepository->findByName($data['name'], [$types[0]]); $result = $this->accountRepository->findByName($data['name'], [$types[0]]);
// or any expected type. // or any expected type.
Log::debug('Find by any expected type.');
$result ??= $this->accountRepository->findByName($data['name'], $types); $result ??= $this->accountRepository->findByName($data['name'], $types);
if (null !== $result) { if (null !== $result) {