kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-24 14:46:37 +00:00
Code Issues Projects Releases Wiki Activity

Some fixes for #129

Browse Source
This commit is contained in:
James Cole
2015-12-11 18:35:49 +01:00
parent cb49c00f4d
commit 5aff0c4943
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Helpers/Report/ReportHelper.php
View File

@@ -365,7 +365,7 @@ class ReportHelper implements ReportHelperInterface
$object = new Expense; $object = new Expense;
$set = $this->query->expenseInPeriodCorrected($start, $end, $shared); $set = $this->query->expenseInPeriodCorrected($start, $end, $shared);
foreach ($set as $entry) { foreach ($set as $entry) {
$object->addToTotal($entry->amount_positive); $object->addToTotal($entry->amount);
$object->addOrCreateExpense($entry); $object->addOrCreateExpense($entry);
} }
@@ -515,7 +515,7 @@ class ReportHelper implements ReportHelperInterface
$object = new Expense; $object = new Expense;
$set = $this->query->expenseInPeriodCorrectedForList($start, $end, $accounts); $set = $this->query->expenseInPeriodCorrectedForList($start, $end, $accounts);
foreach ($set as $entry) { foreach ($set as $entry) {
$object->addToTotal($entry->amount_positive); $object->addToTotal($entry->amount);
$object->addOrCreateExpense($entry); $object->addOrCreateExpense($entry);
} }

2
resources/twig/partials/reports/expenses.twig
View File

@@ -32,7 +32,7 @@
{% endif %} {% endif %}
<tr> <tr>
<td><em>{{ 'sum'|_ }}</em></td> <td><em>{{ 'sum'|_ }}</em></td>
<td><span class="text-danger">{{ (expenses.getTotal)|formatAmountPlain }}</span></td> <td>{{ (expenses.getTotal)|formatAmountPlain }}</td>
</tr> </tr>
</tfoot> </tfoot>
</table> </table>