diff --git a/app/Filters/ExpenseFilters.php b/app/Filters/ExpenseFilters.php index fefd6c038e3c..2a1892e9f2a3 100644 --- a/app/Filters/ExpenseFilters.php +++ b/app/Filters/ExpenseFilters.php @@ -69,14 +69,15 @@ class ExpenseFilters extends QueryFilters return $this->builder; } - $this->builder->whereNested(function ($query) use($status_parameters){ + $this->builder->where(function ($query) use($status_parameters){ if (in_array('logged', $status_parameters)) { $query->orWhere(function ($query){ $query->where('amount', '>', 0) ->whereNull('invoice_id') - ->whereNull('payment_date'); + ->whereNull('payment_date') + ->where('should_be_invoiced',false); }); }