Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-12 14:12:44 +01:00
Code Issues Releases Activity

Fix date range in profit/loss report

Browse Source
This commit is contained in:
Hillel Coren 2017-02-07 09:17:42 +02:00
parent 431ef3121e
commit 8a1142e696
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Ninja/Reports/ProfitAndLossReport.php
View File

@ -23,7 +23,9 @@ class ProfitAndLossReport extends AbstractReport
$payments = Payment::scope() $payments = Payment::scope()
->with('client.contacts') ->with('client.contacts')
->withArchived() ->withArchived()
->excludeFailed(); ->excludeFailed()
->where('payment_date', '>=', $this->startDate)
->where('payment_date', '<=', $this->endDate);
foreach ($payments->get() as $payment) { foreach ($payments->get() as $payment) {
$client = $payment->client; $client = $payment->client;
@ -42,7 +44,9 @@ class ProfitAndLossReport extends AbstractReport
$expenses = Expense::scope() $expenses = Expense::scope()
->with('client.contacts') ->with('client.contacts')
->withArchived(); ->withArchived()
->where('expense_date', '>=', $this->startDate)
->where('expense_date', '<=', $this->endDate);
foreach ($expenses->get() as $expense) { foreach ($expenses->get() as $expense) {
$client = $expense->client; $client = $expense->client;