Auto commit for release 'develop' on 2025-01-15

Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop
Fix account api for new features.
2025-10-29 06:34:37 +00:00 · 2025-01-15 20:30:00 +01:00 · 2025-01-15 18:54:56 +01:00 · 2025-01-15 18:54:49 +01:00 · 2025-01-13 11:32:54 +01:00 · 2025-01-13 04:14:18 +01:00
12 changed files with 153 additions and 128 deletions
--- a/.ci/php-cs-fixer/composer.lock
+++ b/.ci/php-cs-fixer/composer.lock
@@ -406,16 +406,16 @@
        },
        {
            "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.67.0",
+            "version": "v3.68.0",
            "source": {
                "type": "git",
                "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "0ad34c75d1172f7d30320460e803887981830cbf"
+                "reference": "73f78d8b2b34a0dd65fedb434a602ee4c2c8ad4c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/0ad34c75d1172f7d30320460e803887981830cbf",
-                "reference": "0ad34c75d1172f7d30320460e803887981830cbf",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/73f78d8b2b34a0dd65fedb434a602ee4c2c8ad4c",
+                "reference": "73f78d8b2b34a0dd65fedb434a602ee4c2c8ad4c",
                "shasum": ""
            },
            "require": {
@@ -497,7 +497,7 @@
            ],
            "support": {
                "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.67.0"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.68.0"
            },
            "funding": [
                {
@@ -505,7 +505,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-01-08T10:17:40+00:00"
+            "time": "2025-01-13T17:01:01+00:00"
        },
        {
            "name": "psr/container",
--- a/app/Http/Controllers/Account/EditController.php
+++ b/app/Http/Controllers/Account/EditController.php
@@ -119,7 +119,7 @@ class EditController extends Controller
        }
        $request->session()->forget('accounts.edit.fromUpdate');

-        $openingBalanceAmount = (string) $repository->getOpeningBalanceAmount($account);
+        $openingBalanceAmount = (string) $repository->getOpeningBalanceAmount($account, false);
        if ('0' === $openingBalanceAmount) {
            $openingBalanceAmount = '';
        }
--- a/app/Repositories/Account/AccountRepository.php
+++ b/app/Repositories/Account/AccountRepository.php
@@ -293,7 +293,7 @@ class AccountRepository implements AccountRepositoryInterface
    /**
     * Returns the amount of the opening balance for this account.
     */
-    public function getOpeningBalanceAmount(Account $account): ?string
+    public function getOpeningBalanceAmount(Account $account, bool $convertToNative): ?string
    {
        $journal     = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
            ->where('transactions.account_id', $account->id)
@@ -307,6 +307,9 @@ class AccountRepository implements AccountRepositoryInterface
        if (null === $transaction) {
            return null;
        }
+        if ($convertToNative) {
+            return $transaction->native_amount ?? '0';
+        }

        return $transaction->amount;
    }
--- a/app/Repositories/Account/AccountRepositoryInterface.php
+++ b/app/Repositories/Account/AccountRepositoryInterface.php
@@ -106,7 +106,7 @@ interface AccountRepositoryInterface
    /**
     * Returns the amount of the opening balance for this account.
     */
-    public function getOpeningBalanceAmount(Account $account): ?string;
+    public function getOpeningBalanceAmount(Account $account, bool $convertToNative): ?string;

    /**
     * Return date of opening balance as string or null.
--- a/app/Services/Internal/Support/CreditRecalculateService.php
+++ b/app/Services/Internal/Support/CreditRecalculateService.php
@@ -170,7 +170,7 @@ class CreditRecalculateService
                $this->validateOpeningBalance($account, $openingBalance);
            }
        }
-        $startOfDebt    = $this->repository->getOpeningBalanceAmount($account) ?? '0';
+        $startOfDebt    = $this->repository->getOpeningBalanceAmount($account, false) ?? '0';
        $leftOfDebt     = app('steam')->positive($startOfDebt);
        //        Log::debug(sprintf('Start of debt is "%s", so initial left of debt is "%s"', app('steam')->bcround($startOfDebt, 2), app('steam')->bcround($leftOfDebt, 2)));

--- a/app/Transformers/AccountTransformer.php
+++ b/app/Transformers/AccountTransformer.php
@@ -27,7 +27,9 @@ namespace FireflyIII\Transformers;
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
+use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\Steam;
 use Symfony\Component\HttpFoundation\ParameterBag;

@@ -62,17 +64,24 @@ class AccountTransformer extends AbstractTransformer
        $liabilityType                                                = (string) config(sprintf('firefly.shortLiabilityNameByFullName.%s', $fullType));
        $liabilityType                                                = '' === $liabilityType ? null : strtolower($liabilityType);
        $liabilityDirection                                           = $this->repository->getMetaValue($account, 'liability_direction');
+        $convertToNative                                              = Amount::convertToNative();

-        // get account role (will only work if the type is asset.
+        // get account role (will only work if the type is asset).
+        $default                                                      = Amount::getDefaultCurrency();
        $accountRole                                                  = $this->getAccountRole($account, $accountType);
        $date                                                         = $this->getDate();
        $date->endOfDay();

-        [$currencyId, $currencyCode, $currencySymbol, $decimalPlaces] = $this->getCurrency($account);
+        [$currencyId, $currencyCode, $currencySymbol, $decimalPlaces] = $this->getCurrency($account, $default);
        [$creditCardType, $monthlyPaymentDate]                        = $this->getCCInfo($account, $accountRole, $accountType);
-        [$openingBalance, $openingBalanceDate]                        = $this->getOpeningBalance($account, $accountType);
+        [$openingBalance, $nativeOpeningBalance, $openingBalanceDate] = $this->getOpeningBalance($account, $accountType, $convertToNative);
        [$interest, $interestPeriod]                                  = $this->getInterest($account, $accountType);

+        if (!$convertToNative) {
+            // reset default currency to NULL, not interesting.
+            $default = null;
+        }
+
        $openingBalance                                               = app('steam')->bcround($openingBalance, $decimalPlaces);
        $includeNetWorth                                              = '0' !== $this->repository->getMetaValue($account, 'include_net_worth');
        $longitude                                                    = null;
@@ -90,41 +99,56 @@ class AccountTransformer extends AbstractTransformer
        if (!in_array(strtolower($accountType), ['liability', 'liabilities', 'asset'], true)) {
            $order = null;
        }
+        // balance, native balance, virtual balance, native virtual balance?
+        $finalBalance                                                 = Steam::finalAccountBalance($account, $date);
+        if ($convertToNative) {
+            $finalBalance['balance'] = $finalBalance[$currencyCode] ?? '0';
+        }
+
+        $currentBalance                                               = app('steam')->bcround($finalBalance['balance'] ?? '0', $decimalPlaces);
+        $nativeCurrentBalance                                         = $convertToNative ? app('steam')->bcround($finalBalance['native_balance'] ?? '0', $default->decimal_places) : null;

        return [
-            'id'                      => (string) $account->id,
-            'created_at'              => $account->created_at->toAtomString(),
-            'updated_at'              => $account->updated_at->toAtomString(),
-            'active'                  => $account->active,
-            'order'                   => $order,
-            'name'                    => $account->name,
-            'type'                    => strtolower($accountType),
-            'account_role'            => $accountRole,
-            'currency_id'             => $currencyId,
-            'currency_code'           => $currencyCode,
-            'currency_symbol'         => $currencySymbol,
-            'currency_decimal_places' => $decimalPlaces,
-            'current_balance'         => app('steam')->bcround(Steam::finalAccountBalance($account, $date)['balance'] ?? '0', $decimalPlaces),
-            'current_balance_date'    => $date->toAtomString(),
-            'notes'                   => $this->repository->getNoteText($account),
-            'monthly_payment_date'    => $monthlyPaymentDate,
-            'credit_card_type'        => $creditCardType,
-            'account_number'          => $this->repository->getMetaValue($account, 'account_number'),
-            'iban'                    => '' === $account->iban ? null : $account->iban,
-            'bic'                     => $this->repository->getMetaValue($account, 'BIC'),
-            'virtual_balance'         => app('steam')->bcround($account->virtual_balance, $decimalPlaces),
-            'opening_balance'         => $openingBalance,
-            'opening_balance_date'    => $openingBalanceDate,
-            'liability_type'          => $liabilityType,
-            'liability_direction'     => $liabilityDirection,
-            'interest'                => $interest,
-            'interest_period'         => $interestPeriod,
-            'current_debt'            => $this->repository->getMetaValue($account, 'current_debt'),
-            'include_net_worth'       => $includeNetWorth,
-            'longitude'               => $longitude,
-            'latitude'                => $latitude,
-            'zoom_level'              => $zoomLevel,
-            'links'                   => [
+            'id'                             => (string) $account->id,
+            'created_at'                     => $account->created_at->toAtomString(),
+            'updated_at'                     => $account->updated_at->toAtomString(),
+            'active'                         => $account->active,
+            'order'                          => $order,
+            'name'                           => $account->name,
+            'type'                           => strtolower($accountType),
+            'account_role'                   => $accountRole,
+            'currency_id'                    => $currencyId,
+            'currency_code'                  => $currencyCode,
+            'currency_symbol'                => $currencySymbol,
+            'currency_decimal_places'        => $decimalPlaces,
+            'native_currency_id'             => null === $default ? null : (string) $default->id,
+            'native_currency_code'           => $default?->code,
+            'native_currency_symbol'         => $default?->symbol,
+            'native_currency_decimal_places' => $default?->decimal_places,
+            'current_balance'                => $currentBalance,
+            'native_current_balance'         => $nativeCurrentBalance,
+            'current_balance_date'           => $date->toAtomString(),
+            'notes'                          => $this->repository->getNoteText($account),
+            'monthly_payment_date'           => $monthlyPaymentDate,
+            'credit_card_type'               => $creditCardType,
+            'account_number'                 => $this->repository->getMetaValue($account, 'account_number'),
+            'iban'                           => '' === $account->iban ? null : $account->iban,
+            'bic'                            => $this->repository->getMetaValue($account, 'BIC'),
+            'virtual_balance'                => app('steam')->bcround($account->virtual_balance, $decimalPlaces),
+            'native_virtual_balance'         => $convertToNative ? app('steam')->bcround($account->native_virtual_balance, $default->decimal_places) : null,
+            'opening_balance'                => $openingBalance,
+            'native_opening_balance'         => $nativeOpeningBalance,
+            'opening_balance_date'           => $openingBalanceDate,
+            'liability_type'                 => $liabilityType,
+            'liability_direction'            => $liabilityDirection,
+            'interest'                       => $interest,
+            'interest_period'                => $interestPeriod,
+            'current_debt'                   => $this->repository->getMetaValue($account, 'current_debt'),
+            'include_net_worth'              => $includeNetWorth,
+            'longitude'                      => $longitude,
+            'latitude'                       => $latitude,
+            'zoom_level'                     => $zoomLevel,
+            'links'                          => [
                [
                    'rel' => 'self',
                    'uri' => '/accounts/'.$account->id,
@@ -156,16 +180,13 @@ class AccountTransformer extends AbstractTransformer
        return $date;
    }

-    /**
-     * @throws FireflyException
-     */
-    private function getCurrency(Account $account): array
+    private function getCurrency(Account $account, TransactionCurrency $default): array
    {
        $currency       = $this->repository->getAccountCurrency($account);

        // only grab default when result is null:
        if (null === $currency) {
-            $currency = app('amount')->getDefaultCurrencyByUserGroup($account->user->userGroup);
+            $currency = $default;
        }
        $currencyId     = (string) $currency->id;
        $currencyCode   = $currency->code;
@@ -203,14 +224,15 @@ class AccountTransformer extends AbstractTransformer
    /**
     * TODO refactor call to get~OpeningBalanceAmount / Date because it is a lot of queries
     */
-    private function getOpeningBalance(Account $account, string $accountType): array
+    private function getOpeningBalance(Account $account, string $accountType, bool $convertToNative): array
    {
-        $openingBalance     = null;
-        $openingBalanceDate = null;
+        $openingBalance       = null;
+        $openingBalanceDate   = null;
+        $nativeOpeningBalance = null;
        if (in_array($accountType, ['asset', 'liabilities'], true)) {
-            $amount             = $this->repository->getOpeningBalanceAmount($account);
-            $openingBalance     = $amount;
-            $openingBalanceDate = $this->repository->getOpeningBalanceDate($account);
+            $openingBalance       = $this->repository->getOpeningBalanceAmount($account, false);
+            $nativeOpeningBalance = $this->repository->getOpeningBalanceAmount($account, true);
+            $openingBalanceDate   = $this->repository->getOpeningBalanceDate($account);
        }
        if (null !== $openingBalanceDate) {
            $object             = Carbon::createFromFormat('Y-m-d H:i:s', $openingBalanceDate, config('app.timezone'));
@@ -220,7 +242,7 @@ class AccountTransformer extends AbstractTransformer
            $openingBalanceDate = $object->toAtomString();
        }

-        return [$openingBalance, $openingBalanceDate];
+        return [$openingBalance, $nativeOpeningBalance, $openingBalanceDate];
    }

    private function getInterest(Account $account, string $accountType): array
--- a/composer.lock
+++ b/composer.lock
@@ -1874,16 +1874,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v11.37.0",
+            "version": "v11.38.2",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "6cb103d2024b087eae207654b3f4b26646119ba5"
+                "reference": "9d290aa90fcad44048bedca5219d2b872e98772a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/6cb103d2024b087eae207654b3f4b26646119ba5",
-                "reference": "6cb103d2024b087eae207654b3f4b26646119ba5",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/9d290aa90fcad44048bedca5219d2b872e98772a",
+                "reference": "9d290aa90fcad44048bedca5219d2b872e98772a",
                "shasum": ""
            },
            "require": {
@@ -2084,20 +2084,20 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2025-01-02T20:10:21+00:00"
+            "time": "2025-01-15T00:06:46+00:00"
        },
        {
            "name": "laravel/passport",
-            "version": "v12.3.1",
+            "version": "v12.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/passport.git",
-                "reference": "0d95ca9cc9c80bdf64d04dcf04542720e3d5d55c"
+                "reference": "b06a413cb18d07123ced88ba8caa432d40e3bb8c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/passport/zipball/0d95ca9cc9c80bdf64d04dcf04542720e3d5d55c",
-                "reference": "0d95ca9cc9c80bdf64d04dcf04542720e3d5d55c",
+                "url": "https://api.github.com/repos/laravel/passport/zipball/b06a413cb18d07123ced88ba8caa432d40e3bb8c",
+                "reference": "b06a413cb18d07123ced88ba8caa432d40e3bb8c",
                "shasum": ""
            },
            "require": {
@@ -2160,20 +2160,20 @@
                "issues": "https://github.com/laravel/passport/issues",
                "source": "https://github.com/laravel/passport"
            },
-            "time": "2024-11-11T20:15:28+00:00"
+            "time": "2025-01-13T17:40:20+00:00"
        },
        {
            "name": "laravel/prompts",
-            "version": "v0.3.2",
+            "version": "v0.3.3",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/prompts.git",
-                "reference": "0e0535747c6b8d6d10adca8b68293cf4517abb0f"
+                "reference": "749395fcd5f8f7530fe1f00dfa84eb22c83d94ea"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/0e0535747c6b8d6d10adca8b68293cf4517abb0f",
-                "reference": "0e0535747c6b8d6d10adca8b68293cf4517abb0f",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/749395fcd5f8f7530fe1f00dfa84eb22c83d94ea",
+                "reference": "749395fcd5f8f7530fe1f00dfa84eb22c83d94ea",
                "shasum": ""
            },
            "require": {
@@ -2217,9 +2217,9 @@
            "description": "Add beautiful and user-friendly forms to your command-line applications.",
            "support": {
                "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.3.2"
+                "source": "https://github.com/laravel/prompts/tree/v0.3.3"
            },
-            "time": "2024-11-12T14:59:47+00:00"
+            "time": "2024-12-30T15:53:31+00:00"
        },
        {
            "name": "laravel/sanctum",
@@ -10192,16 +10192,16 @@
        },
        {
            "name": "barryvdh/laravel-ide-helper",
-            "version": "v3.5.3",
+            "version": "v3.5.4",
            "source": {
                "type": "git",
                "url": "https://github.com/barryvdh/laravel-ide-helper.git",
-                "reference": "271682a2a6d57691e1c7ff378f44e4ae6ac2aba0"
+                "reference": "980a87e250fc2a7558bc46e07f61c7594500ea53"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/271682a2a6d57691e1c7ff378f44e4ae6ac2aba0",
-                "reference": "271682a2a6d57691e1c7ff378f44e4ae6ac2aba0",
+                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/980a87e250fc2a7558bc46e07f61c7594500ea53",
+                "reference": "980a87e250fc2a7558bc46e07f61c7594500ea53",
                "shasum": ""
            },
            "require": {
@@ -10270,7 +10270,7 @@
            ],
            "support": {
                "issues": "https://github.com/barryvdh/laravel-ide-helper/issues",
-                "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v3.5.3"
+                "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v3.5.4"
            },
            "funding": [
                {
@@ -10282,7 +10282,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-01-08T10:01:30+00:00"
+            "time": "2025-01-14T09:07:00+00:00"
        },
        {
            "name": "barryvdh/reflection-docblock",
@@ -11818,16 +11818,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "11.5.2",
+            "version": "11.5.3",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "153d0531b9f7e883c5053160cad6dd5ac28140b3"
+                "reference": "30e319e578a7b5da3543073e30002bf82042f701"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/153d0531b9f7e883c5053160cad6dd5ac28140b3",
-                "reference": "153d0531b9f7e883c5053160cad6dd5ac28140b3",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/30e319e578a7b5da3543073e30002bf82042f701",
+                "reference": "30e319e578a7b5da3543073e30002bf82042f701",
                "shasum": ""
            },
            "require": {
@@ -11848,7 +11848,7 @@
                "phpunit/php-timer": "^7.0.1",
                "sebastian/cli-parser": "^3.0.2",
                "sebastian/code-unit": "^3.0.2",
-                "sebastian/comparator": "^6.2.1",
+                "sebastian/comparator": "^6.3.0",
                "sebastian/diff": "^6.0.2",
                "sebastian/environment": "^7.2.0",
                "sebastian/exporter": "^6.3.0",
@@ -11899,7 +11899,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.2"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.3"
            },
            "funding": [
                {
@@ -11915,7 +11915,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-12-21T05:51:08+00:00"
+            "time": "2025-01-13T09:36:00+00:00"
        },
        {
            "name": "sebastian/cli-parser",
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -81,7 +81,7 @@ return [
        'running_balance_column' => env('USE_RUNNING_BALANCE', false),
        // see cer.php for exchange rates feature flag.
    ],
-    'version'                      => 'develop/2025-01-11',
+    'version'                      => 'develop/2025-01-15',
    'api_version'                  => '2.1.0', // field is no longer used.
    'db_version'                   => 25,

--- a/package-lock.json
+++ b/package-lock.json
@@ -1123,9 +1123,9 @@
            }
        },
        "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-            "version": "7.26.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.26.5.tgz",
-            "integrity": "sha512-OHqczNm4NTQlW1ghrVY43FPoiRzbmzNVbcgVnMKZN/RQYezHUSdjACjaX50CD3B7UIAjv39+MlsrVDb3v741FA==",
+            "version": "7.26.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.26.6.tgz",
+            "integrity": "sha512-CKW8Vu+uUZneQCPtXmSBUC6NCAUdya26hWCElAWh5mVSlSRsmiCPUUDKb3Z0szng1hiAJa098Hkhg9o4SE35Qw==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -3007,9 +3007,9 @@
            }
        },
        "node_modules/@types/express-serve-static-core": {
-            "version": "5.0.4",
-            "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.4.tgz",
-            "integrity": "sha512-5kz9ScmzBdzTgB/3susoCgfqNDzBjvLL4taparufgSvlwjdLy6UyUy9T/tCpYd2GIdIilCatC4iSQS0QSYHt0w==",
+            "version": "5.0.5",
+            "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.5.tgz",
+            "integrity": "sha512-GLZPrd9ckqEBFMcVM/qRFAP0Hg3qiVEojgEFsx/N/zKXsBzbGF6z5FBDpZ0+Xhp1xr+qRZYjfGr1cWHB9oFHSA==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -3133,9 +3133,9 @@
            "license": "MIT"
        },
        "node_modules/@types/node": {
-            "version": "22.10.5",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.5.tgz",
-            "integrity": "sha512-F8Q+SeGimwOo86fiovQh8qiXfFEh2/ocYv7tU5pJ3EXMSSxk1Joj5wefpFK2fHTf/N6HKGSxIDBT9f3gCxXPkQ==",
+            "version": "22.10.6",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.6.tgz",
+            "integrity": "sha512-qNiuwC4ZDAUNcY47xgaSuS92cjf8JbSUoaKS77bmLG1rU7MlATVSiw/IlrjtIyyskXBZ8KkNfjK/P5na7rgXbQ==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -3160,9 +3160,9 @@
            "license": "MIT"
        },
        "node_modules/@types/qs": {
-            "version": "6.9.17",
-            "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.17.tgz",
-            "integrity": "sha512-rX4/bPcfmvxHDv0XjfJELTTr+iB+tn032nPILqHm5wbthUUUuVtNGGqzhya9XUxjTP8Fpr0qYgSZZKxGY++svQ==",
+            "version": "6.9.18",
+            "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz",
+            "integrity": "sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==",
            "dev": true,
            "license": "MIT"
        },
@@ -5663,9 +5663,9 @@
            "license": "MIT"
        },
        "node_modules/electron-to-chromium": {
-            "version": "1.5.80",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.80.tgz",
-            "integrity": "sha512-LTrKpW0AqIuHwmlVNV+cjFYTnXtM9K37OGhpe0ZI10ScPSxqVSryZHIY3WnCS5NSYbBODRTZyhRMS2h5FAEqAw==",
+            "version": "1.5.82",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.82.tgz",
+            "integrity": "sha512-Zq16uk1hfQhyGx5GpwPAYDwddJuSGhtRhgOA2mCxANYaDT79nAeGnaXogMGng4KqLaJUVnOnuL0+TDop9nLOiA==",
            "dev": true,
            "license": "ISC"
        },
