kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-06-09 03:44:57 +00:00
Code Issues Projects Releases Wiki Activity

Fix https://github.com/firefly-iii/firefly-iii/issues/12223

Browse Source
This commit is contained in:
James Cole
2026-05-09 07:02:06 +02:00
parent ed9557aaa0
commit 984e735bc1
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/Report/BudgetController.php
View File

@@ -70,6 +70,7 @@ final class BudgetController extends Controller
*/
public function accountPerBudget(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end): Factory|\Illuminate\Contracts\View\View
{
/** @var BudgetReportGenerator $generator */
$generator = app(BudgetReportGenerator::class);
@@ -90,6 +91,7 @@ final class BudgetController extends Controller
*/
public function accounts(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end): Factory|\Illuminate\Contracts\View\View
{
$spent = $this->opsRepository->listExpenses($start, $end, $accounts, $budgets);
$report = [];
$sums = [];
@@ -255,6 +257,7 @@ final class BudgetController extends Controller
*/
public function general(Collection $accounts, Carbon $start, Carbon $end)
{
/** @var BudgetReportGenerator $generator */
$generator = app(BudgetReportGenerator::class);
@@ -284,7 +287,7 @@ final class BudgetController extends Controller
$cache->addProperty('budget-period-report');
$cache->addProperty($accounts->pluck('id')->toArray());
if ($cache->has()) {
return $cache->get();
// return $cache->get();
}
$periods = Navigation::listOfPeriods($start, $end);
@@ -292,7 +295,6 @@ final class BudgetController extends Controller
// list expenses for budgets in account(s)
$expenses = $this->opsRepository->listExpenses($start, $end, $accounts);
$report = [];
foreach ($expenses as $currency) {
foreach ($currency['budgets'] as $budget) {
@@ -300,9 +302,12 @@ final class BudgetController extends Controller
foreach ($budget['transaction_journals'] as $journal) {
// #10678
// skip transactions between two asset / liability accounts.
// #12223
// must also be of the same type to be skipped
if (
in_array($journal['source_account_type'], config('firefly.valid_currency_account_types'), true)
&& in_array($journal['destination_account_type'], config('firefly.valid_currency_account_types'), true)
&& $journal['source_account_type'] === $journal['destination_account_type']
) {
continue;
}

1
config/firefly.php
View File

@@ -198,6 +198,7 @@ return [
'default_locale' => env_default_when_empty(env('DEFAULT_LOCALE'), 'equal'),
// account types that may have or set a currency
'valid_currency_account_types' => [
AccountTypeEnum::ASSET->value,
AccountTypeEnum::LOAN->value,