Auto commit for release 'develop' on 2024-12-27

# Conflicts:
#	composer.lock
#	config/firefly.php
#	package-lock.json

.ci/php-cs-fixer/composer.lock

@@ -1369,12 +1369,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -1517,12 +1517,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -2329,12 +2329,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {

.github/workflows/release.yml

@@ -10,7 +10,7 @@ on:
       phpversion:
         description: 'PHP version'
         required: true
-        default: '8.3'
+        default: '8.4'
   schedule:
     - cron: '0 3 * * MON'
 

.github/workflows/sonarcloud.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Setup PHP with Xdebug
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3'
+          php-version: '8.4'
           coverage: xdebug
           extensions: >-
             bcmath

app/Console/Commands/Correction/CorrectionSkeleton.php.stub

@@ -4,10 +4,6 @@ namespace FireflyIII\Console\Commands\Correction;
 
 use Illuminate\Console\Command;
 
-/**
- * Class CorrectionSkeleton
- * TODO DONT FORGET TO ADD THIS TO THE DOCKER BUILD
- */
 class CorrectionSkeleton extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Correction/CorrectsGroupAccounts.php

@@ -31,9 +31,6 @@ use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
 
-/**
- * Class FixGroupAccounts
- */
 class CorrectsGroupAccounts extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Correction/CorrectsNativeAmounts.php

@@ -102,7 +102,7 @@ class CorrectsNativeAmounts extends Command
         foreach ($set as $account) {
             $account->touch();
         }
-        Log::debug(sprintf('Recalculated %d accounts', $set->count()));
+        Log::debug(sprintf('Recalculated %d accounts for user group #%d.', $set->count(), $userGroup->id));
     }
 
     private function recalculatePiggyBanks(UserGroup $userGroup, TransactionCurrency $currency): void
@@ -131,7 +131,7 @@ class CorrectsNativeAmounts extends Command
             }
             $this->recalculatePiggyBankEvents($piggyBank);
         }
-        Log::debug(sprintf('Recalculated %d piggy banks.', $set->count()));
+        Log::debug(sprintf('Recalculated %d piggy banks for user group #%d.', $set->count(), $userGroup->id));
 
     }
 
@@ -168,7 +168,7 @@ class CorrectsNativeAmounts extends Command
             $limit->touch();
             Log::debug(sprintf('Done with touch BL #%d', $limit->id));
         }
-        Log::debug(sprintf('Recalculated %d budget limits.', $set->count()));
+        Log::debug(sprintf('Recalculated %d budget limits for budget #%d.', $set->count(), $budget->id));
     }
 
     private function recalculateAutoBudgets(Budget $budget, TransactionCurrency $currency): void
@@ -179,7 +179,7 @@ class CorrectsNativeAmounts extends Command
         foreach ($set as $autoBudget) {
             $autoBudget->touch();
         }
-        Log::debug(sprintf('Recalculated %d auto budgets.', $set->count()));
+        Log::debug(sprintf('Recalculated %d auto budgets for budget #%d.', $set->count(), $budget->id));
     }
 
     private function recalculateAvailableBudgets(UserGroup $userGroup, TransactionCurrency $currency): void

app/Console/Commands/Correction/CorrectsPiggyBanks.php

@@ -29,11 +29,6 @@ use FireflyIII\Models\PiggyBankEvent;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
 
-/**
- * Report (and fix) piggy banks.
- *
- * Class FixPiggies
- */
 class CorrectsPiggyBanks extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Correction/CorrectsTransferBudgets.php

@@ -29,9 +29,6 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use Illuminate\Console\Command;
 
-/**
- * Class TransferBudgets
- */
 class CorrectsTransferBudgets extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Correction/CorrectsUnevenAmount.php

@@ -33,9 +33,6 @@ use FireflyIII\Support\Models\AccountBalanceCalculator;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
 
-/**
- * Class FixUnevenAmount
- */
 class CorrectsUnevenAmount extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Correction/CreatesAccessTokens.php

@@ -29,9 +29,6 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Console\Command;
 
-/**
- * Class CreateAccessTokens
- */
 class CreatesAccessTokens extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Correction/CreatesLinkTypes.php

@@ -28,9 +28,6 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\LinkType;
 use Illuminate\Console\Command;
 
-/**
- * Class CreateLinkTypes. Created all link types in case a migration hasn't fired.
- */
 class CreatesLinkTypes extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Correction/RemovesBills.php

@@ -29,9 +29,6 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use Illuminate\Console\Command;
 
-/**
- * Class RemoveBills
- */
 class RemovesBills extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Correction/RemovesEmptyGroups.php

@@ -29,9 +29,6 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\TransactionGroup;
 use Illuminate\Console\Command;
 
-/**
- * Class DeleteEmptyGroups
- */
 class RemovesEmptyGroups extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Correction/RemovesEmptyJournals.php

@@ -30,9 +30,6 @@ use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
 use Illuminate\Database\QueryException;
 
-/**
- * Class DeleteEmptyJournals
- */
 class RemovesEmptyJournals extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Correction/RestoresOAuthKeys.php

@@ -28,9 +28,6 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Support\System\OAuthKeys;
 use Illuminate\Console\Command;
 
-/**
- * Class RestoreOAuthKeys
- */
 class RestoresOAuthKeys extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Export/ExportsData.php

@@ -36,10 +36,7 @@ use FireflyIII\Support\Export\ExportDataGenerator;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
 