@@ -5797,9 +5797,9 @@
            "license": "MIT"
        },
        "node_modules/es-object-atoms": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
-            "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+            "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -8854,9 +8854,9 @@
            }
        },
        "node_modules/postcss": {
-            "version": "8.4.49",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
-            "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+            "version": "8.5.1",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz",
+            "integrity": "sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==",
            "dev": true,
            "funding": [
                {
@@ -8874,7 +8874,7 @@
            ],
            "license": "MIT",
            "dependencies": {
-                "nanoid": "^3.3.7",
+                "nanoid": "^3.3.8",
                "picocolors": "^1.1.1",
                "source-map-js": "^1.2.1"
            },
@@ -9601,13 +9601,13 @@
            "license": "MIT"
        },
        "node_modules/qs": {
-            "version": "6.13.1",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.1.tgz",
-            "integrity": "sha512-EJPeIn0CYrGu+hli1xilKAPXODtJ12T0sP63Ijx2/khC2JtuaN3JyNIpvmnkmaEtha9ocbG4A4cMcr+TvqvwQg==",
+            "version": "6.14.0",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
+            "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
            "dev": true,
            "license": "BSD-3-Clause",
            "dependencies": {
-                "side-channel": "^1.0.6"
+                "side-channel": "^1.1.0"
            },
            "engines": {
                "node": ">=0.6"
@@ -10077,9 +10077,9 @@
            "license": "MIT"
        },
        "node_modules/sass": {
-            "version": "1.83.1",
-            "resolved": "https://registry.npmjs.org/sass/-/sass-1.83.1.tgz",
-            "integrity": "sha512-EVJbDaEs4Rr3F0glJzFSOvtg2/oy2V/YrGFPqPY24UqcLDWcI9ZY5sN+qyO3c/QCZwzgfirvhXvINiJCE/OLcA==",
+            "version": "1.83.4",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.83.4.tgz",
+            "integrity": "sha512-B1bozCeNQiOgDcLd33e2Cs2U60wZwjUUXzh900ZyQF5qUasvMdDZYbQ566LJu7cqR+sAHlAfO6RMkaID5s6qpA==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -10114,13 +10114,13 @@
            }
        },
        "node_modules/sass/node_modules/readdirp": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz",
-            "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==",
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.1.tgz",
+            "integrity": "sha512-h80JrZu/MHUZCyHu5ciuoI0+WxsCxzxJTILn6Fs8rxSnFPh+UVHYfeIxK1nVGugMqkfC4vJcBOYbkfkwYK0+gw==",
            "dev": true,
            "license": "MIT",
            "engines": {
-                "node": ">= 14.16.0"
+                "node": ">= 14.18.0"
            },
            "funding": {
                "type": "individual",
--- a/resources/assets/v1/src/locales/de.json
+++ b/resources/assets/v1/src/locales/de.json
@@ -9,7 +9,7 @@
        "select_source_account": "Bitte einen g\u00fcltigen Quellkontonamen ausw\u00e4hlen oder eingeben",
        "split_transaction_title": "Beschreibung der Splittbuchung",
        "errors_submission": "Bei Ihren Eingaben stimmt etwas nicht. Bitte \u00fcberpr\u00fcfen Sie die unten stehenden Fehler.",
-        "is_reconciled": "Is reconciled",
+        "is_reconciled": "Ist abgestimmt",
        "split": "Teilen",
        "single_split": "Teilen",
        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Buchung #{ID} (\"{title}\")<\/a> wurde gespeichert.",
@@ -34,7 +34,7 @@
        "submit": "Absenden",
        "amount": "Betrag",
        "date": "Datum",
-        "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s) unless you remove the reconciliation flag.",
+        "is_reconciled_fields_dropped": "Da diese Buchung abgestimmt ist, k\u00f6nnen Sie weder die Konten noch den\/die Betrag\/Betr\u00e4ge aktualisieren, es sei denn, Sie entfernen das Abstimmungskennzeichen.",
        "tags": "Schlagw\u00f6rter",
        "no_budget": "(kein Budget)",
        "no_bill": "(kein Abonnement)",
--- a/resources/assets/v1/src/locales/ru.json
+++ b/resources/assets/v1/src/locales/ru.json
@@ -22,7 +22,7 @@
        "apply_rules_checkbox": "\u041f\u0440\u0438\u043c\u0435\u043d\u0438\u0442\u044c \u043f\u0440\u0430\u0432\u0438\u043b\u0430",
        "fire_webhooks_checkbox": "Fire webhooks",
        "no_budget_pointer": "\u041f\u043e\u0445\u043e\u0436\u0435, \u0443 \u0432\u0430\u0441 \u043f\u043e\u043a\u0430 \u043d\u0435\u0442 \u0431\u044e\u0434\u0436\u0435\u0442\u043e\u0432. \u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0441\u043e\u0437\u0434\u0430\u0442\u044c \u0438\u0445 \u043d\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0435 <a href=\"budgets\">\u0411\u044e\u0434\u0436\u0435\u0442\u044b<\/a>. \u0411\u044e\u0434\u0436\u0435\u0442\u044b \u043c\u043e\u0433\u0443\u0442 \u043f\u043e\u043c\u043e\u0447\u044c \u0432\u0430\u043c \u043e\u0442\u0441\u043b\u0435\u0436\u0438\u0432\u0430\u0442\u044c \u0440\u0430\u0441\u0445\u043e\u0434\u044b.",
-        "no_bill_pointer": "You seem to have no subscription yet. You should create some on the <a href=\"subscriptions\">subscription<\/a>-page. Subscriptions can help you keep track of expenses.",
+        "no_bill_pointer": "\u041f\u043e\u0445\u043e\u0436\u0435, \u0443 \u0432\u0430\u0441 \u043f\u043e\u043a\u0430 \u043d\u0435\u0442 \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0438. \u0412\u0430\u043c \u0441\u043b\u0435\u0434\u0443\u0435\u0442 \u0441\u043e\u0437\u0434\u0430\u0442\u044c \u0435\u0435 \u043d\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0435 <a href=\"subscriptions\">\u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0438<\/a>. \u041f\u043e\u0434\u043f\u0438\u0441\u043a\u0438 \u043c\u043e\u0433\u0443\u0442 \u043f\u043e\u043c\u043e\u0447\u044c \u0432\u0430\u043c \u043e\u0442\u0441\u043b\u0435\u0436\u0438\u0432\u0430\u0442\u044c \u0440\u0430\u0441\u0445\u043e\u0434\u044b.",
        "source_account": "\u0421\u0447\u0451\u0442-\u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a",
        "hidden_fields_preferences": "\u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0431\u043e\u043b\u044c\u0448\u0435 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043e\u0432 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438 \u0432 <a href=\"preferences\">\u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430\u0445<\/a>.",
        "destination_account": "\u0421\u0447\u0451\u0442 \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f",
@@ -132,12 +132,12 @@
        "visit_webhook_url": "\u041f\u043e\u0441\u0435\u0442\u0438\u0442\u044c URL \u0432\u0435\u0431\u0445\u0443\u043a\u0430",
        "reset_webhook_secret": "",
        "header_exchange_rates": "\u041a\u0443\u0440\u0441\u044b \u0432\u0430\u043b\u044e\u0442",
-        "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in <a href=\"https:\/\/docs.firefly-iii.org\/LOL_NOT_FINISHED_YET_TODO\">the documentation<\/a>.",
+        "exchange_rates_intro": "Firefly III \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0443 \u0438 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435 \u043a\u0443\u0440\u0441\u043e\u0432 \u043e\u0431\u043c\u0435\u043d\u0430. \u041f\u043e\u0434\u0440\u043e\u0431\u043d\u0435\u0435 \u043e\u0431 \u044d\u0442\u043e\u043c \u0447\u0438\u0442\u0430\u0439\u0442\u0435 \u0432 <a href=\"https:\/\/docs.firefly-iii.org\/LOL_NOT_FINISHED_YET_TODO\">\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430\u0446\u0438\u0438<\/a>.",
        "exchange_rates_from_to": "\u041c\u0435\u0436\u0434\u0443 {from} \u0438 {to} (\u0438 \u043d\u0430\u043e\u0431\u043e\u0440\u043e\u0442)",
-        "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.",
+        "exchange_rates_intro_rates": "Firefly III \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0435 \u043e\u0431\u043c\u0435\u043d\u043d\u044b\u0435 \u043a\u0443\u0440\u0441\u044b. \u041e\u0431\u0440\u0430\u0442\u043d\u044b\u0439 \u043a\u0443\u0440\u0441 \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438 \u0440\u0430\u0441\u0441\u0447\u0438\u0442\u044b\u0432\u0430\u0435\u0442\u0441\u044f, \u043a\u043e\u0433\u0434\u0430 \u043e\u043d \u043d\u0435 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d. \u0415\u0441\u043b\u0438 \u043d\u0430 \u0434\u0430\u0442\u0443 \u0441\u0434\u0435\u043b\u043a\u0438 \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442 \u043e\u0431\u043c\u0435\u043d\u043d\u043e\u0433\u043e \u043a\u0443\u0440\u0441\u0430, \u0442\u043e Firefly III \u0432\u0435\u0440\u043d\u0435\u0442\u0441\u044f \u0432 \u043d\u0443\u0436\u043d\u043e\u0435 \u0432\u0440\u0435\u043c\u044f. \u0415\u0441\u043b\u0438 \u0438\u0445 \u043d\u0435\u0442, \u0431\u0443\u0434\u0435\u0442 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d \u043a\u0443\u0440\u0441 \"1\".",
        "header_exchange_rates_rates": "\u041a\u0443\u0440\u0441\u044b \u0432\u0430\u043b\u044e\u0442",
        "header_exchange_rates_table": "\u0422\u0430\u0431\u043b\u0438\u0446\u0430 \u0441 \u043e\u0431\u043c\u0435\u043d\u043d\u044b\u043c\u0438 \u043a\u0443\u0440\u0441\u0430\u043c\u0438",
-        "help_rate_form": "On this day, how many {to} will you get for one {from}?",
+        "help_rate_form": "\u0412 \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c \u0441\u043a\u043e\u043b\u044c\u043a\u043e {to} \u0432\u044b \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u0435 \u0437\u0430 \u043e\u0434\u043d\u043e\u0433\u043e {from}?",
        "add_new_rate": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043d\u043e\u0432\u044b\u0439 \u043e\u0431\u043c\u0435\u043d\u043d\u044b\u0439 \u043a\u0443\u0440\u0441",
        "save_new_rate": "\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u043d\u043e\u0432\u044b\u0439 \u0442\u0430\u0440\u0438\u0444"
    },
--- a/resources/views/layout/default.twig
+++ b/resources/views/layout/default.twig
@@ -3,7 +3,7 @@
 <head>
    <!--
    If the base href URL begins with "http://" but you are sure it should start with "https://",
-    please visit the following page: https://bit.ly/FF3-base-href
+    please visit the following page: https://bit.ly/FF3-broken-base-href
    -->
    <base href="{{ route('index', null, true) }}/">
    <meta charset="UTF-8">
Author	SHA1	Message	Date
github-actions	fa6c621968	Auto commit for release 'develop' on 2025-01-15	2025-01-15 20:30:00 +01:00
James Cole	df863b6cff	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop	2025-01-15 18:54:56 +01:00
James Cole	9316ff3e51	Fix account api for new features.	2025-01-15 18:54:49 +01:00
James Cole	bfd91f8ee6	Update default.twig Signed-off-by: James Cole <james@firefly-iii.org>	2025-01-13 11:32:54 +01:00
github-actions	13e5d25cfe	Auto commit for release 'develop' on 2025-01-13	2025-01-13 04:14:18 +01:00
James Cole	b13030420b	Merge branch 'main' into develop	2025-01-11 10:07:21 +01:00
James Cole	63b34c1853	Remove unused step.	2025-01-11 10:05:51 +01:00