kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

amount > queryAmount

Browse Source
This commit is contained in:
James Cole
2015-04-12 10:53:53 +02:00
parent 7a9f5ebdd1
commit 9fd8d8915d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/views/reports/year.blade.php
View File

@@ -92,7 +92,7 @@
$incomeSum = 0; $incomeSum = 0;
$expenseSum = 0; $expenseSum = 0;
foreach($groupedIncomes as $income) { foreach($groupedIncomes as $income) {
$incomeSum += floatval($income->amount); $incomeSum += floatval($income->queryAmount);
} }
foreach($groupedExpenses as $exp) { foreach($groupedExpenses as $exp) {
$expenseSum += floatval($exp['amount']); $expenseSum += floatval($exp['amount']);
@@ -127,11 +127,11 @@
<?php $sum = 0;?> <?php $sum = 0;?>
@foreach($groupedIncomes as $income) @foreach($groupedIncomes as $income)
<?php <?php
$sum += floatval($income->amount)*-1; $sum += floatval($income->queryAmount)*-1;
?> ?>
<tr> <tr>
<td><a href="{{route('accounts.show',$income->account_id)}}">{{{$income->name}}}</a></td> <td><a href="{{route('accounts.show',$income->account_id)}}">{{{$income->name}}}</a></td>
<td>{!! Amount::format(floatval($income->amount)*-1) !!}</td> <td>{!! Amount::format(floatval($income->queryAmount)*-1) !!}</td>
</tr> </tr>
@endforeach @endforeach
<tr> <tr>