kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-17 15:18:05 +00:00
Code Issues Projects Releases Wiki Activity

Make reports slightly more multi currency.

Browse Source
This commit is contained in:
James Cole
2018-09-06 19:47:29 +02:00
parent 1903292202
commit d5773ab5d0
11 changed files with 111 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Support/Http/Controllers/RenderPartialViews.php
View File

@@ -27,6 +27,7 @@ namespace FireflyIII\Support\Http\Controllers;
use FireflyIII\Helpers\Collection\BalanceLine;
use FireflyIII\Helpers\Report\PopupReportInterface;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\Budget;
use FireflyIII\Models\Tag;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
@@ -102,6 +103,7 @@ trait RenderPartialViews
break;
case BalanceLine::ROLE_DEFAULTROLE === $role && null === $budget && null !== $account:
// normal row without a budget:
$budget = new Budget;
$journals = $popupHelper->balanceForNoBudget($account, $attributes);
$budget->name = (string)trans('firefly.no_budget');
break;
@@ -156,7 +158,7 @@ trait RenderPartialViews
$budget = $budgetRepository->findNull((int)$attributes['budgetId']);
if (null === $budget) {
return 'This is an unknown budget. Apologies.';
$budget = new Budget;
}
$journals = $popupHelper->byBudget($budget, $attributes);
try {