kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

Some extra debugging and a fix for #1825

Browse Source
This commit is contained in:
James Cole
2018-10-28 13:53:00 +01:00
parent f90b7bed5e
commit bb39781848
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Repositories/Journal/JournalRepository.php
View File

@@ -28,6 +28,7 @@ use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Factory\TransactionJournalFactory;
use FireflyIII\Factory\TransactionJournalMetaFactory;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Helpers\Filter\InternalTransferFilter;
use FireflyIII\Helpers\Filter\TransferFilter;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
@@ -594,7 +595,9 @@ class JournalRepository implements JournalRepositoryInterface
/** @var TransactionCollectorInterface $collector */
$collector = app(TransactionCollectorInterface::class);
$collector->setUser($this->user);
$collector->addFilter(TransferFilter::class);
$collector->setAllAssetAccounts();
$collector->removeFilter(InternalTransferFilter::class);
//$collector->addFilter(TransferFilter::class);
$collector->setJournals($journals)->withOpposingAccount();
return $collector->getTransactions();