1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 08:21:34 +02:00

Bug fixes

This commit is contained in:
Hillel Coren 2019-02-18 16:10:05 +02:00
parent 46d342fa63
commit c991cde22d

View File

@ -66,7 +66,7 @@ class ExpenseReport extends AbstractReport
$expenses = Expense::scope()
->orderBy('expense_date', 'desc')
->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->endDate);
@ -102,7 +102,7 @@ class ExpenseReport extends AbstractReport
$expense->private_notes,
$expense->user->getDisplayName(),
$expense->present()->payment_date(),
$expense->payment_type_id ? $expense->payment_type->name : '',
$expense->present()->payment_type(),
$expense->transaction_reference,
];