diff --git a/app/Helpers/Collector/JournalCollector.php b/app/Helpers/Collector/JournalCollector.php index 56d53d7446..a85535d907 100644 --- a/app/Helpers/Collector/JournalCollector.php +++ b/app/Helpers/Collector/JournalCollector.php @@ -60,7 +60,6 @@ class JournalCollector implements JournalCollectorInterface 'transaction_journals.description', 'transaction_journals.date', 'transaction_journals.encrypted', - 'transaction_currencies.code as transaction_currency_code', 'transaction_types.type as transaction_type_type', 'transaction_journals.bill_id', 'bills.name as bill_name', @@ -71,6 +70,7 @@ class JournalCollector implements JournalCollectorInterface 'transactions.account_id', 'transactions.identifier', 'transactions.transaction_journal_id', + 'transaction_currencies.code as transaction_currency_code', 'accounts.name as account_name', 'accounts.encrypted as account_encrypted', 'account_types.type as account_type', @@ -484,11 +484,11 @@ class JournalCollector implements JournalCollectorInterface Log::debug('journalCollector::startQuery'); /** @var EloquentBuilder $query */ $query = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') - ->leftJoin('transaction_currencies', 'transaction_currencies.id', 'transaction_journals.transaction_currency_id') ->leftJoin('transaction_types', 'transaction_types.id', 'transaction_journals.transaction_type_id') ->leftJoin('bills', 'bills.id', 'transaction_journals.bill_id') ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id') ->leftJoin('account_types', 'accounts.account_type_id', 'account_types.id') + ->leftJoin('transaction_currencies', 'transaction_currencies.id', 'transactions.transaction_currency_id') ->whereNull('transactions.deleted_at') ->whereNull('transaction_journals.deleted_at') ->where('transaction_journals.user_id', $this->user->id)