IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages 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
Show Stats 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;
$set = $this->query->expenseInPeriodCorrected($start, $end, $shared);
foreach ($set as $entry) {
$object->addToTotal($entry->amount_positive);
$object->addToTotal($entry->amount);
$object->addOrCreateExpense($entry);
}
@ -515,7 +515,7 @@ class ReportHelper implements ReportHelperInterface
$object = new Expense;
$set = $this->query->expenseInPeriodCorrectedForList($start, $end, $accounts);
foreach ($set as $entry) {
$object->addToTotal($entry->amount_positive);
$object->addToTotal($entry->amount);
$object->addOrCreateExpense($entry);
}

2
public/js/reports.js
View File

@ -42,7 +42,7 @@ $(function () {
datePicker.setEndDate(endDate);
}
}
$('.openModal').on('click', openModal);
$('.date-select').on('click', preSelectDate);

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

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