shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

skip transfers in reports

Browse Source
This commit is contained in:
denisdulici 2018-04-11 17:52:41 +03:00
parent b034f17f75
commit eeb715f169
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Reports/ExpenseSummary.php
View File

@ -87,7 +87,7 @@ class ExpenseSummary extends Controller
// Payments // Payments
if ($status != 'upcoming') { if ($status != 'upcoming') {
$payments = Payment::monthsOfYear('paid_at')->get(); $payments = Payment::monthsOfYear('paid_at')->isNotTransfer()->get();
$this->setAmount($expenses_graph, $totals, $expenses, $payments, 'payment', 'paid_at'); $this->setAmount($expenses_graph, $totals, $expenses, $payments, 'payment', 'paid_at');
} }

4
app/Http/Controllers/Reports/IncomeExpenseSummary.php
View File

@ -115,7 +115,7 @@ class IncomeExpenseSummary extends Controller
// Revenues // Revenues
if ($status != 'upcoming') { if ($status != 'upcoming') {
$revenues = Revenue::monthsOfYear('paid_at')->get(); $revenues = Revenue::monthsOfYear('paid_at')->isNotTransfer()->get();
$this->setAmount($profit_graph, $totals, $compares, $revenues, 'revenue', 'paid_at'); $this->setAmount($profit_graph, $totals, $compares, $revenues, 'revenue', 'paid_at');
} }
@ -137,7 +137,7 @@ class IncomeExpenseSummary extends Controller
// Payments // Payments
if ($status != 'upcoming') { if ($status != 'upcoming') {
$payments = Payment::monthsOfYear('paid_at')->get(); $payments = Payment::monthsOfYear('paid_at')->isNotTransfer()->get();
$this->setAmount($profit_graph, $totals, $compares, $payments, 'payment', 'paid_at'); $this->setAmount($profit_graph, $totals, $compares, $payments, 'payment', 'paid_at');
} }

2
app/Http/Controllers/Reports/IncomeSummary.php
View File

@ -87,7 +87,7 @@ class IncomeSummary extends Controller
// Revenues // Revenues
if ($status != 'upcoming') { if ($status != 'upcoming') {
$revenues = Revenue::monthsOfYear('paid_at')->get(); $revenues = Revenue::monthsOfYear('paid_at')->isNotTransfer()->get();
$this->setAmount($incomes_graph, $totals, $incomes, $revenues, 'revenue', 'paid_at'); $this->setAmount($incomes_graph, $totals, $incomes, $revenues, 'revenue', 'paid_at');
} }