Merge pull request #11375 from firefly-iii/release-1765863733

🤖 Automatically merge the PR into the develop branch.
🤖 Auto commit for release 'v6.4.14' on 2025-12-16
2025-12-16 11:28:50 +00:00 · 2025-12-16 06:42:20 +01:00 · 2025-12-16 06:42:13 +01:00 · 2025-12-16 06:38:14 +01:00 · 2025-12-16 06:36:32 +01:00 · 2025-12-16 06:36:17 +01:00
24 changed files with 409 additions and 519 deletions
--- a/.ci/php-cs-fixer/composer.lock
+++ b/.ci/php-cs-fixer/composer.lock
@@ -402,16 +402,16 @@
        },
        {
            "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.92.0",
+            "version": "v3.92.1",
            "source": {
                "type": "git",
                "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "5646c2cd99b7cb4b658ff681fe27069ba86c7280"
+                "reference": "ed33ad03313a019533ba065eba6c86af0a382873"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/5646c2cd99b7cb4b658ff681fe27069ba86c7280",
-                "reference": "5646c2cd99b7cb4b658ff681fe27069ba86c7280",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/ed33ad03313a019533ba065eba6c86af0a382873",
+                "reference": "ed33ad03313a019533ba065eba6c86af0a382873",
                "shasum": ""
            },
            "require": {
@@ -451,6 +451,7 @@
                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.6",
                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.6",
                "phpunit/phpunit": "^9.6.25 || ^10.5.53 || ^11.5.34",
+                "symfony/polyfill-php85": "^1.33",
                "symfony/var-dumper": "^5.4.48 || ^6.4.24 || ^7.3.2 || ^8.0",
                "symfony/yaml": "^5.4.45 || ^6.4.24 || ^7.3.2 || ^8.0"
            },
@@ -493,7 +494,7 @@
            ],
            "support": {
                "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.92.0"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.92.1"
            },
            "funding": [
                {
@@ -501,7 +502,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-12-12T10:29:19+00:00"
+            "time": "2025-12-15T23:09:01+00:00"
        },
        {
            "name": "psr/container",
--- a/.github/workflows/label-actions.yml
+++ b/.github/workflows/label-actions.yml
@@ -18,4 +18,4 @@ jobs:
  action:
    runs-on: ubuntu-latest
    steps:
-      - uses: dessant/label-actions@v4
+      - uses: dessant/label-actions@v5
--- a/app/Api/V1/Controllers/Chart/AccountController.php
+++ b/app/Api/V1/Controllers/Chart/AccountController.php
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Chart;

-use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Chart\ChartRequest;
 use FireflyIII\Enums\UserRoleEnum;
@@ -32,11 +31,13 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Facades\Navigation;
 use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Api\ApiSupport;
 use FireflyIII\Support\Http\Api\CleansChartData;
 use FireflyIII\Support\Http\Api\CollectsAccountsFromFilter;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;

 /**
@@ -48,9 +49,9 @@ class AccountController extends Controller
    use CleansChartData;
    use CollectsAccountsFromFilter;

-    protected array $acceptedRoles            = [UserRoleEnum::READ_ONLY];
+    protected array $acceptedRoles                = [UserRoleEnum::READ_ONLY];

-    private array                  $chartData = [];
+    private array                      $chartData = [];
    private AccountRepositoryInterface $repository;

    /**
@@ -103,7 +104,7 @@ class AccountController extends Controller
        $currency          = $this->repository->getAccountCurrency($account);
        $currentStart      = clone $params['start'];
        $range             = Steam::finalAccountBalanceInRange($account, $params['start'], clone $params['end'], $this->convertToPrimary);
-
+        $period            = $params['period'] ?? '1D';

        $previous          = array_values($range)[0]['balance'];
        $pcPrevious        = null;
@@ -129,7 +130,7 @@ class AccountController extends Controller
            'end_date'                => $params['end']->toAtomString(),
            'type'                    => 'line',
            'yAxisID'                 => 0,
-            'period'                  => '1D',
+            'period'                  => $period,
            'entries'                 => [],
            'pc_entries'              => [],
        ];
@@ -141,7 +142,7 @@ class AccountController extends Controller
            $currentSet['primary_currency_decimal_places'] = $this->primaryCurrency->decimal_places;
            $pcPrevious                                    = array_values($range)[0]['pc_balance'];
        }
-
+        // create array of values to collect.

        while ($currentStart <= $params['end']) {
            $format                        = $currentStart->format('Y-m-d');
@@ -158,8 +159,8 @@ class AccountController extends Controller
                $pcPrevious                       = $pcBalance;
                $currentSet['pc_entries'][$label] = $pcBalance;
            }
-
-            $currentStart->addDay();
+            $currentStart                  = Navigation::addPeriod($currentStart, $period);
+            // $currentStart->addDay();
        }
        $this->chartData[] = $currentSet;
    }
--- a/app/Api/V1/Controllers/Summary/BasicController.php
+++ b/app/Api/V1/Controllers/Summary/BasicController.php
@@ -486,7 +486,7 @@ class BasicController extends Controller
                'currency_decimal_places' => $currencies[$currencyId]->decimal_places,
                'value_parsed'            => Amount::formatFlat($currencies[$currencyId]->symbol, $currencies[$currencyId]->decimal_places, $availableBudget, false),
                'local_icon'              => 'money',
-                'sub_title'               => Amount::formatFlat($currencies[$currencyId]->symbol, $currencies[$currencyId]->decimal_places, $availableBudget, false),
+                'sub_title'               => Amount::formatFlat($currencies[$currencyId]->symbol, $currencies[$currencyId]->decimal_places, bcdiv($availableBudget, (string)$days), false),
            ];
        }
        foreach ($spent as $row) {
--- a/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php
@@ -339,6 +339,9 @@ class UpdateRequest extends FormRequest
                // if more than one, verify that there are journal ID's present.
                $this->validateJournalIds($validator, $transactionGroup);

+                // if more than one split, needs group title
+                $this->validateGroupDescription($validator);
+
                // all transaction types must be equal:
                $this->validateTransactionTypesForUpdate($validator);

--- a/app/Console/Commands/Integrity/ValidatesFilePermissions.php
+++ b/app/Console/Commands/Integrity/ValidatesFilePermissions.php
@@ -55,13 +55,13 @@ class ValidatesFilePermissions extends Command
        /** @var string $directory */
        foreach ($directories as $directory) {
            if (!is_dir($directory)) {
-                $this->friendlyError(sprintf('Directory "%s" cannot found. It is necessary to allow files to be uploaded.', $uploadDir));
+                $this->friendlyError(sprintf('Directory "%s" cannot found. It is necessary to allow files to be uploaded.', $directory));
                $errors = true;

                continue;
            }
            if (!is_writable($directory)) {
-                $this->friendlyError(sprintf('Directory "%s" is not writeable. Uploading attachments may fail silently.', $uploadDir));
+                $this->friendlyError(sprintf('Directory "%s" is not writeable. Uploading attachments may fail silently.', $directory));
                $errors = true;
            }
        }
--- a/app/Http/Controllers/RuleGroup/ExecutionController.php
+++ b/app/Http/Controllers/RuleGroup/ExecutionController.php
@@ -43,7 +43,7 @@ use Illuminate\View\View;
 */
 class ExecutionController extends Controller
 {
-    private AccountRepositoryInterface $repository;
+    private readonly AccountRepositoryInterface $repository;

    /**
     * ExecutionController constructor.
--- a/app/Http/Controllers/Transaction/IndexController.php
+++ b/app/Http/Controllers/Transaction/IndexController.php
@@ -24,13 +24,13 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\Transaction;

-use FireflyIII\Support\Facades\Preferences;
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\Support\Http\Controllers\PeriodOverview;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\Request;
@@ -58,7 +58,7 @@ class IndexController extends Controller
        $this->middleware(
            function ($request, $next) {
                app('view')->share('mainTitleIcon', 'fa-exchange');
-                app('view')->share('title', (string) trans('firefly.transactions'));
+                app('view')->share('title', (string)trans('firefly.transactions'));

                $this->repository = app(JournalRepositoryInterface::class);

@@ -84,8 +84,8 @@ class IndexController extends Controller

        $subTitleIcon  = config('firefly.transactionIconsByType.'.$objectType);
        $types         = config('firefly.transactionTypesByType.'.$objectType);
-        $page          = (int) $request->get('page');
-        $pageSize      = (int) Preferences::get('listPageSize', 50)->data;
+        $page          = (int)$request->get('page');
+        $pageSize      = (int)Preferences::get('listPageSize', 50)->data;

        if (!$start instanceof Carbon) {
            $start = session('start');
@@ -100,11 +100,17 @@ class IndexController extends Controller
        [$start, $end] = $end < $start ? [$end, $start] : [$start, $end];
        $startStr      = $start->isoFormat($this->monthAndDayFormat);
        $endStr        = $end->isoFormat($this->monthAndDayFormat);
-        $subTitle      = (string) trans(sprintf('firefly.title_%s_between', $objectType), ['start' => $startStr, 'end' => $endStr]);
+        $subTitle      = (string)trans(sprintf('firefly.title_%s_between', $objectType), ['start' => $startStr, 'end' => $endStr]);
        $path          = route('transactions.index', [$objectType, $start->format('Y-m-d'), $end->format('Y-m-d')]);
        $firstJournal  = $this->repository->firstNull();
        $startPeriod   = $firstJournal instanceof TransactionJournal ? $firstJournal->date : new Carbon();
        $endPeriod     = clone $end;
+
+        // limit to 3 years for the time being.
+        if (now()->diffInYears($startPeriod, true) > 3) {
+            $startPeriod = now()->subYears(3);
+        }
+
        $periods       = $this->getTransactionPeriodOverview($objectType, $startPeriod, $endPeriod);

        /** @var GroupCollectorInterface $collector */
@@ -137,14 +143,14 @@ class IndexController extends Controller
    {
        $subTitleIcon = config('firefly.transactionIconsByType.'.$objectType);
        $types        = config('firefly.transactionTypesByType.'.$objectType);
-        $page         = (int) $request->get('page');
-        $pageSize     = (int) Preferences::get('listPageSize', 50)->data;
+        $page         = (int)$request->get('page');
+        $pageSize     = (int)Preferences::get('listPageSize', 50)->data;
        $path         = route('transactions.index.all', [$objectType]);
        $first        = $this->repository->firstNull();
        $start        = $first instanceof TransactionJournal ? $first->date : new Carbon();
        $last         = $this->repository->getLast();
        $end          = $last instanceof TransactionJournal ? $last->date : today(config('app.timezone'));
-        $subTitle     = (string) trans('firefly.all_'.$objectType);
+        $subTitle     = (string)trans('firefly.all_'.$objectType);

        /** @var GroupCollectorInterface $collector */
        $collector    = app(GroupCollectorInterface::class);
--- a/app/Services/Internal/Update/JournalUpdateService.php
+++ b/app/Services/Internal/Update/JournalUpdateService.php
@@ -674,9 +674,17 @@ class JournalUpdateService
        $this->destinationTransaction->refresh();
        Log::debug(sprintf('Updated amount to "%s"', $amount));

+        $group                                = $this->transactionGroup;
+        if (null === $group) {
+            $group = $this->transactionJournal?->transactionGroup;
+        }
+        if (null === $group) {
+            return;
+        }
+
        event(new TriggeredAuditLog(
-            $this->transactionGroup->user,
-            $this->transactionGroup,
+            $group->user,
+            $group,
            'update_amount',
            [
                'currency_symbol' => $destTransaction->transactionCurrency->symbol,
--- a/changelog.md
+++ b/changelog.md
@@ -3,7 +3,50 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).

-## 6.4.9 - 2025-11-xx
+## v6.4.14 - 2025-12-17
+
+### Fixed
+
+- [Issue 11368](https://github.com/firefly-iii/firefly-iii/issues/11368) (Attempt to read property "user" on null) reported by @simonwiles
+
+## v6.4.13 - 2025-12-17
+
+### Fixed
+
+- [Issue 11368](https://github.com/firefly-iii/firefly-iii/issues/11368) (Attempt to read property "user" on null) reported by @simonwiles
+
+## v6.4.12 - 2025-12-17
+
+### Fixed
+
+- [Issue 11368](https://github.com/firefly-iii/firefly-iii/issues/11368) (Attempt to read property "user" on null) reported by @simonwiles
+- [Issue 11367](https://github.com/firefly-iii/firefly-iii/issues/11367) (Expenses page has incorrect summary values) reported by @purplemeteorite
+
+## v6.4.11 - 2025-12-16
+
+### Fixed
+
+- [Issue 11356](https://github.com/firefly-iii/firefly-iii/issues/11356) (Dashboard - Budget - Left To Spend "Per day" shows total budget value) reported by @lucasarrudadev
+- [Issue 11357](https://github.com/firefly-iii/firefly-iii/issues/11357) (Firefly III v6.4.10 ran into an error: Undefined variable $uploadDir.) reported by @jgmm81
+
+## v6.4.10 - 2025-12-15
+
+### Added
+
+- Added amount event audit log
+
+### Fixed
+
+- [Issue 11328](https://github.com/firefly-iii/firefly-iii/issues/11328) (Three budget / account display bugs in latest version (annual budget + account list balance)) reported by @qingxianaaa
+- [Issue 11329](https://github.com/firefly-iii/firefly-iii/issues/11329) (Imported and auto-converted transfer from different currency issue) reported by @bozho
+- [Issue 11333](https://github.com/firefly-iii/firefly-iii/issues/11333) (Prepared statement contains too many placeholders) reported by @wendyliga
+- [Issue 11313](https://github.com/firefly-iii/firefly-iii/issues/11313) (Stop Processing and Executing Rule Group on Existing Transaction) reported by @watertrainer
+- [Discussion 11323](https://github.com/orgs/firefly-iii/discussions/11323) (File ownership problem) started by @enboig
+- [Issue 11337](https://github.com/firefly-iii/firefly-iii/issues/11337) (email notifications are sent to old email address after changing it through the web UI) reported by @xsolinsx
+- [Issue 11346](https://github.com/firefly-iii/firefly-iii/issues/11346) (Running balance restart from zero for no reason) reported by @Arkarr
+- [Issue 11310](https://github.com/firefly-iii/firefly-iii/issues/11310) (Period parameter doesn't work in API) reported by @kvdb06
+
+## 6.4.9 - 2025-11-28

 ### Fixed

--- a/composer.lock
+++ b/composer.lock
@@ -4884,16 +4884,16 @@
        },
        {
            "name": "phpseclib/phpseclib",
-            "version": "3.0.47",
+            "version": "3.0.48",
            "source": {
                "type": "git",
                "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "9d6ca36a6c2dd434765b1071b2644a1c683b385d"
+                "reference": "64065a5679c50acb886e82c07aa139b0f757bb89"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/9d6ca36a6c2dd434765b1071b2644a1c683b385d",
-                "reference": "9d6ca36a6c2dd434765b1071b2644a1c683b385d",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/64065a5679c50acb886e82c07aa139b0f757bb89",
+                "reference": "64065a5679c50acb886e82c07aa139b0f757bb89",
                "shasum": ""
            },
            "require": {
@@ -4974,7 +4974,7 @@
            ],
            "support": {
                "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.47"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.48"
            },
            "funding": [
                {
@@ -4990,7 +4990,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-10-06T01:07:24+00:00"
+            "time": "2025-12-15T11:51:42+00:00"
        },
        {
            "name": "pragmarx/google2fa",
@@ -5824,20 +5824,20 @@
        },
        {
            "name": "ramsey/uuid",
-            "version": "4.9.1",
+            "version": "4.9.2",
            "source": {
                "type": "git",
                "url": "https://github.com/ramsey/uuid.git",
-                "reference": "81f941f6f729b1e3ceea61d9d014f8b6c6800440"
+                "reference": "8429c78ca35a09f27565311b98101e2826affde0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/81f941f6f729b1e3ceea61d9d014f8b6c6800440",
-                "reference": "81f941f6f729b1e3ceea61d9d014f8b6c6800440",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/8429c78ca35a09f27565311b98101e2826affde0",
+                "reference": "8429c78ca35a09f27565311b98101e2826affde0",
                "shasum": ""
            },
            "require": {
-                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13 || ^0.14",
+                "brick/math": "^0.8.16 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13 || ^0.14",
                "php": "^8.0",
                "ramsey/collection": "^1.2 || ^2.0"
            },
@@ -5896,9 +5896,9 @@
            ],
            "support": {
                "issues": "https://github.com/ramsey/uuid/issues",
-                "source": "https://github.com/ramsey/uuid/tree/4.9.1"
+                "source": "https://github.com/ramsey/uuid/tree/4.9.2"
            },
-            "time": "2025-09-04T20:59:21+00:00"
+            "time": "2025-12-14T04:43:48+00:00"
        },
        {
            "name": "rcrowe/twigbridge",
@@ -10077,16 +10077,16 @@
        },
        {
            "name": "twig/twig",
-            "version": "v3.22.1",
+            "version": "v3.22.2",
            "source": {
                "type": "git",
                "url": "https://github.com/twigphp/Twig.git",
-                "reference": "1de2ec1fc43ab58a4b7e80b214b96bfc895750f3"
+                "reference": "946ddeafa3c9f4ce279d1f34051af041db0e16f2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/1de2ec1fc43ab58a4b7e80b214b96bfc895750f3",
-                "reference": "1de2ec1fc43ab58a4b7e80b214b96bfc895750f3",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/946ddeafa3c9f4ce279d1f34051af041db0e16f2",
+                "reference": "946ddeafa3c9f4ce279d1f34051af041db0e16f2",
                "shasum": ""
            },
            "require": {
@@ -10140,7 +10140,7 @@
            ],
            "support": {
                "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.22.1"
+                "source": "https://github.com/twigphp/Twig/tree/v3.22.2"
            },
            "funding": [
                {
@@ -10152,7 +10152,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-11-16T16:01:12+00:00"
+            "time": "2025-12-14T11:28:47+00:00"
        },
        {
            "name": "vlucas/phpdotenv",
@@ -10944,16 +10944,16 @@
        },
        {
            "name": "larastan/larastan",
-            "version": "v3.8.0",
+            "version": "v3.8.1",
            "source": {
                "type": "git",
                "url": "https://github.com/larastan/larastan.git",
-                "reference": "d13ef96d652d1b2a8f34f1760ba6bf5b9c98112e"
+                "reference": "ff3725291bc4c7e6032b5a54776e3e5104c86db9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/d13ef96d652d1b2a8f34f1760ba6bf5b9c98112e",
-                "reference": "d13ef96d652d1b2a8f34f1760ba6bf5b9c98112e",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/ff3725291bc4c7e6032b5a54776e3e5104c86db9",
+                "reference": "ff3725291bc4c7e6032b5a54776e3e5104c86db9",
                "shasum": ""
            },
            "require": {
@@ -10967,7 +10967,7 @@
                "illuminate/pipeline": "^11.44.2 || ^12.4.1",
                "illuminate/support": "^11.44.2 || ^12.4.1",
                "php": "^8.2",
-                "phpstan/phpstan": "^2.1.29"
+                "phpstan/phpstan": "^2.1.32"
            },
            "require-dev": {
                "doctrine/coding-standard": "^13",
@@ -11022,7 +11022,7 @@
            ],
            "support": {
                "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v3.8.0"
+                "source": "https://github.com/larastan/larastan/tree/v3.8.1"
            },
            "funding": [
                {
@@ -11030,7 +11030,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-10-27T23:09:14+00:00"
+            "time": "2025-12-11T16:37:35+00:00"
        },
        {
            "name": "laravel-json-api/testing",
@@ -12021,16 +12021,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "12.5.3",
+            "version": "12.5.4",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "6dc2e076d09960efbb0c1272aa9bc156fc80955e"
+                "reference": "4ba0e923f9d3fc655de22f9547c01d15a41fc93a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6dc2e076d09960efbb0c1272aa9bc156fc80955e",
-                "reference": "6dc2e076d09960efbb0c1272aa9bc156fc80955e",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4ba0e923f9d3fc655de22f9547c01d15a41fc93a",
+                "reference": "4ba0e923f9d3fc655de22f9547c01d15a41fc93a",
                "shasum": ""
            },
            "require": {
@@ -12098,7 +12098,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.3"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.4"
            },
            "funding": [
                {
@@ -12122,7 +12122,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-12-11T08:52:59+00:00"
+            "time": "2025-12-15T06:05:34+00:00"
        },
        {
            "name": "rector/rector",
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -78,8 +78,8 @@ return [
        'running_balance_column' => env('USE_RUNNING_BALANCE', false),
        // see cer.php for exchange rates feature flag.
    ],
-    'version'                              => 'develop/2025-12-13',
-    'build_time'                           => 1765602694,
+    'version'                              => '6.4.14',
+    'build_time'                           => 1765863630,
    'api_version'                          => '2.1.0', // field is no longer used.
    'db_version'                           => 28, // field is no longer used.

--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -8,5 +8,8 @@
    ],
    "devDependencies": {
        "postcss": "^8.4.47"
+    },
+    "dependencies": {
+        "patch-package": "^8.0.1"
    }
 }
--- a/patches/admin-lte+4.0.0-rc6.patch
+++ b/patches/admin-lte+4.0.0-rc6.patch
@@ -1,10 +1,8 @@
 diff --git a/node_modules/admin-lte/src/scss/_app-sidebar.scss b/node_modules/admin-lte/src/scss/_app-sidebar.scss
-old mode 100644
-new mode 100755
-index 69dfc16..dc341eb
+index 4420bd0..35da532
 --- a/node_modules/admin-lte/src/scss/_app-sidebar.scss
 +++ b/node_modules/admin-lte/src/scss/_app-sidebar.scss
-@@ -577,7 +577,6 @@ body:not(.app-loaded) {
+@@ -599,7 +599,6 @@ body:not(.app-loaded) {
 
 @if $enable-dark-mode {
   @include color-mode(dark) {
--- a/resources/views/list/groups.twig
+++ b/resources/views/list/groups.twig
@@ -277,32 +277,37 @@
                            {%  endif %}

                        {% elseif transaction.transaction_type_type == 'Withdrawal' %}
+                            {# withdrawal into a liability #}
                            {% if 'Loan' == transaction.destination_account_type or 'Mortgage' == transaction.destination_account_type or 'Debt' == transaction.destination_account_type %}
                                {% if currency.id == transaction.currency_id %}
                                    {% if account.id == transaction.source_account_id %}
                                        {{ formatAmountBySymbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}
-                                    {% endif %}
-                                    {% if account.id == transaction.destination_account_id %}
+                                    {% elseif account.id == transaction.destination_account_id %}
                                        {{ formatAmountBySymbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                                    {% else %}
+                                        -
                                    {% endif %}
                                {% endif %}
                                {% if currency.id == transaction.foreign_currency_id and null != transaction.destination_balance_after and null != transaction.destination_balance_after %}
                                    {{ formatAmountBySymbol(transaction.destination_balance_after, transaction.foreign_currency_symbol ?? transaction.currency_symbol, transaction.foreign_currency_decimal_places ?? transaction.currency_decimal_places) }}
                                {% endif %}
+                            {# withdrawal into an expense account #}
                            {% else %}
                                {% if account.id == transaction.source_account_id %}
                                    {{ formatAmountBySymbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}
-                                {% endif %}
-                                {% if account.id == transaction.destination_account_id %}
+                                {% elseif account.id == transaction.destination_account_id %}
                                    {{ formatAmountBySymbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                                {% else %}
+                                    -
                                {% endif %}
-
                            {% endif %}
                        {% elseif transaction.transaction_type_type == 'Opening balance' %}
-                            {% if transaction.source_account_type == 'Initial balance account' %}
+                            {% if account.id == transaction.source_account_id %}
                                {{ formatAmountBySymbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}
-                            {% else %}
+                            {% elseif account.id == transaction.destination_account_id %}
                                {{ formatAmountBySymbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                                {% else %}
+                                -
                            {% endif %}
                        {% elseif transaction.transaction_type_type == 'Transfer' %}
                            {% if account.id == transaction.source_account_id %}
--- a/tests/unit/Support/Calendar/Periodicity/BimonthlyTest.php
+++ b/tests/unit/Support/Calendar/Periodicity/BimonthlyTest.php
@@ -27,7 +27,6 @@ namespace Tests\unit\Support\Calendar\Periodicity;
 use FireflyIII\Support\Calendar\Periodicity\Bimonthly;
 use Carbon\Carbon;
 use FireflyIII\Support\Calendar\Periodicity;
-use FireflyIII\Support\Calendar\Periodicity\Interval;

 /**
 * @group unit-test
@@ -41,7 +40,7 @@ use FireflyIII\Support\Calendar\Periodicity\Interval;
 */
 final class BimonthlyTest extends IntervalTestCase
 {
-    public static function factory(): Interval
+    public static function factory(): Bimonthly
    {
        return new Bimonthly();
    }
--- a/tests/unit/Support/Calendar/Periodicity/DailyTest.php
+++ b/tests/unit/Support/Calendar/Periodicity/DailyTest.php
@@ -27,7 +27,6 @@ namespace Tests\unit\Support\Calendar\Periodicity;
 use FireflyIII\Support\Calendar\Periodicity\Daily;
 use Carbon\Carbon;
 use FireflyIII\Support\Calendar\Periodicity;
-use FireflyIII\Support\Calendar\Periodicity\Interval;

 /**
 * @group unit-test
@@ -41,7 +40,7 @@ use FireflyIII\Support\Calendar\Periodicity\Interval;
 */
 final class DailyTest extends IntervalTestCase
 {
-    public static function factory(): Interval
+    public static function factory(): Daily
    {
        return new Daily();
    }
--- a/tests/unit/Support/Calendar/Periodicity/FortnightlyTest.php
+++ b/tests/unit/Support/Calendar/Periodicity/FortnightlyTest.php
@@ -27,7 +27,6 @@ namespace Tests\unit\Support\Calendar\Periodicity;
 use FireflyIII\Support\Calendar\Periodicity\Fortnightly;
 use Carbon\Carbon;
 use FireflyIII\Support\Calendar\Periodicity;
-use FireflyIII\Support\Calendar\Periodicity\Interval;

 /**
 * @group unit-test
@@ -41,7 +40,7 @@ use FireflyIII\Support\Calendar\Periodicity\Interval;
 */
 final class FortnightlyTest extends IntervalTestCase
 {
-    public static function factory(): Interval
+    public static function factory(): Fortnightly
    {
        return new Fortnightly();
    }
--- a/tests/unit/Support/Calendar/Periodicity/HalfYearlyTest.php
+++ b/tests/unit/Support/Calendar/Periodicity/HalfYearlyTest.php
@@ -27,7 +27,6 @@ namespace Tests\unit\Support\Calendar\Periodicity;
 use FireflyIII\Support\Calendar\Periodicity\HalfYearly;
 use Carbon\Carbon;
 use FireflyIII\Support\Calendar\Periodicity;
-use FireflyIII\Support\Calendar\Periodicity\Interval;

 /**
 * @group unit-test
@@ -41,7 +40,7 @@ use FireflyIII\Support\Calendar\Periodicity\Interval;
 */
 final class HalfYearlyTest extends IntervalTestCase
 {
-    public static function factory(): Interval
+    public static function factory(): HalfYearly
    {
        return new HalfYearly();
    }
--- a/tests/unit/Support/Calendar/Periodicity/MonthlyTest.php
+++ b/tests/unit/Support/Calendar/Periodicity/MonthlyTest.php
@@ -27,7 +27,6 @@ namespace Tests\unit\Support\Calendar\Periodicity;
 use FireflyIII\Support\Calendar\Periodicity\Monthly;
 use Carbon\Carbon;
 use FireflyIII\Support\Calendar\Periodicity;
-use FireflyIII\Support\Calendar\Periodicity\Interval;

 /**
 * @group unit-test
@@ -41,7 +40,7 @@ use FireflyIII\Support\Calendar\Periodicity\Interval;
 */
 final class MonthlyTest extends IntervalTestCase
 {
-    public static function factory(): Interval
+    public static function factory(): Monthly
    {
        return new Monthly();
    }
--- a/tests/unit/Support/Calendar/Periodicity/QuarterlyTest.php
+++ b/tests/unit/Support/Calendar/Periodicity/QuarterlyTest.php
@@ -27,7 +27,6 @@ namespace Tests\unit\Support\Calendar\Periodicity;
 use FireflyIII\Support\Calendar\Periodicity\Quarterly;
 use Carbon\Carbon;
 use FireflyIII\Support\Calendar\Periodicity;
-use FireflyIII\Support\Calendar\Periodicity\Interval;

 /**
 * @group unit-test
@@ -41,7 +40,7 @@ use FireflyIII\Support\Calendar\Periodicity\Interval;
 */
 final class QuarterlyTest extends IntervalTestCase
 {
-    public static function factory(): Interval
+    public static function factory(): Quarterly
    {
        return new Quarterly();
    }
--- a/tests/unit/Support/Calendar/Periodicity/WeeklyTest.php
+++ b/tests/unit/Support/Calendar/Periodicity/WeeklyTest.php
@@ -27,7 +27,6 @@ namespace Tests\unit\Support\Calendar\Periodicity;
 use FireflyIII\Support\Calendar\Periodicity\Weekly;
 use Carbon\Carbon;
 use FireflyIII\Support\Calendar\Periodicity;
-use FireflyIII\Support\Calendar\Periodicity\Interval;

 /**
 * @group unit-test
@@ -41,7 +40,7 @@ use FireflyIII\Support\Calendar\Periodicity\Interval;
 */
 final class WeeklyTest extends IntervalTestCase
 {
-    public static function factory(): Interval
+    public static function factory(): Weekly
    {
        return new Weekly();
    }
--- a/tests/unit/Support/Calendar/Periodicity/YearlyTest.php
+++ b/tests/unit/Support/Calendar/Periodicity/YearlyTest.php
@@ -27,7 +27,6 @@ namespace Tests\unit\Support\Calendar\Periodicity;
 use FireflyIII\Support\Calendar\Periodicity\Yearly;
 use Carbon\Carbon;
 use FireflyIII\Support\Calendar\Periodicity;
-use FireflyIII\Support\Calendar\Periodicity\Interval;

 /**
 * @group unit-test
@@ -41,7 +40,7 @@ use FireflyIII\Support\Calendar\Periodicity\Interval;
 */
 final class YearlyTest extends IntervalTestCase
 {
-    public static function factory(): Interval
+    public static function factory(): Yearly
    {
        return new Yearly();
    }
Author	SHA1	Message	Date
github-actions[bot]	bdaed65207	Merge pull request #11375 from firefly-iii/release-1765863733 🤖 Automatically merge the PR into the develop branch.	2025-12-16 06:42:20 +01:00
JC5	62a9195acc	🤖 Auto commit for release 'v6.4.14' on 2025-12-16	2025-12-16 06:42:13 +01:00
James Cole	40d1e36ba8	Fix changelog.	2025-12-16 06:38:14 +01:00
James Cole	61a8525d26	Merge branch 'main' into develop	2025-12-16 06:36:32 +01:00
James Cole	ef01fbe5f4	Update changelog.	2025-12-16 06:36:17 +01:00
James Cole	9413f49c84	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop	2025-12-16 06:36:12 +01:00
github-actions[bot]	d9ae99b5fe	Merge pull request #11374 from firefly-iii/develop 🤖 Automatically merge the PR into the main branch.	2025-12-16 06:35:19 +01:00
github-actions[bot]	45d2d86bba	Merge pull request #11373 from firefly-iii/release-1765863308 🤖 Automatically merge the PR into the develop branch.	2025-12-16 06:35:15 +01:00
JC5	e21d5e5d01	🤖 Auto commit for release 'v6.4.13' on 2025-12-16	2025-12-16 06:35:08 +01:00
James Cole	8781e2a870	Fix #11368	2025-12-16 06:31:19 +01:00
github-actions[bot]	9e4bfd9d1a	Merge pull request #11372 from firefly-iii/release-1765862987 🤖 Automatically merge the PR into the develop branch.	2025-12-16 06:29:55 +01:00
JC5	d61d6aa2e2	🤖 Auto commit for release 'develop' on 2025-12-16	2025-12-16 06:29:47 +01:00
github-actions[bot]	230a3a0180	Merge pull request #11371 from firefly-iii/develop 🤖 Automatically merge the PR into the main branch.	2025-12-16 06:25:04 +01:00
github-actions[bot]	002454b995	Merge pull request #11370 from firefly-iii/release-1765862692 🤖 Automatically merge the PR into the develop branch.	2025-12-16 06:24:59 +01:00
JC5	e6d9c2e218	🤖 Auto commit for release 'v6.4.12' on 2025-12-16	2025-12-16 06:24:52 +01:00
github-actions[bot]	eaa5054b00	Merge pull request #11369 from firefly-iii/release-1765861996 🤖 Automatically merge the PR into the develop branch.	2025-12-16 06:13:25 +01:00
JC5	4e9e63ed08	🤖 Auto commit for release 'develop' on 2025-12-16	2025-12-16 06:13:16 +01:00
James Cole	76ea5b6e34	Fix #11367	2025-12-16 06:08:38 +01:00
Sander Dorigo	2f788f7397	Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop	2025-12-15 15:51:13 +01:00
Sander Dorigo	29766aa9b7	Add better running balance	2025-12-15 14:56:58 +01:00
github-actions[bot]	cc30376297	Merge pull request #11364 from firefly-iii/release-1765805210 🤖 Automatically merge the PR into the develop branch.	2025-12-15 14:26:58 +01:00
JC5	5b007fbe01	🤖 Auto commit for release 'develop' on 2025-12-15	2025-12-15 14:26:50 +01:00
Sander Dorigo	e1f8ea3b1a	Fix missing user property	2025-12-15 14:19:43 +01:00
James Cole	6f019f0bb4	Merge pull request #11363 from firefly-iii/main Merge main into develop	2025-12-15 10:48:19 +01:00
github-actions[bot]	f475947776	Merge pull request #11362 from firefly-iii/develop 🤖 Automatically merge the PR into the main branch.	2025-12-15 09:01:26 +01:00
github-actions[bot]	ee6901eb92	Merge pull request #11361 from firefly-iii/release-1765785673 🤖 Automatically merge the PR into the develop branch.	2025-12-15 09:01:21 +01:00
JC5	84d7523d6c	🤖 Auto commit for release 'v6.4.11' on 2025-12-15	2025-12-15 09:01:13 +01:00
github-actions[bot]	6900dc7dae	Merge pull request #11360 from firefly-iii/release-1765785184 🤖 Automatically merge the PR into the develop branch.	2025-12-15 08:53:14 +01:00
JC5	6247e516c6	🤖 Auto commit for release 'develop' on 2025-12-15	2025-12-15 08:53:05 +01:00
Sander Dorigo	cdf970a88c	Add changelog	2025-12-15 08:42:10 +01:00
Sander Dorigo	a447c387f9	Fix #11357	2025-12-15 08:41:07 +01:00
Sander Dorigo	ce2c94efed	Fix #11356	2025-12-15 08:40:19 +01:00
James Cole	205ea4270b	Merge pull request #11358 from firefly-iii/dependabot/github_actions/dessant/label-actions-5	2025-12-15 07:27:43 +01:00
github-actions[bot]	dcbb2428f2	Merge pull request #11359 from firefly-iii/release-1765769737 🤖 Automatically merge the PR into the develop branch.	2025-12-15 04:35:45 +01:00
JC5	319916fc8f	🤖 Auto commit for release 'develop' on 2025-12-15	2025-12-15 04:35:37 +01:00
dependabot[bot]	088b0e2f30	Bump dessant/label-actions from 4 to 5 Bumps [dessant/label-actions](https://github.com/dessant/label-actions) from 4 to 5. - [Release notes](https://github.com/dessant/label-actions/releases) - [Changelog](https://github.com/dessant/label-actions/blob/main/CHANGELOG.md) - [Commits](https://github.com/dessant/label-actions/compare/v4...v5) --- updated-dependencies: - dependency-name: dessant/label-actions dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2025-12-15 03:06:09 +00:00
github-actions[bot]	b45aadf8a3	Merge pull request #11355 from firefly-iii/develop 🤖 Automatically merge the PR into the main branch.	2025-12-14 19:13:25 +01:00
github-actions[bot]	1fafeb1515	Merge pull request #11354 from firefly-iii/release-1765735989 🤖 Automatically merge the PR into the develop branch.	2025-12-14 19:13:19 +01:00
JC5	f60c64c9c1	🤖 Auto commit for release 'v6.4.10' on 2025-12-14	2025-12-14 19:13:09 +01:00
James Cole	564dcb1c6d	Expand changelog.	2025-12-14 19:09:08 +01:00
github-actions[bot]	4044bb85a9	Merge pull request #11353 from firefly-iii/release-1765725243 🤖 Automatically merge the PR into the develop branch.	2025-12-14 16:14:10 +01:00
JC5	18bb0eecff	🤖 Auto commit for release 'develop' on 2025-12-14	2025-12-14 16:14:03 +01:00
James Cole	9af95907e3	Fix patch etc.	2025-12-14 16:10:21 +01:00
James Cole	40ecba4b5a	No longer need patch.	2025-12-14 10:31:35 +01:00
James Cole	73312a4ccc	Fix #11310	2025-12-14 10:24:27 +01:00
James Cole	d747ac237b	Validate title, fix running balance display	2025-12-13 06:36:20 +01:00