Auto commit for release 'develop' on 2024-11-08

Fix https://github.com/firefly-iii/firefly-iii/issues/9444
Merge branch 'main' into develop
2025-12-30 07:01:25 +00:00 · 2024-11-08 21:20:33 +01:00 · 2024-11-08 21:13:41 +01:00 · 2024-11-08 21:08:52 +01:00 · 2024-11-08 21:08:28 +01:00 · 2024-11-08 21:04:08 +01:00
11 changed files with 53 additions and 49 deletions
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -12,6 +12,7 @@ jobs:
    permissions:
      issues: write  # for actions/stale to close stale issues
      pull-requests: write  # for actions/stale to close stale PRs
+      actions: write
    runs-on: ubuntu-latest
    steps:
      - uses: actions/stale@v9
--- a/app/Handlers/Observer/PiggyBankObserver.php
+++ b/app/Handlers/Observer/PiggyBankObserver.php
@@ -39,7 +39,7 @@ class PiggyBankObserver
        $repetition->startdate     = $piggyBank->startdate;
        $repetition->startdate_tz  = $piggyBank->startdate->format('e');
        $repetition->targetdate    = $piggyBank->targetdate;
-        $repetition->targetdate_tz = $piggyBank->targetdate->format('e');
+        $repetition->targetdate_tz = $piggyBank->targetdate?->format('e');
        $repetition->currentamount = '0';
        $repetition->save();
    }
--- a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php
+++ b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php
@@ -377,11 +377,11 @@ trait ModifiesPiggyBanks
        }
        if (array_key_exists('targetdate', $data) && '' !== $data['targetdate']) {
            $piggyBank->targetdate    = $data['targetdate'];
-            $piggyBank->targetdate_tz = $data['targetdate']->format('e');
+            $piggyBank->targetdate_tz = $data['targetdate']?->format('e');
        }
        if (array_key_exists('startdate', $data)) {
            $piggyBank->startdate    = $data['startdate'];
-            $piggyBank->startdate_tz = $data['targetdate']->format('e');
+            $piggyBank->startdate_tz = $data['targetdate']?->format('e');
        }
        $piggyBank->save();

--- a/app/Services/Internal/Update/BillUpdateService.php
+++ b/app/Services/Internal/Update/BillUpdateService.php
@@ -159,11 +159,11 @@ class BillUpdateService
        }
        if (array_key_exists('end_date', $data)) {
            $bill->end_date    = $data['end_date'];
-            $bill->end_date_tz = $data['end_date']->format('e');
+            $bill->end_date_tz = $data['end_date']?->format('e');
        }
        if (array_key_exists('extension_date', $data)) {
            $bill->extension_date    = $data['extension_date'];
-            $bill->extension_date_tz = $data['extension_date']->format('e');
+            $bill->extension_date_tz = $data['extension_date']?->format('e');
        }

        $bill->match     = 'EMPTY';
--- a/app/Support/Http/Controllers/RenderPartialViews.php
+++ b/app/Support/Http/Controllers/RenderPartialViews.php
@@ -86,7 +86,7 @@ trait RenderPartialViews
    {
        /** @var BudgetRepositoryInterface $repository */
        $repository = app(BudgetRepositoryInterface::class);
-        $budgets    = $repository->getBudgets();
+        $budgets    = $repository->getActiveBudgets();

        try {
            $result = view('reports.options.budget', compact('budgets'))->render();
--- a/app/Support/Models/AccountBalanceCalculator.php
+++ b/app/Support/Models/AccountBalanceCalculator.php
@@ -236,12 +236,12 @@ class AccountBalanceCalculator
                        'balance'                 => '0',
                        'transaction_currency_id' => $currencyId,
                        'date'                    => $balance[1],
-                        'date_tz'                 => $balance[1]->format('e'),
+                        'date_tz'                 => $balance[1]?->format('e'),
                    ]
                );
                $object->balance = $balance[0];
                $object->date    = $balance[1];
-                $object->date_tz = $balance[1]->format('e');
+                $object->date_tz = $balance[1]?->format('e');
                $object->save();
            }
        }
