mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-11-09 20:52:56 +01:00
Bug fixes
This commit is contained in:
parent
02b78055d4
commit
88b972be4b
@ -63,7 +63,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);
|
||||
|
||||
@ -98,7 +98,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,
|
||||
];
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user