Merge pull request #11012 from firefly-iii/release-1759813983

🤖 Automatically merge the PR into the develop branch.
🤖 Auto commit for release 'develop' on 2025-10-07
2025-12-24 20:21:21 +00:00 · 2025-10-07 07:13:10 +02:00 · 2025-10-07 07:13:03 +02:00 · 2025-10-07 07:09:12 +02:00 · 2025-10-07 07:06:54 +02:00 · 2025-10-07 07:05:15 +02:00
10 changed files with 60 additions and 45 deletions
--- a/app/Api/V1/Controllers/Autocomplete/AccountController.php
+++ b/app/Api/V1/Controllers/Autocomplete/AccountController.php
@@ -90,7 +90,7 @@ class AccountController extends Controller
        $timer->start(sprintf('AC accounts "%s"', $query));
        $result      = $this->repository->searchAccount((string) $query, $types, $this->parameters->get('limit'));

-        // set date to subday + end-of-day for account balance. so it is at $date 23:59:59
+        // set date to end-of-day for account balance. so it is at $date 23:59:59
        $date->endOfDay();

        $allBalances = Steam::accountsBalancesOptimized($result, $date, $this->primaryCurrency, $this->convertToPrimary);
--- a/app/Api/V1/Controllers/Models/Account/ShowController.php
+++ b/app/Api/V1/Controllers/Models/Account/ShowController.php
@@ -87,6 +87,9 @@ class ShowController extends Controller
        // TODO still need to figure out how to do this easily.
        $accounts    = $collection->slice(($this->parameters->get('page') - 1) * $params['limit'], $params['limit']);

+        // #11007 go to the end of the previous day.
+        $this->parameters->set('start', $this->parameters->get('start')->subSecond());
+
        // enrich
        /** @var User $admin */
        $admin       = auth()->user();
@@ -125,6 +128,9 @@ class ShowController extends Controller
        $account->refresh();
        $manager     = $this->getManager();

+        // #11007 go to the end of the previous day.
+        $this->parameters->set('start', $this->parameters->get('start')->subSecond());
+
        // enrich
        /** @var User $admin */
        $admin       = auth()->user();
--- a/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php
+++ b/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php
@@ -100,11 +100,16 @@ class ListController extends Controller
        $count             = $collection->count();
        $accounts          = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

+        // #11007 go to the end of the previous day.
+        $this->parameters->set('start', $this->parameters->get('start')->subSecond());
+
        // enrich
        /** @var User $admin */
        $admin             = auth()->user();
        $enrichment        = new AccountEnrichment();
        $enrichment->setDate($this->parameters->get('date'));
+        $enrichment->setStart($this->parameters->get('start'));
+        $enrichment->setEnd($this->parameters->get('end'));
        $enrichment->setUser($admin);
        $accounts          = $enrichment->enrich($accounts);

