Merge pull request #11156 from firefly-iii/develop

🤖 Automatically merge the PR into the main branch.

.github/workflows/release.yml

@@ -18,6 +18,16 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
+      - name: Validate input
+        run: |
+          # validate argument
+          if  [[ $version != develo* ]] && [[ $version != v* ]] && [[ $version != branch* ]] ;
+          then
+            echo "Argument '$version' does not start with a d or with a v or a b"
+            exit 1
+          fi
+        env:
+          version: ${{ github.event_name == 'schedule' && 'develop' || inputs.version }}
       - name: Checkout
         uses: actions/checkout@v5
         with:
@@ -36,6 +46,14 @@ jobs:
           extensions: mbstring, intl, zip, bcmath
       - name: Switch and pull
         run: |
+          # validate argument
+          if  [[ $version != d* ]] && [[ $version != v* ]] ;
+          then
+            echo 'Argument does not start with a d or with a v'
+            exit 1
+          fi
+
+
           #
           # Always check out origin/develop, unless its a branch release.
           #

THANKS.md

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

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

@@ -81,6 +81,7 @@ class AccountController extends Controller
      */
     public function accounts(AutocompleteApiRequest $request): JsonResponse
     {
+        Log::debug('Before All.');
         [
             'types' => $types,
             'query' => $query,
@@ -89,7 +90,6 @@ class AccountController extends Controller
         ]
                      = $request->attributes->all();
 
-
         $date ??= today(config('app.timezone'));
 
         // set date to end-of-day for account balance. so it is at $date 23:59:59

app/Api/V1/Requests/DateRangeRequest.php

@@ -40,10 +40,6 @@ class DateRangeRequest extends ApiRequest
         $validator->after(
             function (Validator $validator): void {
                 if ($validator->failed()) {
-                    // set null values
-                    $this->attributes->set('start', null);
-                    $this->attributes->set('end', null);
-
                     return;
                 }
                 $start = $this->getCarbonDate('start')?->startOfDay();

app/Api/V1/Requests/Models/Account/AccountTypesApiRequest.php

@@ -47,11 +47,14 @@ class AccountTypesApiRequest extends ApiRequest
                 if ($validator->failed()) {
                     return;
                 }
-
-                $type = $this->convertString('types', 'all');
-                $this->attributes->add([
-                    'types' => $this->mapAccountTypes($type),
-                ]);
+                $types  = explode(',', $this->convertString('types', 'all'));
+                $result = [];
+                // split and find all types:
+                foreach ($types as $type) {
+                    $result = array_merge($result, $this->mapAccountTypes($type));
+                }
+                $result = array_unique($result);
+                $this->attributes->set('types', $result);
             }
         );
     }

app/Api/V1/Requests/PaginationRequest.php

@@ -68,12 +68,10 @@ class PaginationRequest extends ApiRequest
                     $user  = auth()->user();
                     $limit = (int)Preferences::getForUser($user, 'listPageSize', 50)->data;
                 }
-
                 $page   = $this->convertInteger('page');
                 $page   = min(max(1, $page), 2 ** 16);
                 $offset = ($page - 1) * $limit;
                 $sort   = $this->sortClass ? $this->convertSortParameters('sort', $this->sortClass) : $this->get('sort');
-
                 $this->attributes->set('limit', $limit);
                 $this->attributes->set('sort', $sort);
                 $this->attributes->set('page', $page);

app/Support/Steam.php

@@ -39,6 +39,7 @@ use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
+use Safe\Exceptions\UrlException;
 use ValueError;
 
 use function Safe\parse_url;
