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

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

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

@@ -406,16 +406,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.66.1",
+            "version": "v3.68.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "cde186799d8e92960c5a00c96e6214bf7f5547a9"
+                "reference": "73f78d8b2b34a0dd65fedb434a602ee4c2c8ad4c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/cde186799d8e92960c5a00c96e6214bf7f5547a9",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/73f78d8b2b34a0dd65fedb434a602ee4c2c8ad4c",
-                "reference": "cde186799d8e92960c5a00c96e6214bf7f5547a9",
+                "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.66.1"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.68.0"
             },
             "funding": [
                 {
@@ -505,7 +505,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-01-05T14:43:25+00:00"
+            "time": "2025-01-13T17:01:01+00:00"
         },
         {
             "name": "psr/container",

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 = '';
         }

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

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.

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

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,
+            'id'                             => (string) $account->id,
-            'created_at'              => $account->created_at->toAtomString(),
+            'created_at'                     => $account->created_at->toAtomString(),
-            'updated_at'              => $account->updated_at->toAtomString(),
+            'updated_at'                     => $account->updated_at->toAtomString(),
-            'active'                  => $account->active,
+            'active'                         => $account->active,
-            'order'                   => $order,
+            'order'                          => $order,
-            'name'                    => $account->name,
+            'name'                           => $account->name,
-            'type'                    => strtolower($accountType),
+            'type'                           => strtolower($accountType),
-            'account_role'            => $accountRole,
+            'account_role'                   => $accountRole,
-            'currency_id'             => $currencyId,
+            'currency_id'                    => $currencyId,
-            'currency_code'           => $currencyCode,
+            'currency_code'                  => $currencyCode,
-            'currency_symbol'         => $currencySymbol,
+            'currency_symbol'                => $currencySymbol,
-            'currency_decimal_places' => $decimalPlaces,
+            'currency_decimal_places'        => $decimalPlaces,
-            'current_balance'         => app('steam')->bcround(Steam::finalAccountBalance($account, $date)['balance'] ?? '0', $decimalPlaces),
+            'native_currency_id'             => null === $default ? null : (string) $default->id,
-            'current_balance_date'    => $date->toAtomString(),
+            'native_currency_code'           => $default?->code,
-            'notes'                   => $this->repository->getNoteText($account),
+            'native_currency_symbol'         => $default?->symbol,
-            'monthly_payment_date'    => $monthlyPaymentDate,
+            'native_currency_decimal_places' => $default?->decimal_places,
-            'credit_card_type'        => $creditCardType,
+            'current_balance'                => $currentBalance,
-            'account_number'          => $this->repository->getMetaValue($account, 'account_number'),
+            'native_current_balance'         => $nativeCurrentBalance,
-            'iban'                    => '' === $account->iban ? null : $account->iban,
+            'current_balance_date'           => $date->toAtomString(),
-            'bic'                     => $this->repository->getMetaValue($account, 'BIC'),
+            'notes'                          => $this->repository->getNoteText($account),
-            'virtual_balance'         => app('steam')->bcround($account->virtual_balance, $decimalPlaces),
+            'monthly_payment_date'           => $monthlyPaymentDate,
-            'opening_balance'         => $openingBalance,
+            'credit_card_type'               => $creditCardType,
-            'opening_balance_date'    => $openingBalanceDate,
+            'account_number'                 => $this->repository->getMetaValue($account, 'account_number'),
-            'liability_type'          => $liabilityType,
+            'iban'                           => '' === $account->iban ? null : $account->iban,
-            'liability_direction'     => $liabilityDirection,
+            'bic'                            => $this->repository->getMetaValue($account, 'BIC'),
-            'interest'                => $interest,
+            'virtual_balance'                => app('steam')->bcround($account->virtual_balance, $decimalPlaces),
-            'interest_period'         => $interestPeriod,
+            'native_virtual_balance'         => $convertToNative ? app('steam')->bcround($account->native_virtual_balance, $default->decimal_places) : null,
-            'current_debt'            => $this->repository->getMetaValue($account, 'current_debt'),
+            'opening_balance'                => $openingBalance,
-            'include_net_worth'       => $includeNetWorth,
+            'native_opening_balance'         => $nativeOpeningBalance,
-            'longitude'               => $longitude,
+            'opening_balance_date'           => $openingBalanceDate,
-            'latitude'                => $latitude,
+            'liability_type'                 => $liabilityType,
-            'zoom_level'              => $zoomLevel,
+            'liability_direction'            => $liabilityDirection,
-            'links'                   => [
+            '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;
     }
 
-    /**
+    private function getCurrency(Account $account, TransactionCurrency $default): array
-     * @throws FireflyException
-     */
-    private function getCurrency(Account $account): 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;
+        $openingBalance       = null;
-        $openingBalanceDate = null;
+        $openingBalanceDate   = null;
+        $nativeOpeningBalance = null;
         if (in_array($accountType, ['asset', 'liabilities'], true)) {
-            $amount             = $this->repository->getOpeningBalanceAmount($account);
+            $openingBalance       = $this->repository->getOpeningBalanceAmount($account, false);
-            $openingBalance     = $amount;
+            $nativeOpeningBalance = $this->repository->getOpeningBalanceAmount($account, true);
-            $openingBalanceDate = $this->repository->getOpeningBalanceDate($account);
+            $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

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",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/9d290aa90fcad44048bedca5219d2b872e98772a",
-                "reference": "6cb103d2024b087eae207654b3f4b26646119ba5",
+                "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",
+                "url": "https://api.github.com/repos/laravel/passport/zipball/b06a413cb18d07123ced88ba8caa432d40e3bb8c",
-                "reference": "0d95ca9cc9c80bdf64d04dcf04542720e3d5d55c",
+                "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",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/749395fcd5f8f7530fe1f00dfa84eb22c83d94ea",
-                "reference": "0e0535747c6b8d6d10adca8b68293cf4517abb0f",
+                "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",
@@ -2802,16 +2802,16 @@
         },
         {
             "name": "league/csv",
-            "version": "9.20.1",
+            "version": "9.21.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/csv.git",
-                "reference": "491d1e79e973a7370c7571dc0fe4a7241f4936ee"
+                "reference": "72196d11ebba22d868954cb39c0c7346207430cc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/csv/zipball/491d1e79e973a7370c7571dc0fe4a7241f4936ee",
+                "url": "https://api.github.com/repos/thephpleague/csv/zipball/72196d11ebba22d868954cb39c0c7346207430cc",
-                "reference": "491d1e79e973a7370c7571dc0fe4a7241f4936ee",
+                "reference": "72196d11ebba22d868954cb39c0c7346207430cc",
                 "shasum": ""
             },
             "require": {
@@ -2885,7 +2885,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-12-18T10:11:15+00:00"
+            "time": "2025-01-08T19:27:58+00:00"
         },
         {
             "name": "league/event",
@@ -3705,12 +3705,12 @@
             "version": "3.8.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/briannesbitt/Carbon.git",
+                "url": "https://github.com/CarbonPHP/carbon.git",
                 "reference": "129700ed449b1f02d70272d2ac802357c8c30c58"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/129700ed449b1f02d70272d2ac802357c8c30c58",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/129700ed449b1f02d70272d2ac802357c8c30c58",
                 "reference": "129700ed449b1f02d70272d2ac802357c8c30c58",
                 "shasum": ""
             },
@@ -10192,29 +10192,27 @@
         },
         {
             "name": "barryvdh/laravel-ide-helper",
-            "version": "v3.4.0",
+            "version": "v3.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-ide-helper.git",
-                "reference": "2a41415f01bf3c409d200f6cdd940c1e7d86cfd3"
+                "reference": "980a87e250fc2a7558bc46e07f61c7594500ea53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/2a41415f01bf3c409d200f6cdd940c1e7d86cfd3",
+                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/980a87e250fc2a7558bc46e07f61c7594500ea53",
-                "reference": "2a41415f01bf3c409d200f6cdd940c1e7d86cfd3",
+                "reference": "980a87e250fc2a7558bc46e07f61c7594500ea53",
                 "shasum": ""
             },
             "require": {
-                "barryvdh/reflection-docblock": "^2.2",
+                "barryvdh/reflection-docblock": "^2.3",
                 "composer/class-map-generator": "^1.0",
                 "ext-json": "*",
                 "illuminate/console": "^11.15",
                 "illuminate/database": "^11.15",
                 "illuminate/filesystem": "^11.15",
                 "illuminate/support": "^11.15",
-                "nikic/php-parser": "^4.18 || ^5",
+                "php": "^8.2"
-                "php": "^8.2",
-                "phpdocumentor/type-resolver": "^1.1.0"
             },
             "require-dev": {
                 "ext-pdo_sqlite": "*",
@@ -10225,7 +10223,8 @@
                 "orchestra/testbench": "^9.2",
                 "phpunit/phpunit": "^10.5",
                 "spatie/phpunit-snapshot-assertions": "^4 || ^5",
-                "vimeo/psalm": "^5.4"
+                "vimeo/psalm": "^5.4",
+                "vlucas/phpdotenv": "^5"
             },
             "suggest": {
                 "illuminate/events": "Required for automatic helper generation (^6|^7|^8|^9|^10|^11)."
@@ -10238,7 +10237,7 @@
                     ]
                 },
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "3.5-dev"
                 }
             },
             "autoload": {
@@ -10260,6 +10259,7 @@
             "keywords": [
                 "autocomplete",
                 "codeintel",
+                "dev",
                 "helper",
                 "ide",
                 "laravel",
@@ -10270,7 +10270,7 @@
             ],
             "support": {
                 "issues": "https://github.com/barryvdh/laravel-ide-helper/issues",
-                "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v3.4.0"
+                "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v3.5.4"
             },
             "funding": [
                 {
@@ -10282,7 +10282,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-12-29T12:10:58+00:00"
+            "time": "2025-01-14T09:07:00+00:00"
         },
         {
             "name": "barryvdh/reflection-docblock",
@@ -10546,51 +10546,6 @@
             ],
             "time": "2024-11-12T16:29:46+00:00"
         },
-        {
-            "name": "doctrine/deprecations",
-            "version": "1.1.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/deprecations.git",
-                "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/31610dbb31faa98e6b5447b62340826f54fbc4e9",
-                "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1 || ^8.0"
-            },
-            "require-dev": {
-                "doctrine/coding-standard": "^9 || ^12",
-                "phpstan/phpstan": "1.4.10 || 2.0.3",
-                "phpstan/phpstan-phpunit": "^1.0 || ^2",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "psr/log": "^1 || ^2 || ^3"
-            },
-            "suggest": {
-                "psr/log": "Allows logging deprecations via PSR-3 logger implementation"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Deprecations\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.",
-            "homepage": "https://www.doctrine-project.org/",
-            "support": {
-                "issues": "https://github.com/doctrine/deprecations/issues",
-                "source": "https://github.com/doctrine/deprecations/tree/1.1.4"
-            },
-            "time": "2024-12-07T21:18:45+00:00"
-        },
         {
             "name": "fakerphp/faker",
             "version": "v1.24.1",
@@ -11250,117 +11205,6 @@
             },
             "time": "2022-02-21T01:04:05+00:00"
         },
-        {
-            "name": "phpdocumentor/reflection-common",
-            "version": "2.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.x": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
-                }
-            ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
-            "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
-            ],
-            "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
-            },
-            "time": "2020-06-27T09:03:43+00:00"
-        },
-        {
-            "name": "phpdocumentor/type-resolver",
-            "version": "1.10.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/679e3ce485b99e84c775d28e2e96fade9a7fb50a",
-                "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/deprecations": "^1.0",
-                "php": "^7.3 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.0",
-                "phpstan/phpdoc-parser": "^1.18|^2.0"
-            },
-            "require-dev": {
-                "ext-tokenizer": "*",
-                "phpbench/phpbench": "^1.2",
-                "phpstan/extension-installer": "^1.1",
-                "phpstan/phpstan": "^1.8",
-                "phpstan/phpstan-phpunit": "^1.1",
-                "phpunit/phpunit": "^9.5",
-                "rector/rector": "^0.13.9",
-                "vimeo/psalm": "^4.25"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-1.x": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "support": {
-                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.10.0"
-            },
-            "time": "2024-11-09T15:12:26+00:00"
-        },
         {
             "name": "phpmyadmin/sql-parser",
             "version": "5.10.2",
@@ -11496,53 +11340,6 @@
             },
             "time": "2024-09-04T20:21:43+00:00"
         },
