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

Catch nullpointers

Signed-off-by: James Cole <james@firefly-iii.org>

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

@@ -1259,16 +1259,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.1.5",
+            "version": "v7.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "0fa539d12b3ccf068a722bbbffa07ca7079af9ee"
+                "reference": "3284aafcac338b6e86fd955ee4d794cbe434151a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/0fa539d12b3ccf068a722bbbffa07ca7079af9ee",
-                "reference": "0fa539d12b3ccf068a722bbbffa07ca7079af9ee",
+                "url": "https://api.github.com/repos/symfony/console/zipball/3284aafcac338b6e86fd955ee4d794cbe434151a",
+                "reference": "3284aafcac338b6e86fd955ee4d794cbe434151a",
                 "shasum": ""
             },
             "require": {
@@ -1332,7 +1332,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.1.5"
+                "source": "https://github.com/symfony/console/tree/v7.1.7"
             },
             "funding": [
                 {
@@ -1348,7 +1348,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-20T08:28:38+00:00"
+            "time": "2024-11-05T15:34:55+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -1419,16 +1419,16 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v7.1.1",
+            "version": "v7.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7"
+                "reference": "87254c78dd50721cfd015b62277a8281c5589702"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7",
-                "reference": "9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/87254c78dd50721cfd015b62277a8281c5589702",
+                "reference": "87254c78dd50721cfd015b62277a8281c5589702",
                 "shasum": ""
             },
             "require": {
@@ -1479,7 +1479,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v7.1.1"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.1.6"
             },
             "funding": [
                 {
@@ -1495,7 +1495,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -1575,16 +1575,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v7.1.5",
+            "version": "v7.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "61fe0566189bf32e8cfee78335d8776f64a66f5a"
+                "reference": "c835867b3c62bb05c7fe3d637c871c7ae52024d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/61fe0566189bf32e8cfee78335d8776f64a66f5a",
-                "reference": "61fe0566189bf32e8cfee78335d8776f64a66f5a",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/c835867b3c62bb05c7fe3d637c871c7ae52024d4",
+                "reference": "c835867b3c62bb05c7fe3d637c871c7ae52024d4",
                 "shasum": ""
             },
             "require": {
@@ -1621,7 +1621,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v7.1.5"
+                "source": "https://github.com/symfony/filesystem/tree/v7.1.6"
             },
             "funding": [
                 {
@@ -1637,20 +1637,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-17T09:16:35+00:00"
+            "time": "2024-10-25T15:11:02+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v7.1.4",
+            "version": "v7.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "d95bbf319f7d052082fb7af147e0f835a695e823"
+                "reference": "2cb89664897be33f78c65d3d2845954c8d7a43b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/d95bbf319f7d052082fb7af147e0f835a695e823",
-                "reference": "d95bbf319f7d052082fb7af147e0f835a695e823",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/2cb89664897be33f78c65d3d2845954c8d7a43b8",
+                "reference": "2cb89664897be33f78c65d3d2845954c8d7a43b8",
                 "shasum": ""
             },
             "require": {
@@ -1685,7 +1685,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v7.1.4"
+                "source": "https://github.com/symfony/finder/tree/v7.1.6"
             },
             "funding": [
                 {
@@ -1701,20 +1701,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-13T14:28:19+00:00"
+            "time": "2024-10-01T08:31:23+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v7.1.1",
+            "version": "v7.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "47aa818121ed3950acd2b58d1d37d08a94f9bf55"
+                "reference": "85e95eeede2d41cd146146e98c9c81d9214cae85"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/47aa818121ed3950acd2b58d1d37d08a94f9bf55",
-                "reference": "47aa818121ed3950acd2b58d1d37d08a94f9bf55",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/85e95eeede2d41cd146146e98c9c81d9214cae85",
+                "reference": "85e95eeede2d41cd146146e98c9c81d9214cae85",
                 "shasum": ""
             },
             "require": {
@@ -1752,7 +1752,7 @@
                 "options"
             ],
             "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v7.1.1"
+                "source": "https://github.com/symfony/options-resolver/tree/v7.1.6"
             },
             "funding": [
                 {
@@ -1768,7 +1768,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -2246,16 +2246,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v7.1.5",
+            "version": "v7.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "5c03ee6369281177f07f7c68252a280beccba847"
+                "reference": "9b8a40b7289767aa7117e957573c2a535efe6585"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/5c03ee6369281177f07f7c68252a280beccba847",
-                "reference": "5c03ee6369281177f07f7c68252a280beccba847",
+                "url": "https://api.github.com/repos/symfony/process/zipball/9b8a40b7289767aa7117e957573c2a535efe6585",
+                "reference": "9b8a40b7289767aa7117e957573c2a535efe6585",
                 "shasum": ""
             },
             "require": {
@@ -2287,7 +2287,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v7.1.5"
+                "source": "https://github.com/symfony/process/tree/v7.1.7"
             },
             "funding": [
                 {
@@ -2303,7 +2303,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-19T21:48:23+00:00"
+            "time": "2024-11-06T09:25:12+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -2390,16 +2390,16 @@
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v7.1.1",
+            "version": "v7.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "5b75bb1ac2ba1b9d05c47fc4b3046a625377d23d"
+                "reference": "8b4a434e6e7faf6adedffb48783a5c75409a1a05"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/5b75bb1ac2ba1b9d05c47fc4b3046a625377d23d",
-                "reference": "5b75bb1ac2ba1b9d05c47fc4b3046a625377d23d",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/8b4a434e6e7faf6adedffb48783a5c75409a1a05",
+                "reference": "8b4a434e6e7faf6adedffb48783a5c75409a1a05",
                 "shasum": ""
             },
             "require": {
@@ -2432,7 +2432,7 @@
             "description": "Provides a way to profile code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v7.1.1"
+                "source": "https://github.com/symfony/stopwatch/tree/v7.1.6"
             },
             "funding": [
                 {
@@ -2448,20 +2448,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v7.1.5",
+            "version": "v7.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "d66f9c343fa894ec2037cc928381df90a7ad4306"
+                "reference": "61b72d66bf96c360a727ae6232df5ac83c71f626"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/d66f9c343fa894ec2037cc928381df90a7ad4306",
-                "reference": "d66f9c343fa894ec2037cc928381df90a7ad4306",
+                "url": "https://api.github.com/repos/symfony/string/zipball/61b72d66bf96c360a727ae6232df5ac83c71f626",
+                "reference": "61b72d66bf96c360a727ae6232df5ac83c71f626",
                 "shasum": ""
             },
             "require": {
@@ -2519,7 +2519,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.1.5"
+                "source": "https://github.com/symfony/string/tree/v7.1.6"
             },
             "funding": [
                 {
@@ -2535,7 +2535,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-20T08:28:38+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         }
     ],
     "packages-dev": [],

.github/label-actions.yml

@@ -4,6 +4,7 @@
 feature:
   issues:
     # Post a comment, `{issue-author}` is an optional placeholder
+    unlabel: feature
     comment: |
       Hi there! 
 
@@ -32,6 +33,7 @@ epic:
       Thank you for your contributions.
 
 enhancement:
+  unlabel: enhancement
   issues:
     # Post a comment, `{issue-author}` is an optional placeholder
     comment: |

.github/workflows/close-duplicates.yml

@@ -13,7 +13,7 @@ jobs:
   close_duplicates:
     runs-on: ubuntu-latest
     steps:
-      - uses: github/command@v1.2.1
+      - uses: github/command@v1.2.2
         id: command
         with:
           allowed_contexts: "issue"

.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
@@ -35,4 +36,5 @@ jobs:
             Thank you for your contributions.
           days-before-stale: 14
           days-before-close: 7
-          exempt-issue-labels: 'enhancement,feature,bug,announcement,epic,triage'
+          exempt-all-milestones: true
+          exempt-issue-labels: 'triage'

app/Api/V1/Controllers/System/AboutController.php

@@ -52,7 +52,7 @@ class AboutController extends Controller
         $data
                        = [
                            'version'     => config('firefly.version'),
-                           'api_version' => config('firefly.api_version'),
+                           'api_version' => config('firefly.version'),
                            'php_version' => $phpVersion,
                            'os'          => $phpOs,
                            'driver'      => $currentDriver,

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

@@ -46,6 +46,8 @@ class DateRequest extends FormRequest
     {
         $start = $this->getCarbonDate('start');
         $end   = $this->getCarbonDate('end');
+        $start->startOfDay();
+        $end->endOfDay();
         if ($start->diffInYears($end, true) > 5) {
             throw new FireflyException('Date range out of range.');
         }

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

@@ -138,7 +138,7 @@ class StoreRequest extends FormRequest
                 // all custom fields:
                 'internal_reference'    => $this->clearString((string)$object['internal_reference']),
                 'external_id'           => $this->clearString((string)$object['external_id']),
-                'original_source'       => sprintf('ff3-v%s|api-v%s', config('firefly.version'), config('firefly.api_version')),
+                'original_source'       => sprintf('ff3-v%s', config('firefly.version')),
                 'recurrence_id'         => $this->integerFromValue($object['recurrence_id']),
                 'bunq_payment_id'       => $this->clearString((string)$object['bunq_payment_id']),
                 'external_url'          => $this->clearString((string)$object['external_url']),

app/Api/V2/Controllers/Autocomplete/AccountController.php

@@ -68,9 +68,9 @@ class AccountController extends Controller
      */
     public function accounts(AutocompleteRequest $request): JsonResponse
     {
-        $queryParameters = $request->getParameters();
-        $result          = $this->repository->searchAccount($queryParameters['query'], $queryParameters['account_types'], $queryParameters['size']);
-        $return          = [];
+        $params = $request->getParameters();
+        $result = $this->repository->searchAccount($params['query'], $params['account_types'], $params['page'], $params['size']);
+        $return = [];
 
         /** @var Account $account */
         foreach ($result as $account) {
@@ -89,6 +89,7 @@ class AccountController extends Controller
             'title' => $account->name,
             'meta'  => [
                 'type'                    => $account->accountType->type,
+                // TODO is multi currency property.
                 'currency_id'             => null === $currency ? null : (string) $currency->id,
                 'currency_code'           => $currency?->code,
                 'currency_symbol'         => $currency?->symbol,

app/Api/V2/Request/Autocomplete/AutocompleteRequest.php

@@ -23,15 +23,12 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V2\Request\Autocomplete;
 
-use FireflyIII\JsonApi\Rules\IsValidFilter;
-use FireflyIII\JsonApi\Rules\IsValidPage;
+use FireflyIII\Models\AccountType;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\Support\Http\Api\ParsesQueryFilters;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
-use LaravelJsonApi\Core\Query\QueryParameters;
-use LaravelJsonApi\Validation\Rule as JsonApiRule;
 
 /**
  * Class AutocompleteRequest
@@ -51,35 +48,46 @@ class AutocompleteRequest extends FormRequest
      */
     public function getParameters(): array
     {
-        $queryParameters = QueryParameters::cast($this->all());
-
-        return [
-            'date'          => $this->dateOrToday($queryParameters, 'date'),
-            'query'         => $this->arrayOfStrings($queryParameters, 'query'),
-            'size'          => $this->integerFromQueryParams($queryParameters, 'size', 50),
-            'account_types' => $this->getAccountTypeParameter($this->arrayOfStrings($queryParameters, 'account_types')),
+        $array                  = [
+            'date'              => $this->convertDateTime('date'),
+            'query'             => $this->clearString((string) $this->get('query')),
+            'size'              => $this->integerFromValue('size'),
+            'page'              => $this->integerFromValue('page'),
+            'account_types'     => $this->arrayFromValue($this->get('account_types')),
+            'transaction_types' => $this->arrayFromValue($this->get('transaction_types')),
         ];
+        $array['size']          = $array['size'] < 1 || $array['size'] > 100 ? 15 : $array['size'];
+        $array['page']          = max($array['page'], 1);
+        if (null === $array['account_types']) {
+            $array['account_types'] = [];
+        }
+        if (null === $array['transaction_types']) {
+            $array['transaction_types'] = [];
+        }
+
+        // remove 'initial balance' from allowed types. its internal
+        $array['account_types'] = array_diff($array['account_types'], [AccountType::INITIAL_BALANCE, AccountType::RECONCILIATION, AccountType::CREDITCARD]);
+        $array['account_types'] = $this->getAccountTypeParameter($array['account_types']);
+
+        return $array;
     }
 
     public function rules(): array
     {
+        $valid = array_keys($this->types);
+
         return [
-            'fields'  => JsonApiRule::notSupported(),
-            'filter'  => ['nullable', 'array', new IsValidFilter(['query', 'date', 'account_types'])],
-            'include' => JsonApiRule::notSupported(),
-            'page'    => ['nullable', 'array', new IsValidPage(['size'])],
-            'sort'    => JsonApiRule::notSupported(),
+            'date'              => 'nullable|date|after:1900-01-01|before:2100-01-01',
+            'query'             => 'nullable|string',
+            'size'              => 'nullable|integer|min:1|max:100',
+            'page'              => 'nullable|integer|min:1',
+            'account_types'     => sprintf('nullable|in:%s', implode(',', $valid)),
+            'transaction_types' => 'nullable|in:todo',
         ];
     }
 
-    private function getAccountTypeParameter(mixed $types): array
+    private function getAccountTypeParameter(array $types): array
     {
-        if (is_string($types) && str_contains($types, ',')) {
-            $types = explode(',', $types);
-        }
-        if (!is_iterable($types)) {
-            $types = [$types];
-        }
         $return = [];
         foreach ($types as $type) {
             $return = array_merge($return, $this->mapAccountTypes($type));

app/Api/V2/Request/Chart/ChartRequest.php

@@ -24,8 +24,6 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V2\Request\Chart;
 
 use FireflyIII\Enums\UserRoleEnum;
-use FireflyIII\JsonApi\Rules\IsValidFilter;
-use FireflyIII\Rules\IsFilterValueIn;
 use FireflyIII\Support\Http\Api\ParsesQueryFilters;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use FireflyIII\Support\Request\ChecksLogin;
@@ -33,8 +31,6 @@ use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\Validator;
-use LaravelJsonApi\Core\Query\QueryParameters;
-use LaravelJsonApi\Validation\Rule as JsonApiRule;
 
 /**
  * Class ChartRequest
@@ -50,52 +46,29 @@ class ChartRequest extends FormRequest
 
     public function getParameters(): array
     {
-        $queryParameters = QueryParameters::cast($this->all());
-
+        // $queryParameters = QueryParameters::cast($this->all());
         return [
-            'start'       => $this->dateOrToday($queryParameters, 'start')->startOfDay(),
-            'end'         => $this->dateOrToday($queryParameters, 'end')->endOfDay(),
-            'preselected' => $this->stringFromQueryParams($queryParameters, 'preselected', 'empty'),
-            'period'      => $this->stringFromFilterParams($queryParameters, 'period', '1M'),
-            'accounts'    => $this->arrayOfStrings($queryParameters, 'accounts'),
-            // preselected heeft maar een paar toegestane waardes, dat moet ook goed gaan.
-            //            'query'         => $this->arrayOfStrings($queryParameters, 'query'),
-            //            'size'          => $this->integerFromQueryParams($queryParameters,'size', 50),
-            //            'account_types' => $this->getAccountTypeParameter($this->arrayOfStrings($queryParameters, 'account_types')),
+            'start'       => $this->convertDateTime('start')?->startOfDay(),
+            'end'         => $this->convertDateTime('end')?->endOfDay(),
+            'preselected' => $this->convertString('preselected', 'empty'),
+            'period'      => $this->convertString('period', '1M'),
+            'accounts'    => $this->arrayFromValue($this->get('accounts')),
         ];
-        // collect accounts based on this list?
     }
 
-    //        return [
-    //            'accounts'    => $this->getAccountList(),
-    //            'preselected' => $this->convertString('preselected'),
-    //        ];
-    //    }
-
     /**
      * The rules that the incoming request must be matched against.
      */
     public function rules(): array
     {
         return [
-            'fields'  => JsonApiRule::notSupported(),
-            'filter'  => ['nullable', 'array',
-                new IsValidFilter(['start', 'end', 'preselected', 'accounts', 'period']),
-                new IsFilterValueIn('preselected', config('firefly.preselected_accounts')),
-            ],
-            'include' => JsonApiRule::notSupported(),
-            'page'    => JsonApiRule::notSupported(),
-            'sort'    => JsonApiRule::notSupported(),
-            // 'start'   => 'required|date|after:1900-01-01|before:2099-12-31',
-            // 'end'     => 'required|date|after_or_equal:start|before:2099-12-31|after:1900-01-01',
+            'start'       => 'required|date|after:1900-01-01|before:2099-12-31|before_or_equal:end',
+            'end'         => 'required|date|after:1900-01-01|before:2099-12-31|after_or_equal:start',
+            'preselected' => sprintf('nullable|in:%s', implode(',', config('firefly.preselected_accounts'))),
+            'period'      => sprintf('nullable|in:%s', implode(',', config('firefly.valid_view_ranges'))),
+            'accounts.*'  => 'exists:accounts,id',
         ];
 
-        //        return [
-        //            'start'       => 'required|date|after:1900-01-01|before:2099-12-31',
-        //            'end'         => 'required|date|after_or_equal:start|before:2099-12-31|after:1900-01-01',
-        //            'preselected' => sprintf('in:%s', implode(',', config('firefly.preselected_accounts'))),
-        //            'accounts.*'  => 'exists:accounts,id',
-        //        ];
     }
 
     public function withValidator(Validator $validator): void

app/Api/V2/Request/Generic/DateRequest.php

@@ -44,7 +44,7 @@ class DateRequest extends FormRequest
     public function getAll(): array
     {
         return [
-            'start' => $this->getCarbonDate('start'),
+            'start' => $this->getCarbonDate('start')->startOfDay(),
             'end'   => $this->getCarbonDate('end')->endOfDay(),
         ];
     }

app/Api/V2/Request/Model/Transaction/StoreRequest.php

@@ -147,7 +147,7 @@ class StoreRequest extends FormRequest
                 // all custom fields:
                 'internal_reference'    => $this->clearString((string)$object['internal_reference']),
                 'external_id'           => $this->clearString((string)$object['external_id']),
-                'original_source'       => sprintf('ff3-v%s|api-v%s', config('firefly.version'), config('firefly.api_version')),
+                'original_source'       => sprintf('ff3-v%s', config('firefly.version')),
                 'recurrence_id'         => $this->integerFromValue($object['recurrence_id']),
                 'bunq_payment_id'       => $this->clearString((string)$object['bunq_payment_id']),
                 'external_url'          => $this->clearString((string)$object['external_url']),

app/Console/Commands/Correction/FixUnevenAmount.php

@@ -51,7 +51,11 @@ class FixUnevenAmount extends Command
         $this->convertOldStyleTransfers();
         $this->fixUnevenAmounts();
         $this->matchCurrencies();
-        AccountBalanceCalculator::forceRecalculateAll();
+        if (config('firefly.feature_flags.running_balance_column')) {
+            $this->friendlyInfo('Will recalculate transaction running balance columns. This may take a LONG time. Please be patient.');
+            AccountBalanceCalculator::recalculateAll(true);
+            $this->friendlyInfo('Done recalculating transaction running balance columns.');
+        }
 
         return 0;
     }

app/Console/Commands/Integrity/AddTimezonesToDates.php

@@ -0,0 +1,113 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * AddTimezonesToDates.php
+ * Copyright (c) 2024 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\Console\Commands\Integrity;
+
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use FireflyIII\Models\AccountBalance;
+use FireflyIII\Models\AvailableBudget;
+use FireflyIII\Models\Bill;
+use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Models\CurrencyExchangeRate;
+use FireflyIII\Models\InvitedUser;
+use FireflyIII\Models\PiggyBank;
+use FireflyIII\Models\PiggyBankEvent;
+use FireflyIII\Models\PiggyBankRepetition;
+use FireflyIII\Models\Recurrence;
+use FireflyIII\Models\Tag;
+use FireflyIII\Models\TransactionJournal;
+use Illuminate\Console\Command;
+use Illuminate\Database\QueryException;
+use Illuminate\Support\Facades\Log;
+
+class AddTimezonesToDates extends Command
+{
+    use ShowsFriendlyMessages;
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature   = 'firefly-iii:add-timezones-to-dates';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Make sure all dates have a timezone.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): void
+    {
+        $models = [
+            AccountBalance::class       => ['date'], // done
+            AvailableBudget::class      => ['start_date', 'end_date'], // done
+            Bill::class                 => ['date', 'end_date', 'extension_date'], // done
+            BudgetLimit::class          => ['start_date', 'end_date'], // done
+            CurrencyExchangeRate::class => ['date'], // done
+            InvitedUser::class          => ['expires'],
+            PiggyBankEvent::class       => ['date'],
+            PiggyBankRepetition::class  => ['startdate', 'targetdate'],
+            PiggyBank::class            => ['startdate', 'targetdate'], // done
+            Recurrence::class           => ['first_date', 'repeat_until', 'latest_date'],
+            Tag::class                  => ['date'],
+            TransactionJournal::class   => ['date'],
+        ];
+        foreach ($models as $model => $fields) {
+            $this->addTimezoneToModel($model, $fields);
+        }
+    }
+
+    private function addTimezoneToModel(string $model, array $fields): void
+    {
+        foreach ($fields as $field) {
+            $this->addTimezoneToModelField($model, $field);
+        }
+    }
+
+    private function addTimezoneToModelField(string $model, string $field): void
+    {
+        $shortModel    = str_replace('FireflyIII\Models\\', '', $model);
+        $timezoneField = sprintf('%s_tz', $field);
+        $count         = 0;
+
+        try {
+            $count = $model::whereNull($timezoneField)->count();
+        } catch (QueryException $e) {
+            $this->friendlyError(sprintf('Cannot add timezone information to field "%s" of model "%s". Field does not exist.', $field, $shortModel));
+            Log::error($e->getMessage());
+        }
+        if (0 === $count) {
+            $this->friendlyPositive(sprintf('Timezone information is present in field "%s" of model "%s".', $field, $shortModel));
+
+            return;
+        }
+        $this->friendlyInfo(sprintf('Adding timezone information to field "%s" of model "%s".', $field, $shortModel));
+
+        $model::whereNull($timezoneField)->update([$timezoneField => config('app.timezone')]);
+    }
+}

app/Console/Commands/Integrity/ReportIntegrity.php

@@ -47,6 +47,7 @@ class ReportIntegrity extends Command
             return 1;
         }
         $commands = [
+            'firefly-iii:add-timezones-to-dates',
             'firefly-iii:create-group-memberships',
             'firefly-iii:report-empty-objects',
             'firefly-iii:report-sum',

app/Console/Commands/Tools/Cron.php

@@ -46,10 +46,15 @@ class Cron extends Command
     protected $signature   = 'firefly-iii:cron
         {--F|force : Force the cron job(s) to execute.}
         {--date= : Set the date in YYYY-MM-DD to make Firefly III think that\'s the current date.}
+        {--download-cer : Download exchange rates. Other tasks will be skipped unless also requested.}
+        {--create-recurring : Create recurring transactions. Other tasks will be skipped unless also requested.}
+        {--create-auto-budgets : Create auto budgets. Other tasks will be skipped unless also requested.}
+        {--send-bill-warnings : Send bill warnings. Other tasks will be skipped unless also requested.}
         ';
 
     public function handle(): int
     {
+        $doAll = !$this->option('download-cer') && !$this->option('create-recurring') && !$this->option('create-auto-budgets') && !$this->option('send-bill-warnings');
         $date  = null;
 
         try {
@@ -60,7 +65,7 @@ class Cron extends Command
         $force = (bool)$this->option('force'); // @phpstan-ignore-line
 
         // Fire exchange rates cron job.
-        if (true === config('cer.download_enabled')) {
+        if (true === config('cer.download_enabled') && ($doAll || $this->option('download-cer'))) {
             try {
                 $this->exchangeRatesCronJob($force, $date);
             } catch (FireflyException $e) {
@@ -71,30 +76,36 @@ class Cron extends Command
         }
 
         // Fire recurring transaction cron job.
-        try {
-            $this->recurringCronJob($force, $date);
-        } catch (FireflyException $e) {
-            app('log')->error($e->getMessage());
-            app('log')->error($e->getTraceAsString());
-            $this->friendlyError($e->getMessage());
+        if ($doAll || $this->option('create-recurring')) {
+            try {
+                $this->recurringCronJob($force, $date);
+            } catch (FireflyException $e) {
+                app('log')->error($e->getMessage());
+                app('log')->error($e->getTraceAsString());
+                $this->friendlyError($e->getMessage());
+            }
         }
 
         // Fire auto-budget cron job:
-        try {
-            $this->autoBudgetCronJob($force, $date);
-        } catch (FireflyException $e) {
-            app('log')->error($e->getMessage());
-            app('log')->error($e->getTraceAsString());
-            $this->friendlyError($e->getMessage());
+        if ($doAll || $this->option('create-auto-budgets')) {
+            try {
+                $this->autoBudgetCronJob($force, $date);
+            } catch (FireflyException $e) {
+                app('log')->error($e->getMessage());
+                app('log')->error($e->getTraceAsString());
+                $this->friendlyError($e->getMessage());
+            }
         }
 
         // Fire bill warning cron job
-        try {
-            $this->billWarningCronJob($force, $date);
-        } catch (FireflyException $e) {
-            app('log')->error($e->getMessage());
-            app('log')->error($e->getTraceAsString());
-            $this->friendlyError($e->getMessage());
+        if ($doAll || $this->option('send-bill-warnings')) {
+            try {
+                $this->billWarningCronJob($force, $date);
+            } catch (FireflyException $e) {
+                app('log')->error($e->getMessage());
+                app('log')->error($e->getTraceAsString());
+                $this->friendlyError($e->getMessage());
+            }
         }
 
         $this->friendlyInfo('More feedback on the cron jobs can be found in the log files.');

app/Console/Commands/Upgrade/CorrectAccountBalance.php

@@ -33,6 +33,7 @@ use Illuminate\Console\Command;
 class CorrectAccountBalance extends Command
 {
     use ShowsFriendlyMessages;
+
     public const string CONFIG_NAME = '610_correct_balances';
     protected $description          = 'Recalculate all account balance amounts';
     protected $signature            = 'firefly-iii:correct-account-balance {--F|force : Force the execution of this command.}';
@@ -44,23 +45,30 @@ class CorrectAccountBalance extends Command
 
             return 0;
         }
-        $this->friendlyWarning('This command has been disabled.');
-        $this->markAsExecuted();
+        if (config('firefly.feature_flags.running_balance_column')) {
+            $this->friendlyInfo('Will recalculate account balances. This may take a LONG time. Please be patient.');
+            $this->markAsExecuted();
+            $this->correctBalanceAmounts();
+            $this->friendlyInfo('Done recalculating account balances.');
+
+            return 0;
+        }
+        $this->friendlyWarning('This command has been disabled.');
 
-        //        $this->correctBalanceAmounts();
         return 0;
     }
 
     private function correctBalanceAmounts(): void
     {
-        AccountBalanceCalculator::recalculateAll();
+        return;
+        AccountBalanceCalculator::recalculateAll(true);
     }
 
     private function isExecuted(): bool
     {
         $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
 
-        return (bool)$configVar?->data;
+        return (bool) $configVar?->data;
     }
 
     private function markAsExecuted(): void

app/Console/Commands/Upgrade/MigrateRuleActions.php

@@ -54,6 +54,7 @@ class MigrateRuleActions extends Command
         }
         $this->replaceEqualSign();
         $this->replaceObsoleteActions();
+        $this->markAsExecuted();
 
         return 0;
     }
@@ -179,4 +180,9 @@ class MigrateRuleActions extends Command
             }
         }
     }
+
+    private function markAsExecuted(): void
+    {
+        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+    }
 }

app/Console/Commands/Upgrade/UpgradeDatabase.php

@@ -67,6 +67,7 @@ class UpgradeDatabase extends Command
             'firefly-iii:restore-oauth-keys',
             'firefly-iii:correct-account-balance',
             // also just in case, some integrity commands:
+            'firefly-iii:add-timezones-to-dates',
             'firefly-iii:create-group-memberships',
             'firefly-iii:upgrade-group-information',
             'firefly-iii:upgrade-currency-preferences',

app/Factory/BillFactory.php

@@ -58,20 +58,23 @@ class BillFactory
             /** @var Bill $bill */
             $bill   = Bill::create(
                 [
-                    'name'                    => $data['name'],
-                    'match'                   => 'MIGRATED_TO_RULES',
-                    'amount_min'              => $data['amount_min'],
-                    'user_id'                 => $this->user->id,
-                    'user_group_id'           => $this->user->user_group_id,
-                    'transaction_currency_id' => $currency->id,
-                    'amount_max'              => $data['amount_max'],
-                    'date'                    => $data['date'],
-                    'end_date'                => $data['end_date'] ?? null,
-                    'extension_date'          => $data['extension_date'] ?? null,
-                    'repeat_freq'             => $data['repeat_freq'],
-                    'skip'                    => $skip,
-                    'automatch'               => true,
-                    'active'                  => $active,
+                    'name'                       => $data['name'],
+                    'match'                      => 'MIGRATED_TO_RULES',
+                    'amount_min'                 => $data['amount_min'],
+                    'user_id'                    => $this->user->id,
+                    'user_group_id'              => $this->user->user_group_id,
+                    'transaction_currency_id'    => $currency->id,
+                    'amount_max'                 => $data['amount_max'],
+                    'date'                       => $data['date'],
+                    'date_tz'                    => $data['date']->format('e'),
+                    'end_date'                   => $data['end_date'] ?? null,
+                    'end_date_tz'                => $data['end_date']?->format('e'),
+                    'extension_date'             => $data['extension_date'] ?? null,
+                    'extension_date_tz'          => $data['extension_date']?->format('e'),
+                    'repeat_freq'                => $data['repeat_freq'],
+                    'skip'                       => $skip,
+                    'automatch'                  => true,
+                    'active'                     => $active,
                 ]
             );
         } catch (QueryException $e) {

app/Factory/TransactionJournalFactory.php

@@ -225,7 +225,8 @@ class TransactionJournalFactory
                 'bill_id'                 => $billId,
                 'transaction_currency_id' => $currency->id,
                 'description'             => substr($description, 0, 1000),
-                'date'                    => $carbon->format('Y-m-d H:i:s'),
+                'date'                    => $carbon,
+                'date_tz'                 => $carbon->format('e'),
                 'order'                   => $order,
                 'tag_count'               => 0,
                 'completed'               => 0,

app/Handlers/Events/Model/BudgetLimitHandler.php

@@ -131,12 +131,14 @@ class BudgetLimitHandler
                     app('log')->debug(sprintf('Will create AB for period %s to %s', $current->format('Y-m-d'), $currentEnd->format('Y-m-d')));
                     $availableBudget = new AvailableBudget(
                         [
-                            'user_id'                 => $budgetLimit->budget->user->id,
-                            'user_group_id'           => $budgetLimit->budget->user->user_group_id,
-                            'transaction_currency_id' => $budgetLimit->transaction_currency_id,
-                            'start_date'              => $current,
-                            'end_date'                => $currentEnd,
-                            'amount'                  => $amount,
+                            'user_id'                    => $budgetLimit->budget->user->id,
+                            'user_group_id'              => $budgetLimit->budget->user->user_group_id,
+                            'transaction_currency_id'    => $budgetLimit->transaction_currency_id,
+                            'start_date'                 => $current,
+                            'start_date_tz'              => $current->format('e'),
+                            'end_date'                   => $currentEnd,
+                            'end_date_tz'                => $currentEnd->format('e'),
+                            'amount'                     => $amount,
                         ]
                     );
                     $availableBudget->save();

app/Handlers/Events/Model/PiggyBankEventHandler.php

@@ -58,6 +58,7 @@ class PiggyBankEventHandler
                 'piggy_bank_id'          => $event->piggyBank->id,
                 'transaction_journal_id' => $journal?->id,
                 'date'                   => $date->format('Y-m-d'),
+                'date_tz'                => $date->format('e'),
                 'amount'                 => $event->amount,
             ]
         );

app/Handlers/Observer/PiggyBankObserver.php

@@ -37,7 +37,9 @@ class PiggyBankObserver
         $repetition                = new PiggyBankRepetition();
         $repetition->piggyBank()->associate($piggyBank);
         $repetition->startdate     = $piggyBank->startdate;
+        $repetition->startdate_tz  = $piggyBank->startdate->format('e');
         $repetition->targetdate    = $piggyBank->targetdate;
+        $repetition->targetdate_tz = $piggyBank->targetdate?->format('e');
         $repetition->currentamount = '0';
         $repetition->save();
     }

app/Helpers/Collector/GroupCollector.php

@@ -117,6 +117,7 @@ class GroupCollector implements GroupCollectorInterface
             'transaction_journals.transaction_type_id',
             'transaction_journals.description',
             'transaction_journals.date',
+            'transaction_journals.date_tz',
             'transaction_journals.order',
 
             // types

app/Http/Controllers/Chart/CategoryController.php

@@ -151,6 +151,7 @@ class CategoryController extends Controller
      */
     private function reportPeriodChart(Collection $accounts, Carbon $start, Carbon $end, ?Category $category): array
     {
+
         $income     = [];
         $expenses   = [];
         $categoryId = 0;
@@ -169,8 +170,8 @@ class CategoryController extends Controller
             $categoryId    = $category->id;
             // this gives us all currencies
             $collection    = new Collection([$category]);
-            $expenses      = $opsRepository->listExpenses($start, $end, null, $collection);
-            $income        = $opsRepository->listIncome($start, $end, null, $collection);
+            $expenses      = $opsRepository->listExpenses($start, $end, $accounts, $collection);
+            $income        = $opsRepository->listIncome($start, $end, $accounts, $collection);
         }
         $currencies = array_unique(array_merge(array_keys($income), array_keys($expenses)));
         $periods    = app('navigation')->listOfPeriods($start, $end);

app/Http/Controllers/Chart/CategoryReportController.php

@@ -122,6 +122,7 @@ class CategoryReportController extends Controller
 
     public function categoryIncome(Collection $accounts, Collection $categories, Carbon $start, Carbon $end): JsonResponse
     {
+
         $result = [];
         $earned = $this->opsRepository->listIncome($start, $end, $accounts, $categories);
 

app/Http/Controllers/DebugController.php

@@ -95,7 +95,7 @@ class DebugController extends Controller
 
         // also do some recalculations.
         Artisan::call('firefly-iii:trigger-credit-recalculation');
-        AccountBalanceCalculator::forceRecalculateAll();
+        AccountBalanceCalculator::recalculateAll(true);
 
         try {
             Artisan::call('twig:clean');

app/Http/Controllers/JavascriptController.php

@@ -107,7 +107,6 @@ class JavascriptController extends Controller
         $lang                      = $pref->data;
         $dateRange                 = $this->getDateRangeConfig();
         $uid                       = substr(hash('sha256', sprintf('%s-%s-%s', (string)config('app.key'), auth()->user()->id, auth()->user()->email)), 0, 12);
-
         $data                      = [
             'currencyCode'         => $currency->code,
             'currencySymbol'       => $currency->symbol,

app/Http/Controllers/Json/FrontpageController.php

@@ -65,6 +65,16 @@ class FrontpageController extends Controller
                 $info[] = $entry;
             }
         }
+
+        // sort by current percentage (lowest at the top)
+        uasort(
+            $info,
+            static function (array $a, array $b) {
+                return $a['percentage'] <=> $b['percentage'];
+            }
+        );
+
+
         $html = '';
         if (0 !== count($info)) {
             try {

app/Http/Controllers/Recurring/ShowController.php

@@ -77,17 +77,18 @@ class ShowController extends Controller
      */
     public function show(Recurrence $recurrence)
     {
-        $repos                 = app(AttachmentRepositoryInterface::class);
+        $repos                  = app(AttachmentRepositoryInterface::class);
 
         /** @var RecurrenceTransformer $transformer */
-        $transformer           = app(RecurrenceTransformer::class);
+        $transformer            = app(RecurrenceTransformer::class);
         $transformer->setParameters(new ParameterBag());
 
-        $array                 = $transformer->transform($recurrence);
+        $array                  = $transformer->transform($recurrence);
 
-        $groups                = $this->recurring->getTransactions($recurrence);
-        $today                 = today(config('app.timezone'));
-        $array['repeat_until'] = null !== $array['repeat_until'] ? new Carbon($array['repeat_until']) : null;
+        $groups                 = $this->recurring->getTransactions($recurrence);
+        $today                  = today(config('app.timezone'));
+        $array['repeat_until']  = null !== $array['repeat_until'] ? new Carbon($array['repeat_until']) : null;
+        $array['journal_count'] = $this->recurring->getJournalCount($recurrence);
 
         // transform dates back to Carbon objects and expand information
         foreach ($array['repetitions'] as $index => $repetition) {
@@ -103,9 +104,9 @@ class ShowController extends Controller
         }
 
         // add attachments to the recurrence object.
-        $attachments           = $recurrence->attachments()->get();
-        $array['attachments']  = [];
-        $attachmentTransformer = app(AttachmentTransformer::class);
+        $attachments            = $recurrence->attachments()->get();
+        $array['attachments']   = [];
+        $attachmentTransformer  = app(AttachmentTransformer::class);
 
         /** @var Attachment $attachment */
         foreach ($attachments as $attachment) {
@@ -114,7 +115,16 @@ class ShowController extends Controller
             $array['attachments'][] = $item;
         }
 
-        $subTitle              = (string)trans('firefly.overview_for_recurrence', ['title' => $recurrence->title]);
+        if (null !== $array['nr_of_repetitions']) {
+            $left = $array['nr_of_repetitions'] - $array['journal_count'];
+            $left = max(0, $left);
+            // limit each repetition to X occurrences:
+            foreach ($array['repetitions'] as $index => $repetition) {
+                $array['repetitions'][$index]['occurrences'] = array_slice($repetition['occurrences'], 0, $left);
+            }
+        }
+
+        $subTitle               = (string)trans('firefly.overview_for_recurrence', ['title' => $recurrence->title]);
 
         return view('recurring.show', compact('recurrence', 'subTitle', 'array', 'groups', 'today'));
     }

app/Http/Controllers/Recurring/TriggerController.php

@@ -40,24 +40,24 @@ class TriggerController extends Controller
 {
     public function trigger(Recurrence $recurrence, TriggerRecurrenceRequest $request): RedirectResponse
     {
-        $all                     = $request->getAll();
-        $date                    = $all['date'];
+        $all                        = $request->getAll();
+        $date                       = $all['date'];
 
         // grab the date from the last time the recurrence fired:
-        $backupDate              = $recurrence->latest_date;
+        $backupDate                 = $recurrence->latest_date;
 
         // fire the recurring cron job on the given date, then post-date the created transaction.
         app('log')->info(sprintf('Trigger: will now fire recurring cron job task for date "%s".', $date->format('Y-m-d H:i:s')));
 
         /** @var CreateRecurringTransactions $job */
-        $job                     = app(CreateRecurringTransactions::class);
+        $job                        = app(CreateRecurringTransactions::class);
         $job->setRecurrences(new Collection([$recurrence]));
         $job->setDate($date);
         $job->setForce(false);
         $job->handle();
         app('log')->debug('Done with recurrence.');
 
-        $groups                  = $job->getGroups();
+        $groups                     = $job->getGroups();
 
         /** @var TransactionGroup $group */
         foreach ($groups as $group) {
@@ -68,7 +68,8 @@ class TriggerController extends Controller
                 $journal->save();
             }
         }
-        $recurrence->latest_date = $backupDate;
+        $recurrence->latest_date    = $backupDate;
+        $recurrence->latest_date_tz = $backupDate?->format('e');
         $recurrence->save();
         app('preferences')->mark();
 

app/Jobs/CreateRecurringTransactions.php

@@ -177,10 +177,11 @@ class CreateRecurringTransactions implements ShouldQueue
         // has repeated X times.
         $journalCount = $this->repository->getJournalCount($recurrence);
         if (0 !== $recurrence->repetitions && $journalCount >= $recurrence->repetitions && false === $this->force) {
-            app('log')->info(sprintf('Recurrence #%d has run %d times, so will run no longer.', $recurrence->id, $recurrence->repetitions));
+            app('log')->info(sprintf('Recurrence #%d has run %d times, so will run no longer.', $recurrence->id, $journalCount));
 
             return false;
         }
+        app('log')->debug(sprintf('Recurrence #%d has run %d times, max is %d times.', $recurrence->id, $journalCount, $recurrence->repetitions));
 
         // is no longer running
         if ($this->repeatUntilHasPassed($recurrence)) {
@@ -202,8 +203,8 @@ class CreateRecurringTransactions implements ShouldQueue
                 sprintf(
                     'Recurrence #%d is set to run on %s, and today\'s date is %s. Skipped.',
                     $recurrence->id,
-                    $recurrence->first_date->format('Y-m-d'),
-                    $this->date->format('Y-m-d')
+                    $recurrence->first_date->format('Y-m-d H:i:s'),
+                    $this->date->format('Y-m-d H:i:s')
                 )
             );
 
@@ -244,9 +245,10 @@ class CreateRecurringTransactions implements ShouldQueue
     private function hasNotStartedYet(Recurrence $recurrence): bool
     {
         $startDate = $this->getStartDate($recurrence);
-        app('log')->debug(sprintf('Start date is %s', $startDate->format('Y-m-d')));
+        app('log')->debug(sprintf('Start date is %s', $startDate->format('Y-m-d H:i:s')));
+        app('log')->debug(sprintf('Ask   date is %s', $this->date->format('Y-m-d H:i:s')));
 
-        return $startDate->gt($this->date);
+        return $startDate->gte($this->date);
     }
 
     /**
@@ -341,7 +343,7 @@ class CreateRecurringTransactions implements ShouldQueue
         app('log')->debug(sprintf('%s IS today (%s)', $date->format('Y-m-d'), $this->date->format('Y-m-d')));
 
         // count created journals on THIS day.
-        $journalCount            = $this->repository->getJournalCount($recurrence, $date, $date);
+        $journalCount               = $this->repository->getJournalCount($recurrence, $date, $date);
         if ($journalCount > 0 && false === $this->force) {
             app('log')->info(sprintf('Already created %d journal(s) for date %s', $journalCount, $date->format('Y-m-d')));
 
@@ -359,11 +361,11 @@ class CreateRecurringTransactions implements ShouldQueue
         }
 
         // create transaction array and send to factory.
-        $groupTitle              = null;
-        $count                   = $recurrence->recurrenceTransactions->count();
+        $groupTitle                 = null;
+        $count                      = $recurrence->recurrenceTransactions->count();
         // #8844, if there is one recurrence transaction, use the first title as the title.
         // #9305, if there is one recurrence transaction, group title must be NULL.
-        $groupTitle              = null;
+        $groupTitle                 = null;
 
         // #8844, if there are more, use the recurrence transaction itself.
         if ($count > 1) {
@@ -376,14 +378,14 @@ class CreateRecurringTransactions implements ShouldQueue
             return null;
         }
 
-        $array                   = [
+        $array                      = [
             'user'         => $recurrence->user_id,
             'group_title'  => $groupTitle,
             'transactions' => $this->getTransactionData($recurrence, $repetition, $date),
         ];
 
         /** @var TransactionGroup $group */
-        $group                   = $this->groupRepository->store($array);
+        $group                      = $this->groupRepository->store($array);
         ++$this->created;
         app('log')->info(sprintf('Created new transaction group #%d', $group->id));
 
@@ -392,7 +394,8 @@ class CreateRecurringTransactions implements ShouldQueue
         $this->groups->push($group);
 
         // update recurring thing:
-        $recurrence->latest_date = $date;
+        $recurrence->latest_date    = $date;
+        $recurrence->latest_date_tz = $date?->format('e');
         $recurrence->save();
 
         return $group;

app/Models/AccountBalance.php

@@ -14,7 +14,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 class AccountBalance extends Model
 {
     use HasFactory;
-    protected $fillable = ['account_id', 'title', 'transaction_currency_id', 'balance'];
+    protected $fillable = ['account_id', 'title', 'transaction_currency_id', 'balance', 'date', 'date_tz'];
 
     public function account(): BelongsTo
     {

app/Models/AccountType.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Models;
 
+use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -34,19 +35,46 @@ class AccountType extends Model
 {
     use ReturnsIntegerIdTrait;
 
+    /** @deprecated */
     public const string ASSET            = 'Asset account';
+
+    /** @deprecated */
     public const string BENEFICIARY      = 'Beneficiary account';
+
+    /** @deprecated */
     public const string CASH             = 'Cash account';
+
+    /** @deprecated */
     public const string CREDITCARD       = 'Credit card';
+
+    /** @deprecated */
     public const string DEBT             = 'Debt';
+
+    /** @deprecated */
     public const string DEFAULT          = 'Default account';
+
+    /** @deprecated */
     public const string EXPENSE          = 'Expense account';
+
+    /** @deprecated */
     public const string IMPORT           = 'Import account';
+
+    /** @deprecated */
     public const string INITIAL_BALANCE  = 'Initial balance account';
+
+    /** @deprecated */
     public const string LIABILITY_CREDIT = 'Liability credit account';
+
+    /** @deprecated */
     public const string LOAN             = 'Loan';
+
+    /** @deprecated */
     public const string MORTGAGE         = 'Mortgage';
+
+    /** @deprecated */
     public const string RECONCILIATION   = 'Reconciliation account';
+
+    /** @deprecated */
     public const string REVENUE          = 'Revenue account';
 
     protected $casts
@@ -61,4 +89,11 @@ class AccountType extends Model
     {
         return $this->hasMany(Account::class);
     }
+
+    protected function casts(): array
+    {
+        return [
+            // 'type' => AccountTypeEnum::class,
+        ];
+    }
 }

app/Models/AutoBudget.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Models;
 
+use FireflyIII\Enums\AutoBudgetType;
 use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
@@ -38,8 +39,13 @@ class AutoBudget extends Model
     use ReturnsIntegerIdTrait;
     use SoftDeletes;
 
+    /** @deprecated */
     public const int AUTO_BUDGET_ADJUSTED = 3;
+
+    /** @deprecated */
     public const int AUTO_BUDGET_RESET    = 1;
+
+    /** @deprecated */
     public const int AUTO_BUDGET_ROLLOVER = 2;
     protected $fillable                   = ['budget_id', 'amount', 'period'];
 
@@ -53,6 +59,13 @@ class AutoBudget extends Model
         return $this->belongsTo(TransactionCurrency::class);
     }
 
+    protected function casts(): array
+    {
+        return [
+            // 'auto_budget_type' => AutoBudgetType::class,
+        ];
+    }
+
     protected function amount(): Attribute
     {
         return Attribute::make(

app/Models/AvailableBudget.php

@@ -51,7 +51,7 @@ class AvailableBudget extends Model
             'transaction_currency_id' => 'int',
         ];
 
-    protected $fillable = ['user_id', 'user_group_id', 'transaction_currency_id', 'amount', 'start_date', 'end_date'];
+    protected $fillable = ['user_id', 'user_group_id', 'transaction_currency_id', 'amount', 'start_date', 'end_date', 'start_date_tz', 'end_date_tz'];
 
     /**
      * Route binder. Converts the key in the URL to the specified object (or throw 404).

app/Models/Bill.php

@@ -68,6 +68,7 @@ class Bill extends Model
             'user_group_id',
             'amount_max',
             'date',
+            'date_tz',
             'repeat_freq',
             'skip',
             'automatch',
@@ -75,6 +76,8 @@ class Bill extends Model
             'transaction_currency_id',
             'end_date',
             'extension_date',
+            'end_date_tz',
+            'extension_date_tz',
         ];
 
     protected $hidden = ['amount_min_encrypted', 'amount_max_encrypted', 'name_encrypted', 'match_encrypted'];

app/Models/BudgetLimit.php

@@ -54,7 +54,7 @@ class BudgetLimit extends Model
             'deleted' => Deleted::class,
         ];
 
-    protected $fillable = ['budget_id', 'start_date', 'end_date', 'amount', 'transaction_currency_id'];
+    protected $fillable = ['budget_id', 'start_date', 'end_date', 'start_date_tz', 'end_date_tz', 'amount', 'transaction_currency_id'];
 
     /**
      * Route binder. Converts the key in the URL to the specified object (or throw 404).

app/Models/CurrencyExchangeRate.php

@@ -49,7 +49,7 @@ class CurrencyExchangeRate extends Model
             'to_currency_id'   => 'int',
             'date'             => 'datetime',
         ];
-    protected $fillable = ['user_id', 'from_currency_id', 'to_currency_id', 'date', 'rate'];
+    protected $fillable = ['user_id', 'from_currency_id', 'to_currency_id', 'date', 'date_tz', 'rate'];
 
     public function fromCurrency(): BelongsTo
     {

app/Models/InvitedUser.php

@@ -44,7 +44,7 @@ class InvitedUser extends Model
             'expires'  => 'datetime',
             'redeemed' => 'boolean',
         ];
-    protected $fillable = ['user_id', 'email', 'invite_code', 'expires', 'redeemed'];
+    protected $fillable = ['user_id', 'email', 'invite_code', 'expires', 'expires_tz', 'redeemed'];
 
     /**
      * Route binder. Converts the key in the URL to the specified object (or throw 404).

app/Models/PiggyBank.php

@@ -53,7 +53,7 @@ class PiggyBank extends Model
             'encrypted'  => 'boolean',
         ];
 
-    protected $fillable = ['name', 'account_id', 'order', 'targetamount', 'startdate', 'targetdate', 'active'];
+    protected $fillable = ['name', 'account_id', 'order', 'targetamount', 'startdate', 'startdate_tz', 'targetdate', 'targetdate_tz', 'active'];
 
     protected $hidden   = ['targetamount_encrypted', 'encrypted'];
 

app/Models/PiggyBankEvent.php

@@ -42,7 +42,7 @@ class PiggyBankEvent extends Model
             'date'       => 'date',
         ];
 
-    protected $fillable = ['piggy_bank_id', 'transaction_journal_id', 'date', 'amount'];
+    protected $fillable = ['piggy_bank_id', 'transaction_journal_id', 'date', 'date_tz', 'amount'];
 
     protected $hidden   = ['amount_encrypted'];
 

app/Models/PiggyBankRepetition.php

@@ -45,7 +45,7 @@ class PiggyBankRepetition extends Model
             'targetdate' => 'date',
         ];
 
-    protected $fillable = ['piggy_bank_id', 'startdate', 'targetdate', 'currentamount'];
+    protected $fillable = ['piggy_bank_id', 'startdate', 'startdate_tz', 'targetdate', 'targetdate_tz', 'currentamount'];
 
     public function piggyBank(): BelongsTo
     {

app/Models/Recurrence.php

@@ -60,7 +60,7 @@ class Recurrence extends Model
         ];
 
     protected $fillable
-                     = ['user_id', 'transaction_type_id', 'title', 'description', 'first_date', 'repeat_until', 'latest_date', 'repetitions', 'apply_rules', 'active'];
+                     = ['user_id', 'transaction_type_id', 'title', 'description', 'first_date', 'first_date_tz', 'repeat_until', 'repeat_until_tz', 'latest_date', 'latest_date_tz', 'repetitions', 'apply_rules', 'active'];
 
     /** @var string The table to store the data in */
     protected $table = 'recurrences';

app/Models/RecurrenceRepetition.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Models;
 
+use FireflyIII\Enums\RecurrenceRepetitionWeekend;
 use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
@@ -37,9 +38,16 @@ class RecurrenceRepetition extends Model
     use ReturnsIntegerIdTrait;
     use SoftDeletes;
 
+    /** @deprecated */
     public const int WEEKEND_DO_NOTHING    = 1;
+
+    /** @deprecated */
     public const int WEEKEND_SKIP_CREATION = 2;
+
+    /** @deprecated */
     public const int WEEKEND_TO_FRIDAY     = 3;
+
+    /** @deprecated */
     public const int WEEKEND_TO_MONDAY     = 4;
 
     protected $casts
@@ -58,6 +66,13 @@ class RecurrenceRepetition extends Model
     /** @var string The table to store the data in */
     protected $table                       = 'recurrences_repetitions';
 
+    protected function casts(): array
+    {
+        return [
+            // 'weekend' => RecurrenceRepetitionWeekend::class,
+        ];
+    }
+
     public function recurrence(): BelongsTo
     {
         return $this->belongsTo(Recurrence::class);

app/Models/Tag.php

@@ -53,7 +53,7 @@ class Tag extends Model
             'longitude'  => 'float',
         ];
 
-    protected $fillable = ['user_id', 'user_group_id', 'tag', 'date', 'description', 'tagMode'];
+    protected $fillable = ['user_id', 'user_group_id', 'tag', 'date', 'date_tz', 'description', 'tagMode'];
 
     protected $hidden   = ['zoomLevel', 'latitude', 'longitude'];
 

app/Models/TransactionJournal.php

@@ -37,6 +37,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Facades\Log;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
@@ -76,6 +77,7 @@ class TransactionJournal extends Model
             'completed',
             'order',
             'date',
+            'date_tz',
         ];
 
     protected $hidden = ['encrypted'];
@@ -88,7 +90,7 @@ class TransactionJournal extends Model
     public static function routeBinder(string $value): self
     {
         if (auth()->check()) {
-            $journalId = (int)$value;
+            $journalId = (int) $value;
 
             /** @var User $user */
             $user      = auth()->user();
@@ -167,12 +169,16 @@ class TransactionJournal extends Model
 
     public function scopeAfter(EloquentBuilder $query, Carbon $date): EloquentBuilder
     {
-        return $query->where('transaction_journals.date', '>=', $date->format('Y-m-d 00:00:00'));
+        Log::debug(sprintf('scopeAfter("%s")', $date->format('Y-m-d H:i:s')));
+
+        return $query->where('transaction_journals.date', '>=', $date->format('Y-m-d H:i:s'));
     }
 
     public function scopeBefore(EloquentBuilder $query, Carbon $date): EloquentBuilder
     {
-        return $query->where('transaction_journals.date', '<=', $date->format('Y-m-d 00:00:00'));
+        Log::debug(sprintf('scopeBefore("%s")', $date->format('Y-m-d H:i:s')));
+
+        return $query->where('transaction_journals.date', '<=', $date->format('Y-m-d H:i:s'));
     }
 
     public function scopeTransactionTypes(EloquentBuilder $query, array $types): void
@@ -238,14 +244,14 @@ class TransactionJournal extends Model
     protected function order(): Attribute
     {
         return Attribute::make(
-            get: static fn ($value) => (int)$value,
+            get: static fn ($value) => (int) $value,
         );
     }
 
     protected function transactionTypeId(): Attribute
     {
         return Attribute::make(
-            get: static fn ($value) => (int)$value,
+            get: static fn ($value) => (int) $value,
         );
     }
 }

app/Models/TransactionType.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Models;
 
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -37,12 +38,25 @@ class TransactionType extends Model
     use ReturnsIntegerIdTrait;
     use SoftDeletes;
 
+    /** @deprecated */
     public const string DEPOSIT          = 'Deposit';
+
+    /** @deprecated */
     public const string INVALID          = 'Invalid';
+
+    /** @deprecated */
     public const string LIABILITY_CREDIT = 'Liability credit';
+
+    /** @deprecated */
     public const string OPENING_BALANCE  = 'Opening balance';
+
+    /** @deprecated */
     public const string RECONCILIATION   = 'Reconciliation';
+
+    /** @deprecated */
     public const string TRANSFER         = 'Transfer';
+
+    /** @deprecated */
     public const string WITHDRAWAL       = 'Withdrawal';
 
     protected $casts
@@ -53,6 +67,13 @@ class TransactionType extends Model
         ];
     protected $fillable                  = ['type'];
 
+    protected function casts(): array
+    {
+        return [
+            // 'type' => TransactionTypeEnum::class,
+        ];
+    }
+
     /**
      * Route binder. Converts the key in the URL to the specified object (or throw 404).
      *

app/Models/Webhook.php

@@ -53,6 +53,15 @@ class Webhook extends Model
         ];
     protected $fillable = ['active', 'trigger', 'response', 'delivery', 'user_id', 'user_group_id', 'url', 'title', 'secret'];
 
+    protected function casts(): array
+    {
+        return [
+            //            'delivery' => WebhookDelivery::class,
+            //            'response' => WebhookResponse::class,
+            //            'trigger'  => WebhookTrigger::class,
+        ];
+    }
+
     public static function getDeliveries(): array
     {
         $array = [];
@@ -130,7 +139,7 @@ class Webhook extends Model
     public static function routeBinder(string $value): self
     {
         if (auth()->check()) {
-            $webhookId = (int)$value;
+            $webhookId = (int) $value;
 
             /** @var User $user */
             $user      = auth()->user();

app/Repositories/Bill/BillRepository.php

@@ -306,6 +306,8 @@ class BillRepository implements BillRepositoryInterface
     {
         // app('log')->debug('Now in getPaidDatesInRange()');
 
+        Log::debug(sprintf('Search for linked journals between %s and %s', $start->toW3cString(), $end->toW3cString()));
+
         return $bill->transactionJournals()
             ->before($end)->after($start)->get(
                 [
@@ -435,15 +437,17 @@ class BillRepository implements BillRepositoryInterface
         }
         // find the most recent date for this bill NOT in the future. Cache this date:
         $start        = clone $bill->date;
+        $start->startOfDay();
         app('log')->debug('nextExpectedMatch: Start is '.$start->format('Y-m-d'));
 
         while ($start < $date) {
-            app('log')->debug(sprintf('$start (%s) < $date (%s)', $start->format('Y-m-d'), $date->format('Y-m-d')));
+            app('log')->debug(sprintf('$start (%s) < $date (%s)', $start->format('Y-m-d H:i:s'), $date->format('Y-m-d H:i:s')));
             $start = app('navigation')->addPeriod($start, $bill->repeat_freq, $bill->skip);
-            app('log')->debug('Start is now '.$start->format('Y-m-d'));
+            app('log')->debug('Start is now '.$start->format('Y-m-d H:i:s'));
         }
 
         $end          = app('navigation')->addPeriod($start, $bill->repeat_freq, $bill->skip);
+        $end->endOfDay();
 
         // see if the bill was paid in this period.
         $journalCount = $bill->transactionJournals()->before($end)->after($start)->count();

app/Repositories/Budget/AvailableBudgetRepository.php

@@ -198,11 +198,13 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
             ->where('end_date', $end->format('Y-m-d'))->first()
         ;
         if (null === $availableBudget) {
-            $availableBudget             = new AvailableBudget();
+            $availableBudget                = new AvailableBudget();
             $availableBudget->user()->associate($this->user);
             $availableBudget->transactionCurrency()->associate($currency);
-            $availableBudget->start_date = $start->startOfDay()->format('Y-m-d'); // @phpstan-ignore-line
-            $availableBudget->end_date   = $end->endOfDay()->format('Y-m-d');     // @phpstan-ignore-line
+            $availableBudget->start_date    = $start->startOfDay()->format('Y-m-d'); // @phpstan-ignore-line
+            $availableBudget->start_date_tz = $start->format('e');
+            $availableBudget->end_date      = $end->endOfDay()->format('Y-m-d');     // @phpstan-ignore-line
+            $availableBudget->end_date_tz   = $end->format('e');
         }
         $availableBudget->amount = $amount;
         $availableBudget->save();
@@ -235,7 +237,9 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
                 'transaction_currency_id' => $data['currency_id'],
                 'amount'                  => $data['amount'],
                 'start_date'              => $start->format('Y-m-d'),
+                'start_date_tz'           => $start->format('e'),
                 'end_date'                => $end->format('Y-m-d'),
+                'end_date_tz'             => $end->format('e'),
             ]
         );
     }
@@ -255,8 +259,9 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
         if (array_key_exists('start', $data)) {
             $start = $data['start'];
             if ($start instanceof Carbon) {
-                $start                       = $data['start']->startOfDay();
-                $availableBudget->start_date = $start->format('Y-m-d');
+                $start                          = $data['start']->startOfDay();
+                $availableBudget->start_date    = $start->format('Y-m-d');
+                $availableBudget->start_date_tz = $start->format('e');
                 $availableBudget->save();
             }
         }
@@ -264,8 +269,9 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
         if (array_key_exists('end', $data)) {
             $end = $data['end'];
             if ($end instanceof Carbon) {
-                $end                       = $data['end']->endOfDay();
-                $availableBudget->end_date = $end->format('Y-m-d');
+                $end                          = $data['end']->endOfDay();
+                $availableBudget->end_date    = $end->format('Y-m-d');
+                $availableBudget->end_date_tz = $end->format('e');
                 $availableBudget->save();
             }
         }

app/Repositories/Budget/BudgetLimitRepository.php

@@ -277,7 +277,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
         $currency->save();
 
         // find the budget:
-        $budget                         = $this->user->budgets()->find((int)$data['budget_id']);
+        $budget                         = $this->user->budgets()->find((int) $data['budget_id']);
         if (null === $budget) {
             throw new FireflyException('200004: Budget does not exist.');
         }
@@ -323,8 +323,15 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
     {
         $budgetLimit->amount                  = array_key_exists('amount', $data) ? $data['amount'] : $budgetLimit->amount;
         $budgetLimit->budget_id               = array_key_exists('budget_id', $data) ? $data['budget_id'] : $budgetLimit->budget_id;
-        $budgetLimit->start_date              = array_key_exists('start', $data) ? $data['start']->format('Y-m-d 00:00:00') : $budgetLimit->start_date;
-        $budgetLimit->end_date                = array_key_exists('end', $data) ? $data['end']->format('Y-m-d 23:59:59') : $budgetLimit->end_date;
+
+        if (array_key_exists('start', $data)) {
+            $budgetLimit->start_date    = $data['start']->startOfDay();
+            $budgetLimit->start_date_tz = $data['start']->format('e');
+        }
+        if (array_key_exists('end', $data)) {
+            $budgetLimit->end_date    = $data['end']->endOfDay();
+            $budgetLimit->end_date_tz = $data['end']->format('e');
+        }
 
         // if no currency has been provided, use the user's default currency:
         $currency                             = null;
@@ -351,7 +358,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
     public function updateLimitAmount(Budget $budget, Carbon $start, Carbon $end, string $amount): ?BudgetLimit
     {
         // count the limits:
-        $limits            = $budget->budgetlimits()
+        $limits               = $budget->budgetlimits()
             ->where('budget_limits.start_date', $start->format('Y-m-d 00:00:00'))
             ->where('budget_limits.end_date', $end->format('Y-m-d 00:00:00'))
             ->count('budget_limits.*')
@@ -360,7 +367,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
 
         // there might be a budget limit for these dates:
         /** @var null|BudgetLimit $limit */
-        $limit             = $budget->budgetlimits()
+        $limit                = $budget->budgetlimits()
             ->where('budget_limits.start_date', $start->format('Y-m-d 00:00:00'))
             ->where('budget_limits.end_date', $end->format('Y-m-d 00:00:00'))
             ->first(['budget_limits.*'])
@@ -395,11 +402,13 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
         }
         app('log')->debug('No existing budget limit, create a new one');
         // or create one and return it.
-        $limit             = new BudgetLimit();
+        $limit                = new BudgetLimit();
         $limit->budget()->associate($budget);
-        $limit->start_date = $start->startOfDay();
-        $limit->end_date   = $end->startOfDay();
-        $limit->amount     = $amount;
+        $limit->start_date    = $start->startOfDay();
+        $limit->start_date_tz = $start->format('e');
+        $limit->end_date      = $end->startOfDay();
+        $limit->end_date_tz   = $end->format('e');
+        $limit->amount        = $amount;
         $limit->save();
         app('log')->debug(sprintf('Created new budget limit with ID #%d and amount %s', $limit->id, $amount));
 

app/Repositories/Currency/CurrencyRepository.php

@@ -89,11 +89,12 @@ class CurrencyRepository implements CurrencyRepositoryInterface
     {
         return CurrencyExchangeRate::create(
             [
-                'user_id'          => $this->user->id,
-                'from_currency_id' => $fromCurrency->id,
-                'to_currency_id'   => $toCurrency->id,
-                'date'             => $date,
-                'rate'             => $rate,
+                'user_id'             => $this->user->id,
+                'from_currency_id'    => $fromCurrency->id,
+                'to_currency_id'      => $toCurrency->id,
+                'date'                => $date,
+                'date_tz'             => $date->format('e'),
+                'rate'                => $rate,
             ]
         );
     }

app/Repositories/PiggyBank/ModifiesPiggyBanks.php

@@ -178,12 +178,12 @@ trait ModifiesPiggyBanks
      */
     public function store(array $data): PiggyBank
     {
-        $order            = $this->getMaxOrder() + 1;
+        $order                      = $this->getMaxOrder() + 1;
         if (array_key_exists('order', $data)) {
             $order = $data['order'];
         }
-        $data['order']    = 31337; // very high when creating.
-        $piggyData        = $data;
+        $data['order']              = 31337; // very high when creating.
+        $piggyData                  = $data;
         // unset fields just in case.
         unset($piggyData['object_group_title'], $piggyData['object_group_id'], $piggyData['notes'], $piggyData['current_amount']);
 
@@ -192,6 +192,9 @@ trait ModifiesPiggyBanks
             $piggyData['targetamount'] = '0';
         }
 
+        $piggyData['startdate_tz']  = $piggyData['startdate']?->format('e');
+        $piggyData['targetdate_tz'] = $piggyData['targetdate']?->format('e');
+
         try {
             /** @var PiggyBank $piggyBank */
             $piggyBank = PiggyBank::create($piggyData);
@@ -208,13 +211,13 @@ trait ModifiesPiggyBanks
         $this->updateNote($piggyBank, $data['notes']);
 
         // repetition is auto created.
-        $repetition       = $this->getRepetition($piggyBank);
+        $repetition                 = $this->getRepetition($piggyBank);
         if (null !== $repetition && array_key_exists('current_amount', $data) && '' !== $data['current_amount']) {
             $repetition->currentamount = $data['current_amount'];
             $repetition->save();
         }
 
-        $objectGroupTitle = $data['object_group_title'] ?? '';
+        $objectGroupTitle           = $data['object_group_title'] ?? '';
         if ('' !== $objectGroupTitle) {
             $objectGroup = $this->findOrCreateObjectGroup($objectGroupTitle);
             if (null !== $objectGroup) {
@@ -223,7 +226,7 @@ trait ModifiesPiggyBanks
             }
         }
         // try also with ID
-        $objectGroupId    = (int)($data['object_group_id'] ?? 0);
+        $objectGroupId              = (int)($data['object_group_id'] ?? 0);
         if (0 !== $objectGroupId) {
             $objectGroup = $this->findObjectGroupById($objectGroupId);
             if (null !== $objectGroup) {
@@ -373,10 +376,12 @@ trait ModifiesPiggyBanks
             $piggyBank->targetamount = '0';
         }
         if (array_key_exists('targetdate', $data) && '' !== $data['targetdate']) {
-            $piggyBank->targetdate = $data['targetdate'];
+            $piggyBank->targetdate    = $data['targetdate'];
+            $piggyBank->targetdate_tz = $data['targetdate']?->format('e');
         }
         if (array_key_exists('startdate', $data)) {
-            $piggyBank->startdate = $data['startdate'];
+            $piggyBank->startdate    = $data['startdate'];
+            $piggyBank->startdate_tz = $data['targetdate']?->format('e');
         }
         $piggyBank->save();
 

app/Repositories/Recurring/RecurringRepository.php

@@ -67,13 +67,13 @@ class RecurringRepository implements RecurringRepositoryInterface
         $set
             = TransactionJournalMeta::where(static function (Builder $q1) use ($recurrence): void {
                 $q1->where('name', 'recurrence_id');
-                $q1->where('data', json_encode((string)$recurrence->id));
+                $q1->where('data', json_encode((string) $recurrence->id));
             })->get(['journal_meta.transaction_journal_id']);
 
         // there are X journals made for this recurrence. Any of them meant for today?
         foreach ($set as $journalMeta) {
             $count = TransactionJournalMeta::where(static function (Builder $q2) use ($date): void {
-                $string = (string)$date;
+                $string = (string) $date;
                 app('log')->debug(sprintf('Search for date: %s', json_encode($string)));
                 $q2->where('name', 'recurrence_date');
                 $q2->where('data', json_encode($string));
@@ -141,7 +141,7 @@ class RecurringRepository implements RecurringRepositoryInterface
         /** @var RecurrenceTransactionMeta $meta */
         foreach ($recTransaction->recurrenceTransactionMeta as $meta) {
             if ('bill_id' === $meta->name) {
-                $return = (int)$meta->value;
+                $return = (int) $meta->value;
             }
         }
 
@@ -158,7 +158,7 @@ class RecurringRepository implements RecurringRepositoryInterface
         /** @var RecurrenceTransactionMeta $meta */
         foreach ($recTransaction->recurrenceTransactionMeta as $meta) {
             if ('budget_id' === $meta->name) {
-                $return = (int)$meta->value;
+                $return = (int) $meta->value;
             }
         }
 
@@ -175,7 +175,7 @@ class RecurringRepository implements RecurringRepositoryInterface
         /** @var RecurrenceTransactionMeta $meta */
         foreach ($recTransaction->recurrenceTransactionMeta as $meta) {
             if ('category_id' === $meta->name) {
-                $return = (int)$meta->value;
+                $return = (int) $meta->value;
             }
         }
 
@@ -192,7 +192,7 @@ class RecurringRepository implements RecurringRepositoryInterface
         /** @var RecurrenceTransactionMeta $meta */
         foreach ($recTransaction->recurrenceTransactionMeta as $meta) {
             if ('category_name' === $meta->name) {
-                $return = (string)$meta->value;
+                $return = (string) $meta->value;
             }
         }
 
@@ -204,6 +204,7 @@ class RecurringRepository implements RecurringRepositoryInterface
      */
     public function getJournalCount(Recurrence $recurrence, ?Carbon $start = null, ?Carbon $end = null): int
     {
+        Log::debug(sprintf('Now in getJournalCount(#%d, "%s", "%s")', $recurrence->id, $start?->format('Y-m-d H:i:s'), $end?->format('Y-m-d H:i:s')));
         $query = TransactionJournal::leftJoin('journal_meta', 'journal_meta.transaction_journal_id', '=', 'transaction_journals.id')
             ->where('transaction_journals.user_id', $recurrence->user_id)
             ->whereNull('transaction_journals.deleted_at')
@@ -216,8 +217,10 @@ class RecurringRepository implements RecurringRepositoryInterface
         if (null !== $end) {
             $query->where('transaction_journals.date', '<=', $end->format('Y-m-d 00:00:00'));
         }
+        $count = $query->count('transaction_journals.id');
+        Log::debug(sprintf('Count is %d', $count));
 
-        return $query->count('transaction_journals.id');
+        return $count;
     }
 
     /**
@@ -228,7 +231,7 @@ class RecurringRepository implements RecurringRepositoryInterface
         return TransactionJournalMeta::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id')
             ->where('transaction_journals.user_id', $this->user->id)
             ->where('journal_meta.name', '=', 'recurrence_id')
-            ->where('journal_meta.data', '=', json_encode((string)$recurrence->id))
+            ->where('journal_meta.data', '=', json_encode((string) $recurrence->id))
             ->get(['journal_meta.transaction_journal_id'])->pluck('transaction_journal_id')->toArray()
         ;
     }
@@ -241,7 +244,7 @@ class RecurringRepository implements RecurringRepositoryInterface
         /** @var null|Note $note */
         $note = $recurrence->notes()->first();
 
-        return (string)$note?->text;
+        return (string) $note?->text;
     }
 
     public function getPiggyBank(RecurrenceTransaction $transaction): ?int
@@ -251,7 +254,7 @@ class RecurringRepository implements RecurringRepositoryInterface
         /** @var RecurrenceTransactionMeta $metaEntry */
         foreach ($meta as $metaEntry) {
             if ('piggy_bank_id' === $metaEntry->name) {
-                return (int)$metaEntry->value;
+                return (int) $metaEntry->value;
             }
         }
 
@@ -281,12 +284,12 @@ class RecurringRepository implements RecurringRepositoryInterface
             ->whereNull('transaction_journals.deleted_at')
             ->where('transaction_journals.user_id', $this->user->id)
             ->where('name', 'recurrence_id')
-            ->where('data', json_encode((string)$recurrence->id))
+            ->where('data', json_encode((string) $recurrence->id))
             ->get()->pluck('transaction_journal_id')->toArray()
         ;
         $search      = [];
         foreach ($journalMeta as $journalId) {
-            $search[] = (int)$journalId;
+            $search[] = (int) $journalId;
         }
 
         /** @var GroupCollectorInterface $collector */
@@ -314,13 +317,13 @@ class RecurringRepository implements RecurringRepositoryInterface
             ->whereNull('transaction_journals.deleted_at')
             ->where('transaction_journals.user_id', $this->user->id)
             ->where('name', 'recurrence_id')
-            ->where('data', json_encode((string)$recurrence->id))
+            ->where('data', json_encode((string) $recurrence->id))
             ->get()->pluck('transaction_journal_id')->toArray()
         ;
         $search      = [];
 
         foreach ($journalMeta as $journalId) {
-            $search[] = (int)$journalId;
+            $search[] = (int) $journalId;
         }
         if (0 === count($search)) {
             return new Collection();
@@ -442,28 +445,28 @@ class RecurringRepository implements RecurringRepositoryInterface
         if (is_array($language)) {
             $language = 'en_US';
         }
-        $language = (string)$language;
+        $language = (string) $language;
         if ('daily' === $repetition->repetition_type) {
-            return (string)trans('firefly.recurring_daily', [], $language);
+            return (string) trans('firefly.recurring_daily', [], $language);
         }
         if ('weekly' === $repetition->repetition_type) {
             $dayOfWeek = trans(sprintf('config.dow_%s', $repetition->repetition_moment), [], $language);
             if ($repetition->repetition_skip > 0) {
-                return (string)trans('firefly.recurring_weekly_skip', ['weekday' => $dayOfWeek, 'skip' => $repetition->repetition_skip + 1], $language);
+                return (string) trans('firefly.recurring_weekly_skip', ['weekday' => $dayOfWeek, 'skip' => $repetition->repetition_skip + 1], $language);
             }
 
-            return (string)trans('firefly.recurring_weekly', ['weekday' => $dayOfWeek], $language);
+            return (string) trans('firefly.recurring_weekly', ['weekday' => $dayOfWeek], $language);
         }
         if ('monthly' === $repetition->repetition_type) {
             if ($repetition->repetition_skip > 0) {
-                return (string)trans(
+                return (string) trans(
                     'firefly.recurring_monthly_skip',
                     ['dayOfMonth' => $repetition->repetition_moment, 'skip' => $repetition->repetition_skip + 1],
                     $language
                 );
             }
 
-            return (string)trans(
+            return (string) trans(
                 'firefly.recurring_monthly',
                 ['dayOfMonth' => $repetition->repetition_moment, 'skip' => $repetition->repetition_skip - 1],
                 $language
@@ -474,7 +477,7 @@ class RecurringRepository implements RecurringRepositoryInterface
             // first part is number of week, second is weekday.
             $dayOfWeek = trans(sprintf('config.dow_%s', $parts[1]), [], $language);
 
-            return (string)trans('firefly.recurring_ndom', ['weekday' => $dayOfWeek, 'dayOfMonth' => $parts[0]], $language);
+            return (string) trans('firefly.recurring_ndom', ['weekday' => $dayOfWeek, 'dayOfMonth' => $parts[0]], $language);
         }
         if ('yearly' === $repetition->repetition_type) {
             $today       = today(config('app.timezone'))->endOfYear();
@@ -482,11 +485,11 @@ class RecurringRepository implements RecurringRepositoryInterface
             if (null === $repDate) {
                 $repDate = clone $today;
             }
-            $diffInYears = (int)$today->diffInYears($repDate, true);
+            $diffInYears = (int) $today->diffInYears($repDate, true);
             $repDate->addYears($diffInYears); // technically not necessary.
-            $string      = $repDate->isoFormat((string)trans('config.month_and_day_no_year_js'));
+            $string      = $repDate->isoFormat((string) trans('config.month_and_day_no_year_js'));
 
-            return (string)trans('firefly.recurring_yearly', ['date' => $string], $language);
+            return (string) trans('firefly.recurring_yearly', ['date' => $string], $language);
         }
 
         return '';
@@ -520,16 +523,16 @@ class RecurringRepository implements RecurringRepositoryInterface
     public function totalTransactions(Recurrence $recurrence, RecurrenceRepetition $repetition): int
     {
         // if repeat = null just return 0.
-        if (null === $recurrence->repeat_until && 0 === (int)$recurrence->repetitions) {
+        if (null === $recurrence->repeat_until && 0 === (int) $recurrence->repetitions) {
             return 0;
         }
         // expect X transactions then stop. Return that number
-        if (null === $recurrence->repeat_until && 0 !== (int)$recurrence->repetitions) {
-            return (int)$recurrence->repetitions;
+        if (null === $recurrence->repeat_until && 0 !== (int) $recurrence->repetitions) {
+            return (int) $recurrence->repetitions;
         }
 
         // need to calculate, this depends on the repetition:
-        if (null !== $recurrence->repeat_until && 0 === (int)$recurrence->repetitions) {
+        if (null !== $recurrence->repeat_until && 0 === (int) $recurrence->repetitions) {
             $occurrences = $this->getOccurrencesInRange($repetition, $recurrence->first_date ?? today(), $recurrence->repeat_until);
 
             return count($occurrences);

app/Repositories/User/UserRepository.php

@@ -276,6 +276,7 @@ class UserRepository implements UserRepositoryInterface
         $invitee->email       = $email;
         $invitee->redeemed    = false;
         $invitee->expires     = $now;
+        $invitee->expires_tz  = $now->format('e');
         $invitee->save();
 
         return $invitee;

app/Repositories/UserGroups/Account/AccountRepository.php

@@ -298,34 +298,38 @@ class AccountRepository implements AccountRepositoryInterface
         return $query->get(['accounts.*']);
     }
 
-    public function searchAccount(array $query, array $types, int $limit): Collection
+    public function searchAccount(string $query, array $types, int $page, int $limit): Collection
     {
         // search by group, not by user
         $dbQuery = $this->userGroup->accounts()
             ->where('active', true)
+            ->orderBy('accounts.updated_at', 'ASC')
             ->orderBy('accounts.order', 'ASC')
             ->orderBy('accounts.account_type_id', 'ASC')
             ->orderBy('accounts.name', 'ASC')
             ->with(['accountType'])
         ;
-        if (count($query) > 0) {
-            // split query on spaces just in case:
+
+        // split query on spaces just in case:
+        if ('' !== trim($query)) {
             $dbQuery->where(function (EloquentBuilder $q) use ($query): void {
-                foreach ($query as $line) {
-                    $parts = explode(' ', $line);
-                    foreach ($parts as $part) {
-                        $search = sprintf('%%%s%%', $part);
-                        $q->orWhereLike('name', $search);
-                    }
+                $parts = explode(' ', $query);
+                foreach ($parts as $part) {
+                    $search = sprintf('%%%s%%', $part);
+                    $q->orWhereLike('name', $search);
                 }
             });
         }
+
         if (0 !== count($types)) {
             $dbQuery->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
             $dbQuery->whereIn('account_types.type', $types);
         }
 
-        return $dbQuery->take($limit)->get(['accounts.*']);
+        $dbQuery->skip(($page - 1) * $limit)->take($limit);
+
+        return $dbQuery->get(['accounts.*']);
+
     }
 
     #[\Override]

app/Repositories/UserGroups/Account/AccountRepositoryInterface.php

@@ -80,7 +80,7 @@ interface AccountRepositoryInterface
      */
     public function resetAccountOrder(): void;
 
-    public function searchAccount(array $query, array $types, int $limit): Collection;
+    public function searchAccount(string $query, array $types, int $page, int $limit): Collection;
 
     public function setUser(User $user): void;
 

app/Rules/Account/IsUniqueAccount.php

@@ -105,10 +105,12 @@ class IsUniqueAccount implements ValidationRule, DataAwareRule
     /**
      * TODO duplicate from old validation class.
      */
-    private function validateAccountAnonymously(): void
+    private function validateAccountAnonymously(): bool
     {
         if (!array_key_exists('user_id', $this->data)) {
             $this->fail('No user ID provided.');
+
+            return false;
         }
 
         /** @var User $user */

app/Services/Internal/Support/CreditRecalculateService.php

@@ -161,7 +161,7 @@ class CreditRecalculateService
         app('log')->debug(sprintf('Now processing account #%d ("%s"). All amounts with 2 decimals!', $account->id, $account->name));
         // get opening balance (if present)
         $this->repository->setUser($account->user);
-        $direction      = (string)$this->repository->getMetaValue($account, 'liability_direction');
+        $direction      = (string) $this->repository->getMetaValue($account, 'liability_direction');
         $openingBalance = $this->repository->getOpeningBalance($account);
         if (null !== $openingBalance) {
             app('log')->debug(sprintf('Found opening balance transaction journal #%d', $openingBalance->id));
@@ -242,6 +242,15 @@ class CreditRecalculateService
     private function processTransaction(Account $account, string $direction, Transaction $transaction, string $leftOfDebt): string
     {
         $journal         = $transaction->transactionJournal;
+
+        // here be null pointers.
+        if (null === $journal) {
+            app('log')->warning(sprintf('Transaction #%d has no journal.', $transaction->id));
+
+            return $leftOfDebt;
+        }
+
+
         $foreignCurrency = $transaction->foreignCurrency;
         $accountCurrency = $this->repository->getAccountCurrency($account);
         $type            = $journal->transactionType->type;

app/Services/Internal/Support/RecurringTransactionTrait.php

@@ -40,6 +40,7 @@ use FireflyIII\Models\RecurrenceTransaction;
 use FireflyIII\Models\RecurrenceTransactionMeta;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Validation\AccountValidator;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Trait RecurringTransactionTrait
@@ -212,10 +213,14 @@ trait RecurringTransactionTrait
 
     private function setBudget(RecurrenceTransaction $transaction, int $budgetId): void
     {
+        Log::debug(sprintf('Now in %s', __METHOD__));
         $budgetFactory = app(BudgetFactory::class);
         $budgetFactory->setUser($transaction->recurrence->user);
         $budget        = $budgetFactory->find($budgetId, null);
         if (null === $budget) {
+            // remove budget from recurring transaction:
+            $transaction->recurrenceTransactionMeta()->where('name', 'budget_id')->delete();
+
             return;
         }
 
@@ -235,6 +240,9 @@ trait RecurringTransactionTrait
         $billFactory->setUser($transaction->recurrence->user);
         $bill        = $billFactory->find($billId, null);
         if (null === $bill) {
+            // remove bill from recurring transaction:
+            $transaction->recurrenceTransactionMeta()->where('name', 'bill_id')->delete();
+
             return;
         }
 

app/Services/Internal/Update/BillUpdateService.php

@@ -145,7 +145,8 @@ class BillUpdateService
             $bill->amount_max = $data['amount_max'];
         }
         if (array_key_exists('date', $data) && '' !== (string)$data['date']) {
-            $bill->date = $data['date'];
+            $bill->date    = $data['date'];
+            $bill->date_tz = $data['date']->format('e');
         }
         if (array_key_exists('repeat_freq', $data) && '' !== (string)$data['repeat_freq']) {
             $bill->repeat_freq = $data['repeat_freq'];
@@ -157,10 +158,12 @@ class BillUpdateService
             $bill->active = $data['active'];
         }
         if (array_key_exists('end_date', $data)) {
-            $bill->end_date = $data['end_date'];
+            $bill->end_date    = $data['end_date'];
+            $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    = $data['extension_date'];
+            $bill->extension_date_tz = $data['extension_date']?->format('e');
         }
 
         $bill->match     = 'EMPTY';

app/Services/Internal/Update/JournalUpdateService.php

@@ -490,6 +490,7 @@ class JournalUpdateService
                 }
                 // do some parsing.
                 app('log')->debug(sprintf('Create date value from string "%s".', $value));
+                $this->transactionJournal->date_tz = $value->format('e');
             }
             event(
                 new TriggeredAuditLog(
@@ -610,6 +611,13 @@ class JournalUpdateService
                     'data'    => $value,
                 ];
                 $factory->updateOrCreate($set);
+                // also set date with timezone.
+                $set = [
+                    'journal' => $this->transactionJournal,
+                    'name'    => sprintf('%s_tz', $field),
+                    'data'    => $value?->format('e'),
+                ];
+                $factory->updateOrCreate($set);
             }
         }
     }

app/Services/Internal/Update/RecurrenceUpdateService.php

@@ -64,11 +64,13 @@ class RecurrenceUpdateService
                 $recurrence->description = $info['description'];
             }
             if (array_key_exists('first_date', $info)) {
-                $recurrence->first_date = $info['first_date'];
+                $recurrence->first_date    = $info['first_date'];
+                $recurrence->first_date_tz = $info['first_date']?->format('e');
             }
             if (array_key_exists('repeat_until', $info)) {
-                $recurrence->repeat_until = $info['repeat_until'];
-                $recurrence->repetitions  = 0;
+                $recurrence->repeat_until    = $info['repeat_until'];
+                $recurrence->repeat_until_tz = $info['repeat_until']?->format('e');
+                $recurrence->repetitions     = 0;
             }
             if (array_key_exists('nr_of_repetitions', $info)) {
                 if (0 !== (int)$info['nr_of_repetitions']) {

app/Support/Binder/EitherConfigKey.php

@@ -39,7 +39,6 @@ class EitherConfigKey
 
             // firefly iii settings
             'firefly.version',
-            'firefly.api_version',
             'firefly.default_location',
             'firefly.account_to_transaction',
             'firefly.allowed_opposing_types',

app/Support/Cronjobs/RecurringCronjob.php

@@ -77,9 +77,7 @@ class RecurringCronjob extends AbstractCronjob
     {
         app('log')->info(sprintf('Will now fire recurring cron job task for date "%s".', $this->date->format('Y-m-d H:i:s')));
 
-        /** @var CreateRecurringTransactions $job */
-        $job                = app(CreateRecurringTransactions::class);
-        $job->setDate($this->date);
+        $job                = new CreateRecurringTransactions($this->date);
         $job->setForce($this->force);
         $job->handle();
 

app/Support/Http/Api/AccountFilter.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Support\Http\Api;
 
+use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Models\AccountType;
 
 /**
@@ -32,7 +33,7 @@ trait AccountFilter
 {
     protected array $types = [
         'all'                        => [
-            AccountType::DEFAULT,
+            AccountTypeEnum::DEFAULT->value,
             AccountType::CASH,
             AccountType::ASSET,
             AccountType::EXPENSE,

app/Support/Http/Api/CollectsAccountsFromFilter.php

@@ -36,10 +36,12 @@ trait CollectsAccountsFromFilter
         $collection = new Collection();
 
         // always collect from the query parameter, even when it's empty.
-        foreach ($queryParameters['accounts'] as $accountId) {
-            $account = $this->repository->find((int) $accountId);
-            if (null !== $account) {
-                $collection->push($account);
+        if (null !== $queryParameters['accounts']) {
+            foreach ($queryParameters['accounts'] as $accountId) {
+                $account = $this->repository->find((int) $accountId);
+                if (null !== $account) {
+                    $collection->push($account);
+                }
             }
         }
 

app/Support/Http/Controllers/ModelInformation.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Support\Http\Controllers;
 
+use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Bill;
@@ -84,9 +85,9 @@ trait ModelInformation
         /** @var AccountType $mortgage */
         $mortgage       = $repository->getAccountTypeByType(AccountType::MORTGAGE);
         $liabilityTypes = [
-            $debt->id     => (string)trans(sprintf('firefly.account_type_%s', AccountType::DEBT)),
-            $loan->id     => (string)trans(sprintf('firefly.account_type_%s', AccountType::LOAN)),
-            $mortgage->id => (string)trans(sprintf('firefly.account_type_%s', AccountType::MORTGAGE)),
+            $debt->id     => (string)trans(sprintf('firefly.account_type_%s', AccountTypeEnum::DEBT->value)),
+            $loan->id     => (string)trans(sprintf('firefly.account_type_%s', AccountTypeEnum::LOAN->value)),
+            $mortgage->id => (string)trans(sprintf('firefly.account_type_%s', AccountTypeEnum::MORTGAGE->value)),
         ];
         asort($liabilityTypes);
 

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();

app/Support/Models/AccountBalanceCalculator.php

@@ -24,10 +24,10 @@ declare(strict_types=1);
 namespace FireflyIII\Support\Models;
 
 use Carbon\Carbon;
-use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountBalance;
 use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
@@ -47,20 +47,15 @@ class AccountBalanceCalculator
     }
 
     /**
-     * Recalculate all balances.
+     * Recalculate all account and transaction balances.
      */
-    public static function forceRecalculateAll(): void
-    {
-        Transaction::whereNull('deleted_at')->update(['balance_dirty' => true]);
-        $object = new self();
-        $object->optimizedCalculation(new Collection());
-    }
-
-    /**
-     * Recalculate all balances.
-     */
-    public static function recalculateAll(): void
+    public static function recalculateAll(bool $forced): void
     {
+        if ($forced) {
+            Transaction::whereNull('deleted_at')->update(['balance_dirty' => true]);
+            // also delete account balances.
+            AccountBalance::whereNotNull('created_at')->delete();
+        }
         $object = new self();
         $object->optimizedCalculation(new Collection());
     }
@@ -130,12 +125,6 @@ class AccountBalanceCalculator
     private function optimizedCalculation(Collection $accounts, ?Carbon $notBefore = null): void
     {
         Log::debug('start of optimizedCalculation');
-        if (false === config('firefly.feature_flags.running_balance_column')) {
-            Log::debug('optimizedCalculation is disabled, return.');
-
-            return;
-        }
-
         if ($accounts->count() > 0) {
             Log::debug(sprintf('Limited to %d account(s)', $accounts->count()));
         }
@@ -162,14 +151,17 @@ class AccountBalanceCalculator
 
         $set      = $query->get(['transactions.id', 'transactions.balance_dirty', 'transactions.transaction_currency_id', 'transaction_journals.date', 'transactions.account_id', 'transactions.amount']);
 
+        // the balance value is an array.
+        // first entry is the balance, second is the date.
+
         /** @var Transaction $entry */
         foreach ($set as $entry) {
             // start with empty array:
             $balances[$entry->account_id]                                  ??= [];
-            $balances[$entry->account_id][$entry->transaction_currency_id] ??= $this->getLatestBalance($entry->account_id, $entry->transaction_currency_id, $notBefore);
+            $balances[$entry->account_id][$entry->transaction_currency_id] ??= [$this->getLatestBalance($entry->account_id, $entry->transaction_currency_id, $notBefore), null];
 
             // before and after are easy:
-            $before                                                        = $balances[$entry->account_id][$entry->transaction_currency_id];
+            $before                                                        = $balances[$entry->account_id][$entry->transaction_currency_id][0];
             $after                                                         = bcadd($before, $entry->amount);
             if (true === $entry->balance_dirty || $accounts->count() > 0) {
                 // update the transaction:
@@ -181,12 +173,13 @@ class AccountBalanceCalculator
             }
 
             // then update the array:
-            $balances[$entry->account_id][$entry->transaction_currency_id] = $after;
+            $balances[$entry->account_id][$entry->transaction_currency_id] = [$after, $entry->date];
         }
         Log::debug(sprintf('end of optimizedCalculation, corrected %d balance(s)', $count));
         // then update all transactions.
 
-        // ?? something with accounts?
+        // save all collected balances in their respective account objects.
+        $this->storeAccountBalances($balances);
     }
 
     private function getAccountBalanceByJournal(string $title, int $account, int $journal, int $currency): AccountBalance
@@ -208,145 +201,49 @@ class AccountBalanceCalculator
         return $entry;
     }
 
-    private function recalculateLatest(?Account $account): void
+    private function storeAccountBalances(array $balances): void
     {
-        $query  = Transaction::groupBy(['transactions.account_id', 'transactions.transaction_currency_id', 'transactions.foreign_currency_id']);
+        /**
+         * @var int   $accountId
+         * @var array $currencies
+         */
+        foreach ($balances as $accountId => $currencies) {
+            /** @var Account $account */
+            $account = Account::find($accountId);
+            if (null === $account) {
+                Log::error(sprintf('Could not find account #%d, will not save account balance.', $accountId));
 
-        if (null !== $account) {
-            $query->where('transactions.account_id', $account->id);
-        }
-        $result = $query->get(['transactions.account_id', 'transactions.transaction_currency_id', 'transactions.foreign_currency_id', \DB::raw('SUM(transactions.amount) as sum_amount'), \DB::raw('SUM(transactions.foreign_amount) as sum_foreign_amount')]);
-
-        // reset account balances:
-        $this->resetAccountBalancesByAccount('balance', $account);
-
-        /** @var \stdClass $row */
-        foreach ($result as $row) {
-            $account             = (int) $row->account_id;
-            $transactionCurrency = (int) $row->transaction_currency_id;
-            $foreignCurrency     = (int) $row->foreign_currency_id;
-            $sumAmount           = (string) $row->sum_amount;
-            $sumForeignAmount    = (string) $row->sum_foreign_amount;
-            $sumAmount           = '' === $sumAmount ? '0' : $sumAmount;
-            $sumForeignAmount    = '' === $sumForeignAmount ? '0' : $sumForeignAmount;
-
-            // at this point SQLite may return scientific notation because why not. Terrible.
-            $sumAmount           = app('steam')->floatalize($sumAmount);
-            $sumForeignAmount    = app('steam')->floatalize($sumForeignAmount);
-
-            // first create for normal currency:
-            $entry               = $this->getAccountBalanceByAccount($account, $transactionCurrency);
-
-            try {
-                $entry->balance = bcadd((string) $entry->balance, $sumAmount);
-            } catch (\ValueError $e) {
-                $message = sprintf('[a] Could not add "%s" to "%s": %s', $entry->balance, $sumAmount, $e->getMessage());
-                Log::error($message);
-
-                throw new FireflyException($message, 0, $e);
+                continue;
             }
-            $entry->save();
 
-            // then do foreign amount, if present:
-            if ($foreignCurrency > 0) {
-                $entry = $this->getAccountBalanceByAccount($account, $foreignCurrency);
+            /**
+             * @var int   $currencyId
+             * @var array $balance
+             */
+            foreach ($currencies as $currencyId => $balance) {
+                /** @var TransactionCurrency $currency */
+                $currency        = TransactionCurrency::find($currencyId);
+                if (null === $currency) {
+                    Log::error(sprintf('Could not find currency #%d, will not save account balance.', $currencyId));
 
-                try {
-                    $entry->balance = bcadd((string) $entry->balance, $sumForeignAmount);
-                } catch (\ValueError $e) {
-                    $message = sprintf('[b] Could not add "%s" to "%s": %s', $entry->balance, $sumForeignAmount, $e->getMessage());
-                    Log::error($message);
-
-                    throw new FireflyException($message, 0, $e);
+                    continue;
                 }
-                $entry->save();
+
+                /** @var AccountBalance $object */
+                $object          = $account->accountBalances()->firstOrCreate(
+                    [
+                        'title'                   => 'running_balance',
+                        'balance'                 => '0',
+                        'transaction_currency_id' => $currencyId,
+                        'date'                    => $balance[1],
+                        'date_tz'                 => $balance[1]?->format('e'),
+                    ]
+                );
+                $object->balance = $balance[0];
+                $object->date    = $balance[1];
+                $object->date_tz = $balance[1]?->format('e');
+                $object->save();
             }
         }
-        Log::debug(sprintf('Recalculated %d account balance(s)', $result->count()));
-    }
-
-    private function resetAccountBalancesByAccount(string $title, ?Account $account): void
-    {
-        if (null === $account) {
-            $count = AccountBalance::whereNotNull('updated_at')->where('title', $title)->update(['balance' => '0']);
-            Log::debug(sprintf('Set %d account balance(s) to zero.', $count));
-
-            return;
-        }
-        $count = AccountBalance::where('account_id', $account->id)->where('title', $title)->update(['balance' => '0']);
-        Log::debug(sprintf('Set %d account balance(s) of account #%d to zero.', $count, $account->id));
-    }
-
-    /**
-     * Als je alles opnieuw doet, verzamel je alle transactions en het bedrag en zet je dat neer als "balance after
-     * journal". Dat betekent, netjes op volgorde van datum en doorrekenen.
-     *
-     * Zodra je een transaction journal verplaatst (datum) moet je dat journal en alle latere journals opnieuw doen.
-     * Maar dan moet je van de account wel een beginnetje hebben, namelijk de balance tot en met dat moment.
-     *
-     *  1. Dus dan search je eerst naar die SUM, som alle transactions eerder dan (niet inclusief) de journal.
-     *  2. En vanaf daar pak je alle journals op of na de journal (dus ook de journal zelf) en begin je door te tellen.
-     *  3. Elke voorbij gaande journal entry "balance_after_journal" geef je een update of voeg je toe.
-     */
-    private function recalculateJournals(?Account $account, ?TransactionJournal $transactionJournal): void
-    {
-        $query   = Transaction::groupBy(['transactions.account_id', 'transaction_journals.id', 'transactions.transaction_currency_id', 'transactions.foreign_currency_id']);
-        $query->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id');
-        $query->orderBy('transaction_journals.date', 'asc');
-        $amounts = [];
-        if (null !== $account) {
-            $query->where('transactions.account_id', $account->id);
-        }
-        if (null !== $account && null !== $transactionJournal) {
-            $query->where('transaction_journals.date', '>=', $transactionJournal->date);
-            $amounts = $this->getStartAmounts($account, $transactionJournal);
-        }
-        $result  = $query->get(['transactions.account_id', 'transaction_journals.id', 'transactions.transaction_currency_id', 'transactions.foreign_currency_id', \DB::raw('SUM(transactions.amount) as sum_amount'), \DB::raw('SUM(transactions.foreign_amount) as sum_foreign_amount')]);
-
-        /** @var \stdClass $row */
-        foreach ($result as $row) {
-            $account                                 = (int) $row->account_id;
-            $transactionCurrency                     = (int) $row->transaction_currency_id;
-            $foreignCurrency                         = (int) $row->foreign_currency_id;
-            $sumAmount                               = (string) $row->sum_amount;
-            $sumForeignAmount                        = (string) $row->sum_foreign_amount;
-            $journalId                               = (int) $row->id;
-
-            // check for empty strings
-            $sumAmount                               = '' === $sumAmount ? '0' : $sumAmount;
-            $sumForeignAmount                        = '' === $sumForeignAmount ? '0' : $sumForeignAmount;
-
-            // new amounts:
-            $amounts[$account][$transactionCurrency] = bcadd($amounts[$account][$transactionCurrency] ?? '0', $sumAmount);
-            $amounts[$account][$foreignCurrency]     = bcadd($amounts[$account][$foreignCurrency] ?? '0', $sumForeignAmount);
-
-            // first create for normal currency:
-            $entry                                   = self::getAccountBalanceByJournal('balance_after_journal', $account, $journalId, $transactionCurrency);
-            $entry->balance                          = $amounts[$account][$transactionCurrency];
-            $entry->save();
-
-            // then do foreign amount, if present:
-            if ($foreignCurrency > 0) {
-                $entry          = self::getAccountBalanceByJournal('balance_after_journal', $account, $journalId, $foreignCurrency);
-                $entry->balance = $amounts[$account][$foreignCurrency];
-                $entry->save();
-            }
-        }
-
-        // select transactions.account_id, transaction_journals.id, transactions.transaction_currency_id, transactions.foreign_currency_id, sum(transactions.amount), sum(transactions.foreign_amount)
-        //
-        // from transactions
-        //
-        // left join transaction_journals ON transaction_journals.id = transactions.transaction_journal_id
-        //
-        // group by account_id, transaction_journals.id, transaction_currency_id, foreign_currency_id
-        // order by transaction_journals.date desc
-    }
-
-    private function getStartAmounts(Account $account, TransactionJournal $journal): array
-    {
-        exit('here we are 1');
-
-        return [];
     }
 }

app/Support/Request/ConvertsDataTypes.php

@@ -105,11 +105,11 @@ trait ConvertsDataTypes
     /**
      * Return string value.
      */
-    public function convertString(string $field): string
+    public function convertString(string $field, string $default = ''): string
     {
         $entry = $this->get($field);
         if (!is_scalar($entry)) {
-            return '';
+            return $default;
         }
 
         return (string)$this->clearString((string)$entry);

app/TransactionRules/Actions/UpdatePiggybank.php

@@ -81,7 +81,7 @@ class UpdatePiggybank implements ActionInterface
 
         if ($source->account_id === $piggyBank->account_id) {
             app('log')->debug('Piggy bank account is linked to source, so remove amount from piggy bank.');
-            $this->removeAmount($piggyBank, $journalObj, $destination->amount);
+            $this->removeAmount($piggyBank, $journal, $journalObj, $destination->amount);
 
             event(
                 new TriggeredAuditLog(
@@ -102,7 +102,7 @@ class UpdatePiggybank implements ActionInterface
         }
         if ($destination->account_id === $piggyBank->account_id) {
             app('log')->debug('Piggy bank account is linked to source, so add amount to piggy bank.');
-            $this->addAmount($piggyBank, $journalObj, $destination->amount);
+            $this->addAmount($piggyBank, $journal, $journalObj, $destination->amount);
 
             event(
                 new TriggeredAuditLog(
@@ -111,10 +111,11 @@ class UpdatePiggybank implements ActionInterface
                     'add_to_piggy',
                     null,
                     [
-                        'currency_symbol' => $journalObj->transactionCurrency->symbol,
-                        'decimal_places'  => $journalObj->transactionCurrency->decimal_places,
-                        'amount'          => $destination->amount,
-                        'piggy'           => $piggyBank->name,
+                        'currency_symbol'    => $journalObj->transactionCurrency->symbol,
+                        'decimal_places'     => $journalObj->transactionCurrency->decimal_places,
+                        'amount'             => $destination->amount,
+                        'piggy'              => $piggyBank->name,
+                        'piggy_id'           => $piggyBank->id,
                     ]
                 )
             );
@@ -138,7 +139,7 @@ class UpdatePiggybank implements ActionInterface
         return $user->piggyBanks()->where('piggy_banks.name', $name)->first();
     }
 
-    private function removeAmount(PiggyBank $piggyBank, TransactionJournal $journal, string $amount): void
+    private function removeAmount(PiggyBank $piggyBank, array $array, TransactionJournal $journal, string $amount): void
     {
         $repository = app(PiggyBankRepositoryInterface::class);
         $repository->setUser($journal->user);
@@ -154,6 +155,7 @@ class UpdatePiggybank implements ActionInterface
         // if amount is zero, stop.
         if (0 === bccomp('0', $amount)) {
             app('log')->warning('Amount left is zero, stop.');
+            event(new RuleActionFailedOnArray($this->action, $array, trans('rules.cannot_remove_zero_piggy', ['name' => $piggyBank->name])));
 
             return;
         }
@@ -161,6 +163,7 @@ class UpdatePiggybank implements ActionInterface
         // make sure we can remove amount:
         if (false === $repository->canRemoveAmount($piggyBank, $amount)) {
             app('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])));
 
             return;
         }
@@ -169,7 +172,7 @@ class UpdatePiggybank implements ActionInterface
         $repository->removeAmount($piggyBank, $amount, $journal);
     }
 
-    private function addAmount(PiggyBank $piggyBank, TransactionJournal $journal, string $amount): void
+    private function addAmount(PiggyBank $piggyBank, array $array, TransactionJournal $journal, string $amount): void
     {
         $repository = app(PiggyBankRepositoryInterface::class);
         $repository->setUser($journal->user);
@@ -190,6 +193,7 @@ class UpdatePiggybank implements ActionInterface
         // if amount is zero, stop.
         if (0 === bccomp('0', $amount)) {
             app('log')->warning('Amount left is zero, stop.');
+            event(new RuleActionFailedOnArray($this->action, $array, trans('rules.cannot_add_zero_piggy', ['name' => $piggyBank->name])));
 
             return;
         }
@@ -197,6 +201,7 @@ class UpdatePiggybank implements ActionInterface
         // make sure we can add amount:
         if (false === $repository->canAddAmount($piggyBank, $amount)) {
             app('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])));
 
             return;
         }

app/Transformers/BillTransformer.php

@@ -194,11 +194,19 @@ class BillTransformer extends AbstractTransformer
         $searchStart  = clone $start;
         $start->subDay();
 
-        app('log')->debug(sprintf('Parameters are start: %s end: %s', $start->format('Y-m-d'), $this->parameters->get('end')->format('Y-m-d')));
+        /** @var Carbon $end */
+        $end          = clone $this->parameters->get('end');
+        $searchEnd    = clone $end;
+
+        // move the search dates to the start of the day.
+        $searchStart->startOfDay();
+        $searchEnd->endOfDay();
+
+        app('log')->debug(sprintf('Parameters are start: %s end: %s', $start->format('Y-m-d'), $end->format('Y-m-d')));
         app('log')->debug(sprintf('Search parameters are: start: %s', $searchStart->format('Y-m-d')));
 
         // Get from database when bill was paid.
-        $set          = $this->repository->getPaidDatesInRange($bill, $searchStart, $this->parameters->get('end'));
+        $set          = $this->repository->getPaidDatesInRange($bill, $searchStart, $searchEnd);
         app('log')->debug(sprintf('Count %d entries in getPaidDatesInRange()', $set->count()));
 
         // Grab from array the most recent payment. If none exist, fall back to the start date and pretend *that* was the last paid date.

app/Validation/FireflyValidator.php

@@ -847,7 +847,8 @@ class FireflyValidator extends Validator
                 ->where('trigger', $trigger)
                 ->where('response', $response)
                 ->where('delivery', $delivery)
-                ->where('url', $url)->count();
+                ->where('url', $url)->count()
+            ;
         }
 
         return false;

changelog.md

@@ -3,6 +3,40 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 6.1.22 - 2024-11-07
+
+### Added
+
+- [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
+
+- [Issue 9282](https://github.com/firefly-iii/firefly-iii/issues/9282) (Default report - no transactions for no budget) reported by @rymrg 
+- [Issue 9147](https://github.com/firefly-iii/firefly-iii/issues/9147) (Store/Update Bill API end_date and extension_date cant be null in request) reported by @jkano
+- [Issue 9175](https://github.com/firefly-iii/firefly-iii/issues/9175) ("Attempt to read property "type" on null" when mass editing transactions) reported by @Still34
+- [Issue 9225](https://github.com/firefly-iii/firefly-iii/issues/9225) (Liability amount due calculated incorrectly on liabilities list when the liability is settled with a transfer to another liability) reported by @uumas
+- [Issue 9236](https://github.com/firefly-iii/firefly-iii/issues/9236) (Autocomplete not working for rrules having the bill as a trigger) reported by @pvieira84
+- [Issue 9305](https://github.com/firefly-iii/firefly-iii/issues/9305) (Recurring transactions get group title on overview page) reported by @zeitwidrig
+- [Issue 9106](https://github.com/firefly-iii/firefly-iii/issues/9106) (Inactive accounts are inaccessible when no active accounts of that type exist) reported by @codemicro
+- [Discussion 9324](https://github.com/orgs/firefly-iii/discussions/9324) (Consistent behavior accross DB Engines) started by @stackcoder
+- [Issue 9360](https://github.com/firefly-iii/firefly-iii/issues/9360) (Date incorrectly shown) reported by @enboig
+- [Issue 9303](https://github.com/firefly-iii/firefly-iii/issues/9303) (Rules > Rule > Action) reported by @EricVanCaenenberghe
+- [Issue 9416](https://github.com/firefly-iii/firefly-iii/issues/9416) (Linking Transaction to Bill doesn't mark as paid for 31st) reported by @harrhunt
+- [Issue 9389](https://github.com/firefly-iii/firefly-iii/issues/9389) (Budget and Bill field on Recurring transactions not updating) reported by @HHUBSS
+- [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
+
+- API version is no longer distinguished from Firefly III version. API jumps from v2.1.0 to v6.1.22
+- API v2 is cleaned up and misses a few previously available endpoints. They will be added in the future.
+- [Discussion 9271](https://github.com/orgs/firefly-iii/discussions/9271) (/v2/chart/balance/balance ignoring the `period` parameter) started by @victorbalssa
+
 ## 6.1.21 - 2024-09-30
 
 ### Added

config/firefly.php

@@ -110,9 +110,9 @@ return [
         'running_balance_column' => env('USE_RUNNING_BALANCE', false),
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'develop/2024-10-14',
-    'api_version'                  => '2.1.0',
-    'db_version'                   => 24,
+    'version'                      => 'develop/2024-11-08',
+    'api_version'                  => '2.1.0', // field is no longer used.
+    'db_version'                   => 25,
 
     // generic settings
     'maxUploadSize'                => 1073741824, // 1 GB

database/migrations/2024_11_05_062108_add_date_tz_columns.php

@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\QueryException;
+use Illuminate\Database\Schema\Blueprint;
+
+return new class () extends Migration {
+    private array $tables;
+
+    public function __construct()
+    {
+        $this->tables = [
+            'account_balances'        => ['date'], // done
+            'available_budgets'       => ['start_date', 'end_date'], // done
+            'bills'                   => ['date', 'end_date', 'extension_date'], // done
+            'budget_limits'           => ['start_date', 'end_date'], // done
+            'currency_exchange_rates' => ['date'], // done
+            'invited_users'           => ['expires'],
+            'piggy_bank_events'       => ['date'],
+            'piggy_bank_repetitions'  => ['startdate', 'targetdate'],
+            'piggy_banks'             => ['startdate', 'targetdate'], // done
+            'recurrences'             => ['first_date', 'repeat_until', 'latest_date'],
+            'tags'                    => ['date'],
+            'transaction_journals'    => ['date'],
+        ];
+    }
+
+    /**
+     * Run the migrations.
+     * TODO journal_meta, all date fields?
+     */
+    public function up(): void
+    {
+        foreach ($this->tables as $table => $columns) {
+            foreach ($columns as $column) {
+                $newColumn = sprintf('%s_tz', $column);
+                if (Schema::hasColumn($table, $column) && !Schema::hasColumn($table, $newColumn)) {
+                    try {
+                        Schema::table(
+                            $table,
+                            static function (Blueprint $table) use ($column, $newColumn): void {
+                                $table->string($newColumn, 50)->nullable()->after($column);
+                            }
+                        );
+                    } catch (QueryException $e) {
+                        app('log')->error(sprintf('Could not add column "%s" to table "%s" query: %s', $newColumn, $table, $e->getMessage()));
+                        app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void {}
+};

public/v1/js/ff/common/autocomplete.js

@@ -131,7 +131,7 @@ function initRevenueACField(fieldName) {
                                              }
                                          });
         sourceNames.initialize();
-        $('input[name="' + fieldName + '"]').typeahead({hint: true, highlight: true,}, {source: sourceNames, displayKey: 'name', autoSelect: false});
+        $('input[name="' + fieldName + '"]').typeahead({hint: true, highlight: true,}, {source: sourceNames, displayKey: 'name', autoselect: true});
     }
 }
 
@@ -161,5 +161,5 @@ function initCategoryAC() {
                                         }
                                     });
     categories.initialize();
-    $('input[name="category"]').typeahead({hint: true, highlight: true,}, {source: categories, displayKey: 'name', autoSelect: false});
+    $('input[name="category"]').typeahead({hint: true, highlight: true,}, {source: categories, displayKey: 'name', autoselect: true});
 }

public/v1/js/lib/typeahead/bloodhound.js

@@ -1,7 +1,7 @@
 /*!
- * typeahead.js 1.3.1
+ * typeahead.js 1.3.3
  * https://github.com/corejavascript/typeahead.js
- * Copyright 2013-2020 Twitter, Inc. and other contributors; Licensed MIT
+ * Copyright 2013-2024 Twitter, Inc. and other contributors; Licensed MIT
  */
 
 
@@ -159,7 +159,7 @@
             noop: function() {}
         };
     }();
-    var VERSION = "1.3.1";
+    var VERSION = "1.3.3";
     var tokenizers = function() {
         "use strict";
         return {

public/v1/js/lib/typeahead/typeahead.bundle.js

@@ -1,7 +1,7 @@
 /*!
- * typeahead.js 1.3.1
+ * typeahead.js 1.3.3
  * https://github.com/corejavascript/typeahead.js
- * Copyright 2013-2020 Twitter, Inc. and other contributors; Licensed MIT
+ * Copyright 2013-2024 Twitter, Inc. and other contributors; Licensed MIT
  */
 
 
@@ -159,7 +159,7 @@
             noop: function() {}
         };
     }();
-    var VERSION = "1.3.1";
+    var VERSION = "1.3.3";
     var tokenizers = function() {
         "use strict";
         return {
@@ -1446,6 +1446,7 @@
             });
             this.$input.attr({
                 "aria-owns": id + "_listbox",
+                "aria-controls": id + "_listbox",
                 role: "combobox",
                 "aria-autocomplete": "list",
                 "aria-expanded": false

public/v1/js/lib/typeahead/typeahead.jquery.js

@@ -1,7 +1,7 @@
 /*!
- * typeahead.js 1.3.1
+ * typeahead.js 1.3.3
  * https://github.com/corejavascript/typeahead.js
- * Copyright 2013-2020 Twitter, Inc. and other contributors; Licensed MIT
+ * Copyright 2013-2024 Twitter, Inc. and other contributors; Licensed MIT
  */
 
 
@@ -499,6 +499,7 @@
             });
             this.$input.attr({
                 "aria-owns": id + "_listbox",
+                "aria-controls": id + "_listbox",
                 role: "combobox",
                 "aria-autocomplete": "list",
                 "aria-expanded": false

resources/assets/v2/package.json

@@ -29,7 +29,7 @@
         "bootstrap5-tags": "^1.7",
         "chart.js": "^4.4.0",
         "chartjs-adapter-date-fns": "^3.0.0",
-        "chartjs-chart-sankey": "^0.12.1",
+        "chartjs-chart-sankey": "^0.13.0",
         "date-fns": "^4.0.0",
         "i18next": "^23.15.2",
         "i18next-chained-backend": "^4.6.2",

resources/lang/en_US/firefly.php

@@ -755,7 +755,7 @@ return [
     'instructions_rule_from_journal'                              => 'Create a rule based on one of your transactions. Complement or submit the form below.',
     'rule_is_strict'                                              => 'strict rule',
     'rule_is_not_strict'                                          => 'non-strict rule',
-    'rule_help_stop_processing'                                   => 'When you check this box, later rules in this group will not be executed.',
+    'rule_help_stop_processing'                                   => 'When you check this box, later rules in this group will not be executed if this particular rule is executed.',
     'rule_help_strict'                                            => 'In strict rules ALL triggers must fire for the action(s) to be executed. In non-strict rules, ANY trigger is enough for the action(s) to be executed.',
     'rule_help_active'                                            => 'Inactive rules will never fire.',
     'stored_new_rule'                                             => 'Stored new rule with title ":title"',
@@ -2627,6 +2627,7 @@ return [
     'no_bills_create_default'                                     => 'Create a bill',
 
     // recurring transactions
+    'recurrence_max_count'                                        => 'This recurring transactions will be created at most :max time(s), and has been created :count time(s) already.',
     'create_right_now'                                            => 'Create right now',
     'no_new_transaction_in_recurrence'                            => 'No new transaction was created. Perhaps it was already fired for this date?',
     'recurrences'                                                 => 'Recurring transactions',

resources/lang/en_US/rules.php

@@ -71,4 +71,8 @@ return [
     'cannot_find_category'                        => 'Firefly III can\'t find category ":name"',
     '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_add_zero_piggy'                       => 'Cannot add zero amount to piggy bank ":name"',
+    'cannot_add_to_piggy'                         => 'Cannot add ":amount" to piggy bank ":name"',
 ];

resources/views/javascript/variables.twig

@@ -1,12 +1,12 @@
 // date ranges
 var ranges = {};
 {% for title, range in dateRangeConfig.ranges %}
-    ranges["{{ title }}"] = [moment("{{ range[0].format('Y-m-d') }}"), moment("{{ range[1].format('Y-m-d') }}")];
+    ranges["{{ title|escape('js') }}"] = [moment("{{ range[0].format('Y-m-d') }}"), moment("{{ range[1].format('Y-m-d') }}")];
 {% endfor %}
 
 // date range meta configuration
 var dateRangeMeta = {
-title: "{{ dateRangeTitle }}",
+title: "{{ dateRangeTitle|escape('js') }}",
 url: "{{ route('daterange') }}",
 labels: {
 apply: "{{ 'apply'|_ }}",

resources/views/list/ale.twig

@@ -93,10 +93,10 @@
                     <code>{{ logEntry.after }}</code>
                 {% endif %}
                 {% if 'add_to_piggy' == logEntry.action %}
-                    {{ trans('firefly.ale_action_log_add', {amount: formatAmountBySymbol(logEntry.after.amount, logEntry.after.currency_symbol, logEntry.after.decimal_places, true), name: logEntry.after.name})|raw }}
+                    {{ trans('firefly.ale_action_log_add', {amount: formatAmountBySymbol(logEntry.after.amount, logEntry.after.currency_symbol, logEntry.after.decimal_places, true), name: logEntry.after.piggy})|raw }}
                 {% endif %}
                 {% if 'remove_from_piggy' == logEntry.action %}
-                    {{ trans('firefly.ale_action_log_remove', {amount: formatAmountBySymbol(logEntry.after.amount, logEntry.after.currency_symbol, logEntry.after.decimal_places, true), name: logEntry.after.name})|raw }}
+                    {{ trans('firefly.ale_action_log_remove', {amount: formatAmountBySymbol(logEntry.after.amount, logEntry.after.currency_symbol, logEntry.after.decimal_places, true), name: logEntry.after.piggy})|raw }}
                 {% endif %}
             </td>
 

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 }}">

resources/views/recurring/show.twig

@@ -22,6 +22,17 @@
             </div>
             <div class="box-body">
                 <h4>{{ 'transaction_journal_meta'|_ }}</h4>
+                {% if array.nr_of_repetitions > 0 %}
+                <p>
+                    {% if array.journal_count >= array.nr_of_repetitions %}
+                        <span class="text-danger">{{ trans('firefly.recurrence_max_count', {count: array.journal_count, max: array.nr_of_repetitions}) }}</span>
+                    {% endif %}
+                    {% if array.journal_count < array.nr_of_repetitions %}
+                        {{ trans('firefly.recurrence_max_count', {count: array.journal_count, max: array.nr_of_repetitions}) }}
+                    {% endif %}
+                </p>
+                {% endif %}
+
                 <p>{{ 'description'|_ }}: <em>{{ array.description }}</em></p>
 
                 {% if array.active == false %}

routes/api.php

@@ -47,9 +47,9 @@ Route::group(
     ],
     static function (): void {
         Route::get('accounts', ['uses' => 'AccountController@accounts', 'as' => 'accounts']);
-        Route::get('categories', ['uses' => 'CategoryController@categories', 'as' => 'categories']);
-        Route::get('tags', ['uses' => 'TagController@tags', 'as' => 'tags']);
-        Route::get('transaction-descriptions', ['uses' => 'TransactionController@transactionDescriptions', 'as' => 'transaction-descriptions']);
+        // Route::get('categories', ['uses' => 'CategoryController@categories', 'as' => 'categories']);
+        // Route::get('tags', ['uses' => 'TagController@tags', 'as' => 'tags']);
+        // Route::get('transaction-descriptions', ['uses' => 'TransactionController@transactionDescriptions', 'as' => 'transaction-descriptions']);
     }
 );
 
@@ -58,12 +58,12 @@ Route::group(
     [
         'namespace' => 'FireflyIII\Api\V2\Controllers\Chart',
         'prefix'    => 'v2/chart',
-        'as'        => 'api.v1.chart.',
+        'as'        => 'api.v2.chart.',
     ],
     static function (): void {
-        Route::get('account/dashboard', ['uses' => 'AccountController@dashboard', 'as' => 'account.dashboard']);
-        Route::get('budget/dashboard', ['uses' => 'BudgetController@dashboard', 'as' => 'budget.dashboard']);
-        Route::get('category/dashboard', ['uses' => 'CategoryController@dashboard', 'as' => 'category.dashboard']);
+        // Route::get('account/dashboard', ['uses' => 'AccountController@dashboard', 'as' => 'account.dashboard']);
+        // Route::get('budget/dashboard', ['uses' => 'BudgetController@dashboard', 'as' => 'budget.dashboard']);
+        // Route::get('category/dashboard', ['uses' => 'CategoryController@dashboard', 'as' => 'category.dashboard']);
         Route::get('balance/balance', ['uses' => 'BalanceController@balance', 'as' => 'balance.balance']);
     }
 );
@@ -77,7 +77,7 @@ Route::group(
         'as'        => 'api.v2.summary.',
     ],
     static function (): void {
-        Route::get('basic', ['uses' => 'BasicController@basic', 'as' => 'basic']);
+        // Route::get('basic', ['uses' => 'BasicController@basic', 'as' => 'basic']);
     }
 );
 // V2 API route for all kinds of Transaction lists.
@@ -91,11 +91,11 @@ Route::group(
     ],
     static function (): void {
         // basic list
-        Route::get('transactions', ['uses' => 'TransactionController@list', 'as' => 'transactions.list']);
+        // Route::get('transactions', ['uses' => 'TransactionController@list', 'as' => 'transactions.list']);
 
         // list by parent or related object.
         // note how the check is done on the user group, not the user itself.
-        Route::get('accounts/{userGroupAccount}/transactions', ['uses' => 'AccountController@list', 'as' => 'accounts.transactions']);
+        // Route::get('accounts/{userGroupAccount}/transactions', ['uses' => 'AccountController@list', 'as' => 'accounts.transactions']);
     }
 );
 
@@ -109,7 +109,7 @@ Route::group(
         'as'        => 'api.v2.net-worth.',
     ],
     static function (): void {
-        Route::get('', ['uses' => 'NetWorthController@get', 'as' => 'index']);
+        // Route::get('', ['uses' => 'NetWorthController@get', 'as' => 'index']);
     }
 );
 
@@ -135,10 +135,10 @@ Route::group(
         'as'        => 'api.v2.subscriptions.',
     ],
     static function (): void {
-        Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']);
-        Route::get('{userGroupBill}', ['uses' => 'ShowController@show', 'as' => 'show']);
-        Route::get('sum/paid', ['uses' => 'SumController@paid', 'as' => 'sum.paid']);
-        Route::get('sum/unpaid', ['uses' => 'SumController@unpaid', 'as' => 'sum.unpaid']);
+        //        Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']);
+        //        Route::get('{userGroupBill}', ['uses' => 'ShowController@show', 'as' => 'show']);
+        //        Route::get('sum/paid', ['uses' => 'SumController@paid', 'as' => 'sum.paid']);
+        //        Route::get('sum/unpaid', ['uses' => 'SumController@unpaid', 'as' => 'sum.unpaid']);
     }
 );
 
@@ -150,7 +150,7 @@ Route::group(
         'as'        => 'api.v2.piggy-banks.',
     ],
     static function (): void {
-        Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']);
+        //        Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']);
     }
 );
 
@@ -162,7 +162,7 @@ Route::group(
         'as'        => 'api.v2.currencies.',
     ],
     static function (): void {
-        Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']);
+        //        Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']);
     }
 );
 
@@ -174,9 +174,9 @@ Route::group(
         'as'        => 'api.v2.transactions.',
     ],
     static function (): void {
-        Route::post('', ['uses' => 'StoreController@post', 'as' => 'store']);
-        Route::get('{userGroupTransaction}', ['uses' => 'ShowController@show', 'as' => 'show']);
-        Route::put('{userGroupTransaction}', ['uses' => 'UpdateController@update', 'as' => 'update']);
+        //        Route::post('', ['uses' => 'StoreController@post', 'as' => 'store']);
+        //        Route::get('{userGroupTransaction}', ['uses' => 'ShowController@show', 'as' => 'show']);
+        //        Route::put('{userGroupTransaction}', ['uses' => 'UpdateController@update', 'as' => 'update']);
     }
 );
 // infinite (transactions) list:
@@ -187,7 +187,7 @@ Route::group(
         'as'        => 'api.v2.infinite.transactions.',
     ],
     static function (): void {
-        Route::get('', ['uses' => 'TransactionController@infiniteList', 'as' => 'list']);
+        //        Route::get('', ['uses' => 'TransactionController@infiniteList', 'as' => 'list']);
     }
 );
 
@@ -199,11 +199,11 @@ Route::group(
         'as'        => 'api.v2.budgets',
     ],
     static function (): void {
-        Route::get('', ['uses' => 'Budget\IndexController@index', 'as' => 'index']);
-        Route::get('{budget}', ['uses' => 'Budget\ShowController@show', 'as' => 'show']);
-        Route::get('{budget}/limits', ['uses' => 'BudgetLimit\IndexController@index', 'as' => 'budget-limits.index']);
-        Route::get('sum/budgeted', ['uses' => 'Budget\SumController@budgeted', 'as' => 'sum.budgeted']);
-        Route::get('sum/spent', ['uses' => 'Budget\SumController@spent', 'as' => 'sum.spent']);
+        //        Route::get('', ['uses' => 'Budget\IndexController@index', 'as' => 'index']);
+        //        Route::get('{budget}', ['uses' => 'Budget\ShowController@show', 'as' => 'show']);
+        //        Route::get('{budget}/limits', ['uses' => 'BudgetLimit\IndexController@index', 'as' => 'budget-limits.index']);
+        //        Route::get('sum/budgeted', ['uses' => 'Budget\SumController@budgeted', 'as' => 'sum.budgeted']);
+        //        Route::get('sum/spent', ['uses' => 'Budget\SumController@spent', 'as' => 'sum.spent']);
         // Route::get('{budget}/budgeted', ['uses' => 'Budget\ShowController@budgeted', 'as' => 'budget.budgeted']);
         // Route::get('{budget}/spent', ['uses' => 'Budget\ShowController@spent', 'as' => 'budget.spent']);
     }
@@ -217,7 +217,7 @@ Route::group(
         'as'        => 'api.v2.system.',
     ],
     static function (): void {
-        Route::get('preferences/{preference}', ['uses' => 'PreferencesController@get', 'as' => 'preferences.get']);
+        //        Route::get('preferences/{preference}', ['uses' => 'PreferencesController@get', 'as' => 'preferences.get']);
     }
 );
 
@@ -229,32 +229,32 @@ Route::group(
         'as'        => 'api.v2.user-groups.',
     ],
     static function (): void {
-        Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']);
-        Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
-        Route::get('{userGroup}', ['uses' => 'ShowController@show', 'as' => 'show']);
-        Route::put('{userGroup}', ['uses' => 'UpdateController@update', 'as' => 'update']);
-        Route::post('{userGroup}/use', ['uses' => 'UpdateController@useUserGroup', 'as' => 'use']);
-        Route::put('{userGroup}/update-membership', ['uses' => 'UpdateController@updateMembership', 'as' => 'updateMembership']);
-        Route::delete('{userGroup}', ['uses' => 'DestroyController@destroy', 'as' => 'destroy']);
+        //        Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']);
+        //        Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
+        //        Route::get('{userGroup}', ['uses' => 'ShowController@show', 'as' => 'show']);
+        //        Route::put('{userGroup}', ['uses' => 'UpdateController@update', 'as' => 'update']);
+        //        Route::post('{userGroup}/use', ['uses' => 'UpdateController@useUserGroup', 'as' => 'use']);
+        //        Route::put('{userGroup}/update-membership', ['uses' => 'UpdateController@updateMembership', 'as' => 'updateMembership']);
+        //        Route::delete('{userGroup}', ['uses' => 'DestroyController@destroy', 'as' => 'destroy']);
     }
 );
 
 // V2 JSON API ROUTES
-JsonApiRoute::server('v2')->prefix('v2')
-    ->resources(function (ResourceRegistrar $server): void {
-        // ACCOUNTS
-        $server->resource('accounts', AccountController::class)
-            ->relationships(function (Relationships $relations): void {
-                $relations->hasOne('user')->readOnly();
-            })
-        ;
-
-        // USERS
-        $server->resource('users', JsonApiController::class)->readOnly()->relationships(function (Relationships $relations): void {
-            $relations->hasMany('accounts')->readOnly();
-        });
-    })
-;
+// JsonApiRoute::server('v2')->prefix('v2')
+//    ->resources(function (ResourceRegistrar $server): void {
+//        // ACCOUNTS
+//        $server->resource('accounts', AccountController::class)
+//            ->relationships(function (Relationships $relations): void {
+//                $relations->hasOne('user')->readOnly();
+//            })
+//        ;
+//
+//        // USERS
+//        $server->resource('users', JsonApiController::class)->readOnly()->relationships(function (Relationships $relations): void {
+//            $relations->hasMany('accounts')->readOnly();
+//        });
+//    })
+// ;
 
 /*
  * ____    ____  __     .______        ______    __    __  .___________. _______     _______.