IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7171 from firefly-iii/fix-7166

Browse Source 
Fix #7166
This commit is contained in:
James Cole 2023-03-07 19:55:15 +01:00 committed by GitHub
commit ae813a536e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Helpers/Collector/GroupCollector.php
View File

@ -37,6 +37,7 @@ use FireflyIII\Helpers\Collector\Extensions\TimeCollection;
use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionGroup;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use Illuminate\Database\Query\JoinClause; use Illuminate\Database\Query\JoinClause;
@ -436,6 +437,10 @@ class GroupCollector implements GroupCollectorInterface
public function exists(): GroupCollectorInterface public function exists(): GroupCollectorInterface
{ {
$this->query->whereNull('transaction_groups.deleted_at'); $this->query->whereNull('transaction_groups.deleted_at');
$this->query->whereNotIn(
'transaction_types.type',
[TransactionType::LIABILITY_CREDIT, TransactionType::OPENING_BALANCE, TransactionType::RECONCILIATION]
);
return $this; return $this;
} }