--- a/app/Console/Commands/Integrity/ReportsEmptyObjects.php
+++ b/app/Console/Commands/Integrity/ReportsEmptyObjects.php
@@ -70,7 +70,7 @@ class ReportsEmptyObjects extends Command
        /** @var stdClass $entry */
        foreach ($set as $entry) {
            $line = sprintf(
-                'User #%d (%s) has budget #%d ("%s") which has no transaction journals.',
+                'User #%d (%s) has budget #%d ("%s") which has no transactions.',
                $entry->user_id,
                $entry->email,
                $entry->id,
@@ -96,7 +96,7 @@ class ReportsEmptyObjects extends Command
        /** @var stdClass $entry */
        foreach ($set as $entry) {
            $line = sprintf(
-                'User #%d (%s) has category #%d ("%s") which has no transaction journals.',
+                'User #%d (%s) has category #%d ("%s") which has no transactions.',
                $entry->user_id,
                $entry->email,
                $entry->id,
@@ -119,7 +119,7 @@ class ReportsEmptyObjects extends Command
        /** @var stdClass $entry */
        foreach ($set as $entry) {
            $line = sprintf(
-                'User #%d (%s) has tag #%d ("%s") which has no transaction journals.',
+                'User #%d (%s) has tag #%d ("%s") which has no transactions.',
                $entry->user_id,
                $entry->email,
                $entry->id,
--- a/app/Support/Request/ConvertsDataTypes.php
+++ b/app/Support/Request/ConvertsDataTypes.php
@@ -314,7 +314,8 @@ trait ConvertsDataTypes

        // is an atom string, I hope?
        try {
-            $carbon = Carbon::parse($value, $value, config('app.timezone'));
+            $carbon = Carbon::parse($value);
+            $carbon->setTimezone(config('app.timezone'));
        } catch (InvalidDateException $e) { // @phpstan-ignore-line
            Log::error(sprintf('[3] "%s" is not a valid date or time: %s', $value, $e->getMessage()));

--- a/changelog.md
+++ b/changelog.md
@@ -17,7 +17,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - [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
@@ -27,13 +26,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - [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

 - [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
+- [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 10990](https://github.com/firefly-iii/firefly-iii/issues/10990) (duplicate piggy event via API) reported by @4e868df3
+- [Issue 11005](https://github.com/firefly-iii/firefly-iii/issues/11005) (PUT /v1/accounts/{id} timezone error) reported by @cioraneanu
+- [Issue 11007](https://github.com/firefly-iii/firefly-iii/issues/11007) (/v1/accounts balance_difference takes time into account, but api only accepts days) reported by @ctrl-f5
+- [Issue 11010](https://github.com/firefly-iii/firefly-iii/issues/11010) (/v1/currencies/{code}/accounts does not use start and end date for account enrichment) reported by @ctrl-f5


 ## 6.4.0 - 2025-09-14
--- a/composer.lock
+++ b/composer.lock
@@ -4813,16 +4813,16 @@
        },
        {
            "name": "phpseclib/phpseclib",
-            "version": "3.0.46",
+            "version": "3.0.47",
            "source": {
                "type": "git",
                "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "56483a7de62a6c2a6635e42e93b8a9e25d4f0ec6"
+                "reference": "9d6ca36a6c2dd434765b1071b2644a1c683b385d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/56483a7de62a6c2a6635e42e93b8a9e25d4f0ec6",
-                "reference": "56483a7de62a6c2a6635e42e93b8a9e25d4f0ec6",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/9d6ca36a6c2dd434765b1071b2644a1c683b385d",
+                "reference": "9d6ca36a6c2dd434765b1071b2644a1c683b385d",
                "shasum": ""
            },
            "require": {
@@ -4903,7 +4903,7 @@
            ],
            "support": {
                "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.46"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.47"
            },
            "funding": [
                {
@@ -4919,7 +4919,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-06-26T16:29:55+00:00"
+            "time": "2025-10-06T01:07:24+00:00"
        },
        {
            "name": "pragmarx/google2fa",
@@ -11920,21 +11920,21 @@
        },
        {
            "name": "rector/rector",
-            "version": "2.1.7",
+            "version": "2.2.1",
            "source": {
                "type": "git",
                "url": "https://github.com/rectorphp/rector.git",
-                "reference": "c34cc07c4698f007a20dc5c99ff820089ae413ce"
+                "reference": "e1aaf3061e9ae9342ed0824865e3a3360defddeb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/c34cc07c4698f007a20dc5c99ff820089ae413ce",
-                "reference": "c34cc07c4698f007a20dc5c99ff820089ae413ce",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/e1aaf3061e9ae9342ed0824865e3a3360defddeb",
+                "reference": "e1aaf3061e9ae9342ed0824865e3a3360defddeb",
                "shasum": ""
            },
            "require": {
                "php": "^7.4|^8.0",
-                "phpstan/phpstan": "^2.1.18"
+                "phpstan/phpstan": "^2.1.26"
            },
            "conflict": {
                "rector/rector-doctrine": "*",
@@ -11968,7 +11968,7 @@
            ],
            "support": {
                "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/2.1.7"
+                "source": "https://github.com/rectorphp/rector/tree/2.2.1"
            },
            "funding": [
                {
@@ -11976,7 +11976,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-09-10T11:13:58+00:00"
+            "time": "2025-10-06T21:25:14+00:00"
        },
        {
            "name": "sebastian/cli-parser",
--- 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-10-05',
-    'build_time'                   => 1759662132,
+    'version'                      => 'develop/2025-10-07',
+    'build_time'                   => 1759813879,
    '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
@@ -3047,9 +3047,9 @@
            }
        },
        "node_modules/@types/express-serve-static-core": {
-            "version": "5.0.7",
-            "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.7.tgz",
-            "integrity": "sha512-R+33OsgWw7rOhD1emjU7dzCDHucJrgJXMA5PYCzJxVil0dsyx5iBEPHqpPfiKNJQb7lZ1vxwoLR4Z87bBUpeGQ==",
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.1.0.tgz",
+            "integrity": "sha512-jnHMsrd0Mwa9Cf4IdOzbz543y4XJepXrbia2T4b6+spXC2We3t1y6K44D3mR8XMFSXMCf3/l7rCgddfx7UNVBA==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -3060,9 +3060,9 @@
            }
        },
        "node_modules/@types/express/node_modules/@types/express-serve-static-core": {
-            "version": "4.19.6",
-            "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz",
-            "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==",
+            "version": "4.19.7",
+            "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.7.tgz",
+            "integrity": "sha512-FvPtiIf1LfhzsaIXhv/PHan/2FeQBbtBDtfX2QfvPxdUelMDEckK08SM6nqo1MIZY3RUlfA+HV8+hFUSio78qg==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -3173,13 +3173,13 @@
            "license": "MIT"
        },
        "node_modules/@types/node": {
-            "version": "24.6.2",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.6.2.tgz",
-            "integrity": "sha512-d2L25Y4j+W3ZlNAeMKcy7yDsK425ibcAOO2t7aPTz6gNMH0z2GThtwENCDc0d/Pw9wgyRqE5Px1wkV7naz8ang==",
+            "version": "24.7.0",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.7.0.tgz",
+            "integrity": "sha512-IbKooQVqUBrlzWTi79E8Fw78l8k1RNtlDDNWsFZs7XonuQSJ8oNYfEeclhprUldXISRMLzBpILuKgPlIxm+/Yw==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
-                "undici-types": "~7.13.0"
+                "undici-types": "~7.14.0"
            }
        },
        "node_modules/@types/node-forge": {
@@ -4521,9 +4521,9 @@
            }
        },
        "node_modules/caniuse-lite": {
-            "version": "1.0.30001747",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001747.tgz",
-            "integrity": "sha512-mzFa2DGIhuc5490Nd/G31xN1pnBnYMadtkyTjefPI7wzypqgCEpeWu9bJr0OnDsyKrW75zA9ZAt7pbQFmwLsQg==",
+            "version": "1.0.30001748",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001748.tgz",
+            "integrity": "sha512-5P5UgAr0+aBmNiplks08JLw+AW/XG/SurlgZLgB1dDLfAw7EfRGxIwzPHxdSCGY/BTKDqIVyJL87cCN6s0ZR0w==",
            "dev": true,
            "funding": [
                {
@@ -5736,9 +5736,9 @@
            "license": "MIT"
        },
        "node_modules/electron-to-chromium": {
-            "version": "1.5.230",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.230.tgz",
-            "integrity": "sha512-A6A6Fd3+gMdaed9wX83CvHYJb4UuapPD5X5SLq72VZJzxHSY0/LUweGXRWmQlh2ln7KV7iw7jnwXK7dlPoOnHQ==",
+            "version": "1.5.232",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.232.tgz",
+            "integrity": "sha512-ENirSe7wf8WzyPCibqKUG1Cg43cPaxH4wRR7AJsX7MCABCHBIOFqvaYODSLKUuZdraxUTHRE/0A2Aq8BYKEHOg==",
            "dev": true,
            "license": "ISC"
        },
@@ -5820,9 +5820,9 @@
            }
        },
        "node_modules/envinfo": {
-            "version": "7.16.0",
-            "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.16.0.tgz",
-            "integrity": "sha512-LqGbDxROFEWnYpUm9KiU2xHiYbjlHZS6NZQUpm1Lg1To4p+FJLks5crEhUnw+s/ZLHzI8U0QB+oVG7e8cXckMg==",
+            "version": "7.17.0",
+            "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.17.0.tgz",
+            "integrity": "sha512-GpfViocsFM7viwClFgxK26OtjMlKN67GCR5v6ASFkotxtpBWd9d+vNy+AH7F2E1TUkMDZ8P/dDPZX71/NG8xnQ==",
            "dev": true,
            "license": "MIT",
            "bin": {
@@ -11316,9 +11316,9 @@
            }
        },
        "node_modules/undici-types": {
-            "version": "7.13.0",
-            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.13.0.tgz",
-            "integrity": "sha512-Ov2Rr9Sx+fRgagJ5AX0qvItZG/JKKoBRAVITs1zk7IqZGTJUwgUr7qoYBpWwakpWilTZFM98rG/AFRocu10iIQ==",
+            "version": "7.14.0",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.14.0.tgz",
+            "integrity": "sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==",
            "dev": true,
            "license": "MIT"
        },
--- a/routes/web.php
+++ b/routes/web.php
@@ -1427,7 +1427,7 @@ Route::group(
    static function (): void {
        Route::get('', ['uses' => 'UserGroup\IndexController@index', 'as' => 'index']);
        Route::get('create', ['uses' => 'UserGroup\CreateController@create', 'as' => 'create']);
-        Route::get('edit/{userGroup}', ['uses' => 'UserGroup\EditController@edit', 'as' => 'edit']);
+        Route::get('edit/{userGroup?}', ['uses' => 'UserGroup\EditController@edit', 'as' => 'edit']);
        // Route::get('show/{userGroup}', ['uses' => 'UserGroup\ShowController@show', 'as' => 'show']);

        //        Route::post('rescan/{bill}', ['uses' => 'Bill\ShowController@rescan', 'as' => 'rescan']);
Author	SHA1	Message	Date
github-actions[bot]	22f67be0b5	Merge pull request #11012 from firefly-iii/release-1759813983 🤖 Automatically merge the PR into the develop branch.	2025-10-07 07:13:10 +02:00
JC5	0e1633b52b	🤖 Auto commit for release 'develop' on 2025-10-07	2025-10-07 07:13:03 +02:00
James Cole	0070e000b6	Fix changelog.	2025-10-07 07:09:12 +02:00
James Cole	c525a18263	Add subSecond routine.	2025-10-07 07:06:54 +02:00
James Cole	68fbd8d5f4	Merge pull request #11011 from ctrl-f5/fix/currency-account-list-range Fix #11010 currency account list range	2025-10-07 07:05:15 +02:00
mergify[bot]	0724c005cf	Merge branch 'develop' into fix/currency-account-list-range	2025-10-06 20:45:49 +00:00
Nicky De Maeyer	e662275400	use the start and end date to enrich the accounts	2025-10-06 22:41:29 +02:00
James Cole	def2dd77ab	Fix #11003	2025-10-06 20:45:20 +02:00
James Cole	36e87f3383	Fix #11007 and fix #11005	2025-10-06 20:43:47 +02:00
github-actions[bot]	e420752991	Merge pull request #11004 from firefly-iii/release-1759720893 🤖 Automatically merge the PR into the develop branch.	2025-10-06 05:21:43 +02:00
JC5	c541cf48c3	🤖 Auto commit for release 'develop' on 2025-10-06	2025-10-06 05:21:33 +02:00
James Cole	521db984ab	More user friendly message.	2025-10-05 13:09:42 +02:00