kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-17 09:51:40 +00:00
Code Issues Projects Releases Wiki Activity

Fixes #151

Browse Source
This commit is contained in:
James Cole
2016-03-12 07:44:20 +01:00
parent 4cded0bf57
commit 1aea4045a3
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Chart/BudgetController.php
View File

@@ -200,7 +200,7 @@ class BudgetController extends Controller
$allEntries->push([$name, $left, $spent, $overspent, $amount, $expenses]);
}
$noBudgetExpenses = $repository->getWithoutBudgetSum($start, $end);
$noBudgetExpenses = $repository->getWithoutBudgetSum($accounts, $start, $end);
$allEntries->push([trans('firefly.noBudget'), '0', '0', $noBudgetExpenses, '0', '0']);
$data = $this->generator->frontpage($allEntries);
$cache->store($data);
@@ -266,7 +266,7 @@ class BudgetController extends Controller
// this might be a good moment to collect no budget stuff.
if (is_null($budget->id)) {
// get without budget sum in range:
$spent = $repository->getWithoutBudgetSum($currentStart, $currentEnd) * -1;
$spent = $repository->getWithoutBudgetSum($accounts, $currentStart, $currentEnd) * -1;
} else {
if (isset($set[$id]['entries'][$year])) {
$spent = $set[$id]['entries'][$year] * -1;