@@ -671,8 +672,22 @@ class Steam
     {
         // Log::debug(sprintf('getSafeUrl(%s, %s)', $unknownUrl, $safeUrl));
         $returnUrl      = $safeUrl;
-        $unknownHost    = parse_url($unknownUrl, PHP_URL_HOST);
-        $safeHost       = parse_url($safeUrl, PHP_URL_HOST);
+
+        try {
+            $unknownHost = parse_url($unknownUrl, PHP_URL_HOST);
+        } catch (UrlException $e) {
+            Log::error(sprintf('Could not parse "%s": %s', $unknownUrl, $e->getMessage()));
+
+            return $returnUrl;
+        }
+
+        try {
+            $safeHost = parse_url($safeUrl, PHP_URL_HOST);
+        } catch (UrlException $e) {
+            Log::error(sprintf('Could not parse "%s": %s', $unknownUrl, $e->getMessage()));
+
+            return $returnUrl;
+        }
 
         if (null !== $unknownHost && $unknownHost === $safeHost) {
             $returnUrl = $unknownUrl;

changelog.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 6.4.4 - 2025-11-02
+
+### Added
+
+- [PR 11140](https://github.com/firefly-iii/firefly-iii/pull/11140) (Add Saudi Riyal (SAR) currency) reported by @Jihad
+
+### Fixed
+
+- [Issue 11144](https://github.com/firefly-iii/firefly-iii/issues/11144) (Initial balance is auto suggested as an account) reported by @elliot-gh
+- [Issue 11147](https://github.com/firefly-iii/firefly-iii/issues/11147) (Start and End Balance gets blanked out during reconciliation) reported by @lrdshaper
+
 ## 6.4.3 - 2025-11-01
 
 ### Added

composer.lock

@@ -753,29 +753,28 @@
         },
         {
             "name": "dragonmantank/cron-expression",
-            "version": "v3.4.0",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dragonmantank/cron-expression.git",
-                "reference": "8c784d071debd117328803d86b2097615b457500"
+                "reference": "d61a8a9604ec1f8c3d150d09db6ce98b32675013"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/8c784d071debd117328803d86b2097615b457500",
-                "reference": "8c784d071debd117328803d86b2097615b457500",
+                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/d61a8a9604ec1f8c3d150d09db6ce98b32675013",
+                "reference": "d61a8a9604ec1f8c3d150d09db6ce98b32675013",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2|^8.0",
-                "webmozart/assert": "^1.0"
+                "php": "^8.2|^8.3|^8.4|^8.5"
             },
             "replace": {
                 "mtdowling/cron-expression": "^1.0"
             },
             "require-dev": {
-                "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "^1.0",
-                "phpunit/phpunit": "^7.0|^8.0|^9.0"
+                "phpstan/extension-installer": "^1.4.3",
+                "phpstan/phpstan": "^1.12.32|^2.1.31",
+                "phpunit/phpunit": "^8.5.48|^9.0"
             },
             "type": "library",
             "extra": {
@@ -806,7 +805,7 @@
             ],
             "support": {
                 "issues": "https://github.com/dragonmantank/cron-expression/issues",
-                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.4.0"
+                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -814,7 +813,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-10-09T13:47:03+00:00"
+            "time": "2025-10-31T18:51:33+00:00"
         },
         {
             "name": "egulias/email-validator",
@@ -10052,64 +10051,6 @@
                 }
             ],
             "time": "2024-11-21T01:49:47+00:00"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "1.12.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozarts/assert.git",
-                "reference": "9be6926d8b485f55b9229203f962b51ed377ba68"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/9be6926d8b485f55b9229203f962b51ed377ba68",
-                "reference": "9be6926d8b485f55b9229203f962b51ed377ba68",
-                "shasum": ""
-            },
-            "require": {
-                "ext-ctype": "*",
-                "ext-date": "*",
-                "ext-filter": "*",
-                "php": "^7.2 || ^8.0"
-            },
-            "suggest": {
-                "ext-intl": "",
-                "ext-simplexml": "",
-                "ext-spl": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.10-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "support": {
-                "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/1.12.1"
-            },
-            "time": "2025-10-29T15:56:20+00:00"
         }
     ],
     "packages-dev": [
@@ -10552,21 +10493,21 @@
         },
         {
             "name": "driftingly/rector-laravel",
-            "version": "2.1.1",
+            "version": "2.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/driftingly/rector-laravel.git",
-                "reference": "abc336cbf06f53d90ab74cecfd319379fc55d408"
+                "reference": "d7cd932cff9e398a43393f1a1a63b27d574e35ef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/driftingly/rector-laravel/zipball/abc336cbf06f53d90ab74cecfd319379fc55d408",
-                "reference": "abc336cbf06f53d90ab74cecfd319379fc55d408",
+                "url": "https://api.github.com/repos/driftingly/rector-laravel/zipball/d7cd932cff9e398a43393f1a1a63b27d574e35ef",
+                "reference": "d7cd932cff9e398a43393f1a1a63b27d574e35ef",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.4 || ^8.0",
-                "rector/rector": "^2.0"
+                "rector/rector": "^2.2.7"
             },
             "type": "rector-extension",
             "autoload": {
@@ -10581,9 +10522,9 @@
             "description": "Rector upgrades rules for Laravel Framework",
             "support": {
                 "issues": "https://github.com/driftingly/rector-laravel/issues",
-                "source": "https://github.com/driftingly/rector-laravel/tree/2.1.1"
+                "source": "https://github.com/driftingly/rector-laravel/tree/2.1.2"
             },
-            "time": "2025-10-23T13:53:44+00:00"
+            "time": "2025-10-31T21:56:58+00:00"
         },
         {
             "name": "fakerphp/faker",

config/firefly.php

@@ -78,8 +78,8 @@ return [
         'running_balance_column' => env('USE_RUNNING_BALANCE', false),
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => '6.4.3',
-    'build_time'                   => 1761889776,
+    'version'                      => '6.4.4',
+    'build_time'                   => 1762026349,
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 28, // field is no longer used.
 

database/seeders/TransactionCurrencySeeder.php

@@ -85,6 +85,7 @@ class TransactionCurrencySeeder extends Seeder
         $currencies[] = ['code' => 'NOK', 'name' => 'Norwegian krone', 'symbol' => 'kr.', 'decimal_places' => 2];
         $currencies[] = ['code' => 'CZK', 'name' => 'Czech koruna', 'symbol' => 'Kč', 'decimal_places' => 2];
         $currencies[] = ['code' => 'KZT', 'name' => 'Kazakhstani tenge', 'symbol' => '₸', 'decimal_places' => 2];
+        $currencies[] = ['code' => 'SAR', 'name' => 'Saudi Riyal', 'symbol' => 'SAR', 'decimal_places' => 2];
 
         foreach ($currencies as $currency) {
             if (null === TransactionCurrency::where('code', $currency['code'])->first()) {

package-lock.json

@@ -4075,9 +4075,9 @@
             "license": "MIT"
         },
         "node_modules/baseline-browser-mapping": {
-            "version": "2.8.21",
-            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.21.tgz",
-            "integrity": "sha512-JU0h5APyQNsHOlAM7HnQnPToSDQoEBZqzu/YBlqDnEeymPnZDREeXJA3KBMQee+dKteAxZ2AtvQEvVYdZf241Q==",
+            "version": "2.8.23",
+            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.23.tgz",
+            "integrity": "sha512-616V5YX4bepJFzNyOfce5Fa8fDJMfoxzOIzDCZwaGL8MKVpFrXqfNUoIpRn9YMI5pXf/VKgzjB4htFMsFKKdiQ==",
             "dev": true,
             "license": "Apache-2.0",
             "bin": {
@@ -10203,9 +10203,9 @@
             "license": "MIT"
         },
         "node_modules/sass": {
-            "version": "1.93.2",
-            "resolved": "https://registry.npmjs.org/sass/-/sass-1.93.2.tgz",
-            "integrity": "sha512-t+YPtOQHpGW1QWsh1CHQ5cPIr9lbbGZLZnbihP/D/qZj/yuV68m8qarcV17nvkOX81BCrvzAlq2klCQFZghyTg==",
+            "version": "1.93.3",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.93.3.tgz",
+            "integrity": "sha512-elOcIZRTM76dvxNAjqYrucTSI0teAF/L2Lv0s6f6b7FOwcwIuA357bIE871580AjHJuSvLIRUosgV+lIWx6Rgg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {

public/v1/js/ff/accounts/reconcile.js

@@ -89,9 +89,9 @@ function selectAllReconcile(e) {
         console.log('in selectAllReconcile(' + journalId + ') with amount ' + amount + ' and selected amount ' + selectedAmount);
 
         // do nothing if line is already in target state
-        if (check.prop('checked') === doCheck )
+        if (check.prop('checked') === doCheck)
             return;
-    
+
         check.prop('checked', doCheck);
         // if checked, add to selected amount
         if (doCheck === true && check.data('younger') === false) {
@@ -201,6 +201,7 @@ function getTransactionsForRange() {
 
     $.getJSON(url).done(placeTransactions).catch(exceptionHandling)
 }
+
 function exceptionHandling() {
     $('#transactions_holder').empty().append($('<p>').addClass('text-center lead').html(selectRangeAndBalance));
     $('.start_reconcile').show();
@@ -254,8 +255,8 @@ function placeTransactions(data) {
     selectedAmount = 0;
     // update start + end balance when user has not touched them.
     if (!changedBalances) {
-        $('input[name="start_balance"]').val(data.startBalance);
-        $('input[name="end_balance"]').val(data.endBalance);
+        $('input[name="start_balance"]').val(data.startBalance.balance);
+        $('input[name="end_balance"]').val(data.endBalance.balance);
     }
 
     // as long as the dates are equal, changing the balance does not matter.