-        {
-            "name": "phpstan/phpdoc-parser",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "c00d78fb6b29658347f9d37ebe104bffadf36299"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/c00d78fb6b29658347f9d37ebe104bffadf36299",
-                "reference": "c00d78fb6b29658347f9d37ebe104bffadf36299",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.4 || ^8.0"
-            },
-            "require-dev": {
-                "doctrine/annotations": "^2.0",
-                "nikic/php-parser": "^5.3.0",
-                "php-parallel-lint/php-parallel-lint": "^1.2",
-                "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "^2.0",
-                "phpstan/phpstan-phpunit": "^2.0",
-                "phpstan/phpstan-strict-rules": "^2.0",
-                "phpunit/phpunit": "^9.6",
-                "symfony/process": "^5.2"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "PHPStan\\PhpDocParser\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "PHPDoc parser with support for nullable, intersection and generic types",
-            "support": {
-                "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/2.0.0"
-            },
-            "time": "2024-10-13T11:29:49+00:00"
-        },
         {
             "name": "phpstan/phpstan",
             "version": "2.1.1",
@@ -12021,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",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/30e319e578a7b5da3543073e30002bf82042f701",
-                "reference": "153d0531b9f7e883c5053160cad6dd5ac28140b3",
+                "reference": "30e319e578a7b5da3543073e30002bf82042f701",
                 "shasum": ""
             },
             "require": {
@@ -12051,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",
@@ -12102,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": [
                 {
@@ -12118,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",
@@ -12292,16 +12089,16 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "6.2.1",
+            "version": "6.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "43d129d6a0f81c78bee378b46688293eb7ea3739"
+                "reference": "d4e47a769525c4dd38cea90e5dcd435ddbbc7115"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/43d129d6a0f81c78bee378b46688293eb7ea3739",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/d4e47a769525c4dd38cea90e5dcd435ddbbc7115",
-                "reference": "43d129d6a0f81c78bee378b46688293eb7ea3739",
+                "reference": "d4e47a769525c4dd38cea90e5dcd435ddbbc7115",
                 "shasum": ""
             },
             "require": {
@@ -12314,6 +12111,9 @@
             "require-dev": {
                 "phpunit/phpunit": "^11.4"
             },
+            "suggest": {
+                "ext-bcmath": "For comparing BcMath\\Number objects"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -12357,7 +12157,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
                 "security": "https://github.com/sebastianbergmann/comparator/security/policy",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/6.2.1"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/6.3.0"
             },
             "funding": [
                 {
@@ -12365,7 +12165,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-10-31T05:30:08+00:00"
+            "time": "2025-01-06T10:28:19+00:00"
         },
         {
             "name": "sebastian/complexity",

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-06',
+    'version'                      => 'develop/2025-01-15',
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 25,
 

config/translations.php

@@ -146,6 +146,7 @@ return [
                 'select_source_account',
                 'split_transaction_title',
                 'errors_submission',
+                'is_reconciled',
                 'split',
                 'single_split',
                 'transaction_stored_link',

package-lock.json

@@ -79,9 +79,9 @@
             }
         },
         "node_modules/@babel/compat-data": {
-            "version": "7.26.3",
+            "version": "7.26.5",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.3.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.5.tgz",
-            "integrity": "sha512-nHIxvKPniQXpmQLb0vhY3VaFb3S0YrTAwpOWJZh1wn3oJPjJk9Asva204PsBdmAE8vpzfHudT8DB0scYvy9q0g==",
+            "integrity": "sha512-XvcZi1KWf88RVbF9wn8MN6tYFloU5qX8KjuF3E1PVBmJ9eypXfs4GRiJwLuTZL0iSnJUKn1BFPa5BPZZJyFzPg==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -130,14 +130,14 @@
             }
         },
         "node_modules/@babel/generator": {
-            "version": "7.26.3",
+            "version": "7.26.5",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.3.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.5.tgz",
-            "integrity": "sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==",
+            "integrity": "sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/parser": "^7.26.3",
+                "@babel/parser": "^7.26.5",
-                "@babel/types": "^7.26.3",
+                "@babel/types": "^7.26.5",
                 "@jridgewell/gen-mapping": "^0.3.5",
                 "@jridgewell/trace-mapping": "^0.3.25",
                 "jsesc": "^3.0.2"
@@ -160,13 +160,13 @@
             }
         },
         "node_modules/@babel/helper-compilation-targets": {
-            "version": "7.25.9",
+            "version": "7.26.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz",
-            "integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==",
+            "integrity": "sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/compat-data": "^7.25.9",
+                "@babel/compat-data": "^7.26.5",
                 "@babel/helper-validator-option": "^7.25.9",
                 "browserslist": "^4.24.0",
                 "lru-cache": "^5.1.1",
@@ -323,9 +323,9 @@
             }
         },
         "node_modules/@babel/helper-plugin-utils": {
-            "version": "7.25.9",
+            "version": "7.26.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz",
-            "integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==",
+            "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -351,15 +351,15 @@
             }
         },
         "node_modules/@babel/helper-replace-supers": {
-            "version": "7.25.9",
+            "version": "7.26.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.9.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.26.5.tgz",
-            "integrity": "sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==",
+            "integrity": "sha512-bJ6iIVdYX1YooY2X7w1q6VITt+LnUILtNk7zT78ykuwStx8BauCzxvFqFaHjOpW1bVnSUM1PN1f0p5P21wHxvg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/helper-member-expression-to-functions": "^7.25.9",
                 "@babel/helper-optimise-call-expression": "^7.25.9",
-                "@babel/traverse": "^7.25.9"
+                "@babel/traverse": "^7.26.5"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -442,13 +442,13 @@
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.26.3",
+            "version": "7.26.5",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.3.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.5.tgz",
-            "integrity": "sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==",
+            "integrity": "sha512-SRJ4jYmXRqV1/Xc+TIVG84WjHBXKlxO9sHQnA2Pf12QQEAp1LOh6kDzNHXcUnbH1QI0FDoPPVOt+vyUDucxpaw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/types": "^7.26.3"
+                "@babel/types": "^7.26.5"
             },
             "bin": {
                 "parser": "bin/babel-parser.js"
@@ -703,13 +703,13 @@
             }
         },
         "node_modules/@babel/plugin-transform-block-scoped-functions": {
-            "version": "7.25.9",
+            "version": "7.26.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.9.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.26.5.tgz",
-            "integrity": "sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==",
+            "integrity": "sha512-chuTSY+hq09+/f5lMj8ZSYgCFpppV2CbYrhNFJ1BFoXpiWPnnAb7R0MqrafCpN8E1+YRrtM1MXZHJdIx8B6rMQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-plugin-utils": "^7.25.9"
+                "@babel/helper-plugin-utils": "^7.26.5"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -1123,13 +1123,13 @@
             }
         },
         "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-            "version": "7.25.9",
+            "version": "7.26.6",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.9.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.26.6.tgz",
-            "integrity": "sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog==",
+            "integrity": "sha512-CKW8Vu+uUZneQCPtXmSBUC6NCAUdya26hWCElAWh5mVSlSRsmiCPUUDKb3Z0szng1hiAJa098Hkhg9o4SE35Qw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-plugin-utils": "^7.25.9"
+                "@babel/helper-plugin-utils": "^7.26.5"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -1655,17 +1655,17 @@
             }
         },
         "node_modules/@babel/traverse": {
-            "version": "7.26.4",
+            "version": "7.26.5",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.4.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.5.tgz",
-            "integrity": "sha512-fH+b7Y4p3yqvApJALCPJcwb0/XaOSgtK4pzV6WVjPR5GLFQBRI7pfoX2V2iM48NXvX07NUxxm1Vw98YjqTcU5w==",
+            "integrity": "sha512-rkOSPOw+AXbgtwUga3U4u8RpoK9FEFWBNAlTpcnkLFjL5CT+oyHNuUUC/xx6XefEJ16r38r8Bc/lfp6rYuHeJQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/code-frame": "^7.26.2",
-                "@babel/generator": "^7.26.3",
+                "@babel/generator": "^7.26.5",
-                "@babel/parser": "^7.26.3",
+                "@babel/parser": "^7.26.5",
                 "@babel/template": "^7.25.9",
-                "@babel/types": "^7.26.3",
+                "@babel/types": "^7.26.5",
                 "debug": "^4.3.1",
                 "globals": "^11.1.0"
             },
