Merge pull request #10995 from firefly-iii/release-1759464256

🤖 Automatically merge the PR into the develop branch.

THANKS.md

@@ -4,6 +4,7 @@ Over time, many people have contributed to Firefly III. Their efforts are not al
 Please find below all the people who contributed to the Firefly III code. Their names are mentioned in the year of their first contribution.
 
 ## 2025
+- Nicky De Maeyer
 - Denis Iskandarov
 - =
 - Lompi

app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php

@@ -68,10 +68,6 @@ class UpdateController extends Controller
         $data        = $request->getAll();
         $piggyBank   = $this->repository->update($piggyBank, $data);
 
-        if (array_key_exists('current_amount', $data) && '' !== $data['current_amount']) {
-            $this->repository->setCurrentAmount($piggyBank, $data['current_amount']);
-        }
-
         // enrich
         /** @var User $admin */
         $admin       = auth()->user();

app/Api/V1/Requests/Data/DateRequest.php

@@ -44,8 +44,18 @@ class DateRequest extends FormRequest
      */
     public function getAll(): array
     {
-        $start = $this->getCarbonDate('start');
-        $end   = $this->getCarbonDate('end');
+        $start         = $this->getCarbonDate('start');
+        $end           = $this->getCarbonDate('end');
+        if (null === $start) {
+            $start = now()->startOfMonth();
+        }
+        if (null === $end) {
+            $end = now()->endOfMonth();
+        }
+        // sanity check on dates:
+        [$start, $end] = $end < $start ? [$end, $start] : [$start, $end];
+
+
         $start->startOfDay();
         $end->endOfDay();
         if ($start->diffInYears($end, true) > 5) {

app/Api/V1/Requests/Models/Transaction/UpdateRequest.php

@@ -64,7 +64,7 @@ class UpdateRequest extends FormRequest
      */
     public function getAll(): array
     {
-        app('log')->debug(sprintf('Now in %s', __METHOD__));
+        Log::debug(sprintf('Now in %s', __METHOD__));
         $this->integerFields  = ['order', 'currency_id', 'foreign_currency_id', 'transaction_journal_id', 'source_id', 'destination_id', 'budget_id', 'category_id', 'bill_id', 'recurrence_id'];
         $this->dateFields     = ['date', 'interest_date', 'book_date', 'process_date', 'due_date', 'payment_date', 'invoice_date'];
         $this->textareaFields = ['notes'];
@@ -97,7 +97,7 @@ class UpdateRequest extends FormRequest
      */
     private function getTransactionData(): array
     {
-        app('log')->debug(sprintf('Now in %s', __METHOD__));
+        Log::debug(sprintf('Now in %s', __METHOD__));
         $return       = [];
 
         /** @var null|array $transactions */
@@ -181,7 +181,7 @@ class UpdateRequest extends FormRequest
     private function getDateData(array $current, array $transaction): array
     {
         foreach ($this->dateFields as $fieldName) {
-            app('log')->debug(sprintf('Now at date field %s', $fieldName));
+            Log::debug(sprintf('Now at date field %s', $fieldName));
             if (array_key_exists($fieldName, $transaction)) {
                 Log::debug(sprintf('New value: "%s"', $transaction[$fieldName]));
                 $current[$fieldName] = $this->dateFromValue((string) $transaction[$fieldName]);
@@ -247,7 +247,7 @@ class UpdateRequest extends FormRequest
      */
     public function rules(): array
     {
-        app('log')->debug(sprintf('Now in %s', __METHOD__));
+        Log::debug(sprintf('Now in %s', __METHOD__));
         $validProtocols = config('firefly.valid_url_protocols');
 
         return [
@@ -330,7 +330,7 @@ class UpdateRequest extends FormRequest
      */
     public function withValidator(Validator $validator): void
     {
-        app('log')->debug('Now in withValidator');
+        Log::debug('Now in withValidator');
 
         /** @var TransactionGroup $transactionGroup */
         $transactionGroup = $this->route()->parameter('transactionGroup');

app/Console/Commands/System/OutputsInstructions.php

@@ -26,12 +26,14 @@ namespace FireflyIII\Console\Commands\System;
 
 use Carbon\Carbon;
 use FireflyIII\Support\System\GeneratesInstallationId;
+use FireflyIII\Support\System\IsOldVersion;
 use Illuminate\Console\Command;
 use Random\RandomException;
 
 class OutputsInstructions extends Command
 {
     use GeneratesInstallationId;
+    use IsOldVersion;
 
     protected $description = 'Instructions in case of upgrade trouble.';
 
@@ -58,7 +60,7 @@ class OutputsInstructions extends Command
      */
     private function updateInstructions(): void
     {
-        $version = (string) config('firefly.version');
+        $version = (string)config('firefly.version');
 
         /** @var array $config */
         $config  = config('upgrade.text.upgrade');
@@ -68,12 +70,12 @@ class OutputsInstructions extends Command
         foreach (array_keys($config) as $compare) {
             // if string starts with:
             if (str_starts_with($version, $compare)) {
-                $text = (string) $config[$compare];
+                $text = (string)$config[$compare];
             }
         }
 
         // validate some settings.
-        if ('' === $text && 'local' === (string) config('app.env')) {
+        if ('' === $text && 'local' === (string)config('app.env')) {
             $text = 'Please set APP_ENV=production for a safer environment.';
         }
 
@@ -191,7 +193,7 @@ class OutputsInstructions extends Command
      */
     private function installInstructions(): void
     {
-        $version = (string) config('firefly.version');
+        $version = (string)config('firefly.version');
 
         /** @var array $config */
         $config  = config('upgrade.text.install');
@@ -201,12 +203,12 @@ class OutputsInstructions extends Command
         foreach (array_keys($config) as $compare) {
             // if string starts with:
             if (str_starts_with($version, $compare)) {
-                $text = (string) $config[$compare];
+                $text = (string)$config[$compare];
             }
         }
 
         // validate some settings.
-        if ('' === $text && 'local' === (string) config('app.env')) {
+        if ('' === $text && 'local' === (string)config('app.env')) {
             $text = 'Please set APP_ENV=production for a safer environment.';
         }
 
@@ -242,14 +244,15 @@ class OutputsInstructions extends Command
 
     private function someQuote(): void
     {
-        $lines     = [
-            'Forgive yourself for not being at peace.',
-            'Doesn\'t look like anything to me.',
-            'Be proud of what you make.',
-            'Be there or forever wonder.',
-            'A year from now you will wish you had started today.',
+        $lines = [
+            '"Forgive yourself for not being at peace."',
+            '"Doesn\'t look like anything to me."',
+            '"Be proud of what you make."',
+            '"Be there or forever wonder."',
+            '"A year from now you will wish you had started today."',
+            '🇺🇦 Слава Україні!',
+            '🇺🇦 Slava Ukraini!',
         ];
-        $addQuotes = true;
 
         // fuck the Russian aggression in Ukraine.
 
@@ -260,8 +263,7 @@ class OutputsInstructions extends Command
         // going on, to allow that to happen.
 
         if ('ru_RU' === config('firefly.default_language')) {
-            $addQuotes = false;
-            $lines     = [
+            $lines = [
                 '🇺🇦 Слава Україні!',
                 '🇺🇦 Slava Ukraini!',
             ];
@@ -272,11 +274,6 @@ class OutputsInstructions extends Command
         } catch (RandomException) {
             $random = 0;
         }
-        if ($addQuotes) {
-            $this->line(sprintf('       "%s"', $lines[$random]));
-
-            return;
-        }
         $this->line(sprintf('       %s', $lines[$random]));
 
     }

app/Console/Commands/System/SetsLatestVersion.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\System;
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use FireflyIII\Support\Facades\FireflyConfig;
 use Illuminate\Console\Command;
 
 class SetsLatestVersion extends Command
@@ -45,8 +46,7 @@ class SetsLatestVersion extends Command
 
             return 0;
         }
-        app('fireflyconfig')->set('db_version', config('firefly.db_version'));
-        app('fireflyconfig')->set('ff3_version', config('firefly.version'));
+        FireflyConfig::set('ff3_version', config('firefly.version'));
         $this->friendlyInfo('Updated version.');
 
         return 0;

app/Console/Commands/Upgrade/UpgradesDatabase.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands\Upgrade;
 
+use FireflyIII\Support\Facades\FireflyConfig;
 use Illuminate\Support\Facades\Log;
 use Safe\Exceptions\InfoException;
 
@@ -86,10 +87,8 @@ class UpgradesDatabase extends Command
             $this->friendlyLine(sprintf('Now executing %s', $command));
             $this->call($command, $args);
         }
-        // set new DB version.
-        app('fireflyconfig')->set('db_version', (int) config('firefly.db_version'));
         // index will set FF3 version.
-        app('fireflyconfig')->set('ff3_version', (string) config('firefly.version'));
+        FireflyConfig::set('ff3_version', (string) config('firefly.version'));
 
         return 0;
     }

app/Factory/PiggyBankFactory.php

@@ -242,6 +242,7 @@ class PiggyBankFactory
                 }
             }
         }
+        Log::debug('Looping all accounts.');
 
         /** @var array $info */
         foreach ($accounts as $info) {
@@ -251,6 +252,7 @@ class PiggyBankFactory
 
                 continue;
             }
+            Log::debug(sprintf('Working on account #%d', $account->id));
             if (array_key_exists('current_amount', $info) && null !== $info['current_amount']) {
                 // an amount is set, first check out if there is a difference with the previous amount.
                 $previous                 = $toBeLinked[$account->id]['current_amount'] ?? '0';
@@ -258,22 +260,24 @@ class PiggyBankFactory
 
                 // create event for difference.
                 if (0 !== bccomp($diff, '0')) {
+                    // 2025-10-01 for issue #10990 disable this event.
                     Log::debug(sprintf('[a] Will save event for difference %s (previous value was %s)', $diff, $previous));
-                    event(new ChangedAmount($piggyBank, $diff, null, null));
+                    // event(new ChangedAmount($piggyBank, $diff, null, null));
                 }
 
                 $toBeLinked[$account->id] = ['current_amount' => $info['current_amount']];
                 Log::debug(sprintf('[a] Will link account #%d with amount %s', $account->id, $info['current_amount']));
             }
             if (array_key_exists('current_amount', $info) && null === $info['current_amount']) {
-                // an amount is set, first check out if there is a difference with the previous amount.
+                // no amount is set, first check out if there is a difference with the previous amount.
                 $previous                 = $toBeLinked[$account->id]['current_amount'] ?? '0';
                 $diff                     = bcsub('0', $previous);
 
                 // create event for difference.
                 if (0 !== bccomp($diff, '0')) {
+                    // 2025-10-01 for issue #10990 disable this event.
                     Log::debug(sprintf('[b] Will save event for difference %s (previous value was %s)', $diff, $previous));
-                    event(new ChangedAmount($piggyBank, $diff, null, null));
+                    // event(new ChangedAmount($piggyBank, $diff, null, null));
                 }
 
                 // no amount set, use previous amount or go to ZERO.
@@ -282,7 +286,8 @@ class PiggyBankFactory
 
                 // create event:
                 Log::debug('linkToAccountIds: Trigger change for positive amount [b].');
-                event(new ChangedAmount($piggyBank, $toBeLinked[$account->id]['current_amount'] ?? '0', null, null));
+                // 2025-10-01 for issue #10990 disable this event.
+                // event(new ChangedAmount($piggyBank, $toBeLinked[$account->id]['current_amount'] ?? '0', null, null));
             }
             if (!array_key_exists('current_amount', $info)) {
                 $toBeLinked[$account->id] ??= [];

app/Handlers/Events/StoredGroupEventHandler.php

@@ -105,16 +105,28 @@ class StoredGroupEventHandler
 
         /** @var TransactionJournal $journal */
         foreach ($event->transactionGroup->transactionJournals as $journal) {
-            $source = $journal->transactions()->where('amount', '<', '0')->first();
-            $dest   = $journal->transactions()->where('amount', '>', '0')->first();
+            $source     = $journal->transactions()->where('amount', '<', '0')->first();
+            $dest       = $journal->transactions()->where('amount', '>', '0')->first();
             $repository->deleteStatisticsForModel($source->account, $journal->date);
             $repository->deleteStatisticsForModel($dest->account, $journal->date);
-            foreach ($journal->categories as $category) {
+            $categories = $journal->categories;
+            $tags       = $journal->tags;
+            $budgets    = $journal->budgets;
+            foreach ($categories as $category) {
                 $repository->deleteStatisticsForModel($category, $journal->date);
             }
-            foreach ($journal->tags as $tag) {
+            foreach ($tags as $tag) {
                 $repository->deleteStatisticsForModel($tag, $journal->date);
             }
+            foreach ($budgets as $budget) {
+                $repository->deleteStatisticsForModel($budget, $journal->date);
+            }
+            if (0 === $categories->count()) {
+                $repository->deleteStatisticsForPrefix($journal->userGroup, 'no_category', $journal->date);
+            }
+            if (0 === $budgets->count()) {
+                $repository->deleteStatisticsForPrefix($journal->userGroup, 'no_budget', $journal->date);
+            }
         }
     }
 

app/Http/Controllers/DebugController.php

@@ -184,7 +184,6 @@ class DebugController extends Controller
         $currentDriver = DB::getDriverName();
 
         return [
-            'db_version'      => app('fireflyconfig')->get('db_version', 1)->data,
             'php_version'     => PHP_VERSION,
             'php_os'          => PHP_OS,
             'uname'           => php_uname('m'),

app/Http/Controllers/System/InstallController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\System;
 
+use FireflyIII\Support\Facades\FireflyConfig;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Cache;
 use Exception;
@@ -81,10 +82,7 @@ class InstallController extends Controller
     {
         app('view')->share('FF_VERSION', config('firefly.version'));
         // index will set FF3 version.
-        app('fireflyconfig')->set('ff3_version', (string) config('firefly.version'));
-
-        // set new DB version.
-        app('fireflyconfig')->set('db_version', (int) config('firefly.db_version'));
+        FireflyConfig::set('ff3_version', (string) config('firefly.version'));
 
         return view('install.index');
     }

app/Http/Middleware/Installer.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Http\Middleware;
 
 use Closure;
 use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Support\System\IsOldVersion;
 use FireflyIII\Support\System\OAuthKeys;
 use Illuminate\Database\QueryException;
 use Illuminate\Http\Request;
@@ -37,6 +38,8 @@ use Illuminate\Support\Facades\Log;
  */
 class Installer
 {
+    use IsOldVersion;
+
     /**
      * Handle an incoming request.
      *
@@ -65,7 +68,7 @@ class Installer
         // run installer when no tables are present,
         // or when old scheme version
         // or when old firefly version
-        if ($this->hasNoTables() || $this->oldDBVersion() || $this->oldVersion()) {
+        if ($this->hasNoTables() || $this->isOldVersionInstalled()) {
             return response()->redirectTo(route('installer.index'));
         }
         OAuthKeys::verifyKeysRoutine();
@@ -126,59 +129,4 @@ class Installer
     {
         return false !== stripos($message, 'Base table or view not found');
     }
-
-    /**
-     * Check if the "db_version" variable is correct.
-     */
-    private function oldDBVersion(): bool
-    {
-        // older version in config than database?
-        $configVersion = (int) config('firefly.db_version');
-        $dbVersion     = (int) app('fireflyconfig')->getFresh('db_version', 1)->data;
-        if ($configVersion > $dbVersion) {
-            Log::warning(
-                sprintf(
-                    'The current configured version (%d) is older than the required version (%d). Redirect to migrate routine.',
-                    $dbVersion,
-                    $configVersion
-                )
-            );
-
-            return true;
-        }
-
-        // Log::info(sprintf('Configured DB version (%d) equals expected DB version (%d)', $dbVersion, $configVersion));
-
-        return false;
-    }
-
-    /**
-     * Check if the "firefly_version" variable is correct.
-     */
-    private function oldVersion(): bool
-    {
-        // version compare thing.
-        $configVersion = (string) config('firefly.version');
-        $dbVersion     = (string) app('fireflyconfig')->getFresh('ff3_version', '1.0')->data;
-        if (str_starts_with($configVersion, 'develop')) {
-            Log::debug('Skipping version check for develop version.');
-
-            return false;
-        }
-        if (1 === version_compare($configVersion, $dbVersion)) {
-            Log::warning(
-                sprintf(
-                    'The current configured Firefly III version (%s) is older than the required version (%s). Redirect to migrate routine.',
-                    $dbVersion,
-                    $configVersion
-                )
-            );
-
-            return true;
-        }
-
-        // Log::info(sprintf('Installed Firefly III version (%s) equals expected Firefly III version (%s)', $dbVersion, $configVersion));
-
-        return false;
-    }
 }

app/Repositories/PeriodStatistic/PeriodStatisticRepository.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Repositories\PeriodStatistic;
 
 use Carbon\Carbon;
 use FireflyIII\Models\PeriodStatistic;
+use FireflyIII\Models\UserGroup;
 use FireflyIII\Support\Repositories\UserGroup\UserGroupInterface;
 use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
 use Illuminate\Database\Eloquent\Model;
@@ -133,4 +134,10 @@ class PeriodStatisticRepository implements PeriodStatisticRepositoryInterface, U
 
         return $stat;
     }
+
+    #[Override]
+    public function deleteStatisticsForPrefix(UserGroup $userGroup, string $prefix, Carbon $date): void
+    {
+        $userGroup->periodStatistics()->where('start', '<=', $date)->where('end', '>=', $date)->where('type', 'LIKE', sprintf('%s%%', $prefix))->delete();
+    }
 }

app/Repositories/PeriodStatistic/PeriodStatisticRepositoryInterface.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Repositories\PeriodStatistic;
 
 use Carbon\Carbon;
 use FireflyIII\Models\PeriodStatistic;
+use FireflyIII\Models\UserGroup;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
 
@@ -43,4 +44,6 @@ interface PeriodStatisticRepositoryInterface
     public function allInRangeForPrefix(string $prefix, Carbon $start, Carbon $end): Collection;
 
     public function deleteStatisticsForModel(Model $model, Carbon $date): void;
+
+    public function deleteStatisticsForPrefix(UserGroup $userGroup, string $prefix, Carbon $date): void;
 }

app/Repositories/PiggyBank/ModifiesPiggyBanks.php

@@ -36,6 +36,7 @@ use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\ObjectGroup\CreatesObjectGroups;
 use FireflyIII\Support\Facades\Amount;
+use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use Illuminate\Support\Facades\Log;
 
@@ -227,7 +228,6 @@ trait ModifiesPiggyBanks
         $factory->user = $this->user;
 
         // the piggy bank currency is set or updated FIRST, if it exists.
-
         $factory->linkToAccountIds($piggyBank, $data['accounts'] ?? []);
 
 
@@ -244,7 +244,7 @@ trait ModifiesPiggyBanks
 
             // question is, from which account(s) to remove the difference?
             // solution: just start from the top until there is no more money left to remove.
-            $this->removeAmountFromAll($piggyBank, app('steam')->positive($difference));
+            $this->removeAmountFromAll($piggyBank, Steam::positive($difference));
         }
 
         // update using name:

app/Services/FireflyIIIOrg/Update/UpdateRequest.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Services\FireflyIIIOrg\Update;
 
 use Carbon\Carbon;
 use FireflyIII\Events\NewVersionAvailable;
+use FireflyIII\Support\System\IsOldVersion;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Support\Facades\Log;
@@ -38,6 +39,8 @@ use function Safe\json_decode;
  */
 class UpdateRequest implements UpdateRequestInterface
 {
+    use IsOldVersion;
+
     public function getUpdateInformation(string $channel): array
     {
         Log::debug(sprintf('Now in getUpdateInformation(%s)', $channel));
@@ -183,20 +186,15 @@ class UpdateRequest implements UpdateRequestInterface
     private function parseResultDevelop(string $current, string $latest, array $information): array
     {
         Log::debug(sprintf('User is running develop version "%s"', $current));
-        $parts             = explode('/', $current);
+        $compare           = $this->compareDevelopVersions($current, $latest);
         $return            = [];
 
-        /** @var Carbon $devDate */
-        $devDate           = Carbon::createFromFormat('Y-m-d', $parts[1]);
-
-        if ($devDate->lte($information['date'])) {
-            Log::debug(sprintf('This development release is older, release = %s, latest version %s = %s', $devDate->format('Y-m-d'), $latest, $information['date']->format('Y-m-d')));
+        if (-1 === $compare) {
             $return['level']   = 'info';
             $return['message'] = (string) trans('firefly.update_current_dev_older', ['version' => $current, 'new_version' => $latest]);
 
             return $return;
         }
-        Log::debug(sprintf('This development release is newer, release = %s, latest version %s = %s', $devDate->format('Y-m-d'), $latest, $information['date']->format('Y-m-d')));
         $return['level']   = 'info';
         $return['message'] = (string) trans('firefly.update_current_dev_newer', ['version' => $current, 'new_version' => $latest]);
 

app/Support/Http/Controllers/PeriodOverview.php

@@ -263,13 +263,13 @@ trait PeriodOverview
 
         $entry
                     = [
-                     'title'              => $title,
-                     'route'              => route(sprintf('%s.no-%s', Str::plural($model), $model), [$start->format('Y-m-d'), $end->format('Y-m-d')]),
-                     'total_transactions' => 0,
-                     'spent'              => [],
-                     'earned'             => [],
-                     'transferred'        => [],
-                 ];
+                        'title'              => $title,
+                        'route'              => route(sprintf('%s.no-%s', Str::plural($model), $model), [$start->format('Y-m-d'), $end->format('Y-m-d')]),
+                        'total_transactions' => 0,
+                        'spent'              => [],
+                        'earned'             => [],
+                        'transferred'        => [],
+                    ];
         $grouped    = [];
 
         /** @var PeriodStatistic $statistic */
@@ -325,30 +325,26 @@ trait PeriodOverview
     private function filterStatistics(Carbon $start, Carbon $end, string $type): Collection
     {
         if (0 === $this->statistics->count()) {
-            Log::warning('Have no statistic to filter!');
+            Log::debug('Have no statistic to filter!');
 
             return new Collection();
         }
 
         return $this->statistics->filter(
-            function (PeriodStatistic $statistic) use ($start, $end, $type) {
-                return $statistic->start->eq($start) && $statistic->end->eq($end) && $statistic->type === $type;
-            }
+            fn (PeriodStatistic $statistic) => $statistic->start->eq($start) && $statistic->end->eq($end) && $statistic->type === $type
         );
     }
 
     private function filterPrefixedStatistics(Carbon $start, Carbon $end, string $prefix): Collection
     {
         if (0 === $this->statistics->count()) {
-            Log::warning('Have no statistic to filter!');
+            Log::debug('Have no statistic to filter!');
 
             return new Collection();
         }
 
         return $this->statistics->filter(
-            function (PeriodStatistic $statistic) use ($start, $end, $prefix) {
-                return $statistic->start->eq($start) && $statistic->end->eq($end) && str_starts_with($statistic->type, $prefix);
-            }
+            fn (PeriodStatistic $statistic) => $statistic->start->eq($start) && $statistic->end->eq($end) && str_starts_with($statistic->type, $prefix)
         );
     }
 
@@ -515,13 +511,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),
+                   ];
             ++$loops;
         }
 

app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php

@@ -57,10 +57,12 @@ class PiggyBankEnrichment implements EnrichmentInterface
     private readonly TransactionCurrency $primaryCurrency;
     private User                         $user;
     private UserGroup                    $userGroup;
+    private ?Carbon $date;
 
     public function __construct()
     {
         $this->primaryCurrency = Amount::getPrimaryCurrency();
+        $this->date            = now(config('app.timezone'));
     }
 
     public function enrich(Collection $collection): Collection
@@ -69,7 +71,6 @@ class PiggyBankEnrichment implements EnrichmentInterface
         $this->collectIds();
         $this->collectObjectGroups();
         $this->collectNotes();
-        $this->collectCurrentAmounts();
 
 
         $this->appendCollectedData();
@@ -157,8 +158,8 @@ class PiggyBankEnrichment implements EnrichmentInterface
             }
 
             // get suggested per month.
-            $meta['save_per_month']    = Steam::bcround($this->getSuggestedMonthlyAmount($item->start_date, $item->target_date, $meta['target_amount'], $meta['current_amount']), $currency->decimal_places);
-            $meta['pc_save_per_month'] = Steam::bcround($this->getSuggestedMonthlyAmount($item->start_date, $item->target_date, $meta['pc_target_amount'], $meta['pc_current_amount']), $currency->decimal_places);
+            $meta['save_per_month']    = Steam::bcround($this->getSuggestedMonthlyAmount($this->date, $item->target_date, $meta['target_amount'], $meta['current_amount']), $currency->decimal_places);
+            $meta['pc_save_per_month'] = Steam::bcround($this->getSuggestedMonthlyAmount($this->date, $item->target_date, $meta['pc_target_amount'], $meta['pc_current_amount']), $currency->decimal_places);
 
             $item->meta                = $meta;
 
@@ -166,7 +167,10 @@ class PiggyBankEnrichment implements EnrichmentInterface
         });
     }
 
-    private function collectCurrentAmounts(): void {}
+    public function setDate(?Carbon $date): void
+    {
+        $this->date = $date;
+    }
 
     private function collectIds(): void
     {

app/Support/System/IsOldVersion.php

@@ -0,0 +1,99 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * IsOldVersion.php
+ * Copyright (c) 2025 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Support\System;
+
+use Carbon\Carbon;
+use FireflyIII\Support\Facades\FireflyConfig;
+use Illuminate\Support\Facades\Log;
+
+trait IsOldVersion
+{
+    /**
+     * By default, version_compare() returns -1 if the first version is lower than the second, 0 if they are equal, and
+     * 1 if the second is lower.
+     */
+    protected function compareDevelopVersions(string $current, string $latest): int
+    {
+        $currentParts = explode('/', $current);
+        $latestParts  = explode('/', $latest);
+        if (2 !== count($currentParts) || 2 !== count($latestParts)) {
+            Log::error(sprintf('Version "%s" or "%s" is not a valid develop-version.', $current, $latest));
+
+            return 0;
+        }
+
+        $currentDate  = Carbon::createFromFormat('!Y-m-d', $currentParts[1]);
+        $latestDate   = Carbon::createFromFormat('!Y-m-d', $latestParts[1]);
+
+        if ($currentDate->lt($latestDate)) {
+            Log::debug(sprintf('This current version is older, current = %s, latest version %s.', $current, $latest));
+
+            return -1;
+        }
+        if ($currentDate->gt($latestDate)) {
+            Log::debug(sprintf('This current version is newer, current = %s, latest version %s.', $current, $latest));
+
+            return 1;
+        }
+        Log::debug(sprintf('This current version is of the same age, current = %s, latest version %s.', $current, $latest));
+
+        return 0;
+    }
+
+    /**
+     * Check if the "firefly_version" variable is correct.
+     */
+    protected function isOldVersionInstalled(): bool
+    {
+        // version compare thing.
+        $configVersion = (string)config('firefly.version');
+        $dbVersion     = (string)FireflyConfig::getFresh('ff3_version', '1.0')->data;
+        $compare       = 0;
+        // compare develop to develop
+        if (str_starts_with($configVersion, 'develop') && str_starts_with($dbVersion, 'develop')) {
+            $compare = $this->compareDevelopVersions($configVersion, $dbVersion);
+        }
+        // user has develop installed, goes to normal version.
+        if (!str_starts_with($configVersion, 'develop') && str_starts_with($dbVersion, 'develop')) {
+            return true;
+        }
+
+        // user has normal, goes to develop version.
+        if (str_starts_with($configVersion, 'develop') && !str_starts_with($dbVersion, 'develop')) {
+            return true;
+        }
+
+        // compare normal with normal.
+        if (!str_starts_with($configVersion, 'develop') && !str_starts_with($dbVersion, 'develop')) {
+            $compare = version_compare($configVersion, $dbVersion);
+        }
+        if (-1 === $compare) {
+            Log::warning(sprintf('The current configured Firefly III version (%s) is older than the required version (%s). Redirect to migrate routine.', $dbVersion, $configVersion));
+
+            return true;
+        }
+
+        return false;
+    }
+}

app/TransactionRules/Actions/UpdatePiggyBank.php

@@ -31,7 +31,9 @@ use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
+use FireflyIII\Support\Facades\Amount;
 use FireflyIII\User;
 use Illuminate\Support\Facades\Log;
 
@@ -175,15 +177,17 @@ class UpdatePiggyBank implements ActionInterface
 
     private function removeAmount(PiggyBank $piggyBank, array $array, TransactionJournal $journal, Account $account, string $amount): void
     {
-        $repository = app(PiggyBankRepositoryInterface::class);
+        $repository        = app(PiggyBankRepositoryInterface::class);
+        $accountRepository = app(AccountRepositoryInterface::class);
         $repository->setUser($journal->user);
+        $accountRepository->setUser($account->user);
 
         // how much can we remove from this piggy bank?
-        $toRemove   = $repository->getCurrentAmount($piggyBank, $account);
+        $toRemove          = $repository->getCurrentAmount($piggyBank, $account);
         Log::debug(sprintf('Amount is %s, max to remove is %s', $amount, $toRemove));
 
         // if $amount is bigger than $toRemove, shrink it.
-        $amount     = -1 === bccomp($amount, $toRemove) ? $amount : $toRemove;
+        $amount            = -1 === bccomp($amount, $toRemove) ? $amount : $toRemove;
         Log::debug(sprintf('Amount is now %s', $amount));
 
         // if amount is zero, stop.
@@ -196,7 +200,8 @@ class UpdatePiggyBank implements ActionInterface
 
         if (false === $repository->canRemoveAmount($piggyBank, $account, $amount)) {
             Log::warning(sprintf('Cannot remove %s from piggy bank.', $amount));
-            event(new RuleActionFailedOnArray($this->action, $array, trans('rules.cannot_remove_from_piggy', ['amount' => $amount, 'name' => $piggyBank->name])));
+            $currency = $accountRepository->getAccountCurrency($account) ?? Amount::getPrimaryCurrency();
+            event(new RuleActionFailedOnArray($this->action, $array, trans('rules.cannot_remove_from_piggy', ['amount' => Amount::formatAnything($amount, $currency, false), 'name' => $piggyBank->name])));
 
             return;
         }
@@ -207,8 +212,10 @@ class UpdatePiggyBank implements ActionInterface
 
     private function addAmount(PiggyBank $piggyBank, array $array, TransactionJournal $journal, Account $account, string $amount): void
     {
-        $repository = app(PiggyBankRepositoryInterface::class);
+        $repository        = app(PiggyBankRepositoryInterface::class);
+        $accountRepository = app(AccountRepositoryInterface::class);
         $repository->setUser($journal->user);
+        $accountRepository->setUser($account->user);
 
         // how much can we add to the piggy bank?
         if (0 !== bccomp($piggyBank->target_amount, '0')) {
@@ -233,7 +240,8 @@ class UpdatePiggyBank implements ActionInterface
 
         if (false === $repository->canAddAmount($piggyBank, $account, $amount)) {
             Log::warning(sprintf('Cannot add %s to piggy bank.', $amount));
-            event(new RuleActionFailedOnArray($this->action, $array, trans('rules.cannot_add_to_piggy', ['amount' => $amount, 'name' => $piggyBank->name])));
+            $currency = $accountRepository->getAccountCurrency($account) ?? Amount::getPrimaryCurrency();
+            event(new RuleActionFailedOnArray($this->action, $array, trans('rules.cannot_add_to_piggy', ['amount' => Amount::formatAnything($amount, $currency, false), 'name' => $piggyBank->name])));
 
             return;
         }

changelog.md

@@ -5,17 +5,35 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## 6.4.1 - 2025-09-15
 
+### Added
+
+- [PR 10979](https://github.com/firefly-iii/firefly-iii/pull/10979) (Add Kazakhstani Tenge (KZT) currency) reported by @maksimkurb
+
 ### Fixed
 
 - Fixed a missing filter from [issue 10803](https://github.com/firefly-iii/firefly-iii/issues/10803).
-- #10891
-- #10920
-- #10921
-- #10833
+- [Issue 10833](https://github.com/firefly-iii/firefly-iii/issues/10833) (Can't open transaction after assigning a tag to it) reported by @zynexiz
+- [Issue 10854](https://github.com/firefly-iii/firefly-iii/issues/10854) (string / null in budget causes budget page to not render) reported by @4e868df3
+- [Discussion 10891](https://github.com/orgs/firefly-iii/discussions/10891) (User group id is null when downloading new exchange rates) started by @dakennguyen
+- [Discussion 10916](https://github.com/orgs/firefly-iii/discussions/10916) (Errors/Warnings in Logs after Batch API Import) started by @Mr-Kanister
+- [Issue 10920](https://github.com/firefly-iii/firefly-iii/issues/10920) (Liability transaction with same source and destination possible) reported by @Mr-Kanister
+- [Issue 10921](https://github.com/firefly-iii/firefly-iii/issues/10921) (Transaction type between asset and liability not correctly enforced using API) reported by @Mr-Kanister
+- [Issue 10924](https://github.com/firefly-iii/firefly-iii/issues/10924) (Recurring transactions don't save (or show) selected subscription) reported by @SteffoSpieler
+- [Discussion 10938](https://github.com/orgs/firefly-iii/discussions/10938) (Unable to apply default rule group to certain transactions) started by @praemon
+- [Issue 10940](https://github.com/firefly-iii/firefly-iii/issues/10940) (Internal Server Error when trying to open piggy banks) reported by @mattephi
+- [Issue 10954](https://github.com/firefly-iii/firefly-iii/issues/10954) (Internal Server Error when trying to access (default) account) reported by @thomaschristory
+- [Issue 10956](https://github.com/firefly-iii/firefly-iii/issues/10956) (Manual webhook trigger fail) reported by @dudu7731
+- [Issue 10960](https://github.com/firefly-iii/firefly-iii/issues/10960) (404 after deleting subscription) reported by @lindely
+- [Issue 10965](https://github.com/firefly-iii/firefly-iii/issues/10965) (Fix running balance on liability overview) reported by @JC5
+- [Discussion 10974](https://github.com/orgs/firefly-iii/discussions/10974) (Big webhook_messages table) started by @Billos
+- [Discussion 10988](https://github.com/orgs/firefly-iii/discussions/10988) (Call to a member function startOfDay() on null.) started by @molnarti
+- [Issue 10990](https://github.com/firefly-iii/firefly-iii/issues/10990) (duplicate piggy event via API) reported by @4e868df3
+- [Discussion 10994](https://github.com/orgs/firefly-iii/discussions/10994) (How does the save per month attribute from a piggy bank is calculated?) started by @AdriDevelopsThings
 
 ### API
 
-- #10908
+- [Issue 10803](https://github.com/firefly-iii/firefly-iii/issues/10803) (Issue in /v1/budget-limits spent attribute) reported by @Billos
+- [Discussion 10908](https://github.com/orgs/firefly-iii/discussions/10908) (New fields for BudgetLimit object) started by @Billos
 
 
 ## 6.4.0 - 2025-09-14

composer.lock

@@ -1878,16 +1878,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v12.31.1",
+            "version": "v12.32.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "281b711710c245dd8275d73132e92635be3094df"
+                "reference": "77b2740391cd2a825ba59d6fada45e9b8b9bcc5a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/281b711710c245dd8275d73132e92635be3094df",
-                "reference": "281b711710c245dd8275d73132e92635be3094df",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/77b2740391cd2a825ba59d6fada45e9b8b9bcc5a",
+                "reference": "77b2740391cd2a825ba59d6fada45e9b8b9bcc5a",
                 "shasum": ""
             },
             "require": {
@@ -1915,7 +1915,6 @@
                 "monolog/monolog": "^3.0",
                 "nesbot/carbon": "^3.8.4",
                 "nunomaduro/termwind": "^2.0",
-                "phiki/phiki": "^2.0.0",
                 "php": "^8.2",
                 "psr/container": "^1.1.1|^2.0.1",
                 "psr/log": "^1.0|^2.0|^3.0",
@@ -2094,7 +2093,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-09-23T15:33:04+00:00"
+            "time": "2025-09-30T17:39:22+00:00"
         },
         {
             "name": "laravel/passport",
@@ -2812,16 +2811,16 @@
         },
         {
             "name": "league/csv",
-            "version": "9.25.0",
+            "version": "9.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/csv.git",
-                "reference": "f856f532866369fb1debe4e7c5a1db185f40ef86"
+                "reference": "7fce732754d043f3938899e5183e2d0f3d31b571"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/csv/zipball/f856f532866369fb1debe4e7c5a1db185f40ef86",
-                "reference": "f856f532866369fb1debe4e7c5a1db185f40ef86",
+                "url": "https://api.github.com/repos/thephpleague/csv/zipball/7fce732754d043f3938899e5183e2d0f3d31b571",
+                "reference": "7fce732754d043f3938899e5183e2d0f3d31b571",
                 "shasum": ""
             },
             "require": {
@@ -2899,7 +2898,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-09-11T08:29:08+00:00"
+            "time": "2025-10-01T11:24:54+00:00"
         },
         {
             "name": "league/event",
@@ -4352,77 +4351,6 @@
             },
             "time": "2020-10-15T08:29:30+00:00"
         },
-        {
-            "name": "phiki/phiki",
-            "version": "v2.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phikiphp/phiki.git",
-                "reference": "160785c50c01077780ab217e5808f00ab8f05a13"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phikiphp/phiki/zipball/160785c50c01077780ab217e5808f00ab8f05a13",
-                "reference": "160785c50c01077780ab217e5808f00ab8f05a13",
-                "shasum": ""
-            },
-            "require": {
-                "ext-mbstring": "*",
-                "league/commonmark": "^2.5.3",
-                "php": "^8.2",
-                "psr/simple-cache": "^3.0"
-            },
-            "require-dev": {
-                "illuminate/support": "^11.45",
-                "laravel/pint": "^1.18.1",
-                "orchestra/testbench": "^9.15",
-                "pestphp/pest": "^3.5.1",
-                "phpstan/extension-installer": "^1.4.3",
-                "phpstan/phpstan": "^2.0",
-                "symfony/var-dumper": "^7.1.6"
-            },
-            "type": "library",
-            "extra": {
-                "laravel": {
-                    "providers": [
-                        "Phiki\\Adapters\\Laravel\\PhikiServiceProvider"
-                    ]
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Phiki\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Ryan Chandler",
-                    "email": "support@ryangjchandler.co.uk",
-                    "homepage": "https://ryangjchandler.co.uk",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Syntax highlighting using TextMate grammars in PHP.",
-            "support": {
-                "issues": "https://github.com/phikiphp/phiki/issues",
-                "source": "https://github.com/phikiphp/phiki/tree/v2.0.4"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sponsors/ryangjchandler",
-                    "type": "github"
-                },
-                {
-                    "url": "https://buymeacoffee.com/ryangjchandler",
-                    "type": "other"
-                }
-            ],
-            "time": "2025-09-20T17:21:02+00:00"
-        },
         {
             "name": "php-http/client-common",
             "version": "2.7.2",
@@ -6265,16 +6193,16 @@
         },
         {
             "name": "spatie/laravel-html",
-            "version": "3.12.0",
+            "version": "3.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-html.git",
-                "reference": "3655f335609d853f51e431698179ddfe05851126"
+                "reference": "72af3cad24d153c230ff6e1da9fa3b7b702834c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-html/zipball/3655f335609d853f51e431698179ddfe05851126",
-                "reference": "3655f335609d853f51e431698179ddfe05851126",
+                "url": "https://api.github.com/repos/spatie/laravel-html/zipball/72af3cad24d153c230ff6e1da9fa3b7b702834c9",
+                "reference": "72af3cad24d153c230ff6e1da9fa3b7b702834c9",
                 "shasum": ""
             },
             "require": {
@@ -6331,7 +6259,7 @@
                 "spatie"
             ],
             "support": {
-                "source": "https://github.com/spatie/laravel-html/tree/3.12.0"
+                "source": "https://github.com/spatie/laravel-html/tree/3.12.1"
             },
             "funding": [
                 {
@@ -6339,7 +6267,7 @@
                     "type": "custom"
                 }
             ],
-            "time": "2025-03-21T08:58:06+00:00"
+            "time": "2025-10-02T07:26:38+00:00"
         },
         {
             "name": "spatie/laravel-ignition",
@@ -11405,16 +11333,11 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.29",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpstan/phpstan-phar-composer-source.git",
-                "reference": "git"
-            },
+            "version": "2.1.30",
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d618573eed4a1b6b75e37b2e0b65ac65c885d88e",
-                "reference": "d618573eed4a1b6b75e37b2e0b65ac65c885d88e",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a4a7f159927983dd4f7c8020ed227d80b7f39d7d",
+                "reference": "a4a7f159927983dd4f7c8020ed227d80b7f39d7d",
                 "shasum": ""
             },
             "require": {
@@ -11459,7 +11382,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-09-25T06:58:18+00:00"
+            "time": "2025-10-02T16:07:52+00:00"
         },
         {
             "name": "phpstan/phpstan-deprecation-rules",

config/firefly.php

@@ -78,10 +78,10 @@ return [
         'running_balance_column' => env('USE_RUNNING_BALANCE', false),
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'develop/2025-09-29',
-    'build_time'                   => 1759116036,
+    'version'                      => 'develop/2025-10-03',
+    'build_time'                   => 1759464146,
     'api_version'                  => '2.1.0', // field is no longer used.
-    'db_version'                   => 27,
+    'db_version'                   => 28, // field is no longer used.
 
     // generic settings
     'maxUploadSize'                => 1073741824, // 1 GB

package-lock.json

@@ -2135,9 +2135,9 @@
             }
         },
         "node_modules/@fortawesome/fontawesome-free": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-7.0.1.tgz",
-            "integrity": "sha512-RLmb9U6H2rJDnGxEqXxzy7ANPrQz7WK2/eTjdZqyU9uRU5W+FkAec9uU5gTYzFBH7aoXIw2WTJSCJR4KPlReQw==",
+            "version": "7.1.0",
+            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-7.1.0.tgz",
+            "integrity": "sha512-+WxNld5ZCJHvPQCr/GnzCTVREyStrAJjisUPtUxG5ngDA8TMlPnKp6dddlTpai4+1GNmltAeuk1hJEkBohwZYA==",
             "license": "(CC-BY-4.0 AND OFL-1.1 AND MIT)",
             "engines": {
                 "node": ">=6"
@@ -3173,13 +3173,13 @@
             "license": "MIT"
         },
         "node_modules/@types/node": {
-            "version": "24.5.2",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.5.2.tgz",
-            "integrity": "sha512-FYxk1I7wPv3K2XBaoyH2cTnocQEu8AOZ60hPbsyukMPLv5/5qr7V1i8PLHdl6Zf87I+xZXFvPCXYjiTFq+YSDQ==",
+            "version": "24.6.2",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.6.2.tgz",
+            "integrity": "sha512-d2L25Y4j+W3ZlNAeMKcy7yDsK425ibcAOO2t7aPTz6gNMH0z2GThtwENCDc0d/Pw9wgyRqE5Px1wkV7naz8ang==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "undici-types": "~7.12.0"
+                "undici-types": "~7.13.0"
             }
         },
         "node_modules/@types/node-forge": {
@@ -3898,16 +3898,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/at-least-node": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
-            "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
-            "dev": true,
-            "license": "ISC",
-            "engines": {
-                "node": ">= 4.0.0"
-            }
-        },
         "node_modules/autoprefixer": {
             "version": "10.4.21",
             "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.21.tgz",
@@ -4075,9 +4065,9 @@
             "license": "MIT"
         },
         "node_modules/baseline-browser-mapping": {
-            "version": "2.8.9",
-            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.9.tgz",
-            "integrity": "sha512-hY/u2lxLrbecMEWSB0IpGzGyDyeoMFQhCvZd2jGFSE5I17Fh01sYUBPCJtkWERw7zrac9+cIghxm/ytJa2X8iA==",
+            "version": "2.8.10",
+            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.10.tgz",
+            "integrity": "sha512-uLfgBi+7IBNay8ECBO2mVMGZAc1VgZWEChxm4lv+TobGdG82LnXMjuNGo/BSSZZL4UmkWhxEHP2f5ziLNwGWMA==",
             "dev": true,
             "license": "Apache-2.0",
             "bin": {
@@ -4360,9 +4350,9 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.26.2",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.26.2.tgz",
-            "integrity": "sha512-ECFzp6uFOSB+dcZ5BK/IBaGWssbSYBHvuMeMt3MMFyhI0Z8SqGgEkBLARgpRH3hutIgPVsALcMwbDrJqPxQ65A==",
+            "version": "4.26.3",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.26.3.tgz",
+            "integrity": "sha512-lAUU+02RFBuCKQPj/P6NgjlbCnLBMp4UtgTx7vNHd3XSIJF87s9a5rA3aH2yw3GS9DqZAUbOtZdCCiZeVRqt0w==",
             "dev": true,
             "funding": [
                 {
@@ -4380,9 +4370,9 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "baseline-browser-mapping": "^2.8.3",
-                "caniuse-lite": "^1.0.30001741",
-                "electron-to-chromium": "^1.5.218",
+                "baseline-browser-mapping": "^2.8.9",
+                "caniuse-lite": "^1.0.30001746",
+                "electron-to-chromium": "^1.5.227",
                 "node-releases": "^2.0.21",
                 "update-browserslist-db": "^1.1.3"
             },
@@ -4521,9 +4511,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001745",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001745.tgz",
-            "integrity": "sha512-ywt6i8FzvdgrrrGbr1jZVObnVv6adj+0if2/omv9cmR2oiZs30zL4DIyaptKcbOrBdOIc74QTMoJvSE2QHh5UQ==",
+            "version": "1.0.30001746",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001746.tgz",
+            "integrity": "sha512-eA7Ys/DGw+pnkWWSE/id29f2IcPHVoE8wxtvE5JdvD2V28VTDPy1yEeo11Guz0sJ4ZeGRcm3uaTcAqK1LXaphA==",
             "dev": true,
             "funding": [
                 {
@@ -5061,9 +5051,9 @@
             }
         },
         "node_modules/cross-env": {
-            "version": "10.0.0",
-            "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-10.0.0.tgz",
-            "integrity": "sha512-aU8qlEK/nHYtVuN4p7UQgAwVljzMg8hB4YK5ThRqD2l/ziSnryncPNn7bMLt5cFYsKVKBh8HqLqyCoTupEUu7Q==",
+            "version": "10.1.0",
+            "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-10.1.0.tgz",
+            "integrity": "sha512-GsYosgnACZTADcmEyJctkJIoqAhHjttw7RsFrVoJNXbsWWqaq6Ym+7kZjq6mS45O0jij6vtiReppKQEtqWy6Dw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -5736,9 +5726,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.227",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.227.tgz",
-            "integrity": "sha512-ITxuoPfJu3lsNWUi2lBM2PaBPYgH3uqmxut5vmBxgYvyI4AlJ6P3Cai1O76mOrkJCBzq0IxWg/NtqOrpu/0gKA==",
+            "version": "1.5.229",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.229.tgz",
+            "integrity": "sha512-cwhDcZKGcT/rEthLRJ9eBlMDkh1sorgsuk+6dpsehV0g9CABsIqBxU4rLRjG+d/U6pYU1s37A4lSKrVc5lSQYg==",
             "dev": true,
             "license": "ISC"
         },
@@ -7088,9 +7078,9 @@
             }
         },
         "node_modules/i18next": {
-            "version": "25.5.2",
-            "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.5.2.tgz",
-            "integrity": "sha512-lW8Zeh37i/o0zVr+NoCHfNnfvVw+M6FQbRp36ZZ/NyHDJ3NJVpp2HhAUyU9WafL5AssymNoOjMRB48mmx2P6Hw==",
+            "version": "25.5.3",
+            "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.5.3.tgz",
+            "integrity": "sha512-joFqorDeQ6YpIXni944upwnuHBf5IoPMuqAchGVeQLdWC2JOjxgM9V8UGLhNIIH/Q8QleRxIi0BSRQehSrDLcg==",
             "funding": [
                 {
                     "type": "individual",
@@ -8653,16 +8643,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/os-tmpdir": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-            "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/p-limit": {
             "version": "2.3.0",
             "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -8818,9 +8798,9 @@
             }
         },
         "node_modules/patch-package": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-8.0.0.tgz",
-            "integrity": "sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==",
+            "version": "8.0.1",
+            "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-8.0.1.tgz",
+            "integrity": "sha512-VsKRIA8f5uqHQ7NGhwIna6Bx6D9s/1iXlA1hthBVBEbkq+t4kXD0HHt+rJhf/Z+Ci0F/HCB2hvn0qLdLG+Qxlw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -8829,15 +8809,14 @@
                 "ci-info": "^3.7.0",
                 "cross-spawn": "^7.0.3",
                 "find-yarn-workspace-root": "^2.0.0",
-                "fs-extra": "^9.0.0",
+                "fs-extra": "^10.0.0",
                 "json-stable-stringify": "^1.0.2",
                 "klaw-sync": "^6.0.0",
                 "minimist": "^1.2.6",
                 "open": "^7.4.2",
-                "rimraf": "^2.6.3",
                 "semver": "^7.5.3",
                 "slash": "^2.0.0",
-                "tmp": "^0.0.33",
+                "tmp": "^0.2.4",
                 "yaml": "^2.2.2"
             },
             "bin": {
@@ -8848,22 +8827,6 @@
                 "npm": ">5"
             }
         },
-        "node_modules/patch-package/node_modules/fs-extra": {
-            "version": "9.1.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-            "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "at-least-node": "^1.0.0",
-                "graceful-fs": "^4.2.0",
-                "jsonfile": "^6.0.1",
-                "universalify": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
         "node_modules/patch-package/node_modules/slash": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
@@ -10086,9 +10049,9 @@
             }
         },
         "node_modules/rimraf": {
-            "version": "2.7.1",
-            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-            "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+            "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
             "deprecated": "Rimraf versions prior to v4 are no longer supported",
             "dev": true,
             "license": "ISC",
@@ -10097,6 +10060,9 @@
             },
             "bin": {
                 "rimraf": "bin.js"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
             }
         },
         "node_modules/ripemd160": {
@@ -11014,9 +10980,9 @@
             }
         },
         "node_modules/tapable": {
-            "version": "2.2.3",
-            "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.3.tgz",
-            "integrity": "sha512-ZL6DDuAlRlLGghwcfmSn9sK3Hr6ArtyudlSAiCqQ6IfE+b+HHbydbYDIG15IfS5do+7XQQBdBiubF/cV2dnDzg==",
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz",
+            "integrity": "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -11119,9 +11085,9 @@
             "license": "MIT"
         },
         "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-            "version": "4.3.2",
-            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
-            "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
+            "version": "4.3.3",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.3.tgz",
+            "integrity": "sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -11214,16 +11180,13 @@
             }
         },
         "node_modules/tmp": {
-            "version": "0.0.33",
-            "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-            "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+            "version": "0.2.5",
+            "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz",
+            "integrity": "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==",
             "dev": true,
             "license": "MIT",
-            "dependencies": {
-                "os-tmpdir": "~1.0.2"
-            },
             "engines": {
-                "node": ">=0.6.0"
+                "node": ">=14.14"
             }
         },
         "node_modules/to-arraybuffer": {
@@ -11343,9 +11306,9 @@
             }
         },
         "node_modules/undici-types": {
-            "version": "7.12.0",
-            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.12.0.tgz",
-            "integrity": "sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ==",
+            "version": "7.13.0",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.13.0.tgz",
+            "integrity": "sha512-Ov2Rr9Sx+fRgagJ5AX0qvItZG/JKKoBRAVITs1zk7IqZGTJUwgUr7qoYBpWwakpWilTZFM98rG/AFRocu10iIQ==",
             "dev": true,
             "license": "MIT"
         },
@@ -11540,9 +11503,9 @@
             }
         },
         "node_modules/vite": {
-            "version": "7.1.7",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.7.tgz",
-            "integrity": "sha512-VbA8ScMvAISJNJVbRDTJdCwqQoAareR/wutevKanhR2/1EkoXVZVkkORaYm/tNVCjP/UDTKtcw3bAkwOUdedmA==",
+            "version": "7.1.9",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.9.tgz",
+            "integrity": "sha512-4nVGliEpxmhCL8DslSAUdxlB6+SMrhB0a1v5ijlh1xB1nEPuy1mxaHxysVucLHuWryAxLWg6a5ei+U4TLn/rFg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -11863,9 +11826,9 @@
             "license": "BSD-2-Clause"
         },
         "node_modules/webpack": {
-            "version": "5.101.3",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.101.3.tgz",
-            "integrity": "sha512-7b0dTKR3Ed//AD/6kkx/o7duS8H3f1a4w3BYpIriX4BzIhjkn4teo05cptsxvLesHFKK5KObnadmCHBwGc+51A==",
+            "version": "5.102.0",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.102.0.tgz",
+            "integrity": "sha512-hUtqAR3ZLVEYDEABdBioQCIqSoguHbFn1K7WlPPWSuXmx0031BD73PSE35jKyftdSh4YLDoQNgK4pqBt5Q82MA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -11877,7 +11840,7 @@
                 "@webassemblyjs/wasm-parser": "^1.14.1",
                 "acorn": "^8.15.0",
                 "acorn-import-phases": "^1.0.3",
-                "browserslist": "^4.24.0",
+                "browserslist": "^4.24.5",
                 "chrome-trace-event": "^1.0.2",
                 "enhanced-resolve": "^5.17.3",
                 "es-module-lexer": "^1.2.1",
@@ -11890,9 +11853,9 @@
                 "mime-types": "^2.1.27",
                 "neo-async": "^2.6.2",
                 "schema-utils": "^4.3.2",
-                "tapable": "^2.1.1",
+                "tapable": "^2.2.3",
                 "terser-webpack-plugin": "^5.3.11",
-                "watchpack": "^2.4.1",
+                "watchpack": "^2.4.4",
                 "webpack-sources": "^3.3.3"
             },
             "bin": {
@@ -12021,9 +11984,9 @@
             "license": "MIT"
         },
         "node_modules/webpack-dev-middleware/node_modules/schema-utils": {
-            "version": "4.3.2",
-            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
-            "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
+            "version": "4.3.3",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.3.tgz",
+            "integrity": "sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -12155,27 +12118,10 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/webpack-dev-server/node_modules/rimraf": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-            "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-            "deprecated": "Rimraf versions prior to v4 are no longer supported",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "glob": "^7.1.3"
-            },
-            "bin": {
-                "rimraf": "bin.js"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
         "node_modules/webpack-dev-server/node_modules/schema-utils": {
-            "version": "4.3.2",
-            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
-            "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
+            "version": "4.3.3",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.3.tgz",
+            "integrity": "sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -12275,9 +12221,9 @@
             "license": "MIT"
         },
         "node_modules/webpack/node_modules/schema-utils": {
-            "version": "4.3.2",
-            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
-            "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
+            "version": "4.3.3",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.3.tgz",
+            "integrity": "sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {

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

@@ -160,7 +160,7 @@
         "url": "URL",
         "active": "Activ",
         "interest_date": "Data de interes",
-        "administration_currency": "Primary currency",
+        "administration_currency": "Moneda principala",
         "title": "Titlu",
         "date": "Dat\u0103",
         "book_date": "Rezerv\u0103 dat\u0103",

resources/lang/en_US/firefly.php

@@ -909,6 +909,7 @@ return [
     'rule_trigger_tag_is'                                 => 'Any tag is ":trigger_value"',
     'rule_trigger_tag_contains_choice'                    => 'Any tag contains..',
     'rule_trigger_tag_contains'                           => 'Any tag contains ":trigger_value"',
+    'rule_trigger_not_tag_contains'                           => 'No tag contains ":trigger_value"',
     'rule_trigger_tag_ends_choice'                        => 'Any tag ends with..',
     'rule_trigger_tag_ends'                               => 'Any tag ends with ":trigger_value"',
     'rule_trigger_tag_starts_choice'                      => 'Any tag starts with..',

resources/lang/en_US/rules.php

@@ -75,7 +75,7 @@ return [
     'cannot_set_budget'                             => 'Firefly III can\'t set budget ":name" to a transaction of type ":type"',
     'journal_invalid_amount'                        => 'Firefly III can\'t set amount ":amount" because it is not a valid number.',
     'cannot_remove_zero_piggy'                      => 'Cannot remove zero amount from piggy bank ":name"',
-    'cannot_remove_from_piggy'                      => 'Cannot remove ":amount" from piggy bank ":name"',
+    'cannot_remove_from_piggy'                      => 'Cannot remove :amount from piggy bank ":name"',
     'cannot_add_zero_piggy'                         => 'Cannot add zero amount to piggy bank ":name"',
-    'cannot_add_to_piggy'                           => 'Cannot add ":amount" to piggy bank ":name"',
+    'cannot_add_to_piggy'                           => 'Cannot add :amount to piggy bank ":name"',
 ];

resources/views/list/groups.twig

@@ -270,7 +270,12 @@
                 <td>
                     {% if (null == transaction.balance_dirty or false == transaction.balance_dirty) and null != transaction.destination_balance_after and null != transaction.source_balance_after %}
                         {% if transaction.transaction_type_type == 'Deposit' %}
-                            {{ formatAmountBySymbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                            {% if transaction.source_account_id == account.id %}
+                                {{ formatAmountBySymbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                                {% else %}
+                                {{ formatAmountBySymbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                            {%  endif %}
+
                         {% elseif transaction.transaction_type_type == 'Withdrawal' %}
                             {% if 'Loan' == transaction.destination_account_type or 'Mortgage' == transaction.destination_account_type or 'Debt' == transaction.destination_account_type %}
                                 {% if currency.id == transaction.currency_id %}

resources/views/partials/debug-table.twig

@@ -12,8 +12,7 @@
     {# Firefly III version #}
     <tr>
         <td>Firefly III</td>
-        <td>{% if FF_IS_DEVELOP %}<!-- .Z9JBCmw64Zkx1pQw -->{% endif %}{% if not FF_IS_DEVELOP %}v{% endif %}{{ FF_VERSION }} / <span>#</span>{{ system.db_version }} (expects <span>#</span>{{ config('firefly.db_version') }})
-        </td>
+        <td>{% if FF_IS_DEVELOP %}<!-- .Z9JBCmw64Zkx1pQw -->{% endif %}{% if not FF_IS_DEVELOP %}v{% endif %}{{ FF_VERSION }}</td>
     </tr>
     {# PHP version + settings #}
     <tr>

resources/views/reports/category/partials/avg-income.twig

@@ -2,7 +2,7 @@
     <thead>
     <tr>
         <th data-defaultsign="az">{{ 'account'|_ }}</th>
-        <th data-defaultsign="_19" style="text-align: right;">{{ 'spent_average'|_ }}</th>
+        <th data-defaultsign="_19" style="text-align: right;">{{ 'income_average'|_ }}</th>
         <th data-defaultsign="_19" style="text-align: right;">{{ 'total'|_ }}</th>
         <th data-defaultsign="_19">{{ 'transaction_count'|_ }}</th>
     </tr>