Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 11:04:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2019-02-18 16:10:05 +02:00
parent 46d342fa63
commit c991cde22d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Ninja/Reports/ExpenseReport.php
View File

@ -66,7 +66,7 @@ class ExpenseReport extends AbstractReport
$expenses = Expense::scope() $expenses = Expense::scope()
->orderBy('expense_date', 'desc') ->orderBy('expense_date', 'desc')
->withArchived() ->withArchived()
->with('client.contacts', 'vendor', 'expense_category', 'user', 'payment_type') ->with('client.contacts', 'vendor', 'expense_category', 'user')
->where('expense_date', '>=', $this->startDate) ->where('expense_date', '>=', $this->startDate)
->where('expense_date', '<=', $this->endDate); ->where('expense_date', '<=', $this->endDate);
@ -102,7 +102,7 @@ class ExpenseReport extends AbstractReport
$expense->private_notes, $expense->private_notes,
$expense->user->getDisplayName(), $expense->user->getDisplayName(),
$expense->present()->payment_date(), $expense->present()->payment_date(),
$expense->payment_type_id ? $expense->payment_type->name : '', $expense->present()->payment_type(),
$expense->transaction_reference, $expense->transaction_reference,
]; ];