@@ -1674,9 +1674,9 @@
             }
         },
         "node_modules/@babel/types": {
-            "version": "7.26.3",
+            "version": "7.26.5",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.3.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.5.tgz",
-            "integrity": "sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==",
+            "integrity": "sha512-L6mZmwFDK6Cjh1nRCLXpa6no13ZIioJDz7mdkzHv399pThrTa/k0nUlNaenOeh2kWu/iaOQYElEpKPUswUa9Vg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2591,9 +2591,9 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.29.2",
+            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.29.2.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.30.1.tgz",
-            "integrity": "sha512-s/8RiF4bdmGnc/J0N7lHAr5ZFJj+NdJqJ/Hj29K+c4lEdoVlukzvWXB9XpWZCdakVT0YAw8iyIqUP2iFRz5/jA==",
+            "integrity": "sha512-pSWY+EVt3rJ9fQ3IqlrEUtXh3cGqGtPDH1FQlNZehO2yYxCHEX1SPsz1M//NXwYfbTlcKr9WObLnJX9FsS9K1Q==",
             "cpu": [
                 "arm"
             ],
@@ -2605,9 +2605,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.29.2",
+            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.29.2.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.30.1.tgz",
-            "integrity": "sha512-mKRlVj1KsKWyEOwR6nwpmzakq6SgZXW4NUHNWlYSiyncJpuXk7wdLzuKdWsRoR1WLbWsZBKvsUCdCTIAqRn9cA==",
+            "integrity": "sha512-/NA2qXxE3D/BRjOJM8wQblmArQq1YoBVJjrjoTSBS09jgUisq7bqxNHJ8kjCHeV21W/9WDGwJEWSN0KQ2mtD/w==",
             "cpu": [
                 "arm64"
             ],
@@ -2619,9 +2619,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.29.2",
+            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.29.2.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.30.1.tgz",
-            "integrity": "sha512-vJX+vennGwygmutk7N333lvQ/yKVAHnGoBS2xMRQgXWW8tvn46YWuTDOpKroSPR9BEW0Gqdga2DHqz8Pwk6X5w==",
+            "integrity": "sha512-r7FQIXD7gB0WJ5mokTUgUWPl0eYIH0wnxqeSAhuIwvnnpjdVB8cRRClyKLQr7lgzjctkbp5KmswWszlwYln03Q==",
             "cpu": [
                 "arm64"
             ],
@@ -2633,9 +2633,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.29.2",
+            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.29.2.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.30.1.tgz",
-            "integrity": "sha512-e2rW9ng5O6+Mt3ht8fH0ljfjgSCC6ffmOipiLUgAnlK86CHIaiCdHCzHzmTkMj6vEkqAiRJ7ss6Ibn56B+RE5w==",
+            "integrity": "sha512-x78BavIwSH6sqfP2xeI1hd1GpHL8J4W2BXcVM/5KYKoAD3nNsfitQhvWSw+TFtQTLZ9OmlF+FEInEHyubut2OA==",
             "cpu": [
                 "x64"
             ],
@@ -2647,9 +2647,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.29.2",
+            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.29.2.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.30.1.tgz",
-            "integrity": "sha512-/xdNwZe+KesG6XJCK043EjEDZTacCtL4yurMZRLESIgHQdvtNyul3iz2Ab03ZJG0pQKbFTu681i+4ETMF9uE/Q==",
+            "integrity": "sha512-HYTlUAjbO1z8ywxsDFWADfTRfTIIy/oUlfIDmlHYmjUP2QRDTzBuWXc9O4CXM+bo9qfiCclmHk1x4ogBjOUpUQ==",
             "cpu": [
                 "arm64"
             ],
@@ -2661,9 +2661,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.29.2",
+            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.29.2.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.30.1.tgz",
-            "integrity": "sha512-eXKvpThGzREuAbc6qxnArHh8l8W4AyTcL8IfEnmx+bcnmaSGgjyAHbzZvHZI2csJ+e0MYddl7DX0X7g3sAuXDQ==",
+            "integrity": "sha512-1MEdGqogQLccphhX5myCJqeGNYTNcmTyaic9S7CG3JhwuIByJ7J05vGbZxsizQthP1xpVx7kd3o31eOogfEirw==",
             "cpu": [
                 "x64"
             ],
@@ -2675,9 +2675,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.29.2",
+            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.29.2.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.30.1.tgz",
-            "integrity": "sha512-h4VgxxmzmtXLLYNDaUcQevCmPYX6zSj4SwKuzY7SR5YlnCBYsmvfYORXgiU8axhkFCDtQF3RW5LIXT8B14Qykg==",
+            "integrity": "sha512-PaMRNBSqCx7K3Wc9QZkFx5+CX27WFpAMxJNiYGAXfmMIKC7jstlr32UhTgK6T07OtqR+wYlWm9IxzennjnvdJg==",
             "cpu": [
                 "arm"
             ],
@@ -2689,9 +2689,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.29.2",
+            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.29.2.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.30.1.tgz",
-            "integrity": "sha512-EObwZ45eMmWZQ1w4N7qy4+G1lKHm6mcOwDa+P2+61qxWu1PtQJ/lz2CNJ7W3CkfgN0FQ7cBUy2tk6D5yR4KeXw==",
+            "integrity": "sha512-B8Rcyj9AV7ZlEFqvB5BubG5iO6ANDsRKlhIxySXcF1axXYUyqwBok+XZPgIYGBgs7LDXfWfifxhw0Ik57T0Yug==",
             "cpu": [
                 "arm"
             ],
@@ -2703,9 +2703,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.29.2",
+            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.29.2.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.30.1.tgz",
-            "integrity": "sha512-Z7zXVHEXg1elbbYiP/29pPwlJtLeXzjrj4241/kCcECds8Zg9fDfURWbZHRIKrEriAPS8wnVtdl4ZJBvZr325w==",
+            "integrity": "sha512-hqVyueGxAj3cBKrAI4aFHLV+h0Lv5VgWZs9CUGqr1z0fZtlADVV1YPOij6AhcK5An33EXaxnDLmJdQikcn5NEw==",
             "cpu": [
                 "arm64"
             ],
@@ -2717,9 +2717,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.29.2",
+            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.29.2.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.30.1.tgz",
-            "integrity": "sha512-TF4kxkPq+SudS/r4zGPf0G08Bl7+NZcFrUSR3484WwsHgGgJyPQRLCNrQ/R5J6VzxfEeQR9XRpc8m2t7lD6SEQ==",
+            "integrity": "sha512-i4Ab2vnvS1AE1PyOIGp2kXni69gU2DAUVt6FSXeIqUCPIR3ZlheMW3oP2JkukDfu3PsexYRbOiJrY+yVNSk9oA==",
             "cpu": [
                 "arm64"
             ],
@@ -2731,9 +2731,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-            "version": "4.29.2",
+            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.29.2.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.30.1.tgz",
-            "integrity": "sha512-kO9Fv5zZuyj2zB2af4KA29QF6t7YSxKrY7sxZXfw8koDQj9bx5Tk5RjH+kWKFKok0wLGTi4bG117h31N+TIBEg==",
+            "integrity": "sha512-fARcF5g296snX0oLGkVxPmysetwUk2zmHcca+e9ObOovBR++9ZPOhqFUM61UUZ2EYpXVPN1redgqVoBB34nTpQ==",
             "cpu": [
                 "loong64"
             ],
@@ -2745,9 +2745,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.29.2",
+            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.29.2.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.30.1.tgz",
-            "integrity": "sha512-gIh776X7UCBaetVJGdjXPFurGsdWwHHinwRnC5JlLADU8Yk0EdS/Y+dMO264OjJFo7MXQ5PX4xVFbxrwK8zLqA==",
+            "integrity": "sha512-GLrZraoO3wVT4uFXh67ElpwQY0DIygxdv0BNW9Hkm3X34wu+BkqrDrkcsIapAY+N2ATEbvak0XQ9gxZtCIA5Rw==",
             "cpu": [
                 "ppc64"
             ],
@@ -2759,9 +2759,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.29.2",
+            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.29.2.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.30.1.tgz",
-            "integrity": "sha512-YgikssQ5UNq1GoFKZydMEkhKbjlUq7G3h8j6yWXLBF24KyoA5BcMtaOUAXq5sydPmOPEqB6kCyJpyifSpCfQ0w==",
+            "integrity": "sha512-0WKLaAUUHKBtll0wvOmh6yh3S0wSU9+yas923JIChfxOaaBarmb/lBKPF0w/+jTVozFnOXJeRGZ8NvOxvk/jcw==",
             "cpu": [
                 "riscv64"
             ],
@@ -2773,9 +2773,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.29.2",
+            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.29.2.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.30.1.tgz",
-            "integrity": "sha512-9ouIR2vFWCyL0Z50dfnon5nOrpDdkTG9lNDs7MRaienQKlTyHcDxplmk3IbhFlutpifBSBr2H4rVILwmMLcaMA==",
+            "integrity": "sha512-GWFs97Ruxo5Bt+cvVTQkOJ6TIx0xJDD/bMAOXWJg8TCSTEK8RnFeOeiFTxKniTc4vMIaWvCplMAFBt9miGxgkA==",
             "cpu": [
                 "s390x"
             ],
@@ -2787,9 +2787,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.29.2",
+            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.29.2.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.30.1.tgz",
-            "integrity": "sha512-ckBBNRN/F+NoSUDENDIJ2U9UWmIODgwDB/vEXCPOMcsco1niTkxTXa6D2Y/pvCnpzaidvY2qVxGzLilNs9BSzw==",
+            "integrity": "sha512-UtgGb7QGgXDIO+tqqJ5oZRGHsDLO8SlpE4MhqpY9Llpzi5rJMvrK6ZGhsRCST2abZdBqIBeXW6WPD5fGK5SDwg==",
             "cpu": [
                 "x64"
             ],
@@ -2801,9 +2801,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.29.2",
+            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.29.2.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.30.1.tgz",
-            "integrity": "sha512-jycl1wL4AgM2aBFJFlpll/kGvAjhK8GSbEmFT5v3KC3rP/b5xZ1KQmv0vQQ8Bzb2ieFQ0kZFPRMbre/l3Bu9JA==",
+            "integrity": "sha512-V9U8Ey2UqmQsBT+xTOeMzPzwDzyXmnAoO4edZhL7INkwQcaW1Ckv3WJX3qrrp/VHaDkEWIBWhRwP47r8cdrOow==",
             "cpu": [
                 "x64"
             ],
@@ -2815,9 +2815,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.29.2",
+            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.29.2.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.30.1.tgz",
-            "integrity": "sha512-S2V0LlcOiYkNGlRAWZwwUdNgdZBfvsDHW0wYosYFV3c7aKgEVcbonetZXsHv7jRTTX+oY5nDYT4W6B1oUpMNOg==",
+            "integrity": "sha512-WabtHWiPaFF47W3PkHnjbmWawnX/aE57K47ZDT1BXTS5GgrBUEpvOzq0FI0V/UYzQJgdb8XlhVNH8/fwV8xDjw==",
             "cpu": [
                 "arm64"
             ],
@@ -2829,9 +2829,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.29.2",
+            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.29.2.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.30.1.tgz",
-            "integrity": "sha512-pW8kioj9H5f/UujdoX2atFlXNQ9aCfAxFRaa+mhczwcsusm6gGrSo4z0SLvqLF5LwFqFTjiLCCzGkNK/LE0utQ==",
+            "integrity": "sha512-pxHAU+Zv39hLUTdQQHUVHf4P+0C47y/ZloorHpzs2SXMRqeAWmGghzAhfOlzFHHwjvgokdFAhC4V+6kC1lRRfw==",
             "cpu": [
                 "ia32"
             ],
@@ -2843,9 +2843,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.29.2",
+            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.29.2.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.30.1.tgz",
-            "integrity": "sha512-p6fTArexECPf6KnOHvJXRpAEq0ON1CBtzG/EY4zw08kCHk/kivBc5vUEtnCFNCHOpJZ2ne77fxwRLIKD4wuW2Q==",
+            "integrity": "sha512-D6qjsXGcvhTjv0kI4fU8tUuBDF/Ueee4SVX79VfNDXZa64TfCW1Slkb6Z7O1p7vflqZjcmOVdZlqf8gvJxc6og==",
             "cpu": [
                 "x64"
             ],
@@ -3007,9 +3007,9 @@
             }
         },
         "node_modules/@types/express-serve-static-core": {
-            "version": "5.0.3",
+            "version": "5.0.5",
-            "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.3.tgz",
+            "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.5.tgz",
-            "integrity": "sha512-JEhMNwUJt7bw728CydvYzntD0XJeTmDnvwLlbfbAhE7Tbslm/ax6bdIiUwTgeVlZTsJQPwZwKpAkyDtIjsvx3g==",
+            "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",
+            "version": "22.10.6",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.5.tgz",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.6.tgz",
-            "integrity": "sha512-F8Q+SeGimwOo86fiovQh8qiXfFEh2/ocYv7tU5pJ3EXMSSxk1Joj5wefpFK2fHTf/N6HKGSxIDBT9f3gCxXPkQ==",
+            "integrity": "sha512-qNiuwC4ZDAUNcY47xgaSuS92cjf8JbSUoaKS77bmLG1rU7MlATVSiw/IlrjtIyyskXBZ8KkNfjK/P5na7rgXbQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -3160,9 +3160,9 @@
             "license": "MIT"
         },
         "node_modules/@types/qs": {
-            "version": "6.9.17",
+            "version": "6.9.18",
-            "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.17.tgz",
+            "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz",
-            "integrity": "sha512-rX4/bPcfmvxHDv0XjfJELTTr+iB+tn032nPILqHm5wbthUUUuVtNGGqzhya9XUxjTP8Fpr0qYgSZZKxGY++svQ==",
+            "integrity": "sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==",
             "dev": true,
             "license": "MIT"
         },
