diff --git a/app/lib/FireflyIII/Report/Report.php b/app/lib/FireflyIII/Report/Report.php index 0dfce025fc..8355cfc602 100644 --- a/app/lib/FireflyIII/Report/Report.php +++ b/app/lib/FireflyIII/Report/Report.php @@ -207,18 +207,18 @@ class Report implements ReportInterface $set = $this->_queries->journalsByExpenseAccount($start, $end); $expenses = $this->_helper->makeArray($set); - $alt = $this->_queries->sharedExpenses($start, $end); - $transfers = $this->_helper->makeArray($alt); - - $expenses[-1] = [ - 'amount' => 0, - 'name' => 'Transfers to shared', - 'spent' => 0 - ]; - - foreach ($transfers as $transfer) { - $expenses[-1]['amount'] += $transfer['amount']; - } +// $alt = $this->_queries->sharedExpenses($start, $end); +// $transfers = $this->_helper->makeArray($alt); +// +// $expenses[-1] = [ +// 'amount' => 0, +// 'name' => 'Transfers to shared', +// 'spent' => 0 +// ]; +// +// foreach ($transfers as $transfer) { +// $expenses[-1]['amount'] += $transfer['amount']; +// } $expenses = $this->_helper->sortArray($expenses); $limited = $this->_helper->limitArray($expenses, $limit); diff --git a/app/views/reports/year.blade.php b/app/views/reports/year.blade.php index 29ef5bc4f2..f82304d469 100644 --- a/app/views/reports/year.blade.php +++ b/app/views/reports/year.blade.php @@ -123,12 +123,18 @@ Expenses + @foreach($groupedExpenses as $id => $expense) + @endforeach + + + +
{{{$expense['name']}}} {{Amount::format(floatval($expense['amount'])*-1)}}
Sum{{Amount::format($sum)}}