--- a/changelog.md
+++ b/changelog.md
@@ -9,6 +9,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).

 - [Discussion 8092](https://github.com/orgs/firefly-iii/discussions/8092) (Fresh Install - Register -> 403 Error - Forbidden) started by @pheonix-devapps
 - [Issue 9183](https://github.com/firefly-iii/firefly-iii/issues/9183) (2FA security improvements) reported by @JC5
+- Firefly III stores timezone data in a separate field, preparing for a switch to UTC (in the database).

 ### Fixed

@@ -27,6 +28,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - [Discussion 9234](https://github.com/orgs/firefly-iii/discussions/9234) (Unsupported cipher or incorrect key length ( first run )) started by @spectroman
 - [Issue 9294](https://github.com/firefly-iii/firefly-iii/issues/9294) (Repetition counts ignored for recurring transactions) reported by @Syncena
 - [Issue 9427](https://github.com/firefly-iii/firefly-iii/issues/9427) (The standard financial report does not show all transactions for the income categories) reported by @Neroxeles
+- [Issue 9443](https://github.com/firefly-iii/firefly-iii/issues/9443) (Budget report on inactive budget gives a 404) reported by @adyanth
+- [Issue 9444](https://github.com/firefly-iii/firefly-iii/issues/9444) (Printing a page does not include dates) reported by @cachho 

 ### API

--- a/composer.lock
+++ b/composer.lock
@@ -3208,16 +3208,16 @@
        },
        {
            "name": "lcobucci/jwt",
-            "version": "5.4.1",
+            "version": "5.4.2",
            "source": {
                "type": "git",
                "url": "https://github.com/lcobucci/jwt.git",
-                "reference": "848815d2287abd5d3c285482f8e1f501b289a2e7"
+                "reference": "ea1ce71cbf9741e445a5914e2f67cdbb484ff712"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/lcobucci/jwt/zipball/848815d2287abd5d3c285482f8e1f501b289a2e7",
-                "reference": "848815d2287abd5d3c285482f8e1f501b289a2e7",
+                "url": "https://api.github.com/repos/lcobucci/jwt/zipball/ea1ce71cbf9741e445a5914e2f67cdbb484ff712",
+                "reference": "ea1ce71cbf9741e445a5914e2f67cdbb484ff712",
                "shasum": ""
            },
            "require": {
@@ -3265,7 +3265,7 @@
            ],
            "support": {
                "issues": "https://github.com/lcobucci/jwt/issues",
-                "source": "https://github.com/lcobucci/jwt/tree/5.4.1"
+                "source": "https://github.com/lcobucci/jwt/tree/5.4.2"
            },
            "funding": [
                {
@@ -3277,7 +3277,7 @@
                    "type": "patreon"
                }
            ],
-            "time": "2024-11-06T06:16:04+00:00"
+            "time": "2024-11-07T12:54:35+00:00"
        },
        {
            "name": "league/commonmark",
@@ -4367,16 +4367,16 @@
        },
        {
            "name": "nesbot/carbon",
-            "version": "3.8.1",
+            "version": "3.8.2",
            "source": {
                "type": "git",
                "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "10ac0aa86b8062219ce21e8189123d611ca3ecd9"
+                "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/10ac0aa86b8062219ce21e8189123d611ca3ecd9",
-                "reference": "10ac0aa86b8062219ce21e8189123d611ca3ecd9",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e1268cdbc486d97ce23fef2c666dc3c6b6de9947",
+                "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947",
                "shasum": ""
            },
            "require": {
@@ -4469,7 +4469,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-11-03T16:02:24+00:00"
+            "time": "2024-11-07T17:46:48+00:00"
        },
        {
            "name": "nette/schema",
@@ -10144,16 +10144,16 @@
        },
        {
            "name": "twig/twig",
-            "version": "v3.14.1",
+            "version": "v3.14.2",
            "source": {
                "type": "git",
                "url": "https://github.com/twigphp/Twig.git",
-                "reference": "f405356d20fb43603bcadc8b09bfb676cb04a379"
+                "reference": "0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/f405356d20fb43603bcadc8b09bfb676cb04a379",
-                "reference": "f405356d20fb43603bcadc8b09bfb676cb04a379",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a",
+                "reference": "0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a",
                "shasum": ""
            },
            "require": {
@@ -10207,7 +10207,7 @@
            ],
            "support": {
                "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.14.1"
+                "source": "https://github.com/twigphp/Twig/tree/v3.14.2"
            },
            "funding": [
                {
@@ -10219,7 +10219,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-11-06T18:17:38+00:00"
+            "time": "2024-11-07T12:36:22+00:00"
        },
        {
            "name": "vlucas/phpdotenv",
@@ -11433,16 +11433,16 @@
        },
        {
            "name": "myclabs/deep-copy",
-            "version": "1.12.0",
+            "version": "1.12.1",
            "source": {
                "type": "git",
                "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c"
+                "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
-                "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845",
+                "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845",
                "shasum": ""
            },
            "require": {
@@ -11481,7 +11481,7 @@
            ],
            "support": {
                "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1"
            },
            "funding": [
                {
@@ -11489,7 +11489,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-06-12T14:39:25+00:00"
+            "time": "2024-11-08T17:47:46+00:00"
        },
        {
            "name": "nikic/php-parser",
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -110,7 +110,7 @@ return [
        'running_balance_column' => env('USE_RUNNING_BALANCE', false),
        // see cer.php for exchange rates feature flag.
    ],
-    'version'                      => 'develop/2024-11-07',
+    'version'                      => 'develop/2024-11-08',
    'api_version'                  => '2.1.0', // field is no longer used.
    'db_version'                   => 25,

--- a/package-lock.json
+++ b/package-lock.json
@@ -4070,9 +4070,9 @@
            }
        },
        "node_modules/caniuse-lite": {
-            "version": "1.0.30001677",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001677.tgz",
-            "integrity": "sha512-fmfjsOlJUpMWu+mAAtZZZHz7UEwsUxIIvu1TJfO1HqFQvB/B+ii0xr9B5HpbZY/mC4XZ8SvjHJqtAY6pDPQEog==",
+            "version": "1.0.30001679",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001679.tgz",
+            "integrity": "sha512-j2YqID/YwpLnKzCmBOS4tlZdWprXm3ZmQLBH9ZBXFOhoxLA46fwyBvx6toCBWBmnuwUY/qB3kEU6gFx8qgCroA==",
            "dev": true,
            "funding": [
                {
@@ -4577,9 +4577,9 @@
            }
        },
        "node_modules/cross-spawn": {
-            "version": "7.0.3",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-            "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+            "version": "7.0.5",
+            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.5.tgz",
+            "integrity": "sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==",
            "dev": true,
            "dependencies": {
                "path-key": "^3.1.0",
@@ -5156,9 +5156,9 @@
            "dev": true
        },
        "node_modules/electron-to-chromium": {
-            "version": "1.5.52",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.52.tgz",
-            "integrity": "sha512-xtoijJTZ+qeucLBDNztDOuQBE1ksqjvNjvqFoST3nGC7fSpqJ+X6BdTBaY5BHG+IhWWmpc6b/KfpeuEDupEPOQ==",
+            "version": "1.5.55",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.55.tgz",
+            "integrity": "sha512-6maZ2ASDOTBtjt9FhqYPRnbvKU5tjG0IN9SztUOWYw2AzNDNpKJYLJmlK0/En4Hs/aiWnB+JZ+gW19PIGszgKg==",
            "dev": true
        },
        "node_modules/elliptic": {
@@ -6319,9 +6319,9 @@
            }
        },
        "node_modules/i18next": {
-            "version": "23.16.4",
-            "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.16.4.tgz",
-            "integrity": "sha512-9NIYBVy9cs4wIqzurf7nLXPyf3R78xYbxExVqHLK9od3038rjpyOEzW+XB130kZ1N4PZ9inTtJ471CRJ4Ituyg==",
+            "version": "23.16.5",
+            "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.16.5.tgz",
+            "integrity": "sha512-KTlhE3EP9x6pPTAW7dy0WKIhoCpfOGhRQlO+jttQLgzVaoOjWwBWramu7Pp0i+8wDNduuzXfe3kkVbzrKyrbTA==",
            "funding": [
                {
                    "type": "individual",
@@ -9601,9 +9601,9 @@
            }
        },
        "node_modules/std-env": {
-            "version": "3.7.0",
-            "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.7.0.tgz",
-            "integrity": "sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==",
+            "version": "3.8.0",
+            "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.8.0.tgz",
+            "integrity": "sha512-Bc3YwwCB+OzldMxOXJIIvC6cPRWr/LxOp48CdQTOkPyk/t4JWWJbrilwBd7RJzKV8QW7tJkcgAmeuLLJugl5/w==",
            "dev": true
        },
        "node_modules/store": {
--- a/resources/views/list/groups.twig
+++ b/resources/views/list/groups.twig
@@ -33,7 +33,7 @@
        <th class="hidden-xs">&nbsp;</th>
        <th>{{ trans('list.description') }}</th>
        <th>{{ trans('list.amount') }}</th>
-        <th class="hidden-xs">{{ trans('list.date') }}</th>
+        <th>{{ trans('list.date') }}</th>
        <th>{{ trans('list.source_account') }}</th>
        <th>{{ trans('list.destination_account') }}</th>
        {% if showCategory %}
@@ -210,7 +210,7 @@
                        {% endif %}
                    {% endif %}
                </td>
-                <td style=" {{ style|raw }}" class="hidden-xs">
+                <td style=" {{ style|raw }}">
                    {{ transaction.date.isoFormat(monthAndDayFormat) }}
                </td>
                <td style=" {{ style|raw }}">
Author	SHA1	Message	Date
github-actions	524d382b7a	Auto commit for release 'develop' on 2024-11-08	2024-11-08 21:20:33 +01:00
James Cole	2723e05d2a	Fix https://github.com/firefly-iii/firefly-iii/issues/9444	2024-11-08 21:13:41 +01:00
James Cole	6dd9bda6b4	Merge branch 'main' into develop	2024-11-08 21:08:52 +01:00
James Cole	44449bc716	Add changelog	2024-11-08 21:08:28 +01:00
James Cole	b17d8edb50	Add changelog line	2024-11-08 21:04:08 +01:00
James Cole	578072238a	Fix https://github.com/firefly-iii/firefly-iii/issues/9443	2024-11-08 21:03:33 +01:00
James Cole	b4edd3dcc4	Catch potential nullpointers	2024-11-08 21:02:36 +01:00
James Cole	068094caac	Update BillUpdateService.php Catch nullpointers Signed-off-by: James Cole <james@firefly-iii.org>	2024-11-08 09:30:24 +01:00
James Cole	deb58e617d	Update PiggyBankObserver.php Catch nullpointer. Signed-off-by: James Cole <james@firefly-iii.org>	2024-11-08 09:29:35 +01:00
James Cole	baca0c1120	Update stale.yml Signed-off-by: James Cole <james@firefly-iii.org>	2024-11-07 10:40:38 +01:00