-/**
- * Class ExportData
- */
-class ExportData extends Command
+class ExportsData extends Command
 {
     use ShowsFriendlyMessages;
     use VerifiesAccessToken;

app/Console/Commands/Integrity/ReportSkeleton.php.stub

@@ -4,10 +4,6 @@ namespace FireflyIII\Console\Commands\Integrity;
 
 use Illuminate\Console\Command;
 
-/**
- * Class ReportSkeleton
- * TODO DONT FORGET TO ADD THIS TO THE DOCKER BUILD
- */
 class ReportSkeleton extends Command
 {
 

app/Console/Commands/Integrity/ReportsEmptyObjects.php

@@ -31,9 +31,6 @@ use FireflyIII\Models\Category;
 use FireflyIII\Models\Tag;
 use Illuminate\Console\Command;
 
-/**
- * Class ReportEmptyObjects
- */
 class ReportsEmptyObjects extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Integrity/ReportsIntegrity.php

@@ -27,9 +27,6 @@ namespace FireflyIII\Console\Commands\Integrity;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use Illuminate\Console\Command;
 
-/**
- * Class ReportIntegrity
- */
 class ReportsIntegrity extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Integrity/ReportsSums.php

@@ -29,9 +29,6 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Console\Command;
 
-/**
- * Class ReportSkeleton
- */
 class ReportsSums extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/System/CallsLaravelPassportKeys.php

@@ -28,7 +28,7 @@ use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Artisan;
 use Symfony\Component\Console\Command\Command as CommandAlias;
 
-class LaravelPassportKeys extends Command
+class CallsLaravelPassportKeys extends Command
 {
     use ShowsFriendlyMessages;
 

app/Console/Commands/System/CreatesDatabase.php

@@ -28,10 +28,7 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use Illuminate\Console\Command;
 use PDO;
 
-/**
- * Class CreateDatabase
- */
-class CreateDatabase extends Command
+class CreatesDatabase extends Command
 {
     use ShowsFriendlyMessages;
 

app/Console/Commands/System/CreatesFirstUser.php

@@ -29,16 +29,13 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Hash;
 
-/**
- * Class CreateFirstUser
- */
-class CreateFirstUser extends Command
+class CreatesFirstUser extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Creates a new user and gives admin rights. Outputs the password on the command line. Strictly for testing.';
 
-    protected $signature   = 'firefly-iii:create-first-user {email}';
+    protected $signature   = 'system:create-first-user {email}';
     private UserRepositoryInterface $repository;
 
     /**

app/Console/Commands/System/ForcesDecimalSize.php

@@ -44,13 +44,11 @@ use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 
 /**
- * Class ForceDecimalSize
- *
  * This command was inspired by https://github.com/elliot-gh. It will check all amount fields
  * and their values and correct them to the correct number of decimal places. This fixes issues where
  * Firefly III would store 0.01 as 0.01000000000000000020816681711721685132943093776702880859375.
  */
-class ForceDecimalSize extends Command
+class ForcesDecimalSize extends Command
 {
     use ShowsFriendlyMessages;
 

app/Console/Commands/System/ForcesMigrations.php

@@ -33,10 +33,7 @@ use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Schema;
 
-/**
- * Class ForceMigration
- */
-class ForceMigration extends Command
+class ForcesMigrations extends Command
 {
     use ShowsFriendlyMessages;
     use VerifiesAccessToken;

app/Console/Commands/System/OutputsInstructions.php

@@ -27,16 +27,13 @@ namespace FireflyIII\Console\Commands\System;
 use FireflyIII\Support\System\GeneratesInstallationId;
 use Illuminate\Console\Command;
 
-/**
- * Class UpgradeFireflyInstructions.
- */
-class UpgradeFireflyInstructions extends Command
+class OutputsInstructions extends Command
 {
     use GeneratesInstallationId;
 
     protected $description = 'Instructions in case of upgrade trouble.';
 
-    protected $signature   = 'firefly:instructions {task}';
+    protected $signature   = 'firefly-iii:instructions {task=install}';
 
     /**
      * Execute the console command.
@@ -79,7 +76,7 @@ class UpgradeFireflyInstructions extends Command
         }
 
         $prefix  = 'v';
-        if (str_starts_with($version, 'develop')) {
+        if (str_starts_with($version, 'develop') || str_starts_with($version, 'branch')) {
             $prefix = '';
         }
 
@@ -94,6 +91,8 @@ class UpgradeFireflyInstructions extends Command
             $this->boxedInfo('There are no extra upgrade instructions.');
             $this->boxed('Firefly III should be ready for use.');
             $this->boxed('');
+            $this->donationText();
+            $this->boxed('');
             $this->showLine();
 
             return;
@@ -102,6 +101,8 @@ class UpgradeFireflyInstructions extends Command
         $this->boxed(sprintf('Thank you for updating to Firefly III, %s%s!', $prefix, $version));
         $this->boxedInfo($text);
         $this->boxed('');
+        $this->donationText();
+        $this->boxed('');
         $this->showLine();
     }
 
@@ -213,6 +214,8 @@ class UpgradeFireflyInstructions extends Command
             $this->boxedInfo('There are no extra installation instructions.');
             $this->boxed('Firefly III should be ready for use.');
             $this->boxed('');
+            $this->donationText();
+            $this->boxed('');
             $this->showLine();
 
             return;
@@ -221,6 +224,15 @@ class UpgradeFireflyInstructions extends Command
         $this->boxed(sprintf('Thank you for installing Firefly III, %s%s!', $prefix, $version));
         $this->boxedInfo($text);
         $this->boxed('');
+        $this->donationText();
+        $this->boxed('');
         $this->showLine();
     }
+
+    private function donationText(): void
+    {
+        $this->boxed('Did you know you can support the development of Firefly III?');
+        $this->boxed('You can donate in many ways, like GitHub Sponsors or Patreon.');
+        $this->boxed('For more information, please visit https://bit.ly/donate-to-Firefly-III');
+    }
 }

app/Console/Commands/System/OutputsVersion.php

@@ -26,10 +26,7 @@ namespace FireflyIII\Console\Commands\System;
 
 use Illuminate\Console\Command;
 
-/**
- * Class OutputVersion
- */
-class OutputVersion extends Command
+class OutputsVersion extends Command
 {
     protected $description = 'Outputs the Firefly III version';
 

app/Console/Commands/System/ScansAttachments.php

@@ -29,10 +29,7 @@ use FireflyIII\Models\Attachment;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Encryption\DecryptException;
 
-/**
- * Class ScanAttachments.
- */
-class ScanAttachments extends Command
+class ScansAttachments extends Command
 {
     use ShowsFriendlyMessages;
 

app/Console/Commands/System/SetsLatestVersion.php

@@ -27,10 +27,7 @@ namespace FireflyIII\Console\Commands\System;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use Illuminate\Console\Command;
 
-/**
- * Class SetLatestVersion
- */
-class SetLatestVersion extends Command
+class SetsLatestVersion extends Command
 {
     use ShowsFriendlyMessages;
 

app/Console/Commands/System/VerifySecurityAlerts.php

@@ -29,9 +29,6 @@ use Illuminate\Console\Command;
 use Illuminate\Database\QueryException;
 use League\Flysystem\FilesystemException;
 
-/**
- * Class VerifySecurityAlerts
- */
 class VerifySecurityAlerts extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Tools/ApplyRules.php

@@ -40,9 +40,6 @@ use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 
-/**
- * Class ApplyRules
- */
 class ApplyRules extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Tools/Cron.php

@@ -34,9 +34,6 @@ use FireflyIII\Support\Cronjobs\RecurringCronjob;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
 
-/**
- * Class Cron
- */
 class Cron extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Upgrade/UpgradeSkeleton.php.stub

@@ -4,9 +4,6 @@ namespace FireflyIII\Console\Commands\Upgrade;
 
 use Illuminate\Console\Command;
 
-/**
- * Class UpgradeSkeleton.
- */
 class UpgradeSkeleton extends Command
 {
     use ShowsFriendlyMessages;

app/Factory/PiggyBankFactory.php

@@ -231,8 +231,8 @@ class PiggyBankFactory
             foreach ($accounts as $info) {
                 if ($account->id === $info['account_id']) {
                     if (array_key_exists($account->id, $accounts)) {
-                        $toBeLinked[$account->id] = ['current_amount' => $account->pivot->current_amount];
-                        Log::debug(sprintf('Prefilled for account #%d with amount %s', $account->id, $account->pivot->current_amount));
+                        $toBeLinked[$account->id] = ['current_amount' => $account->pivot?->current_amount ?? '0'];
+                        Log::debug(sprintf('Prefilled for account #%d with amount %s', $account->id, $account->pivot?->current_amount ?? '0'));
                     }
                 }
             }
@@ -247,7 +247,7 @@ class PiggyBankFactory
             }
             if (array_key_exists('current_amount', $info)) {
                 $toBeLinked[$account->id] = ['current_amount' => $info['current_amount']];
-                Log::debug(sprintf('Will link account #%d with amount %s', $account->id, $account->pivot->current_amount));
+                Log::debug(sprintf('Will link account #%d with amount %s', $account->id, $account->pivot?->current_amount ?? '0'));
             }
             if (!array_key_exists('current_amount', $info)) {
                 $toBeLinked[$account->id] ??= [];

app/Handlers/Observer/AccountObserver.php

@@ -37,7 +37,7 @@ class AccountObserver
 {
     public function created(Account $account): void
     {
-        Log::debug('Observe "created" of an account.');
+        //        Log::debug('Observe "created" of an account.');
         $this->updateNativeAmount($account);
     }
 
@@ -57,7 +57,7 @@ class AccountObserver
             $account->native_virtual_balance = null;
         }
         $account->saveQuietly();
-        Log::debug('Account native virtual balance is updated.');
+        // Log::debug('Account native virtual balance is updated.');
     }
 
     /**
@@ -65,7 +65,7 @@ class AccountObserver
      */
     public function deleting(Account $account): void
     {
-        app('log')->debug('Observe "deleting" of an account.');
+        //        app('log')->debug('Observe "deleting" of an account.');
         $account->accountMeta()->delete();
 
         /** @var PiggyBank $piggy */
@@ -84,7 +84,7 @@ class AccountObserver
 
     public function updated(Account $account): void
     {
-        Log::debug('Observe "updated" of an account.');
+        //        Log::debug('Observe "updated" of an account.');
         $this->updateNativeAmount($account);
     }
 }

app/Helpers/Report/NetWorth.php

@@ -74,7 +74,7 @@ class NetWorth implements NetWorthInterface
         $cache->addProperty('net-worth-by-accounts');
         $cache->addProperty($ids);
         if ($cache->has()) {
-            // return $cache->get();
+            return $cache->get();
         }
         Log::debug(sprintf('Now in byAccounts("%s", "%s")', $ids, $date->format('Y-m-d H:i:s')));
         $default         = Amount::getDefaultCurrency();

app/Http/Controllers/Budget/IndexController.php

@@ -36,6 +36,7 @@ use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
 use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use FireflyIII\Support\Http\Controllers\DateCalculation;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\JsonResponse;
@@ -161,6 +162,7 @@ class IndexController extends Controller
 
     private function getAllAvailableBudgets(Carbon $start, Carbon $end): array
     {
+        $converter        = new ExchangeRateConverter();
         // get all available budgets.
         $ab               = $this->abRepository->get($start, $end);
         $availableBudgets = [];
@@ -168,18 +170,22 @@ class IndexController extends Controller
         // for each, complement with spent amount:
         /** @var AvailableBudget $entry */
         foreach ($ab as $entry) {
-            $array               = $entry->toArray();
-            $array['start_date'] = $entry->start_date;
-            $array['end_date']   = $entry->end_date;
+            $array                    = $entry->toArray();
+            $array['start_date']      = $entry->start_date;
+            $array['end_date']        = $entry->end_date;
 
             // spent in period:
-            $spentArr            = $this->opsRepository->sumExpenses($entry->start_date, $entry->end_date, null, null, $entry->transactionCurrency);
-            $array['spent']      = $spentArr[$entry->transaction_currency_id]['sum'] ?? '0';
-
+            $spentArr                 = $this->opsRepository->sumExpenses($entry->start_date, $entry->end_date, null, null, $entry->transactionCurrency);
+            $array['spent']           = $spentArr[$entry->transaction_currency_id]['sum'] ?? '0';
+            $array['native_spent']    = $this->convertToNative && $entry->transaction_currency_id !== $this->defaultCurrency->id ? $converter->convert($entry->transactionCurrency, $this->defaultCurrency, $entry->start_date, $array['spent']) : null;
             // budgeted in period:
-            $budgeted            = $this->blRepository->budgeted($entry->start_date, $entry->end_date, $entry->transactionCurrency);
-            $array['budgeted']   = $budgeted;
-            $availableBudgets[]  = $array;
+            $budgeted                 = $this->blRepository->budgeted($entry->start_date, $entry->end_date, $entry->transactionCurrency);
+            $array['budgeted']        = $budgeted;
+            $array['native_budgeted'] = $this->convertToNative && $entry->transaction_currency_id !== $this->defaultCurrency->id ? $converter->convert($entry->transactionCurrency, $this->defaultCurrency, $entry->start_date, $budgeted) : null;
+            // this time, because of complex sums, use the currency converter.
+
+
+            $availableBudgets[]       = $array;
             unset($spentArr);
         }
 

app/Http/Controllers/Chart/AccountController.php

@@ -426,7 +426,7 @@ class AccountController extends Controller
         $cache->addProperty($this->convertToNative);
         $cache->addProperty($account->id);
         if ($cache->has()) {
-            // return response()->json($cache->get());
+            return response()->json($cache->get());
         }
 
         // collect and filter balances for the entire period.

app/Http/Controllers/Chart/BillController.php

@@ -111,7 +111,7 @@ class BillController extends Controller
         $cache->addProperty($bill->id);
         $cache->addProperty($this->convertToNative);
         if ($cache->has()) {
-            // return response()->json($cache->get());
+            return response()->json($cache->get());
         }
         $locale     = app('steam')->getLocale();
 

app/Http/Controllers/Chart/BudgetController.php

@@ -92,6 +92,7 @@ class BudgetController extends Controller
         $cache          = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
+        $cache->addProperty($this->convertToNative);
         $cache->addProperty('chart.budget.budget');
         $cache->addProperty($budget->id);
 
@@ -108,7 +109,7 @@ class BudgetController extends Controller
         while ($end >= $loopStart) {
             /** @var Carbon $loopEnd */
             $loopEnd                = app('navigation')->endOfPeriod($loopStart, $step);
-            $spent                  = $this->opsRepository->sumExpenses($loopStart, $loopEnd, null, $collection);
+            $spent                  = $this->opsRepository->sumExpenses($loopStart, $loopEnd, null, $collection); // this method already converts to native.
             $label                  = trim(app('navigation')->periodShow($loopStart, $step));
 
             foreach ($spent as $row) {
@@ -157,6 +158,7 @@ class BudgetController extends Controller
         $cache                                  = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
+        $cache->addProperty($this->convertToNative);
         $cache->addProperty('chart.budget.budget.limit');
         $cache->addProperty($budgetLimit->id);
         $cache->addProperty($budget->id);
@@ -169,9 +171,15 @@ class BudgetController extends Controller
         $amount                                 = $budgetLimit->amount;
         $budgetCollection                       = new Collection([$budget]);
         $currency                               = $budgetLimit->transactionCurrency;
+        if ($this->convertToNative) {
+            $amount   = $budgetLimit->native_amount;
+            $currency = $this->defaultCurrency;
+        }
+
+
         while ($start <= $end) {
             $current          = clone $start;
-            $expenses         = $this->opsRepository->sumExpenses($current, $current, null, $budgetCollection, $currency);
+            $expenses         = $this->opsRepository->sumExpenses($current, $current, null, $budgetCollection, $budgetLimit->transactionCurrency);
             $spent            = $expenses[$currency->id]['sum'] ?? '0';
             $amount           = bcadd($amount, $spent);
             $format           = $start->isoFormat((string) trans('config.month_and_day_js', [], $locale));
@@ -181,8 +189,8 @@ class BudgetController extends Controller
         }
         $data                                   = $this->generator->singleSet((string) trans('firefly.left'), $entries);
         // add currency symbol from budget limit:
-        $data['datasets'][0]['currency_symbol'] = $budgetLimit->transactionCurrency->symbol;
-        $data['datasets'][0]['currency_code']   = $budgetLimit->transactionCurrency->code;
+        $data['datasets'][0]['currency_symbol'] = $currency->symbol;
+        $data['datasets'][0]['currency_code']   = $currency->code;
         $cache->store($data);
 
         return response()->json($data);
@@ -198,6 +206,7 @@ class BudgetController extends Controller
         $budgetLimitId = null === $budgetLimit ? 0 : $budgetLimit->id;
         $cache         = new CacheProperties();
         $cache->addProperty($budget->id);
+        $cache->addProperty($this->convertToNative);
         $cache->addProperty($budgetLimitId);
         $cache->addProperty('chart.budget.expense-asset');
         $start         = session('first', today(config('app.timezone'))->startOfYear());
@@ -222,14 +231,33 @@ class BudgetController extends Controller
 
         // group by asset account ID:
         foreach ($journals as $journal) {
-            $key                    = sprintf('%d-%d', (int) $journal['source_account_id'], $journal['currency_id']);
+            $key                    = sprintf('%d-%d', $journal['source_account_id'], $journal['currency_id']);
+            $amount                 = $journal['amount'];
+
+            // if convert to native, use the native things, unless it's the foreign amount which is in the native currency.
+            if ($this->convertToNative && $journal['currency_id'] !== $this->defaultCurrency->id && $journal['foreign_currency_id'] !== $this->defaultCurrency->id) {
+                $key    = sprintf('%d-%d', $journal['source_account_id'], $this->defaultCurrency->id);
+                $symbol = $this->defaultCurrency->symbol;
+                $code   = $this->defaultCurrency->code;
+                $name   = $this->defaultCurrency->name;
+                $amount = $journal['native_amount'];
+            }
+
+            if ($this->convertToNative && $journal['currency_id'] !== $this->defaultCurrency->id && $journal['foreign_currency_id'] === $this->defaultCurrency->id) {
+                $key    = sprintf('%d-%d', $journal['source_account_id'], $this->defaultCurrency->id);
+                $symbol = $this->defaultCurrency->symbol;
+                $code   = $this->defaultCurrency->code;
+                $name   = $this->defaultCurrency->name;
+                $amount = $journal['foreign_amount'];
+            }
+
             $result[$key] ??= [
                 'amount'          => '0',
-                'currency_symbol' => $journal['currency_symbol'],
-                'currency_code'   => $journal['currency_code'],
-                'currency_name'   => $journal['currency_name'],
+                'currency_symbol' => $symbol,
+                'currency_code'   => $code,
+                'currency_name'   => $name,
             ];
-            $result[$key]['amount'] = bcadd($journal['amount'], $result[$key]['amount']);
+            $result[$key]['amount'] = bcadd($amount, $result[$key]['amount']);
         }
 
         $names         = $this->getAccountNames(array_keys($result));
@@ -261,6 +289,7 @@ class BudgetController extends Controller
         $budgetLimitId = null === $budgetLimit ? 0 : $budgetLimit->id;
         $cache         = new CacheProperties();
         $cache->addProperty($budget->id);
+        $cache->addProperty($this->convertToNative);
         $cache->addProperty($budgetLimitId);
         $cache->addProperty('chart.budget.expense-category');
         $start         = session('first', today(config('app.timezone'))->startOfYear());
@@ -283,13 +312,36 @@ class BudgetController extends Controller
         $chartData     = [];
         foreach ($journals as $journal) {
             $key                    = sprintf('%d-%d', $journal['category_id'], $journal['currency_id']);
+            $symbol                 = $journal['currency_symbol'];
+            $code                   = $journal['currency_code'];
+            $name                   = $journal['currency_name'];
+            $amount                 = $journal['amount'];
+            // if convert to native, use the native things, unless it's the foreign amount which is in the native currency.
+            if ($this->convertToNative && $journal['currency_id'] !== $this->defaultCurrency->id && $journal['foreign_currency_id'] !== $this->defaultCurrency->id
+            ) {
+                $key    = sprintf('%d-%d', $journal['category_id'], $this->defaultCurrency->id);
+                $symbol = $this->defaultCurrency->symbol;
+                $code   = $this->defaultCurrency->code;
+                $name   = $this->defaultCurrency->name;
+                $amount = $journal['native_amount'];
+            }
+
+            if ($this->convertToNative && $journal['currency_id'] !== $this->defaultCurrency->id && $journal['foreign_currency_id'] === $this->defaultCurrency->id
+            ) {
+                $key    = sprintf('%d-%d', $journal['category_id'], $this->defaultCurrency->id);
+                $symbol = $this->defaultCurrency->symbol;
+                $code   = $this->defaultCurrency->code;
+                $name   = $this->defaultCurrency->name;
+                $amount = $journal['foreign_amount'];
+            }
+
             $result[$key] ??= [
                 'amount'          => '0',
-                'currency_symbol' => $journal['currency_symbol'],
-                'currency_code'   => $journal['currency_code'],
-                'currency_name'   => $journal['currency_name'],
+                'currency_symbol' => $symbol,
+                'currency_code'   => $code,
+                'currency_name'   => $name,
             ];
-            $result[$key]['amount'] = bcadd($journal['amount'], $result[$key]['amount']);
+            $result[$key]['amount'] = bcadd($amount, $result[$key]['amount']);
         }
 
         $names         = $this->getCategoryNames(array_keys($result));
@@ -320,6 +372,7 @@ class BudgetController extends Controller
         $cache         = new CacheProperties();
         $cache->addProperty($budget->id);
         $cache->addProperty($budgetLimitId);
+        $cache->addProperty($this->convertToNative);
         $cache->addProperty('chart.budget.expense-expense');
         $start         = session('first', today(config('app.timezone'))->startOfYear());
         $end           = today();
@@ -343,13 +396,32 @@ class BudgetController extends Controller
         /** @var array $journal */
         foreach ($journals as $journal) {
             $key                    = sprintf('%d-%d', $journal['destination_account_id'], $journal['currency_id']);
+            $amount                 = $journal['amount'];
+
+            // if convert to native, use the native things, unless it's the foreign amount which is in the native currency.
+            if ($this->convertToNative && $journal['currency_id'] !== $this->defaultCurrency->id && $journal['foreign_currency_id'] !== $this->defaultCurrency->id) {
+                $key    = sprintf('%d-%d', $journal['destination_account_id'], $this->defaultCurrency->id);
+                $symbol = $this->defaultCurrency->symbol;
+                $code   = $this->defaultCurrency->code;
+                $name   = $this->defaultCurrency->name;
+                $amount = $journal['native_amount'];
+            }
+
+            if ($this->convertToNative && $journal['currency_id'] !== $this->defaultCurrency->id && $journal['foreign_currency_id'] === $this->defaultCurrency->id) {
+                $key    = sprintf('%d-%d', $journal['destination_account_id'], $this->defaultCurrency->id);
+                $symbol = $this->defaultCurrency->symbol;
+                $code   = $this->defaultCurrency->code;
+                $name   = $this->defaultCurrency->name;
+                $amount = $journal['foreign_amount'];
+            }
+
             $result[$key] ??= [
                 'amount'          => '0',
-                'currency_symbol' => $journal['currency_symbol'],
-                'currency_code'   => $journal['currency_code'],
-                'currency_name'   => $journal['currency_name'],
+                'currency_symbol' => $symbol,
+                'currency_code'   => $code,
+                'currency_name'   => $name,
             ];
-            $result[$key]['amount'] = bcadd($journal['amount'], $result[$key]['amount']);
+            $result[$key]['amount'] = bcadd($amount, $result[$key]['amount']);
         }
 
         $names         = $this->getAccountNames(array_keys($result));
@@ -385,7 +457,7 @@ class BudgetController extends Controller
         $cache->addProperty($this->convertToNative);
         $cache->addProperty('chart.budget.frontpage');
         if ($cache->has()) {
-            // return response()->json($cache->get());
+            return response()->json($cache->get());
         }
         Log::debug('Regenerate frontpage chart from scratch.');
         $chartGenerator                  = app(FrontpageChartGenerator::class);

app/Http/Controllers/Chart/CategoryController.php

@@ -70,24 +70,27 @@ class CategoryController extends Controller
     public function all(Category $category): JsonResponse
     {
         // cache results:
-        $cache          = new CacheProperties();
+        $cache                           = new CacheProperties();
         $cache->addProperty('chart.category.all');
         $cache->addProperty($category->id);
+        $cache->addProperty($this->convertToNative);
         if ($cache->has()) {
             return response()->json($cache->get());
         }
 
         /** @var CategoryRepositoryInterface $repository */
-        $repository     = app(CategoryRepositoryInterface::class);
-        $start          = $repository->firstUseDate($category) ?? $this->getDate();
-        $range          = app('navigation')->getViewRange(false);
-        $start          = app('navigation')->startOfPeriod($start, $range);
-        $end            = $this->getDate();
+        $repository                      = app(CategoryRepositoryInterface::class);
+        $start                           = $repository->firstUseDate($category) ?? $this->getDate();
+        $range                           = app('navigation')->getViewRange(false);
+        $start                           = app('navigation')->startOfPeriod($start, $range);
+        $end                             = $this->getDate();
 
         /** @var WholePeriodChartGenerator $chartGenerator */
-        $chartGenerator = app(WholePeriodChartGenerator::class);
-        $chartData      = $chartGenerator->generate($category, $start, $end);
-        $data           = $this->generator->multiSet($chartData);
+        $chartGenerator                  = app(WholePeriodChartGenerator::class);
+        $chartGenerator->convertToNative = $this->convertToNative;
+
+        $chartData                       = $chartGenerator->generate($category, $start, $end);
+        $data                            = $this->generator->multiSet($chartData);
         $cache->store($data);
 
         return response()->json($data);
@@ -113,7 +116,7 @@ class CategoryController extends Controller
         $cache->addProperty($this->convertToNative);
         $cache->addProperty('chart.category.frontpage');
         if ($cache->has()) {
-            // return response()->json($cache->get());
+            return response()->json($cache->get());
         }
 
         $frontpageGenerator = new FrontpageChartGenerator($start, $end);
@@ -136,6 +139,7 @@ class CategoryController extends Controller
         $cache->addProperty('chart.category.period');
         $cache->addProperty($accounts->pluck('id')->toArray());
         $cache->addProperty($category);
+        $cache->addProperty($this->convertToNative);
         if ($cache->has()) {
             return response()->json($cache->get());
         }
@@ -193,11 +197,11 @@ class CategoryController extends Controller
 
             $chartData[$inKey]
                           = [
-                              'label'           => sprintf('%s (%s)', (string) trans('firefly.earned'), $currencyInfo['currency_name']),
-                              'entries'         => [],
-                              'type'            => 'bar',
-                              'backgroundColor' => 'rgba(0, 141, 76, 0.5)', // green
-                          ];
+                    'label'           => sprintf('%s (%s)', (string) trans('firefly.earned'), $currencyInfo['currency_name']),
+                    'entries'         => [],
+                    'type'            => 'bar',
+                    'backgroundColor' => 'rgba(0, 141, 76, 0.5)', // green
+                ];
             // loop empty periods:
             foreach (array_keys($periods) as $period) {
                 $label                                 = $periods[$period];

app/Http/Controllers/Chart/ReportController.php

@@ -145,7 +145,7 @@ class ReportController extends Controller
         $cache->addProperty($accounts);
         $cache->addProperty($end);
         if ($cache->has()) {
-            // return response()->json($cache->get());
+            return response()->json($cache->get());
         }
 
         Log::debug('Going to do operations for accounts ', $accounts->pluck('id')->toArray());

app/Http/Controllers/DebugController.php

@@ -76,6 +76,10 @@ class DebugController extends Controller
                 || str_starts_with($route->uri(), '_debugbar')
                 || str_starts_with($route->uri(), '_ignition')
                 || str_starts_with($route->uri(), 'oauth')
+                || str_starts_with($route->uri(), 'chart')
+                || str_starts_with($route->uri(), 'v1/jscript')
+                || str_starts_with($route->uri(), 'v2/jscript')
+                || str_starts_with($route->uri(), 'json')
                 || str_starts_with($route->uri(), 'sanctum')
             ) {
                 continue;

app/Http/Controllers/JavascriptController.php

@@ -49,14 +49,13 @@ class JavascriptController extends Controller
         $accounts = $repository->getAccountsByType(
             [AccountType::DEFAULT, AccountType::ASSET, AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD]
         );
-        $default  = app('amount')->getDefaultCurrency();
         $data     = ['accounts' => []];
 
         /** @var Account $account */
         foreach ($accounts as $account) {
             $accountId                    = $account->id;
             $currency                     = (int) $repository->getMetaValue($account, 'currency_id');
-            $currency                     = 0 === $currency ? $default->id : $currency;
+            $currency                     = 0 === $currency ? $this->defaultCurrency->id : $currency;
             $entry                        = ['preferredCurrency' => $currency, 'name' => $account->name];
             $data['accounts'][$accountId] = $entry;
         }
@@ -96,9 +95,9 @@ class JavascriptController extends Controller
     public function variables(Request $request, AccountRepositoryInterface $repository): Response
     {
         $account                   = $repository->find((int) $request->get('account'));
-        $currency                  = app('amount')->getDefaultCurrency();
+        $currency                  = $this->defaultCurrency;
         if (null !== $account) {
-            $currency = $repository->getAccountCurrency($account) ?? $currency;
+            $currency = $repository->getAccountCurrency($account) ?? $this->defaultCurrency;
         }
         $locale                    = app('steam')->getLocale();
         $accounting                = app('amount')->getJsConfig();

app/Repositories/Budget/OperationsRepository.php

@@ -214,7 +214,6 @@ class OperationsRepository implements OperationsRepositoryInterface
         Log::debug('Start of sumExpenses.');
         // this collector excludes all transfers TO liabilities (which are also withdrawals)
         // because those expenses only become expenses once they move from the liability to the friend.
-        // TODO this filter must be somewhere in AccountRepositoryInterface because I suspect its needed more often (A113)
 
         // 2024-12-24 disable the exclusion for now.
 
@@ -258,30 +257,10 @@ class OperationsRepository implements OperationsRepositoryInterface
         // same but for transactions in the foreign currency:
         if (null !== $currency) {
             Log::debug('STOP looking for transactions in the foreign currency.');
-
-            //            Log::debug(sprintf('Look for transactions with foreign currency %s', $currency->code));
-            //            // app('log')->debug(sprintf('Currency is "%s".', $currency->name));
-            //            /** @var GroupCollectorInterface $collector */
-            //            $collector = app(GroupCollectorInterface::class);
-            //            $collector->setUser($this->user)->setRange($start, $end)->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setForeignCurrency($currency)->setBudgets($budgets);
-            //
-            //            if (null !== $accounts) {
-            //                $collector->setAccounts($accounts);
-            //            }
-            //            $result = $collector->getExtractedJournals();
-            //            // app('log')->debug(sprintf('Found %d journals with currency %s.', count($result), $currency->code));
-            //            // do not use array_merge because you want keys to overwrite (otherwise you get double results):
-            //            Log::debug(sprintf('Found %d extra journals in foreign currency.', count($result)));
-            //            $journals = $result + $journals;
         }
         $array           = [];
 
         foreach ($journals as $journal) {
-            //            Log::debug(sprintf('Journal #%d.', $journal['transaction_journal_id']));
-            //            Log::debug(sprintf('Amounts: %1$s %2$s (amount), %3$s %4$s (foreign_amount), %5$s %6$s (native_amount) %5$s %7$s (foreign native amount)',
-            //                               $journal['currency_code'], $journal['amount'], $journal['foreign_currency_code'], $journal['foreign_amount'],
-            //                               $default->code, $journal['native_amount'], $journal['native_foreign_amount'])
-            //            );
             // TODO same as in category::sumexpenses
             $amount                    = '0';
             $currencyId                = (int) $journal['currency_id'];

app/Repositories/Category/OperationsRepository.php

@@ -355,15 +355,21 @@ class OperationsRepository implements OperationsRepositoryInterface
             $currencyCode              = $journal['currency_code'];
             $currencyDecimalPlaces     = $journal['currency_decimal_places'];
             if ($convertToNative) {
-                $useNative = $default->id !== (int) $journal['currency_id'];
-                $amount    = Amount::getAmountFromJournal($journal);
-                if ($useNative) {
+                $amount = Amount::getAmountFromJournal($journal);
+                if ($default->id !== (int) $journal['currency_id'] && $default->id !== (int) $journal['foreign_currency_id']) {
                     $currencyId            = $default->id;
                     $currencyName          = $default->name;
                     $currencySymbol        = $default->symbol;
                     $currencyCode          = $default->code;
                     $currencyDecimalPlaces = $default->decimal_places;
                 }
+                if ($default->id !== (int) $journal['currency_id'] && $default->id === (int) $journal['foreign_currency_id']) {
+                    $currencyId            = $journal['foreign_currency_id'];
+                    $currencyName          = $journal['foreign_currency_name'];
+                    $currencySymbol        = $journal['foreign_currency_symbol'];
+                    $currencyCode          = $journal['foreign_currency_code'];
+                    $currencyDecimalPlaces = $journal['foreign_currency_decimal_places'];
+                }
                 Log::debug(sprintf('[a] Add amount %s %s', $currencyCode, $amount));
             }
             if (!$convertToNative) {
@@ -372,7 +378,6 @@ class OperationsRepository implements OperationsRepositoryInterface
                 $amount = $journal['amount'];
             }
 
-
             $array[$currencyId] ??= [
                 'sum'                     => '0',
                 'currency_id'             => (string) $currencyId,
@@ -393,9 +398,9 @@ class OperationsRepository implements OperationsRepositoryInterface
     public function sumIncome(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $categories = null): array
     {
         /** @var GroupCollectorInterface $collector */
-        $collector = app(GroupCollectorInterface::class);
+        $collector       = app(GroupCollectorInterface::class);
         $collector->setUser($this->user)->setRange($start, $end)
-            ->setTypes([TransactionType::DEPOSIT])
+            ->setTypes([TransactionTypeEnum::DEPOSIT->value])
         ;
 
         if (null !== $accounts && $accounts->count() > 0) {
@@ -405,20 +410,52 @@ class OperationsRepository implements OperationsRepositoryInterface
             $categories = $this->getCategories();
         }
         $collector->setCategories($categories);
-        $journals  = $collector->getExtractedJournals();
-        $array     = [];
+        $journals        = $collector->getExtractedJournals();
+        $convertToNative = app('preferences')->get('convert_to_native', false)->data;
+        $default         = app('amount')->getDefaultCurrency();
+        $array           = [];
 
         foreach ($journals as $journal) {
+            // Almost the same as in \FireflyIII\Repositories\Budget\OperationsRepository::sumExpenses
+            $amount                    = '0';
             $currencyId                = (int) $journal['currency_id'];
+            $currencyName              = $journal['currency_name'];
+            $currencySymbol            = $journal['currency_symbol'];
+            $currencyCode              = $journal['currency_code'];
+            $currencyDecimalPlaces     = $journal['currency_decimal_places'];
+            if ($convertToNative) {
+                $amount = Amount::getAmountFromJournal($journal);
+                if ($default->id !== (int) $journal['currency_id'] && $default->id !== (int) $journal['foreign_currency_id']) {
+                    $currencyId            = $default->id;
+                    $currencyName          = $default->name;
+                    $currencySymbol        = $default->symbol;
+                    $currencyCode          = $default->code;
+                    $currencyDecimalPlaces = $default->decimal_places;
+                }
+                if ($default->id !== (int) $journal['currency_id'] && $default->id === (int) $journal['foreign_currency_id']) {
+                    $currencyId            = $journal['foreign_currency_id'];
+                    $currencyName          = $journal['foreign_currency_name'];
+                    $currencySymbol        = $journal['foreign_currency_symbol'];
+                    $currencyCode          = $journal['foreign_currency_code'];
+                    $currencyDecimalPlaces = $journal['foreign_currency_decimal_places'];
+                }
+                Log::debug(sprintf('[a] Add amount %s %s', $currencyCode, $amount));
+            }
+            if (!$convertToNative) {
+                // ignore the amount in foreign currency.
+                Log::debug(sprintf('[b] Add amount %s %s', $currencyCode, $journal['amount']));
+                $amount = $journal['amount'];
+            }
+
             $array[$currencyId] ??= [
                 'sum'                     => '0',
                 'currency_id'             => (string) $currencyId,
-                'currency_name'           => $journal['currency_name'],
-                'currency_symbol'         => $journal['currency_symbol'],
-                'currency_code'           => $journal['currency_code'],
-                'currency_decimal_places' => $journal['currency_decimal_places'],
+                'currency_name'           => $currencyName,
+                'currency_symbol'         => $currencySymbol,
+                'currency_code'           => $currencyCode,
+                'currency_decimal_places' => $currencyDecimalPlaces,
             ];
-            $array[$currencyId]['sum'] = bcadd($array[$currencyId]['sum'], app('steam')->positive($journal['amount']));
+            $array[$currencyId]['sum'] = bcadd($array[$currencyId]['sum'], app('steam')->positive($amount));
         }
 
         return $array;

app/Services/Internal/Support/CreditRecalculateService.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Services\Internal\Support;
 
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Factory\AccountMetaFactory;
 use FireflyIII\Models\Account;
@@ -80,8 +81,8 @@ class CreditRecalculateService
             try {
                 $this->findByJournal($journal);
             } catch (FireflyException $e) {
-                app('log')->error($e->getTraceAsString());
-                app('log')->error(sprintf('Could not find work account for transaction group #%d.', $this->group->id));
+                Log::error($e->getTraceAsString());
+                Log::error(sprintf('Could not find work account for transaction group #%d.', $this->group->id));
             }
         }
     }
@@ -158,13 +159,13 @@ class CreditRecalculateService
 
     private function processWorkAccount(Account $account): void
     {
-        app('log')->debug(sprintf('Now processing account #%d ("%s"). All amounts with 2 decimals!', $account->id, $account->name));
+        Log::debug(sprintf('Now processing account #%d ("%s"). All amounts with 2 decimals!', $account->id, $account->name));
         // get opening balance (if present)
         $this->repository->setUser($account->user);
         $direction      = (string) $this->repository->getMetaValue($account, 'liability_direction');
         $openingBalance = $this->repository->getOpeningBalance($account);
         if (null !== $openingBalance) {
-            app('log')->debug(sprintf('Found opening balance transaction journal #%d', $openingBalance->id));
+            //            Log::debug(sprintf('Found opening balance transaction journal #%d', $openingBalance->id));
             // if account direction is "debit" ("I owe this amount") the opening balance must always be AWAY from the account:
             if ('debit' === $direction) {
                 $this->validateOpeningBalance($account, $openingBalance);
@@ -172,7 +173,7 @@ class CreditRecalculateService
         }
         $startOfDebt    = $this->repository->getOpeningBalanceAmount($account) ?? '0';
         $leftOfDebt     = app('steam')->positive($startOfDebt);
-        app('log')->debug(sprintf('Start of debt is "%s", so initial left of debt is "%s"', app('steam')->bcround($startOfDebt, 2), app('steam')->bcround($leftOfDebt, 2)));
+        //        Log::debug(sprintf('Start of debt is "%s", so initial left of debt is "%s"', app('steam')->bcround($startOfDebt, 2), app('steam')->bcround($leftOfDebt, 2)));
 
         /** @var AccountMetaFactory $factory */
         $factory        = app(AccountMetaFactory::class);
@@ -180,7 +181,7 @@ class CreditRecalculateService
         // amount is positive or negative, doesn't matter.
         $factory->crud($account, 'start_of_debt', $startOfDebt);
 
-        app('log')->debug(sprintf('Debt direction is "%s"', $direction));
+        //        Log::debug(sprintf('Debt direction is "%s"', $direction));
 
         // now loop all transactions (except opening balance and credit thing)
         $transactions   = $account->transactions()
@@ -189,15 +190,15 @@ class CreditRecalculateService
             ->get(['transactions.*'])
         ;
         $total          = $transactions->count();
-        app('log')->debug(sprintf('Found %d transaction(s) to process.', $total));
+        //        Log::debug(sprintf('Found %d transaction(s) to process.', $total));
 
         /** @var Transaction $transaction */
         foreach ($transactions as $index => $transaction) {
-            app('log')->debug(sprintf('[%d/%d] Processing transaction.', $index + 1, $total));
+            //            Log::debug(sprintf('[%d/%d] Processing transaction.', $index + 1, $total));
             $leftOfDebt = $this->processTransaction($account, $direction, $transaction, $leftOfDebt);
         }
         $factory->crud($account, 'current_debt', $leftOfDebt);
-        app('log')->debug(sprintf('Done processing account #%d ("%s")', $account->id, $account->name));
+        Log::debug(sprintf('Done processing account #%d ("%s")', $account->id, $account->name));
     }
 
     /**
@@ -211,25 +212,25 @@ class CreditRecalculateService
         /** @var Transaction $dest */
         $dest   = $openingBalance->transactions()->where('amount', '>', 0)->first();
         if ($source->account_id !== $account->id) {
-            app('log')->info(sprintf('Liability #%d has a reversed opening balance. Will fix this now.', $account->id));
-            app('log')->debug(sprintf('Source amount "%s" is now "%s"', $source->amount, app('steam')->positive($source->amount)));
-            app('log')->debug(sprintf('Destination amount "%s" is now "%s"', $dest->amount, app('steam')->negative($dest->amount)));
+            Log::info(sprintf('Liability #%d has a reversed opening balance. Will fix this now.', $account->id));
+            Log::debug(sprintf('Source amount "%s" is now "%s"', $source->amount, app('steam')->positive($source->amount)));
+            Log::debug(sprintf('Destination amount "%s" is now "%s"', $dest->amount, app('steam')->negative($dest->amount)));
             $source->amount = app('steam')->positive($source->amount);
             $dest->amount   = app('steam')->negative($source->amount);
             if (null !== $source->foreign_amount && '' !== $source->foreign_amount) {
                 $source->foreign_amount = app('steam')->positive($source->foreign_amount);
-                app('log')->debug(sprintf('Source foreign amount "%s" is now "%s"', $source->foreign_amount, app('steam')->positive($source->foreign_amount)));
+                Log::debug(sprintf('Source foreign amount "%s" is now "%s"', $source->foreign_amount, app('steam')->positive($source->foreign_amount)));
             }
             if (null !== $dest->foreign_amount && '' !== $dest->foreign_amount) {
                 $dest->foreign_amount = app('steam')->negative($dest->foreign_amount);
-                app('log')->debug(sprintf('Destination amount "%s" is now "%s"', $dest->foreign_amount, app('steam')->negative($dest->foreign_amount)));
+                Log::debug(sprintf('Destination amount "%s" is now "%s"', $dest->foreign_amount, app('steam')->negative($dest->foreign_amount)));
             }
             $source->save();
             $dest->save();
 
             return;
         }
-        app('log')->debug('Opening balance is valid');
+        Log::debug('Opening balance is valid');
     }
 
     /**
@@ -245,7 +246,7 @@ class CreditRecalculateService
 
         // here be null pointers.
         if (null === $journal) {
-            app('log')->warning(sprintf('Transaction #%d has no journal.', $transaction->id));
+            Log::warning(sprintf('Transaction #%d has no journal.', $transaction->id));
 
             return $leftOfDebt;
         }
@@ -254,19 +255,19 @@ class CreditRecalculateService
         $foreignCurrency = $transaction->foreignCurrency;
         $accountCurrency = $this->repository->getAccountCurrency($account);
         $type            = $journal->transactionType->type;
-        app('log')->debug(sprintf('Left of debt is: %s', app('steam')->bcround($leftOfDebt, 2)));
+        //        Log::debug(sprintf('Left of debt is: %s', app('steam')->bcround($leftOfDebt, 2)));
 
         if ('' === $direction) {
-            app('log')->warning('Direction is empty, so do nothing.');
+            //            Log::warning('Direction is empty, so do nothing.');
 
             return $leftOfDebt;
         }
-        if (TransactionType::LIABILITY_CREDIT === $type || TransactionType::OPENING_BALANCE === $type) {
-            app('log')->warning(sprintf('Transaction type is "%s", so do nothing.', $type));
+        if (TransactionTypeEnum::LIABILITY_CREDIT->value === $type || TransactionTypeEnum::OPENING_BALANCE->value === $type) {
+            Log::warning(sprintf('Transaction type is "%s", so do nothing.', $type));
 
             return $leftOfDebt;
         }
-        Log::debug(sprintf('Liability direction is "%s"', $direction));
+        //        Log::debug(sprintf('Liability direction is "%s"', $direction));
 
         // amount to use depends on the currency:
         $usedAmount      = $this->getAmountToUse($transaction, $accountCurrency, $foreignCurrency);
@@ -276,91 +277,80 @@ class CreditRecalculateService
 
         if ($isSameAccount && $isCredit && $this->isWithdrawalIn($usedAmount, $type)) { // case 1
             $usedAmount = app('steam')->positive($usedAmount);
-            $result     = bcadd($leftOfDebt, $usedAmount);
-            app('log')->debug(sprintf('Case 1 (withdrawal into credit liability): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
 
-            return $result;
+            return bcadd($leftOfDebt, $usedAmount);
+            //            Log::debug(sprintf('Case 1 (withdrawal into credit liability): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
         }
 
         if ($isSameAccount && $isCredit && $this->isWithdrawalOut($usedAmount, $type)) { // case 2
             $usedAmount = app('steam')->positive($usedAmount);
-            $result     = bcsub($leftOfDebt, $usedAmount);
-            app('log')->debug(sprintf('Case 2 (withdrawal away from liability): %s - %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
 
-            return $result;
+            return bcsub($leftOfDebt, $usedAmount);
+            //            Log::debug(sprintf('Case 2 (withdrawal away from liability): %s - %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
         }
 
         if ($isSameAccount && $isCredit && $this->isDepositOut($usedAmount, $type)) { // case 3
             $usedAmount = app('steam')->positive($usedAmount);
-            $result     = bcsub($leftOfDebt, $usedAmount);
-            app('log')->debug(sprintf('Case 3 (deposit away from liability): %s - %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
 
-            return $result;
+            return bcsub($leftOfDebt, $usedAmount);
+            //            Log::debug(sprintf('Case 3 (deposit away from liability): %s - %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
         }
 
         if ($isSameAccount && $isCredit && $this->isDepositIn($usedAmount, $type)) { // case 4
             $usedAmount = app('steam')->positive($usedAmount);
-            $result     = bcadd($leftOfDebt, $usedAmount);
-            app('log')->debug(sprintf('Case 4 (deposit into credit liability): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
 
-            return $result;
+            return bcadd($leftOfDebt, $usedAmount);
+            //            Log::debug(sprintf('Case 4 (deposit into credit liability): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
         }
         if ($isSameAccount && $isCredit && $this->isTransferIn($usedAmount, $type)) { // case 5
             $usedAmount = app('steam')->positive($usedAmount);
-            $result     = bcadd($leftOfDebt, $usedAmount);
-            app('log')->debug(sprintf('Case 5 (transfer into credit liability): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
 
-            return $result;
+            return bcadd($leftOfDebt, $usedAmount);
+            //            Log::debug(sprintf('Case 5 (transfer into credit liability): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
         }
         if ($isSameAccount && $isDebit && $this->isWithdrawalIn($usedAmount, $type)) { // case 6
             $usedAmount = app('steam')->positive($usedAmount);
-            $result     = bcsub($leftOfDebt, $usedAmount);
-            app('log')->debug(sprintf('Case 6 (withdrawal into debit liability): %s - %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
 
-            return $result;
+            return bcsub($leftOfDebt, $usedAmount);
+            //            Log::debug(sprintf('Case 6 (withdrawal into debit liability): %s - %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
         }
         if ($isSameAccount && $isDebit && $this->isDepositOut($usedAmount, $type)) { // case 7
             $usedAmount = app('steam')->positive($usedAmount);
-            $result     = bcadd($leftOfDebt, $usedAmount);
-            app('log')->debug(sprintf('Case 7 (deposit away from liability): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
 
-            return $result;
+            return bcadd($leftOfDebt, $usedAmount);
+            //            Log::debug(sprintf('Case 7 (deposit away from liability): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
         }
         if ($isSameAccount && $isDebit && $this->isWithdrawalOut($usedAmount, $type)) { // case 8
             $usedAmount = app('steam')->positive($usedAmount);
-            $result     = bcadd($leftOfDebt, $usedAmount);
-            app('log')->debug(sprintf('Case 8 (withdrawal away from liability): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
 
-            return $result;
+            return bcadd($leftOfDebt, $usedAmount);
+            //            Log::debug(sprintf('Case 8 (withdrawal away from liability): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
         }
 
         if ($isSameAccount && $isDebit && $this->isTransferIn($usedAmount, $type)) { // case 9
             $usedAmount = app('steam')->positive($usedAmount);
-            $result     = bcsub($leftOfDebt, $usedAmount);
-            // 2024-10-05, #9225 this used to say you would owe more, but a transfer INTO a debit from wherever means you owe LESS.
-            app('log')->debug(sprintf('Case 9 (transfer into debit liability, means you owe LESS): %s - %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
 
-            return $result;
+            return bcsub($leftOfDebt, $usedAmount);
+            // 2024-10-05, #9225 this used to say you would owe more, but a transfer INTO a debit from wherever means you owe LESS.
+            //            Log::debug(sprintf('Case 9 (transfer into debit liability, means you owe LESS): %s - %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
         }
         if ($isSameAccount && $isDebit && $this->isTransferOut($usedAmount, $type)) { // case 10
             $usedAmount = app('steam')->positive($usedAmount);
-            $result     = bcadd($leftOfDebt, $usedAmount);
-            // 2024-10-05, #9225 this used to say you would owe less, but a transfer OUT OF a debit from wherever means you owe MORE.
-            app('log')->debug(sprintf('Case 10 (transfer out of debit liability, means you owe MORE): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
 
-            return $result;
+            return bcadd($leftOfDebt, $usedAmount);
+            // 2024-10-05, #9225 this used to say you would owe less, but a transfer OUT OF a debit from wherever means you owe MORE.
+            //            Log::debug(sprintf('Case 10 (transfer out of debit liability, means you owe MORE): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
         }
 
         // in any other case, remove amount from left of debt.
         if (in_array($type, [TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER], true)) {
             $usedAmount = app('steam')->negative($usedAmount);
-            $result     = bcadd($leftOfDebt, $usedAmount);
-            app('log')->debug(sprintf('Case X (all other cases): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
 
-            return $result;
+            return bcadd($leftOfDebt, $usedAmount);
+            //            Log::debug(sprintf('Case X (all other cases): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
         }
 
-        app('log')->warning(sprintf('[-1] Catch-all, should not happen. Left of debt = %s', app('steam')->bcround($leftOfDebt, 2)));
+        Log::warning(sprintf('[-1] Catch-all, should not happen. Left of debt = %s', app('steam')->bcround($leftOfDebt, 2)));
 
         return $leftOfDebt;
     }
@@ -368,10 +358,10 @@ class CreditRecalculateService
     private function getAmountToUse(Transaction $transaction, TransactionCurrency $accountCurrency, ?TransactionCurrency $foreignCurrency): string
     {
         $usedAmount = $transaction->amount;
-        app('log')->debug(sprintf('Amount of transaction is %s', app('steam')->bcround($usedAmount, 2)));
+        //        Log::debug(sprintf('Amount of transaction is %s', app('steam')->bcround($usedAmount, 2)));
         if (null !== $foreignCurrency && $foreignCurrency->id === $accountCurrency->id) {
             $usedAmount = $transaction->foreign_amount;
-            app('log')->debug(sprintf('Overruled by foreign amount. Amount of transaction is now %s', app('steam')->bcround($usedAmount, 2)));
+            //            Log::debug(sprintf('Overruled by foreign amount. Amount of transaction is now %s', app('steam')->bcround($usedAmount, 2)));
         }
 
         return $usedAmount;

app/Support/Chart/Category/WholePeriodChartGenerator.php

@@ -25,7 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Support\Chart\Category;
 
 use Carbon\Carbon;
-use FireflyIII\Models\AccountType;
+use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Models\Category;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Category\OperationsRepositoryInterface;
@@ -36,6 +36,8 @@ use Illuminate\Support\Collection;
  */
 class WholePeriodChartGenerator
 {
+    public bool $convertToNative;
+
     public function generate(Category $category, Carbon $start, Carbon $end): array
     {
         $collection        = new Collection([$category]);
@@ -46,7 +48,7 @@ class WholePeriodChartGenerator
         /** @var AccountRepositoryInterface $accountRepository */
         $accountRepository = app(AccountRepositoryInterface::class);
 
-        $types             = [AccountType::DEFAULT, AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE];
+        $types             = [AccountTypeEnum::DEFAULT->value, AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value];
         $accounts          = $accountRepository->getAccountsByType($types);
         $step              = $this->calculateStep($start, $end);
         $chartData         = [];

app/Support/Http/Controllers/AugumentData.php

@@ -179,6 +179,7 @@ trait AugumentData
         $cache->addProperty($start);
         $cache->addProperty($end);
         $cache->addProperty($budget->id);
+        $cache->addProperty($this->convertToNative);
         $cache->addProperty('get-limits');
 
         if ($cache->has()) {
@@ -186,15 +187,18 @@ trait AugumentData
         }
 
         $set              = $blRepository->getBudgetLimits($budget, $start, $end);
-        $limits           = new Collection();
+
         $budgetCollection = new Collection([$budget]);
 
+        // merge sets based on a key, in case of convert to native
+        $limits           = new Collection();
+
         /** @var BudgetLimit $entry */
         foreach ($set as $entry) {
             $currency     = $entry->transactionCurrency;
-
-            if (null === $currency) {
-                $currency = app('amount')->getDefaultCurrency();
+            if ($this->convertToNative) {
+                // the sumExpenses method already handles this.
+                $currency = $this->defaultCurrency;
             }
 
             // clone because these objects change each other.
@@ -214,7 +218,7 @@ trait AugumentData
         }
         $cache->store($limits);
 
-        return $set;
+        return $limits;
     }
 
     /**

app/Support/Http/Controllers/ChartGeneration.php

@@ -54,7 +54,7 @@ trait ChartGeneration
         $cache->addProperty($accounts);
         $cache->addProperty($convertToNative);
         if ($cache->has()) {
-            // return $cache->get();
+            return $cache->get();
         }
         app('log')->debug('Regenerate chart.account.account-balance-chart from scratch.');
         $locale          = app('steam')->getLocale();

app/Support/Http/Controllers/PeriodOverview.php

@@ -198,36 +198,43 @@ trait PeriodOverview
         /** @var array $journal */
         foreach ($journals as $journal) {
             $currencyId                    = (int) $journal['currency_id'];
+            $currencyCode                  = $journal['currency_code'];
+            $currencyName                  = $journal['currency_name'];
+            $currencySymbol                = $journal['currency_symbol'];
+            $currencyDecimalPlaces         = $journal['currency_decimal_places'];
             $foreignCurrencyId             = $journal['foreign_currency_id'];
-            if (!array_key_exists($currencyId, $return)) {
-                $return[$currencyId] = [
-                    'amount'                  => '0',
-                    'count'                   => 0,
-                    'currency_id'             => $currencyId,
-                    'currency_name'           => $journal['currency_name'],
-                    'currency_code'           => $journal['currency_code'],
-                    'currency_symbol'         => $journal['currency_symbol'],
-                    'currency_decimal_places' => $journal['currency_decimal_places'],
-                ];
-            }
-            $return[$currencyId]['amount'] = bcadd($return[$currencyId]['amount'], $journal['amount'] ?? '0');
-            ++$return[$currencyId]['count'];
+            $amount                        = $journal['amount'];
 
-            if (null !== $foreignCurrencyId && null !== $journal['foreign_amount']) {
-                if (!array_key_exists($foreignCurrencyId, $return)) {
-                    $return[$foreignCurrencyId] = [
-                        'amount'                  => '0',
-                        'count'                   => 0,
-                        'currency_id'             => (int) $foreignCurrencyId,
-                        'currency_name'           => $journal['foreign_currency_name'],
-                        'currency_code'           => $journal['foreign_currency_code'],
-                        'currency_symbol'         => $journal['foreign_currency_symbol'],
-                        'currency_decimal_places' => $journal['foreign_currency_decimal_places'],
-                    ];
-                }
-                ++$return[$foreignCurrencyId]['count'];
-                $return[$foreignCurrencyId]['amount'] = bcadd($return[$foreignCurrencyId]['amount'], $journal['foreign_amount']);
+
+            if ($this->convertToNative && $currencyId !== $this->defaultCurrency->id && $foreignCurrencyId !== $this->defaultCurrency->id) {
+                $amount                = $journal['native_amount'];
+                $currencyId            = $this->defaultCurrency->id;
+                $currencyCode          = $this->defaultCurrency->code;
+                $currencyName          = $this->defaultCurrency->name;
+                $currencySymbol        = $this->defaultCurrency->symbol;
+                $currencyDecimalPlaces = $this->defaultCurrency->decimal_places;
             }
+            if ($this->convertToNative && $currencyId !== $this->defaultCurrency->id && $foreignCurrencyId === $this->defaultCurrency->id) {
+                $currencyId            = (int) $foreignCurrencyId;
+                $currencyCode          = $journal['foreign_currency_code'];
+                $currencyName          = $journal['foreign_currency_name'];
+                $currencySymbol        = $journal['foreign_currency_symbol'];
+                $currencyDecimalPlaces = $journal['foreign_currency_decimal_places'];
+                $amount                = $journal['foreign_amount'];
+            }
+            $return[$currencyId] ??= [
+                'amount'                  => '0',
+                'count'                   => 0,
+                'currency_id'             => $currencyId,
+                'currency_name'           => $currencyName,
+                'currency_code'           => $currencyCode,
+                'currency_symbol'         => $currencySymbol,
+                'currency_decimal_places' => $currencyDecimalPlaces,
+            ];
+
+
+            $return[$currencyId]['amount'] = bcadd($return[$currencyId]['amount'], $amount);
+            ++$return[$currencyId]['count'];
         }
 
         return $return;
@@ -322,6 +329,7 @@ trait PeriodOverview
         $cache         = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
+        $cache->addProperty($this->convertToNative);
         $cache->addProperty('no-budget-period-entries');
 
         if ($cache->has()) {
@@ -568,13 +576,13 @@ trait PeriodOverview
             }
             $entries[]
                          = [
-                             'title'              => $title,
-                             'route'              => route('transactions.index', [$transactionType, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),
-                             'total_transactions' => count($spent) + count($earned) + count($transferred),
-                             'spent'              => $this->groupByCurrency($spent),
-                             'earned'             => $this->groupByCurrency($earned),
-                             'transferred'        => $this->groupByCurrency($transferred),
-                         ];
+                    'title'              => $title,
+                    'route'              => route('transactions.index', [$transactionType, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),
+                    'total_transactions' => count($spent) + count($earned) + count($transferred),
+                    'spent'              => $this->groupByCurrency($spent),
+                    'earned'             => $this->groupByCurrency($earned),
+                    'transferred'        => $this->groupByCurrency($transferred),
+                ];
         }
 
         return $entries;

app/Support/Steam.php

@@ -84,7 +84,7 @@ class Steam
         $cache->addProperty($start);
         $cache->addProperty($end);
         if ($cache->has()) {
-            // return $cache->get();
+            return $cache->get();
         }
 
         $balances             = [];

composer.json

@@ -172,13 +172,11 @@
             "@php artisan clear-compiled",
             "@php artisan cache:clear",
             "@php artisan firefly-iii:upgrade-database",
-            "@php artisan firefly-iii:correct-database",
-            "@php artisan firefly-iii:report-integrity",
             "@php artisan firefly-iii:laravel-passport-keys",
-            "@php artisan firefly:instructions update"
+            "@php artisan firefly-iii:instructions update"
         ],
         "post-install-cmd": [
-            "@php artisan firefly:instructions install",
+            "@php artisan firefly-iii:instructions install",
             "@php artisan firefly-iii:verify-security-alerts"
         ],
         "unit-test": [

composer.lock

@@ -4439,16 +4439,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "3.8.3",
+            "version": "3.8.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "f01cfa96468f4c38325f507ab81a4f1d2cd93cfe"
+                "reference": "129700ed449b1f02d70272d2ac802357c8c30c58"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/f01cfa96468f4c38325f507ab81a4f1d2cd93cfe",
-                "reference": "f01cfa96468f4c38325f507ab81a4f1d2cd93cfe",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/129700ed449b1f02d70272d2ac802357c8c30c58",
+                "reference": "129700ed449b1f02d70272d2ac802357c8c30c58",
                 "shasum": ""
             },
             "require": {
@@ -4541,7 +4541,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-21T18:03:19+00:00"
+            "time": "2024-12-27T09:25:35+00:00"
         },
         {
             "name": "nette/schema",
@@ -7330,12 +7330,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -7637,12 +7637,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -7860,12 +7860,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -9670,12 +9670,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -9930,12 +9930,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {

config/firefly.php

@@ -81,7 +81,7 @@ return [
         'running_balance_column' => env('USE_RUNNING_BALANCE', false),
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'branch-v6.2',
+    'version'                      => 'develop/2024-12-27',
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 25,
 

package-lock.json

@@ -12195,7 +12195,7 @@
                 "chartjs-adapter-date-fns": "^3.0.0",
                 "chartjs-chart-sankey": "^0.14.0",
                 "date-fns": "^4.0.0",
-                "i18next": "^24.0.0",
+                "i18next": "^24.2.0",
                 "i18next-chained-backend": "^4.6.2",
                 "i18next-http-backend": "^3.0.1",
                 "i18next-localstorage-backend": "^4.2.0",

resources/assets/v1/src/locales/de.json

@@ -21,7 +21,7 @@
         "apply_rules_checkbox": "Regeln anwenden",
         "fire_webhooks_checkbox": "Webhooks abfeuern",
         "no_budget_pointer": "Sie scheinen noch keine Budgets festgelegt zu haben. Sie sollten einige davon auf der Seite <a href=\"budgets\">Budgets<\/a> anlegen. Budgets k\u00f6nnen Ihnen dabei helfen, den \u00dcberblick \u00fcber die Ausgaben zu behalten.",
-        "no_bill_pointer": "You seem to have no subscription yet. You should create some on the <a href=\"subscriptions\">subscription<\/a>-page. Subscriptions can help you keep track of expenses.",
+        "no_bill_pointer": "Sie scheinen noch kein Abonnement zu haben. Sie sollten einige auf der Seite <a href=\"subscriptions\">Abonnement<\/a> erstellen. Abonnements k\u00f6nnen Ihnen helfen, den \u00dcberblick \u00fcber Ihre Ausgaben zu behalten.",
         "source_account": "Quellkonto",
         "hidden_fields_preferences": "Sie k\u00f6nnen weitere Buchungsoptionen in Ihren <a href=\"preferences\">Einstellungen<\/a> aktivieren.",
         "destination_account": "Zielkonto",

resources/assets/v2/package.json

@@ -31,7 +31,7 @@
         "chartjs-adapter-date-fns": "^3.0.0",
         "chartjs-chart-sankey": "^0.14.0",
         "date-fns": "^4.0.0",
-        "i18next": "^24.0.0",
+        "i18next": "^24.2.0",
         "i18next-chained-backend": "^4.6.2",
         "i18next-http-backend": "^3.0.1",
         "i18next-localstorage-backend": "^4.2.0",

resources/views/budgets/index.twig

@@ -116,6 +116,9 @@
                                     <small>{{ 'budgeted'|_ }}:
                                         <span class="text-success money-positive budgeted_amount" data-id="{{ budget.id }}" data-currency="{{ budget.transaction_currency.id }}">
                                         {{ formatAmountBySymbol(budget.budgeted, budget.transaction_currency.symbol, budget.transaction_currency.decimal_places, false) }}
+                                            {% if null != budget.native_budgeted %}
+                                            ({{ formatAmountBySymbol(budget.native_budgeted, defaultCurrency.symbol, defaultCurrency.decimal_places, false) }})
+                                            {% endif %}
                                     </span>
                                     </small>
                                 </div>
@@ -125,7 +128,13 @@
                                            data-id="{{ budget.id }}">{{ trans('firefly.available_between', {start: budget.start_date.isoFormat(monthAndDayFormat), end: budget.end_date.isoFormat(monthAndDayFormat) }) }}
                                         :
                                         <span class="available_amount" data-id="{{ budget.id }}" data-currency="{{ budget.transaction_currency.id }}"
-                                              data-value="{{ budget.amount }}">{{ formatAmountBySymbol(budget.amount, budget.transaction_currency.symbol, budget.transaction_currency.decimal_places, true) }}</span>
+                                              data-value="{{ budget.amount }}">
+                                            {{ formatAmountBySymbol(budget.amount, budget.transaction_currency.symbol, budget.transaction_currency.decimal_places, true) }}
+                                            {% if(convertToNative and 0 != budget.native_amount) %}
+                                            ({{ formatAmountBySymbol(budget.native_amount, defaultCurrency.symbol, defaultCurrency.decimal_places, true) }})
+                                            {% endif %}
+
+                                        </span>
                                     </small>
                                 </div>
                             </div>

resources/views/budgets/show.twig

@@ -158,12 +158,19 @@
                                     <td style="width:33%;">{{ 'amount'|_ }}</td>
                                     <td>
                                         {{ formatAmountBySymbol(limit.amount, limit.transactionCurrency.symbol, limit.transactionCurrency.decimal_places) }}
+                                        {% if convertToNative and 0 != limit.native_amount %}
+                                            ({{ formatAmountBySymbol(limit.native_amount, defaultCurrency.symbol, defaultCurrency.decimal_places) }})
+                                        {% endif %}
                                     </td>
                                 </tr>
                                 <tr>
                                     <td style="width:33%;">{{ 'spent'|_ }}</td>
                                     <td>
-                                        {{ formatAmountBySymbol(limit.spent, limit.transactionCurrency.symbol, limit.transactionCurrency.decimal_places) }}
+                                        {% if convertToNative %}
+                                            {{ formatAmountBySymbol(limit.spent, defaultCurrency.symbol, defaultCurrency.decimal_places) }}
+                                        {% else %}
+                                            {{ formatAmountBySymbol(limit.spent, limit.transactionCurrency.symbol, limit.transactionCurrency.decimal_places) }}
+                                        {% endif %}
                                     </td>
                                 </tr>
                                 {% if limit.spent > 0 %}