gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-10 12:24:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some views.

Browse Source
This commit is contained in:
James Cole
2015-05-20 07:20:02 +02:00
parent 95ef691077
commit 9e54eecfaa
5 changed files with 52 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -332,9 +332,9 @@ class ReportHelper implements ReportHelperInterface
public function getExpenseReport($start, $end, $shared)
{
$object = new Expense;
$set = $this->query->expenseInPeriod($start, $end, $shared);
$set = $this->query->expenseInPeriodCorrected($start, $end, $shared);
foreach ($set as $entry) {
$object->addToTotal($entry->queryAmount);
$object->addToTotal($entry->amount);
$object->addOrCreateExpense($entry);
}
@@ -353,9 +353,9 @@ class ReportHelper implements ReportHelperInterface
public function getIncomeReport($start, $end, $shared)
{
$object = new Income;
$set = $this->query->incomeInPeriod($start, $end, $shared);
$set = $this->query->incomeInPeriodCorrected($start, $end, $shared);
foreach ($set as $entry) {
$object->addToTotal($entry->queryAmount);
$object->addToTotal($entry->amount);
$object->addOrCreateIncome($entry);
}