@@ -4158,9 +4158,9 @@
             "license": "MIT"
         },
         "node_modules/bootstrap5-autocomplete": {
-            "version": "1.1.34",
+            "version": "1.1.35",
-            "resolved": "https://registry.npmjs.org/bootstrap5-autocomplete/-/bootstrap5-autocomplete-1.1.34.tgz",
+            "resolved": "https://registry.npmjs.org/bootstrap5-autocomplete/-/bootstrap5-autocomplete-1.1.35.tgz",
-            "integrity": "sha512-Z7+ig9sL5e8PiApQ2JA7BizevVLcsdpTpJboEwcFELg1IBDEU+LdbH6YnYFA2dgRxFkclCttCR8UPC9CbBpZiQ==",
+            "integrity": "sha512-vZAOef3lGrpGGnnIKTJlqiqv6wsx0Wr31/mc010mJmHF1eXJd28jzfGn7ol8eOI/7FiDcm3wd/1VTWku40vLbQ==",
             "license": "MIT"
         },
         "node_modules/bootstrap5-tags": {
@@ -4288,9 +4288,9 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.24.3",
+            "version": "4.24.4",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.3.tgz",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
-            "integrity": "sha512-1CPmv8iobE2fyRMV97dAcMVegvvWKxmq94hkLiAkUGwKVTyDLw33K+ZxiFrREKmmps4rIw6grcCFCnTMSZ/YiA==",
+            "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
             "dev": true,
             "funding": [
                 {
@@ -4448,9 +4448,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001690",
+            "version": "1.0.30001692",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001690.tgz",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001692.tgz",
-            "integrity": "sha512-5ExiE3qQN6oF8Clf8ifIDcMRCRE/dMGcETG/XGMD8/XiXm6HXQgQTh1yZYLXXpSOsEUlJm1Xr7kGULZTuGtP/w==",
+            "integrity": "sha512-A95VKan0kdtrsnMubMKxEKUKImOPSuCpYgxSQBo036P5YYgVIcOYJEgt/txJWqObiRQeISNCfef9nvlQ0vbV7A==",
             "dev": true,
             "funding": [
                 {
@@ -4892,13 +4892,13 @@
             "license": "MIT"
         },
         "node_modules/core-js-compat": {
-            "version": "3.39.0",
+            "version": "3.40.0",
-            "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.39.0.tgz",
+            "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.40.0.tgz",
-            "integrity": "sha512-VgEUx3VwlExr5no0tXlBt+silBvhTryPwCXRI2Id1PN8WTKu7MreethvddqOubrYxkFdv/RnYrqlv1sFNAUelw==",
+            "integrity": "sha512-0XEDpr5y5mijvw8Lbc6E5AkjrHfp7eEoPlu36SWeAbcL8fn1G1ANe8DBlo2XoNN89oVpxWwOjYIPVzR4ZvsKCQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "browserslist": "^4.24.2"
+                "browserslist": "^4.24.3"
             },
             "funding": {
                 "type": "opencollective",
@@ -5663,9 +5663,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.76",
+            "version": "1.5.82",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.76.tgz",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.82.tgz",
-            "integrity": "sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==",
+            "integrity": "sha512-Zq16uk1hfQhyGx5GpwPAYDwddJuSGhtRhgOA2mCxANYaDT79nAeGnaXogMGng4KqLaJUVnOnuL0+TDop9nLOiA==",
             "dev": true,
             "license": "ISC"
         },
@@ -5797,9 +5797,9 @@
             "license": "MIT"
         },
         "node_modules/es-object-atoms": {
-            "version": "1.0.0",
+            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
+            "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
-            "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
+            "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -6105,9 +6105,9 @@
             "license": "MIT"
         },
         "node_modules/fast-uri": {
-            "version": "3.0.4",
+            "version": "3.0.5",
-            "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.4.tgz",
+            "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.5.tgz",
-            "integrity": "sha512-G3iTQw1DizJQ5eEqj1CbFCWhq+pzum7qepkxU7rS1FGZDqjYKcrguo9XDRbV7EgPnn8CgaPigTq+NEjyioeYZQ==",
+            "integrity": "sha512-5JnBCWpFlMo0a3ciDy/JckMzzv1U9coZrIhedq+HXxxUfDTAiS0LA8OKVao4G9BxmCVck/jtA5r3KAtRWEyD8Q==",
             "dev": true,
             "funding": [
                 {
@@ -6910,9 +6910,9 @@
             }
         },
         "node_modules/http-parser-js": {
-            "version": "0.5.8",
+            "version": "0.5.9",
-            "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
+            "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.9.tgz",
-            "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
+            "integrity": "sha512-n1XsPy3rXVxlqxVioEWdC+0+M+SQw0DpJynwtOPo1X+ZlvdzTLtDBIJJlDQTnwZIFJrZSzSGmIOUdP8tu+SgLw==",
             "dev": true,
             "license": "MIT"
         },
@@ -6974,9 +6974,9 @@
             }
         },
         "node_modules/i18next": {
-            "version": "24.2.0",
+            "version": "24.2.1",
-            "resolved": "https://registry.npmjs.org/i18next/-/i18next-24.2.0.tgz",
+            "resolved": "https://registry.npmjs.org/i18next/-/i18next-24.2.1.tgz",
-            "integrity": "sha512-ArJJTS1lV6lgKH7yEf4EpgNZ7+THl7bsGxxougPYiXRTJ/Fe1j08/TBpV9QsXCIYVfdE/HWG/xLezJ5DOlfBOA==",
+            "integrity": "sha512-Q2wC1TjWcSikn1VAJg13UGIjc+okpFxQTxjVAymOnSA3RpttBQNMPf2ovcgoFVsV4QNxTfNZMAxorXZXsk4fBA==",
             "funding": [
                 {
                     "type": "individual",
@@ -8854,9 +8854,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.4.49",
+            "version": "8.5.1",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz",
-            "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+            "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",
+            "version": "6.14.0",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.1.tgz",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
-            "integrity": "sha512-EJPeIn0CYrGu+hli1xilKAPXODtJ12T0sP63Ijx2/khC2JtuaN3JyNIpvmnkmaEtha9ocbG4A4cMcr+TvqvwQg==",
+            "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"
@@ -9987,9 +9987,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.29.2",
+            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.29.2.tgz",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.30.1.tgz",
-            "integrity": "sha512-tJXpsEkzsEzyAKIaB3qv3IuvTVcTN7qBw1jL4SPPXM3vzDrJgiLGFY6+HodgFaUHAJ2RYJ94zV5MKRJCoQzQeA==",
+            "integrity": "sha512-mlJ4glW020fPuLi7DkM/lN97mYEZGWeqBnrljzN0gs7GLctqX3lNWxKQ7Gl712UAX+6fog/L3jh4gb7R6aVi3w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -10003,25 +10003,25 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.29.2",
+                "@rollup/rollup-android-arm-eabi": "4.30.1",
-                "@rollup/rollup-android-arm64": "4.29.2",
+                "@rollup/rollup-android-arm64": "4.30.1",
-                "@rollup/rollup-darwin-arm64": "4.29.2",
+                "@rollup/rollup-darwin-arm64": "4.30.1",
-                "@rollup/rollup-darwin-x64": "4.29.2",
+                "@rollup/rollup-darwin-x64": "4.30.1",
-                "@rollup/rollup-freebsd-arm64": "4.29.2",
+                "@rollup/rollup-freebsd-arm64": "4.30.1",
-                "@rollup/rollup-freebsd-x64": "4.29.2",
+                "@rollup/rollup-freebsd-x64": "4.30.1",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.29.2",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.30.1",
-                "@rollup/rollup-linux-arm-musleabihf": "4.29.2",
+                "@rollup/rollup-linux-arm-musleabihf": "4.30.1",
-                "@rollup/rollup-linux-arm64-gnu": "4.29.2",
+                "@rollup/rollup-linux-arm64-gnu": "4.30.1",
-                "@rollup/rollup-linux-arm64-musl": "4.29.2",
+                "@rollup/rollup-linux-arm64-musl": "4.30.1",
-                "@rollup/rollup-linux-loongarch64-gnu": "4.29.2",
+                "@rollup/rollup-linux-loongarch64-gnu": "4.30.1",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.29.2",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.30.1",
-                "@rollup/rollup-linux-riscv64-gnu": "4.29.2",
+                "@rollup/rollup-linux-riscv64-gnu": "4.30.1",
-                "@rollup/rollup-linux-s390x-gnu": "4.29.2",
+                "@rollup/rollup-linux-s390x-gnu": "4.30.1",
-                "@rollup/rollup-linux-x64-gnu": "4.29.2",
+                "@rollup/rollup-linux-x64-gnu": "4.30.1",
-                "@rollup/rollup-linux-x64-musl": "4.29.2",
+                "@rollup/rollup-linux-x64-musl": "4.30.1",
-                "@rollup/rollup-win32-arm64-msvc": "4.29.2",
+                "@rollup/rollup-win32-arm64-msvc": "4.30.1",
-                "@rollup/rollup-win32-ia32-msvc": "4.29.2",
+                "@rollup/rollup-win32-ia32-msvc": "4.30.1",
-                "@rollup/rollup-win32-x64-msvc": "4.29.2",
+                "@rollup/rollup-win32-x64-msvc": "4.30.1",
                 "fsevents": "~2.3.2"
             }
         },
@@ -10077,9 +10077,9 @@
             "license": "MIT"
         },
         "node_modules/sass": {
-            "version": "1.83.1",
+            "version": "1.83.4",
-            "resolved": "https://registry.npmjs.org/sass/-/sass-1.83.1.tgz",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.83.4.tgz",
-            "integrity": "sha512-EVJbDaEs4Rr3F0glJzFSOvtg2/oy2V/YrGFPqPY24UqcLDWcI9ZY5sN+qyO3c/QCZwzgfirvhXvINiJCE/OLcA==",
+            "integrity": "sha512-B1bozCeNQiOgDcLd33e2Cs2U60wZwjUUXzh900ZyQF5qUasvMdDZYbQ566LJu7cqR+sAHlAfO6RMkaID5s6qpA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -10114,13 +10114,13 @@
             }
         },
         "node_modules/sass/node_modules/readdirp": {
-            "version": "4.0.2",
+            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz",
+            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.1.tgz",
-            "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==",
+            "integrity": "sha512-h80JrZu/MHUZCyHu5ciuoI0+WxsCxzxJTILn6Fs8rxSnFPh+UVHYfeIxK1nVGugMqkfC4vJcBOYbkfkwYK0+gw==",
             "dev": true,
             "license": "MIT",
             "engines": {
-                "node": ">= 14.16.0"
+                "node": ">= 14.18.0"
             },
             "funding": {
                 "type": "individual",
@@ -11171,9 +11171,9 @@
             }
         },
         "node_modules/update-browserslist-db": {
-            "version": "1.1.1",
+            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz",
-            "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
+            "integrity": "sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==",
             "dev": true,
             "funding": [
                 {
@@ -11192,7 +11192,7 @@
             "license": "MIT",
             "dependencies": {
                 "escalade": "^3.2.0",
-                "picocolors": "^1.1.0"
+                "picocolors": "^1.1.1"
             },
             "bin": {
                 "update-browserslist-db": "cli.js"

resources/assets/v1/src/components/exchange-rates/Rates.vue

@@ -203,16 +203,16 @@ export default {
             return ('' === this.rates[index].rate && '' === this.rates[index].inverse) || this.updating;
         },
         updateRate: function (index) {
-            console.log('Update!');
+            // console.log('Update!');
-            console.log(this.rates[index].key);
+            // console.log(this.rates[index].key);
             let parts = this.spliceKey(this.rates[index].key);
             if (0 === parts.length) {
                 return;
             }
             if ('' !== this.rates[index].rate) {
                 // update rate
-                console.log('Rate is ' + this.rates[index].rate);
+                // console.log('Rate is ' + this.rates[index].rate);
-                console.log('ID is ' + this.rates[index].rate_id);
+                // console.log('ID is ' + this.rates[index].rate_id);
                 this.updating = true;
                 axios.put("./api/v2/exchange-rates/" + this.rates[index].rate_id, {rate: this.rates[index].rate})
                     .then(() => {
@@ -221,8 +221,8 @@ export default {
             }
             if ('' !== this.rates[index].inverse) {
                 // update inverse
-                console.log('Inverse is ' + this.rates[index].inverse);
+                // console.log('Inverse is ' + this.rates[index].inverse);
-                console.log('Inverse ID is ' + this.rates[index].inverse_id);
+                // console.log('Inverse ID is ' + this.rates[index].inverse_id);
                 this.updating = true;
                 axios.put("./api/v2/exchange-rates/" + this.rates[index].inverse_id, {rate: this.rates[index].inverse})
                     .then(() => {
@@ -231,12 +231,12 @@ export default {
             }
         },
         deleteRate: function (index) {
-            console.log(this.rates[index].key);
+            // console.log(this.rates[index].key);
             let parts = this.spliceKey(this.rates[index].key);
             if (0 === parts.length) {
                 return;
             }
-            console.log(parts);
+            // console.log(parts);
 
             // delete A to B
             axios.delete("./api/v2/exchange-rates/rates/" + parts.from + '/' + parts.to + '?date=' + format(parts.date, 'yyyy-MM-dd'));
@@ -271,7 +271,7 @@ export default {
                 }
             });
             axios.get("./api/v2/currencies/" + this.to_code).then((response) => {
-                console.log(response.data.data);
+                // console.log(response.data.data);
                 this.to = {
                     id: response.data.data.id,
                     code: response.data.data.attributes.code,
@@ -295,16 +295,16 @@ export default {
                         let rate_id = current.id;
                         let inverse_id = '0';
                         let key = from_code + '_' + to_code + '_' + format(date, 'yyyy-MM-dd');
-                        console.log('Key is now "' + key + '"');
+                        // console.log('Key is now "' + key + '"');
 
                         // perhaps the returned rate is actually the inverse rate.
                         if (from_code === this.to_code && to_code === this.from_code) {
-                            console.log('Inverse rate found!');
+                            // console.log('Inverse rate found!');
                             key = to_code + '_' + from_code + '_' + format(date, 'yyyy-MM-dd');
                             rate = '';
                             inverse = current.attributes.rate;
                             inverse_id = current.id;
-                            console.log('Key updated to "' + key + '"');
+                            // console.log('Key updated to "' + key + '"');
                         }
 
                         if (!this.tempRates.hasOwnProperty(key)) {

resources/assets/v1/src/components/form/Checkbox.vue

@@ -59,7 +59,7 @@ export default {
   },
   methods: {
     handleInput() {
-      console.log(this.active);
+      // console.log(this.active);
       this.$emit('input', this.active);
     },
   },

resources/assets/v1/src/components/transactions/CreateTransaction.vue

@@ -887,7 +887,7 @@ export default {
 
         deleteTransaction: function (index, event) {
             event.preventDefault();
-            console.log('Remove transaction.');
+            // console.log('Remove transaction.');
             this.transactions.splice(index, 1);
         },
         limitSourceType: function (type) {

resources/assets/v1/src/components/transactions/EditTransaction.vue

@@ -154,6 +154,10 @@
                                                     :transactionType="transactionType"
                                                     v-bind:title="$t('form.foreign_amount')"
                                     ></foreign-amount>
+                                    <reconciled v-show="isReconciled"
+                                        v-model="transaction.reconciled"
+                                        :error="transaction.errors.reconciled"
+                                    ></reconciled>
                                 </div>
                                 <div class="col-lg-4">
                                     <budget
@@ -455,6 +459,7 @@ export default {
                 transaction_journal_id: transaction.transaction_journal_id,
                 description: transaction.description,
                 date: transaction.date.substring(0, 16),
+                reconciled: transaction.reconciled,
                 amount: this.roundNumber(this.positiveAmount(transaction.amount), transaction.currency_decimal_places),
                 category: transaction.category_name,
                 errors: {
@@ -464,6 +469,7 @@ export default {
                     amount: [],
                     date: [],
                     budget_id: [],
+                    reconciled: [],
                     bill_id: [],
                     foreign_amount: [],
                     category: [],
@@ -540,7 +546,7 @@ export default {
             // }
         },
         convertData: function () {
-            console.log('start of convertData');
+            // console.log('start of convertData');
             let data = {
                 'apply_rules': this.applyRules,
                 'fire_webhooks': this.fireWebhooks,
@@ -578,7 +584,7 @@ export default {
             if ('deposit' === transactionType) {
                 currencyId = this.transactions[0].destination_account.currency_id;
             }
-            console.log('Overruled currency ID to ' + currencyId);
+            // console.log('Overruled currency ID to ' + currencyId);
 
             for (let key in this.transactions) {
                 if (this.transactions.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
@@ -586,7 +592,7 @@ export default {
                 }
             }
             //console.log(data);
-            console.log('end of convertData');
+            // console.log('end of convertData');
             return data;
         },
         convertDataRow(row, index, transactionType, currencyId) {
@@ -615,7 +621,7 @@ export default {
             // }
 
             row.currency_id = currencyId;
-            console.log('Final currency ID = ' + currencyId);
+            // console.log('Final currency ID = ' + currencyId);
 
             date = row.date;
             if (index > 0) {
@@ -676,6 +682,8 @@ export default {
                 row.amount = String(row.amount).replace(',', '.');
             }
 
+            // console.log('Reconciled is ' + row.reconciled);
+
             currentArray =
                 {
                     transaction_journal_id: row.transaction_journal_id,
@@ -688,6 +696,8 @@ export default {
                     source_id: sourceId,
                     source_name: sourceName,
 
+                    reconciled: row.reconciled,
+
                     destination_id: destId,
                     destination_name: destName,
 
@@ -726,7 +736,7 @@ export default {
             if (parseInt(row.piggy_bank) > 0) {
                 currentArray.piggy_bank_id = parseInt(row.piggy_bank);
             }
-            if(this.isReconciled && !this.storeAsNew) {
+            if(this.isReconciled && !this.storeAsNew && true === row.reconciled) {
                 // drop content from array:
                 delete currentArray.source_id;
                 delete currentArray.source_name;
@@ -738,11 +748,14 @@ export default {
                 delete currentArray.currency_id;
                 currentArray.reconciled = true;
             }
+            if(true === row.isReconciled) {
+                this.isReconciled = false;
+            }
 
             return currentArray;
         },
         submit: function (e) {
-            console.log('Submit!');
+            // console.log('Submit!');
             let button = $(e.currentTarget);
             button.prop("disabled", true);
 
@@ -751,26 +764,26 @@ export default {
             let uri = './api/v1/transactions/' + groupId + '?_token=' + document.head.querySelector('meta[name="csrf-token"]').content;
             let method = 'PUT';
             if (this.storeAsNew) {
-                console.log('storeAsNew');
+                // console.log('storeAsNew');
                 // other links.
                 uri = './api/v1/transactions?_token=' + document.head.querySelector('meta[name="csrf-token"]').content;
                 method = 'POST';
             }
             const data = this.convertData();
-            console.log('POST!');
+            // console.log('POST!');
             axios({
                 method: method,
                 url: uri,
                 data: data,
             }).then(response => {
-                console.log('Response!');
+                // console.log('Response!');
                 if (0 === this.collectAttachmentData(response)) {
                     const title = response.data.data.attributes.group_title ?? response.data.data.attributes.transactions[0].description;
                     this.redirectUser(response.data.data.id, title);
                 }
                 button.removeAttr('disabled');
             }).catch(error => {
-                console.log('Error :(');
+                // console.log('Error :(');
                 // give user errors things back.
                 // something something render errors.
                 this.parseErrors(error.response.data);
@@ -779,11 +792,11 @@ export default {
             if (e) {
                 e.preventDefault();
             }
-            console.log('DONE with method.');
+            // console.log('DONE with method.');
         },
 
         redirectUser(groupId, title) {
-            console.log('Now in redirectUser');
+            // console.log('Now in redirectUser');
             if (this.returnAfter) {
                 this.setDefaultErrors();
                 // do message if update or new:
@@ -801,11 +814,11 @@ export default {
                     window.location.href = window.previousUrl + '?transaction_group_id=' + groupId + '&message=updated';
                 }
             }
-            console.log('End of redirectUser');
+            // console.log('End of redirectUser');
         },
 
         collectAttachmentData(response) {
-            console.log('Now incollectAttachmentData()');
+            // console.log('Now incollectAttachmentData()');
             let groupId = response.data.data.id;
 
             // array of all files to be uploaded:
@@ -837,7 +850,7 @@ export default {
                 }
             }
             let count = toBeUploaded.length;
-            console.log('Found ' + toBeUploaded.length + ' attachments.');
+            // console.log('Found ' + toBeUploaded.length + ' attachments.');
 
             // loop all uploads.
             for (const key in toBeUploaded) {
@@ -863,7 +876,7 @@ export default {
                     })(toBeUploaded[key], key, this);
                 }
             }
-            console.log('Done with collectAttachmentData()');
+            // console.log('Done with collectAttachmentData()');
             return count;
         },
 
@@ -963,6 +976,7 @@ export default {
                     foreign_amount: [],
                     category: [],
                     piggy_bank: [],
+                    reconciled: [],
                     tags: [],
                     // custom fields:
                     custom_errors: {
@@ -1060,6 +1074,7 @@ export default {
                             case 'budget_id':
                             case 'bill_id':
                             case 'description':
+                            case 'reconciled':
                             case 'tags':
                                 this.transactions[transactionIndex].errors[fieldName] = errors.errors[key];
                                 break;
@@ -1106,6 +1121,7 @@ export default {
                         bill_id: [],
                         foreign_amount: [],
                         category: [],
+                        reconciled: [],
                         piggy_bank: [],
                         tags: [],
                         // custom fields:

resources/assets/v1/src/components/transactions/Reconciled.vue

@@ -0,0 +1,75 @@
+<!--
+  - Reconciled.vue
+  - Copyright (c) 2025 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/.
+  -->
+
+
+<template>
+    <div class="form-group" v-bind:class="{ 'has-error': hasError()}">
+        <div class="col-sm-8 col-sm-offset-4 text-sm">
+
+        </div>
+        <label ref="cur" class="col-sm-4 control-label">
+            {{ $t('firefly.is_reconciled') }}
+        </label>
+        <div class="col-sm-8">
+            <div class="checkbox">
+                <label>
+                    <input name="create_another" @input="handleInput" type="checkbox" v-model="reconciled">
+                </label>
+            </div>
+        </div>
+        <ul v-for="error in this.error" class="list-unstyled">
+            <li class="text-danger">{{ error }}</li>
+        </ul>
+    </div>
+</template>
+
+<script>
+
+export default {
+    name: "Reconciled",
+    props: {
+        value: Boolean,
+        error: Array
+    },
+    data() {
+        return {
+            reconciled: this.value
+        }
+    },
+    watch: {
+        reconciled: function () {
+            // console.log('reconciled is ' + this.reconciled);
+            this.$emit('input', this.reconciled);
+        },
+    },
+    methods: {
+        handleInput(e) {
+
+        },
+        hasError: function () {
+            return this.error.length > 0;
+        },
+    }
+}
+</script>
+
+<style scoped>
+
+</style>

resources/assets/v1/src/components/transactions/Tags.vue

@@ -74,13 +74,13 @@ export default {
   },
   methods: {
     update(newTags) {
-      console.log('update', newTags);
+      // console.log('update', newTags);
       this.autocompleteItems = [];
       this.tags = newTags;
       this.$emit('input', this.tags);
     },
     clearTags() {
-      console.log('clearTags');
+      // console.log('clearTags');
       this.tags = [];
       this.$emit('input', this.tags);
 
@@ -89,7 +89,7 @@ export default {
       return this.error.length > 0;
     },
     initItems() {
-      console.log('Now in initItems');
+      // console.log('Now in initItems');
       if (this.tag.length < 2) {
         return;
       }

resources/assets/v1/src/components/webhooks/Edit.vue

@@ -124,7 +124,7 @@ export default {
     },
     downloadWebhook: function (id) {
       axios.get('./api/v1/webhooks/' + id).then(response => {
-        console.log(response.data.data.attributes);
+        // console.log(response.data.data.attributes);
         this.title = response.data.data.attributes.title;
         this.id = parseInt(response.data.data.id);
 

resources/assets/v1/src/components/webhooks/Show.vue

@@ -290,7 +290,7 @@ export default {
       }
       let journalId = parseInt(prompt('Enter a transaction ID'));
       if (journalId !== null && journalId > 0 && journalId <= 16777216) {
-        console.log('OK 1');
+        // console.log('OK 1');
         this.disabledTrigger = true;
         // disable button. Add informative message.
         //let button = $('#triggerButton');
@@ -300,7 +300,7 @@ export default {
         // TODO actually trigger the webhook.
         axios.post('./api/v1/webhooks/' + this.id + '/trigger-transaction/' + journalId, {});
         //button.prop('disabled', false).removeClass('disabled');
-        console.log('OK 2');
+        // console.log('OK 2');
 
         // set a time-outs.
         this.loading = true;
@@ -308,7 +308,7 @@ export default {
           this.getWebhook();
           this.disabledTrigger = false;
         }, 2000);
-        console.log('OK 3');
+        // console.log('OK 3');
       }
 
 
@@ -363,7 +363,7 @@ export default {
     },
     downloadWebhook: function () {
       axios.get('./api/v1/webhooks/' + this.id).then(response => {
-        console.log(response.data.data.attributes);
+        // console.log(response.data.data.attributes);
         this.edit_url = './webhooks/edit/' + this.id;
         this.delete_url = './webhooks/delete/' + this.id;
         this.title = response.data.data.attributes.title;

resources/assets/v1/src/edit_transaction.js

@@ -31,6 +31,7 @@ import PiggyBank from "./components/transactions/PiggyBank";
 import Tags from "./components/transactions/Tags";
 import Category from "./components/transactions/Category";
 import Amount from "./components/transactions/Amount";
+import Reconciled from "./components/transactions/Reconciled";
 import ForeignAmountSelect from "./components/transactions/ForeignAmountSelect";
 import TransactionType from "./components/transactions/TransactionType";
 import AccountSelect from "./components/transactions/AccountSelect";
@@ -63,6 +64,7 @@ Vue.component('tags', Tags);
 Vue.component('category', Category);
 Vue.component('amount', Amount);
 Vue.component('foreign-amount', ForeignAmountSelect);
+Vue.component('reconciled', Reconciled);
 Vue.component('transaction-type', TransactionType);
 Vue.component('account-select', AccountSelect);
 

resources/assets/v1/src/locales/bg.json

@@ -9,6 +9,7 @@
         "select_source_account": "Please select or type a valid source account name",
         "split_transaction_title": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u043d\u0430 \u0440\u0430\u0437\u0434\u0435\u043b\u0435\u043d\u0430 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f",
         "errors_submission": "There was something wrong with your submission. Please check out the errors below.",
+        "is_reconciled": "Is reconciled",
         "split": "\u0420\u0430\u0437\u0434\u0435\u043b\u0438",
         "single_split": "\u0420\u0430\u0437\u0434\u0435\u043b",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">\u0422\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f #{ID}(\"{title}\")<\/a> \u0431\u0435\u0448\u0435 \u0437\u0430\u043f\u0438\u0441\u0430\u043d\u0430.",
@@ -33,7 +34,7 @@
         "submit": "\u041f\u043e\u0442\u0432\u044a\u0440\u0434\u0438",
         "amount": "\u0421\u0443\u043c\u0430",
         "date": "\u0414\u0430\u0442\u0430",
-        "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
+        "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.",
         "tags": "\u0415\u0442\u0438\u043a\u0435\u0442\u0438",
         "no_budget": "(\u0431\u0435\u0437 \u0431\u044e\u0434\u0436\u0435\u0442)",
         "no_bill": "(no subscription)",

resources/assets/v1/src/locales/ca.json

@@ -9,6 +9,7 @@
         "select_source_account": "Per favor, selecciona o escriu un nom de compte d'origen v\u00e0lid",
         "split_transaction_title": "Descripci\u00f3 de la transacci\u00f3 dividida",
         "errors_submission": "Hi ha hagut un error amb el teu enviament. Per favor, revisa els errors de sota.",
+        "is_reconciled": "Is reconciled",
         "split": "Dividir",
         "single_split": "Divisi\u00f3",
         "transaction_stored_link": "La <a href=\"transactions\/show\/{ID}\">Transacci\u00f3 #{ID} (\"{title}\")<\/a> s'ha desat.",
@@ -33,7 +34,7 @@
         "submit": "Enviar",
         "amount": "Import",
         "date": "Data",
-        "is_reconciled_fields_dropped": "Com aquesta transacci\u00f3 est\u00e0 reconciliada, no podr\u00e0s actualitzar els comptes, ni les quantitats.",
+        "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.",
         "tags": "Etiquetes",
         "no_budget": "(cap pressupost)",
         "no_bill": "(no subscription)",

resources/assets/v1/src/locales/cs.json

@@ -9,6 +9,7 @@
         "select_source_account": "Please select or type a valid source account name",
         "split_transaction_title": "Popis roz\u00fa\u010dtov\u00e1n\u00ed",
         "errors_submission": "There was something wrong with your submission. Please check out the errors below.",
+        "is_reconciled": "Is reconciled",
         "split": "Rozd\u011blit",
         "single_split": "Rozd\u011blit",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
@@ -33,7 +34,7 @@
         "submit": "Odeslat",
         "amount": "\u010c\u00e1stka",
         "date": "Datum",
-        "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
+        "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.",
         "tags": "\u0160t\u00edtky",
         "no_budget": "(\u017e\u00e1dn\u00fd rozpo\u010det)",
         "no_bill": "(no subscription)",

resources/assets/v1/src/locales/da.json

@@ -9,6 +9,7 @@
         "select_source_account": "Please select or type a valid source account name",
         "split_transaction_title": "Description of the split transaction",
         "errors_submission": "There was something wrong with your submission. Please check out the errors below.",
+        "is_reconciled": "Is reconciled",
         "split": "Opdel",
         "single_split": "Opdel",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
@@ -33,7 +34,7 @@
         "submit": "Submit",
         "amount": "Bel\u00f8b",
         "date": "Date",
-        "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
+        "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.",
         "tags": "Etiketter",
         "no_budget": "(no budget)",
         "no_bill": "(no subscription)",

resources/assets/v1/src/locales/de.json

@@ -9,6 +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": "Ist abgestimmt",
         "split": "Teilen",
         "single_split": "Teilen",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Buchung #{ID} (\"{title}\")<\/a> wurde gespeichert.",
@@ -33,7 +34,7 @@
         "submit": "Absenden",
         "amount": "Betrag",
         "date": "Datum",
-        "is_reconciled_fields_dropped": "Da diese Buchung abgeglichen ist, k\u00f6nnen Sie weder die Konten noch den\/die Betrag\/Betr\u00e4ge aktualisieren.",
+        "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)",

resources/assets/v1/src/locales/el.json

@@ -9,6 +9,7 @@
         "select_source_account": "Please select or type a valid source account name",
         "split_transaction_title": "\u03a0\u03b5\u03c1\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae \u03c4\u03b7\u03c2 \u03c3\u03c5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ae\u03c2 \u03bc\u03b5 \u03b4\u03b9\u03b1\u03c7\u03c9\u03c1\u03b9\u03c3\u03bc\u03cc",
         "errors_submission": "There was something wrong with your submission. Please check out the errors below.",
+        "is_reconciled": "Is reconciled",
         "split": "\u0394\u03b9\u03b1\u03c7\u03c9\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2",
         "single_split": "\u0394\u03b9\u03b1\u03c7\u03c9\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">\u0397 \u03c3\u03c5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ae #{ID} (\"{title}\")<\/a> \u03ad\u03c7\u03b5\u03b9 \u03b1\u03c0\u03bf\u03b8\u03b7\u03ba\u03b5\u03c5\u03c4\u03b5\u03af.",
@@ -33,7 +34,7 @@
         "submit": "\u03a5\u03c0\u03bf\u03b2\u03bf\u03bb\u03ae",
         "amount": "\u03a0\u03bf\u03c3\u03cc",
         "date": "\u0397\u03bc\u03b5\u03c1\u03bf\u03bc\u03b7\u03bd\u03af\u03b1",
-        "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
+        "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.",
         "tags": "\u0395\u03c4\u03b9\u03ba\u03ad\u03c4\u03b5\u03c2",
         "no_budget": "(\u03c7\u03c9\u03c1\u03af\u03c2 \u03c0\u03c1\u03bf\u03cb\u03c0\u03bf\u03bb\u03bf\u03b3\u03b9\u03c3\u03bc\u03cc)",
         "no_bill": "(no subscription)",

resources/assets/v1/src/locales/en-gb.json

@@ -9,6 +9,7 @@
         "select_source_account": "Please select or type a valid source account name",
         "split_transaction_title": "Description of the split transaction",
         "errors_submission": "There was something wrong with your submission. Please check out the errors below.",
+        "is_reconciled": "Is reconciled",
         "split": "Split",
         "single_split": "Split",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
@@ -33,7 +34,7 @@
         "submit": "Submit",
         "amount": "Amount",
         "date": "Date",
-        "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
+        "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.",
         "tags": "Tags",
         "no_budget": "(no budget)",
         "no_bill": "(no subscription)",

resources/assets/v1/src/locales/en.json

@@ -9,6 +9,7 @@
         "select_source_account": "Please select or type a valid source account name",
         "split_transaction_title": "Description of the split transaction",
         "errors_submission": "There was something wrong with your submission. Please check out the errors below.",
+        "is_reconciled": "Is reconciled",
         "split": "Split",
         "single_split": "Split",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
@@ -33,7 +34,7 @@
         "submit": "Submit",
         "amount": "Amount",
         "date": "Date",
-        "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
+        "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.",
         "tags": "Tags",
         "no_budget": "(no budget)",
         "no_bill": "(no subscription)",

resources/assets/v1/src/locales/es.json

@@ -9,6 +9,7 @@
         "select_source_account": "Por favor, seleccione o escriba un nombre de cuenta de origen v\u00e1lido",
         "split_transaction_title": "Descripci\u00f3n de la transacci\u00f3n dividida",
         "errors_submission": "Hubo un problema con su env\u00edo. Por favor, compruebe los siguientes errores.",
+        "is_reconciled": "Is reconciled",
         "split": "Separar",
         "single_split": "Divisi\u00f3n",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">La transacci\u00f3n #{ID} (\"{title}\")<\/a> ha sido almacenada.",
@@ -33,7 +34,7 @@
         "submit": "Enviar",
         "amount": "Cantidad",
         "date": "Fecha",
-        "is_reconciled_fields_dropped": "Debido a que esta transacci\u00f3n est\u00e1 reconciliada, no podr\u00e1 actualizar las cuentas, ni las cantidades.",
+        "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.",
         "tags": "Etiquetas",
         "no_budget": "(sin presupuesto)",
         "no_bill": "(no subscription)",

resources/assets/v1/src/locales/fi.json

@@ -9,6 +9,7 @@
         "select_source_account": "Please select or type a valid source account name",
         "split_transaction_title": "Jaetun tapahtuman kuvaus",
         "errors_submission": "There was something wrong with your submission. Please check out the errors below.",
+        "is_reconciled": "Is reconciled",
         "split": "Jaa",
         "single_split": "Jako",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Tapahtuma #{ID} (\"{title}\")<\/a> on tallennettu.",
@@ -33,7 +34,7 @@
         "submit": "Vahvista",
         "amount": "Summa",
         "date": "P\u00e4iv\u00e4m\u00e4\u00e4r\u00e4",
-        "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
+        "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.",
         "tags": "T\u00e4git",
         "no_budget": "(ei budjettia)",
         "no_bill": "(no subscription)",
@@ -108,7 +109,7 @@
         "meta_data": "Metatieto",
         "webhook_messages": "Webhook message",
         "inactive": "Ei aktiivinen",
-        "no_webhook_messages": "There are no webhook messages",
+        "no_webhook_messages": "Verkkotoimintokutsuviestej\u00e4 ei ole",
         "inspect": "Inspect",
         "create_new_webhook": "Create new webhook",
         "webhooks": "Webhookit",
@@ -126,7 +127,7 @@
         "attempt_content_help": "These are all the unsuccessful attempts of this webhook message to submit to the configured URL. After some time, Firefly III will stop trying.",
         "no_attempts": "There are no unsuccessful attempts. That's a good thing!",
         "webhook_attempt_at": "Attempt at {moment}",
-        "logs": "Logs",
+        "logs": "Lokitiedot",
         "response": "Response",
         "visit_webhook_url": "Visit webhook URL",
         "reset_webhook_secret": "Reset webhook secret",
@@ -153,12 +154,12 @@
         "payment_date": "Maksup\u00e4iv\u00e4",
         "invoice_date": "Laskun p\u00e4iv\u00e4m\u00e4\u00e4r\u00e4",
         "internal_reference": "Sis\u00e4inen viite",
-        "webhook_response": "Response",
+        "webhook_response": "Vastaus",
-        "webhook_trigger": "Trigger",
+        "webhook_trigger": "Ehto",
-        "webhook_delivery": "Delivery",
+        "webhook_delivery": "Toimitus",
         "from_currency_to_currency": "{from} &rarr; {to}",
         "to_currency_from_currency": "{to} &rarr; {from}",
-        "rate": "Rate"
+        "rate": "Kurssi"
     },
     "list": {
         "active": "Aktiivinen?",

resources/assets/v1/src/locales/fr.json

@@ -9,6 +9,7 @@
         "select_source_account": "Veuillez s\u00e9lectionner ou saisir un nom de compte source valide",
         "split_transaction_title": "Description de l'op\u00e9ration s\u00e9par\u00e9e",
         "errors_submission": "Certaines informations ne sont pas correctes dans votre formulaire. Veuillez v\u00e9rifier les erreurs ci-dessous.",
+        "is_reconciled": "Est rapproch\u00e9",
         "split": "S\u00e9paration",
         "single_split": "S\u00e9paration unique",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">L'op\u00e9ration n\u00b0{ID} (\"{title}\")<\/a> a \u00e9t\u00e9 enregistr\u00e9e.",
@@ -33,7 +34,7 @@
         "submit": "Soumettre",
         "amount": "Montant",
         "date": "Date",
-        "is_reconciled_fields_dropped": "Comme cette op\u00e9ration est rapproch\u00e9e, vous ne pourrez pas modifier les comptes, ni le(s) montant(s).",
+        "is_reconciled_fields_dropped": "Comme cette op\u00e9ration est rapproch\u00e9e, vous ne pourrez pas modifier les comptes, ni le(s) montant(s) \u00e0 moins de retirer l'indicateur de r\u00e9conciliation.",
         "tags": "Tags",
         "no_budget": "(pas de budget)",
         "no_bill": "(no subscription)",
@@ -52,7 +53,7 @@
         "destination_account_reconciliation": "Vous ne pouvez pas modifier le compte de destination d'une op\u00e9ration de rapprochement.",
         "source_account_reconciliation": "Vous ne pouvez pas modifier le compte source d'une op\u00e9ration de rapprochement.",
         "budget": "Budget",
-        "bill": "Subscription",
+        "bill": "Abonnement",
         "you_create_withdrawal": "Vous saisissez une d\u00e9pense.",
         "you_create_transfer": "Vous saisissez un transfert.",
         "you_create_deposit": "Vous saisissez un d\u00e9p\u00f4t.",
@@ -130,15 +131,15 @@
         "response": "R\u00e9ponse",
         "visit_webhook_url": "Visiter l'URL du webhook",
         "reset_webhook_secret": "R\u00e9initialiser le secret du webhook",
-        "header_exchange_rates": "Exchange rates",
+        "header_exchange_rates": "Taux de change",
-        "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 prend en charge le chargement et l'utilisation des taux de change. En savoir plus \u00e0 ce sujet dans <a href=\"https:\/\/docs.firefly-iii.org\/LOL_NOT_FINISHED_YET_TODO\">la documentation<\/a>.",
-        "exchange_rates_from_to": "Between {from} and {to} (and the other way around)",
+        "exchange_rates_from_to": "Entre {from} et {to} (et l'inverse)",
-        "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 utilise les taux de change suivants. L'inverse est calcul\u00e9 automatiquement lorsqu'il n'est pas fourni. Si aucun taux de change n'existe pour la date de la transaction, Firefly III reviendra dans le temps pour en trouver un. Si aucun n'est pr\u00e9sent, le taux \"1\" sera utilis\u00e9.",
-        "header_exchange_rates_rates": "Exchange rates",
+        "header_exchange_rates_rates": "Taux de change",
-        "header_exchange_rates_table": "Table with exchange rates",
+        "header_exchange_rates_table": "Table avec taux de change",
-        "help_rate_form": "On this day, how many {to} will you get for one {from}?",
+        "help_rate_form": "Aujourd'hui, combien de {to} obtiendrez-vous pour un {from} ?",
-        "add_new_rate": "Add a new exchange rate",
+        "add_new_rate": "Ajouter un nouveau taux de change",
-        "save_new_rate": "Save new rate"
+        "save_new_rate": "Enregistrer le nouveau taux"
     },
     "form": {
         "url": "Liens",

resources/assets/v1/src/locales/hu.json

@@ -9,6 +9,7 @@
         "select_source_account": "Please select or type a valid source account name",
         "split_transaction_title": "Felosztott tranzakci\u00f3 le\u00edr\u00e1sa",
         "errors_submission": "Hiba t\u00f6rt\u00e9nt a bek\u00fcld\u00e9s sor\u00e1n. K\u00e9rlek jav\u00edtsd az al\u00e1bbi hib\u00e1kat.",
+        "is_reconciled": "Is reconciled",
         "split": "Feloszt\u00e1s",
         "single_split": "Feloszt\u00e1s",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> mentve.",
@@ -33,7 +34,7 @@
         "submit": "Bek\u00fcld\u00e9s",
         "amount": "\u00d6sszeg",
         "date": "D\u00e1tum",
-        "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
+        "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.",
         "tags": "C\u00edmk\u00e9k",
         "no_budget": "(nincs k\u00f6lts\u00e9gkeret)",
         "no_bill": "(no subscription)",

resources/assets/v1/src/locales/id.json

@@ -9,6 +9,7 @@
         "select_source_account": "Please select or type a valid source account name",
         "split_transaction_title": "Description of the split transaction",
         "errors_submission": "There was something wrong with your submission. Please check out the errors below.",
+        "is_reconciled": "Is reconciled",
         "split": "Pisah",
         "single_split": "Pisah",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
@@ -33,7 +34,7 @@
         "submit": "Menyerahkan",
         "amount": "Jumlah",
         "date": "Tanggal",
-        "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
+        "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.",
         "tags": "Tag",
         "no_budget": "(no budget)",
         "no_bill": "(no subscription)",

resources/assets/v1/src/locales/it.json

@@ -9,6 +9,7 @@
         "select_source_account": "Please select or type a valid source account name",
         "split_transaction_title": "Descrizione della transazione suddivisa",
         "errors_submission": "Errore durante l'invio. Controlla gli errori segnalati qui sotto.",
+        "is_reconciled": "Is reconciled",
         "split": "Dividi",
         "single_split": "Divisione",
         "transaction_stored_link": "La <a href=\"transactions\/show\/{ID}\">transazione #{ID} (\"{title}\")<\/a> \u00e8 stata salvata.",
@@ -33,7 +34,7 @@
         "submit": "Invia",
         "amount": "Importo",
         "date": "Data",
-        "is_reconciled_fields_dropped": "Poich\u00e9 questa transazione \u00e8 riconciliata, non potrai aggiornare i conti, n\u00e9 gli importi.",
+        "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.",
         "tags": "Etichette",
         "no_budget": "(nessun budget)",
         "no_bill": "(no subscription)",

resources/assets/v1/src/locales/ja.json

@@ -9,6 +9,7 @@
         "select_source_account": "Please select or type a valid source account name",
         "split_transaction_title": "\u5206\u5272\u53d6\u5f15\u306e\u6982\u8981",
         "errors_submission": "There was something wrong with your submission. Please check out the errors below.",
+        "is_reconciled": "Is reconciled",
         "split": "\u5206\u5272",
         "single_split": "\u5206\u5272",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">\u53d6\u5f15 #{ID}\u300c{title}\u300d<\/a> \u304c\u4fdd\u5b58\u3055\u308c\u307e\u3057\u305f\u3002",
@@ -33,7 +34,7 @@
         "submit": "\u9001\u4fe1",
         "amount": "\u91d1\u984d",
         "date": "\u65e5\u4ed8",
-        "is_reconciled_fields_dropped": "\u3053\u306e\u53d6\u5f15\u306f\u7167\u5408\u6e08\u307f\u306e\u305f\u3081\u3001\u53e3\u5ea7\u3084\u91d1\u984d\u3092\u66f4\u65b0\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002",
+        "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.",
         "tags": "\u30bf\u30b0",
         "no_budget": "(\u4e88\u7b97\u306a\u3057)",
         "no_bill": "(no subscription)",

resources/assets/v1/src/locales/ko.json

@@ -9,6 +9,7 @@
         "select_source_account": "\uc720\ud6a8\ud55c \uc18c\uc2a4 \uacc4\uc815 \ub0b4\uc5ed\uc744 \uc120\ud0dd \ub610\ub294 \ud0c0\uc785\uc744 \uc120\ud0dd\ud558\uc2ed\uc2dc\uc624.",
         "split_transaction_title": "\ubd84\ud560 \uac70\ub798\uc5d0 \ub300\ud55c \uc124\uba85",
         "errors_submission": "\uc81c\ucd9c\ud55c \ub0b4\uc6a9\uc5d0 \ubb38\uc81c\uac00 \uc788\uc2b5\ub2c8\ub2e4. \uc544\ub798 \uc624\ub958\ub97c \ud655\uc778\ud574 \uc8fc\uc138\uc694.",
+        "is_reconciled": "Is reconciled",
         "split": "\ub098\ub204\uae30",
         "single_split": "\ub098\ub204\uae30",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">\uac70\ub798 #{ID} (\"{title}\")<\/a>\uac00 \uc800\uc7a5\ub418\uc5c8\uc2b5\ub2c8\ub2e4.",
@@ -33,7 +34,7 @@
         "submit": "\uc81c\ucd9c",
         "amount": "\uae08\uc561",
         "date": "\ub0a0\uc9dc",
-        "is_reconciled_fields_dropped": "\uc774 \uac70\ub798\uac00 \uc218\uc815\ub418\uc5c8\uae30 \ub54c\ubb38\uc5d0, \uacc4\uc88c\ub098 \uae08\uc561\uc744 \uc5c5\ub370\uc774\ud2b8 \ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.",
+        "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.",
         "tags": "\ud0dc\uadf8",
         "no_budget": "(\uc608\uc0b0 \uc5c6\uc74c)",
         "no_bill": "(no subscription)",

resources/assets/v1/src/locales/nb.json

@@ -9,6 +9,7 @@
         "select_source_account": "Please select or type a valid source account name",
         "split_transaction_title": "Beskrivelse av den splittende transaksjon",
         "errors_submission": "There was something wrong with your submission. Please check out the errors below.",
+        "is_reconciled": "Is reconciled",
         "split": "Del opp",
         "single_split": "Del opp",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaksjon #{ID} (\"{title}\")<\/a> har blitt lagret.",
@@ -33,7 +34,7 @@
         "submit": "Send inn",
         "amount": "Bel\u00f8p",
         "date": "Dato",
-        "is_reconciled_fields_dropped": "Fordi denne transaksjonen er avstemt, vil du ikke kunne oppdatere kontoene eller bel\u00f8pene.",
+        "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.",
         "tags": "Tagger",
         "no_budget": "(ingen budsjett)",
         "no_bill": "(no subscription)",

resources/assets/v1/src/locales/nl.json

@@ -7,8 +7,9 @@
         "close": "Sluiten",
         "select_dest_account": "Selecteer of type een geldige doelrekeningnaam",
         "select_source_account": "Selecteer of type een geldige bronrekeningnaam",
-        "split_transaction_title": "Beschrijving van de gesplitste transactie",
+        "split_transaction_title": "Omschrijving van de gesplitste transactie",
         "errors_submission": "Er ging iets mis. Check de errors.",
+        "is_reconciled": "Is afgestemd",
         "split": "Splitsen",
         "single_split": "Split",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transactie #{ID} (\"{title}\")<\/a> is opgeslagen.",
@@ -33,7 +34,7 @@
         "submit": "Invoeren",
         "amount": "Bedrag",
         "date": "Datum",
-        "is_reconciled_fields_dropped": "Omdat deze transactie al is afgestemd, kan je het bedrag noch de rekeningen wijzigen.",
+        "is_reconciled_fields_dropped": "Omdat deze transactie al is afgestemd, kan je het bedrag noch de rekeningen wijzigen. Tenzij je het vinkje weghaalt.",
         "tags": "Tags",
         "no_budget": "(geen budget)",
         "no_bill": "(geen abonnement)",
@@ -44,11 +45,11 @@
         "update_transaction": "Update transactie",
         "after_update_create_another": "Na het opslaan terug om door te gaan met wijzigen.",
         "store_as_new": "Opslaan als nieuwe transactie ipv de huidige bij te werken.",
-        "split_title_help": "Als je een gesplitste transactie maakt, moet er een algemene beschrijving zijn voor alle splitsingen van de transactie.",
+        "split_title_help": "Als je een gesplitste transactie maakt, moet er een algemene omschrijving zijn voor alle splitsingen van de transactie.",
         "none_in_select_list": "(geen)",
         "no_piggy_bank": "(geen spaarpotje)",
         "description": "Omschrijving",
-        "split_transaction_title_help": "Als je een gesplitste transactie maakt, moet er een algemene beschrijving zijn voor alle splitsingen van de transactie.",
+        "split_transaction_title_help": "Als je een gesplitste transactie maakt, moet er een algemene omschrijving zijn voor alle splitsingen van de transactie.",
         "destination_account_reconciliation": "Je kan de doelrekening van een afstemming niet wijzigen.",
         "source_account_reconciliation": "Je kan de bronrekening van een afstemming niet wijzigen.",
         "budget": "Budget",

resources/assets/v1/src/locales/nn.json

@@ -9,6 +9,7 @@
         "select_source_account": "Please select or type a valid source account name",
         "split_transaction_title": "Beskrivinga av den splitta transaksjonen",
         "errors_submission": "There was something wrong with your submission. Please check out the errors below.",
+        "is_reconciled": "Is reconciled",
         "split": "Del opp",
         "single_split": "Del opp",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaksjon #{ID} (\"{title}\")<\/a> har vorte lagra.",
@@ -33,7 +34,7 @@
         "submit": "Send inn",
         "amount": "Bel\u00f8p",
         "date": "Dato",
-        "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
+        "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.",
         "tags": "N\u00f8kkelord",
         "no_budget": "(ingen budsjett)",
         "no_bill": "(no subscription)",

resources/assets/v1/src/locales/pl.json

@@ -9,6 +9,7 @@
         "select_source_account": "Wybierz lub wpisz prawid\u0142ow\u0105 nazw\u0119 konta \u017ar\u00f3d\u0142owego",
         "split_transaction_title": "Opis podzielonej transakcji",
         "errors_submission": "Co\u015b posz\u0142o nie tak w czasie zapisu. Prosz\u0119, sprawd\u017a b\u0142\u0119dy poni\u017cej.",
+        "is_reconciled": "Is reconciled",
         "split": "Podziel",
         "single_split": "Podzia\u0142",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transakcja #{ID} (\"{title}\")<\/a> zosta\u0142a zapisana.",
@@ -33,7 +34,7 @@
         "submit": "Prze\u015blij",
         "amount": "Kwota",
         "date": "Data",
-        "is_reconciled_fields_dropped": "Poniewa\u017c ta transakcja jest uzgodniona, nie b\u0119dziesz w stanie zaktualizowa\u0107 ani kont, ani kwot.",
+        "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.",
         "tags": "Tagi",
         "no_budget": "(brak bud\u017cetu)",
         "no_bill": "(no subscription)",

resources/assets/v1/src/locales/pt-br.json

@@ -9,6 +9,7 @@
         "select_source_account": "Por favor, selecione ou digite um nome de conta de origem v\u00e1lido",
         "split_transaction_title": "Descri\u00e7\u00e3o da transa\u00e7\u00e3o dividida",
         "errors_submission": "Algo deu errado com seu envio. Por favor, verifique os erros abaixo.",
+        "is_reconciled": "Is reconciled",
         "split": "Dividir",
         "single_split": "Divis\u00e3o",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transa\u00e7\u00e3o #{ID} (\"{title}\")<\/a> foi salva.",
@@ -33,7 +34,7 @@
         "submit": "Enviar",
         "amount": "Valor",
         "date": "Data",
-        "is_reconciled_fields_dropped": "Como a transa\u00e7\u00e3o est\u00e1 reconciliada, voc\u00ea n\u00e3o pode atualizar as contas, nem o(s) valor(es).",
+        "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.",
         "tags": "Tags",
         "no_budget": "(sem or\u00e7amento)",
         "no_bill": "(no subscription)",

resources/assets/v1/src/locales/pt.json

@@ -9,6 +9,7 @@
         "select_source_account": "Por favor, selecione ou digite um nome de conta v\u00e1lido",
         "split_transaction_title": "Descri\u00e7\u00e3o da transa\u00e7\u00e3o dividida",
         "errors_submission": "Algo correu mal com o envio dos dados. Por favor verifique e corrija os erros abaixo.",
+        "is_reconciled": "Is reconciled",
         "split": "Dividir",
         "single_split": "Divis\u00e3o",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">A transa\u00e7\u00e3o #{ID} (\"{title}\")<\/a> foi guardada.",
@@ -33,7 +34,7 @@
         "submit": "Guardar",
         "amount": "Montante",
         "date": "Data",
-        "is_reconciled_fields_dropped": "Como esta transa\u00e7\u00e3o est\u00e1 reconciliada, n\u00e3o pode atualizar as contas, nem os montantes.",
+        "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.",
         "tags": "Etiquetas",
         "no_budget": "(sem or\u00e7amento)",
         "no_bill": "(no subscription)",

resources/assets/v1/src/locales/ro.json

@@ -9,6 +9,7 @@
         "select_source_account": "Please select or type a valid source account name",
         "split_transaction_title": "Descrierea tranzac\u021biei divizate",
         "errors_submission": "There was something wrong with your submission. Please check out the errors below.",
+        "is_reconciled": "Is reconciled",
         "split": "\u00cemparte",
         "single_split": "\u00cemparte",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Tranzac\u021bia #{ID} (\"{title}\")<\/a> a fost stocat\u0103.",
@@ -33,7 +34,7 @@
         "submit": "Trimite",
         "amount": "Sum\u0103",
         "date": "Dat\u0103",
-        "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
+        "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.",
         "tags": "Etichete",
         "no_budget": "(nici un buget)",
         "no_bill": "(no subscription)",

resources/assets/v1/src/locales/ru.json

@@ -9,6 +9,7 @@
         "select_source_account": "\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0438\u043b\u0438 \u0432\u0432\u0435\u0434\u0438\u0442\u0435 \u043a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u043e\u0435 \u0438\u043c\u044f \u0441\u0447\u0435\u0442\u0430 \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u0430",
         "split_transaction_title": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u0440\u0430\u0437\u0434\u0435\u043b\u0451\u043d\u043d\u043e\u0439 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438",
         "errors_submission": "\u0421 \u0432\u0430\u0448\u0435\u0439 \u043f\u0443\u0431\u043b\u0438\u043a\u0430\u0446\u0438\u0435\u0439 \u043f\u0440\u043e\u0438\u0437\u043e\u0448\u043b\u0430 \u043e\u0448\u0438\u0431\u043a\u0430. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u043e\u0448\u0438\u0431\u043a\u0438 \u043d\u0438\u0436\u0435.",
+        "is_reconciled": "\u0421\u0432\u0435\u0440\u0435\u043d\u043e",
         "split": "\u0420\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u044c",
         "single_split": "\u0420\u0430\u0437\u0434\u0435\u043b\u0451\u043d\u043d\u0430\u044f \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">\u0422\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f #{ID} (\"{title}\")<\/a> \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0430.",
@@ -21,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",
@@ -33,7 +34,7 @@
         "submit": "\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044c",
         "amount": "\u0421\u0443\u043c\u043c\u0430",
         "date": "\u0414\u0430\u0442\u0430",
-        "is_reconciled_fields_dropped": "\u041f\u043e\u0441\u043a\u043e\u043b\u044c\u043a\u0443 \u044d\u0442\u0430 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f \u0441\u0432\u0435\u0440\u0435\u043d\u0430, \u0432\u044b \u043d\u0435 \u0441\u043c\u043e\u0436\u0435\u0442\u0435 \u043e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0441\u0447\u0435\u0442\u0430, \u043d\u0438 \u0441\u0443\u043c\u043c\u0443(\u044b).",
+        "is_reconciled_fields_dropped": "\u041f\u043e\u0441\u043a\u043e\u043b\u044c\u043a\u0443 \u044d\u0442\u0430 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f \u0441\u0432\u0435\u0440\u044f\u0435\u0442\u0441\u044f, \u0432\u0430\u043c \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0444\u043b\u0430\u0433 \u0441\u0432\u0435\u0440\u043a\u0438 \u0434\u043b\u044f \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f \u0441\u0447\u0435\u0442\u0430 \u0438\u043b\u0438 \u0441\u0443\u043c\u043c\u044b.",
         "tags": "\u041c\u0435\u0442\u043a\u0438",
         "no_budget": "(\u0432\u043d\u0435 \u0431\u044e\u0434\u0436\u0435\u0442\u0430)",
         "no_bill": "(\u043d\u0435\u0442 \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0438)",
@@ -131,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"
     },

resources/assets/v1/src/locales/sk.json

@@ -9,6 +9,7 @@
         "select_source_account": "Please select or type a valid source account name",
         "split_transaction_title": "Popis roz\u00fa\u010dtovania",
         "errors_submission": "There was something wrong with your submission. Please check out the errors below.",
+        "is_reconciled": "Is reconciled",
         "split": "Roz\u00fa\u010dtova\u0165",
         "single_split": "Roz\u00fa\u010dtova\u0165",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transakcia #{ID} (\"{title}\")<\/a> bola ulo\u017een\u00e1.",
@@ -33,7 +34,7 @@
         "submit": "Odosla\u0165",
         "amount": "Suma",
         "date": "D\u00e1tum",
-        "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
+        "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.",
         "tags": "\u0160t\u00edtky",
         "no_budget": "(\u017eiadny rozpo\u010det)",
         "no_bill": "(no subscription)",

resources/assets/v1/src/locales/sl.json

@@ -9,6 +9,7 @@
         "select_source_account": "Izberite ali vnesite veljavno ime izvornega ra\u010duna",
         "split_transaction_title": "Opis razdeljene transakcije",
         "errors_submission": "Nekaj je bilo narobe z va\u0161o oddajo. Preverite spodnje napake.",
+        "is_reconciled": "Is reconciled",
         "split": "Razdeli",
         "single_split": "Razdeli",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transakcija \u0161t. #{ID} (\"{title}\")<\/a> je bila shranjena.",
@@ -33,7 +34,7 @@
         "submit": "Potrdite",
         "amount": "Znesek",
         "date": "Datum",
-        "is_reconciled_fields_dropped": "Ker je ta transakcija usklajena, ne boste mogli posodobiti ra\u010dunov niti zneskov.",
+        "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.",
         "tags": "Oznake",
         "no_budget": "(brez prora\u010duna)",
         "no_bill": "(brez naro\u010dnin)",

resources/assets/v1/src/locales/sv.json

@@ -9,6 +9,7 @@
         "select_source_account": "Please select or type a valid source account name",
         "split_transaction_title": "Beskrivning av delad transaktion",
         "errors_submission": "There was something wrong with your submission. Please check out the errors below.",
+        "is_reconciled": "Is reconciled",
         "split": "Dela",
         "single_split": "Dela",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaktion #{ID} (\"{title}\")<\/a> sparades.",
@@ -33,7 +34,7 @@
         "submit": "Skicka",
         "amount": "Belopp",
         "date": "Datum",
-        "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
+        "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.",
         "tags": "Etiketter",
         "no_budget": "(ingen budget)",
         "no_bill": "(no subscription)",

resources/assets/v1/src/locales/tr.json

@@ -9,6 +9,7 @@
         "select_source_account": "Please select or type a valid source account name",
         "split_transaction_title": "Description of the split transaction",
         "errors_submission": "There was something wrong with your submission. Please check out the errors below.",
+        "is_reconciled": "Is reconciled",
         "split": "B\u00f6l",
         "single_split": "B\u00f6l",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">\u0130\u015flem #{ID} (\"{title}\")<\/a> sakl\u0131 olmu\u015ftur.",
@@ -33,7 +34,7 @@
         "submit": "G\u00f6nder",
         "amount": "Miktar",
         "date": "Tarih",
-        "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
+        "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.",
         "tags": "Etiketler",
         "no_budget": "(b\u00fct\u00e7e yok)",
         "no_bill": "(no subscription)",

resources/assets/v1/src/locales/uk.json

@@ -9,6 +9,7 @@
         "select_source_account": "\u0411\u0443\u0434\u044c \u043b\u0430\u0441\u043a\u0430, \u0432\u0438\u0431\u0435\u0440\u0456\u0442\u044c \u0430\u0431\u043e \u0432\u0432\u0435\u0434\u0456\u0442\u044c \u0434\u0456\u0439\u0441\u043d\u0435 \u0456\u043c'\u044f \u0432\u0438\u0445\u0456\u0434\u043d\u043e\u0433\u043e \u043e\u0431\u043b\u0456\u043a\u043e\u0432\u043e\u0433\u043e \u0437\u0430\u043f\u0438\u0441\u0443",
         "split_transaction_title": "\u041e\u043f\u0438\u0441 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0456\u0457 \u0440\u043e\u0437\u0434\u0456\u043b\u0435\u043d\u043d\u044f",
         "errors_submission": "\u0429\u043e\u0441\u044c \u043d\u0435 \u0442\u0430\u043a \u0437 \u0432\u0430\u0448\u043e\u044e \u043f\u0440\u043e\u043f\u043e\u0437\u0438\u0446\u0456\u0454\u044e. \u0411\u0443\u0434\u044c \u043b\u0430\u0441\u043a\u0430, \u043f\u0435\u0440\u0435\u0432\u0456\u0440\u0442\u0435 \u043f\u043e\u043c\u0438\u043b\u043a\u0438 \u043d\u0438\u0436\u0447\u0435.",
+        "is_reconciled": "Is reconciled",
         "split": "\u0420\u043e\u0437\u0434\u0456\u043b\u0438\u0442\u0438",
         "single_split": "\u0420\u043e\u0437\u0434\u0456\u043b\u0438\u0442\u0438",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">\u0422\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0456\u044f #{ID} (\"{title}\")<\/a> \u0431\u0443\u043b\u0430 \u0437\u0431\u0435\u0440\u0435\u0436\u0435\u043d\u0430.",
@@ -33,7 +34,7 @@
         "submit": "\u041f\u0456\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0438",
         "amount": "\u0421\u0443\u043c\u0430",
         "date": "\u0414\u0430\u0442\u0430",
-        "is_reconciled_fields_dropped": "\u0427\u0435\u0440\u0435\u0437 \u0442\u0435, \u0449\u043e \u0446\u044f \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0456\u044f \u0431\u0443\u043b\u0430 \u0432\u0438\u043a\u043e\u043d\u0430\u043d\u0430, \u0432\u0438 \u043d\u0435 \u0437\u043c\u043e\u0436\u0435\u0442\u0435 \u043e\u043d\u043e\u0432\u0438\u0442\u0438 \u043e\u0431\u043b\u0456\u043a\u043e\u0432\u0456 \u0437\u0430\u043f\u0438\u0441\u0438, \u0430 \u0442\u0430\u043a\u043e\u0436 \u0441\u0443\u043c\u0438(\u0457).",
+        "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.",
         "tags": "\u0422\u0435\u0433\u0438",
         "no_budget": "(\u043f\u043e\u0437\u0430 \u0431\u044e\u0434\u0436\u0435\u0442\u043e\u043c)",
         "no_bill": "(no subscription)",

resources/assets/v1/src/locales/vi.json

@@ -9,6 +9,7 @@
         "select_source_account": "Please select or type a valid source account name",
         "split_transaction_title": "M\u00f4 t\u1ea3 giao d\u1ecbch t\u00e1ch",
         "errors_submission": "There was something wrong with your submission. Please check out the errors below.",
+        "is_reconciled": "Is reconciled",
         "split": "Chia ra",
         "single_split": "Chia ra",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Giao d\u1ecbch #{ID} (\"{title}\")<\/a> \u0111\u00e3 \u0111\u01b0\u1ee3c l\u01b0u tr\u1eef.",
@@ -33,7 +34,7 @@
         "submit": "G\u1eedi",
         "amount": "S\u1ed1 ti\u1ec1n",
         "date": "Ng\u00e0y",
-        "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
+        "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.",
         "tags": "Nh\u00e3n",
         "no_budget": "(kh\u00f4ng c\u00f3 ng\u00e2n s\u00e1ch)",
         "no_bill": "(no subscription)",

resources/assets/v1/src/locales/zh-cn.json

@@ -9,6 +9,7 @@
         "select_source_account": "\u8bf7\u9009\u62e9\u6216\u8f93\u5165\u4e00\u4e2a\u6709\u6548\u7684\u6e90\u5e10\u6237\u540d\u79f0",
         "split_transaction_title": "\u62c6\u5206\u4ea4\u6613\u7684\u63cf\u8ff0",
         "errors_submission": "\u60a8\u7684\u63d0\u4ea4\u6709\u8bef\uff0c\u8bf7\u67e5\u770b\u4e0b\u9762\u8f93\u51fa\u7684\u9519\u8bef\u4fe1\u606f\u3002",
+        "is_reconciled": "Is reconciled",
         "split": "\u62c6\u5206",
         "single_split": "\u62c6\u5206",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">\u4ea4\u6613 #{ID} (\u201c{title}\u201d)<\/a> \u5df2\u4fdd\u5b58\u3002",
@@ -33,7 +34,7 @@
         "submit": "\u63d0\u4ea4",
         "amount": "\u91d1\u989d",
         "date": "\u65e5\u671f",
-        "is_reconciled_fields_dropped": "\u8fd9\u7b14\u4ea4\u6613\u5df2\u7ecf\u5bf9\u8d26\uff0c\u60a8\u65e0\u6cd5\u66f4\u65b0\u8d26\u6237\uff0c\u4e5f\u65e0\u6cd5\u66f4\u65b0\u91d1\u989d\u3002",
+        "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.",
         "tags": "\u6807\u7b7e",
         "no_budget": "(\u65e0\u9884\u7b97)",
         "no_bill": "(no subscription)",

resources/assets/v1/src/locales/zh-tw.json

@@ -9,6 +9,7 @@
         "select_source_account": "Please select or type a valid source account name",
         "split_transaction_title": "\u62c6\u5206\u4ea4\u6613\u7684\u63cf\u8ff0",
         "errors_submission": "There was something wrong with your submission. Please check out the errors below.",
+        "is_reconciled": "Is reconciled",
         "split": "\u5206\u5272",
         "single_split": "\u62c6\u5206",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
@@ -33,7 +34,7 @@
         "submit": "\u9001\u51fa",
         "amount": "\u91d1\u984d",
         "date": "\u65e5\u671f",
-        "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
+        "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.",
         "tags": "\u6a19\u7c64",
         "no_budget": "(\u7121\u9810\u7b97)",
         "no_bill": "(no subscription)",

resources/lang/en_US/firefly.php

@@ -1677,7 +1677,8 @@ return [
     'list_all_attachments'                                 => 'List of all attachments',
 
     // transaction index
-    'is_reconciled_fields_dropped'                         => 'Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).',
+    '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'                                        => 'Is reconciled',
     'title_expenses'                                       => 'Expenses',
     'title_withdrawal'                                     => 'Expenses',
     'title_revenue'                                        => 'Revenue / income',

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