Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Merge branch 'develop' into fix-10265-addendum
James Colef141b0be5c28
diff --cc app/Factory/TransactionJournalFactory.phpindex ec74a52d0c,d22e53807b..0aafb0fdeb--- a/app/Factory/TransactionJournalFactory.php+++ b/app/Factory/TransactionJournalFactory.php@@@ -163,13 -162,10 +163,14 @@@ class TransactionJournalFactor$this->errorIfDuplicate($row['import_hash_v2']);// Some basic fields- $type = $this->typeRepository->findTransactionType(null, $row['type']);- $carbon = $row['date'] ?? today(config('app.timezone'));- $order = $row['order'] ?? 0;- $currency = $this->currencyRepository->findCurrency((int) $row['currency_id'], $row['currency_code']);+ $type = $this->typeRepository->findTransactionType(null, $row['type']);+ $carbon = $row['date'] ?? today(config('app.timezone'));+ $order = $row['order'] ?? 0;++ Log::debug('Find currency or return default.');+ $currency = $this->currencyRepository->findCurrency((int) $row['currency_id'], $row['currency_code']);+ Log::debug('Find foreign currency or return NULL.');++$foreignCurrency = $this->currencyRepository->findCurrencyNull($row['foreign_currency_id'], $row['foreign_currency_code']);$bill = $this->billRepository->findBill((int) $row['bill_id'], $row['bill_name']);$billId = TransactionTypeEnum::WITHDRAWAL->value === $type->type && null !== $bill ? $bill->id : null;@@@ -212,12 -208,12 +213,13 @@@'bic' => $row['destination_bic'],'currency_id' => $currency->id,];- app('log')->debug('Source info:', $sourceInfo);- app('log')->debug('Destination info:', $destInfo);+ Log::debug('Source info:', $sourceInfo);+ Log::debug('Destination info:', $destInfo);$sourceAccount = $this->getAccount($type->type, 'source', $sourceInfo);$destinationAccount = $this->getAccount($type->type, 'destination', $destInfo);- app('log')->debug('Done with getAccount(2x)');+ Log::debug('Done with getAccount(2x)');++// this is the moment for a reconciliation sanity check (again).if (TransactionTypeEnum::RECONCILIATION->value === $type->type) {[$sourceAccount, $destinationAccount] = $this->reconciliationSanityCheck($sourceAccount, $destinationAccount);