Merge pull request #10206 from firefly-iii/release-1745670593

🤖 Automatically merge the PR into the develop branch.

.env.example

@@ -164,6 +164,13 @@ MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 MAIL_SENDMAIL_COMMAND=
 
+#
+# If you use self-signed certificates for your STMP server, you can use the following settings.
+#
+MAIL_ALLOW_SELF_SIGNED=false
+MAIL_VERIFY_PEER=true
+MAIL_VERIFY_PEER_NAME=true
+
 # Other mail drivers:
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
 MAILGUN_DOMAIN=

.github/workflows/release.yml

@@ -59,7 +59,28 @@ jobs:
           git config user.email release@firefly-iii.org
           git config advice.addIgnoredFile false
           git config push.autoSetupRemote true
-      - name: crowdin action
+      - name: Lint PHP
+        run: |
+          php_lint_file()
+          {
+              local php_file="$1"
+              php -l "$php_file" &> /dev/null
+              if [ "$?" -ne 0 ]
+              then
+                  echo -e "[FAIL] $php_file"
+                  return 1
+              fi
+          }
+
+          export -f php_lint_file
+
+          find . -path ./vendor -prune -o -name '*.php' | parallel -j 4 php_lint_file {}
+
+          if [ "$?" -ne 0 ]
+          then
+              exit 1
+          fi
+      - name: Crowdin action
         uses: crowdin/github-action@v2
         with:
           upload_sources: true

THANKS.md

@@ -4,6 +4,7 @@ Over time, many people have contributed to Firefly III. Their efforts are not al
 Please find below all the people who contributed to the Firefly III code. Their names are mentioned in the year of their first contribution.
 
 ## 2025
+- Denis Iskandarov
 - =
 - Lompi
 - Jose Diaz-Gonzalez

app/Api/V1/Controllers/Summary/BasicController.php

@@ -43,6 +43,7 @@ use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use FireflyIII\Support\Report\Summarizer\TransactionSummarizer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 
 /**
@@ -99,16 +100,15 @@ class BasicController extends Controller
         $start        = $dates['start'];
         $end          = $dates['end'];
         $code         = $request->get('currency_code');
-
         // balance information:
         $balanceData  = $this->getBalanceInformation($start, $end);
         $billData     = $this->getSubscriptionInformation($start, $end);
         $spentData    = $this->getLeftToSpendInfo($start, $end);
         $netWorthData = $this->getNetWorthInfo($end);
-        //                $balanceData  = [];
-        //                $billData     = [];
+        //                        $balanceData  = [];
+        //                        $billData     = [];
         //                $spentData    = [];
-        //                $netWorthData = [];
+        //                        $netWorthData = [];
         $total        = array_merge($balanceData, $billData, $spentData, $netWorthData);
 
         // give new keys
@@ -471,30 +471,60 @@ class BasicController extends Controller
      */
     private function getLeftToSpendInfo(Carbon $start, Carbon $end): array
     {
-        Log::debug(sprintf('Now in getLeftToSpendInfo("%s", "%s")', $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));
-        $return    = [];
-        $today     = today(config('app.timezone'));
-        $available = $this->abRepository->getAvailableBudgetWithCurrency($start, $end);
-        $budgets   = $this->budgetRepository->getActiveBudgets();
-        $spent     = $this->opsRepository->sumExpenses($start, $end, null, $budgets);
-        $days      = (int) $today->diffInDays($end, true) + 1;
 
+        Log::debug(sprintf('Now in getLeftToSpendInfo("%s", "%s")', $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));
+        $return     = [];
+        $today      = today(config('app.timezone'));
+        $available  = $this->abRepository->getAvailableBudgetWithCurrency($start, $end);
+        $budgets    = $this->budgetRepository->getActiveBudgets();
+        $spent      = $this->opsRepository->sumExpenses($start, $end, null, $budgets);
+        $days       = (int) $today->diffInDays($end, true) + 1;
+        $currencies = [];
+
+        // first, create an entry for each entry in the "available" array.
+        /** @var array $availableBudget */
+        foreach ($available as $currencyId =>  $availableBudget) {
+            $currencies[$currencyId] ??= $this->currencyRepos->find($currencyId);
+            $return[$currencyId] = [
+                'key'                     => sprintf('left-to-spend-in-%s', $currencies[$currencyId]->code),
+                'title'                   => trans('firefly.box_left_to_spend_in_currency', ['currency' => $currencies[$currencyId]->symbol]),
+                'no_available_budgets'    => false,
+                'monetary_value'          => $availableBudget,
+                'currency_id'             => (string) $currencies[$currencyId]->id,
+                'currency_code'           => $currencies[$currencyId]->code,
+                'currency_symbol'         => $currencies[$currencyId]->symbol,
+                'currency_decimal_places' => $currencies[$currencyId]->decimal_places,
+                'value_parsed'            => app('amount')->formatFlat($currencies[$currencyId]->symbol, $currencies[$currencyId]->decimal_places, $availableBudget, false),
+                'local_icon'              => 'money',
+                'sub_title'               => app('amount')->formatFlat(
+                    $currencies[$currencyId]->symbol,
+                    $currencies[$currencyId]->decimal_places,
+                    $availableBudget,
+                    false
+                ),
+            ];
+        }
         foreach ($spent as $row) {
             // either an amount was budgeted or 0 is available.
-            $currencyId      = $row['currency_id'];
-            $amount          = (string) ($available[$currencyId] ?? '0');
-            $spentInCurrency = $row['sum'];
-            $leftToSpend     = bcadd($amount, $spentInCurrency);
-            $perDay          = '0';
+            $currencyId          = (int) $row['currency_id'];
+            $amount              = (string) ($available[$currencyId] ?? '0');
+            if (0 === bccomp($amount, '0')) {
+                // #9858 skip over currencies with no available budget.
+                continue;
+            }
+            $spentInCurrency     = $row['sum'];
+            $leftToSpend         = bcadd($amount, $spentInCurrency);
+            $perDay              = '0';
             if (0 !== $days && bccomp($leftToSpend, '0') > -1) {
                 $perDay = bcdiv($leftToSpend, (string) $days);
             }
 
             Log::debug(sprintf('Spent %s %s', $row['currency_code'], $row['sum']));
 
-            $return[]        = [
+            $return[$currencyId] = [
                 'key'                     => sprintf('left-to-spend-in-%s', $row['currency_code']),
                 'title'                   => trans('firefly.box_left_to_spend_in_currency', ['currency' => $row['currency_symbol']]),
+                'no_available_budgets'    => false,
                 'monetary_value'          => $leftToSpend,
                 'currency_id'             => (string) $row['currency_id'],
                 'currency_code'           => $row['currency_code'],
@@ -510,28 +540,66 @@ class BasicController extends Controller
                 ),
             ];
         }
+        unset($leftToSpend);
         if (0 === count($return)) {
-            $currency = $this->nativeCurrency;
-            $return[] = [
-                'key'                     => sprintf('left-to-spend-in-%s', $currency->code),
-                'title'                   => trans('firefly.box_left_to_spend_in_currency', ['currency' => $currency->symbol]),
-                'monetary_value'          => '0',
-                'currency_id'             => (string) $currency->id,
-                'currency_code'           => $currency->code,
-                'currency_symbol'         => $currency->symbol,
-                'currency_decimal_places' => $currency->decimal_places,
-                'value_parsed'            => app('amount')->formatFlat($currency->symbol, $currency->decimal_places, '0', false),
-                'local_icon'              => 'money',
-                'sub_title'               => app('amount')->formatFlat(
-                    $currency->symbol,
-                    $currency->decimal_places,
-                    '0',
-                    false
-                ),
-            ];
+            // a small trick to get every expense in this period, regardless of budget.
+            $spent = $this->opsRepository->sumExpenses($start, $end, null, new Collection());
+            foreach ($spent as $row) {
+                // either an amount was budgeted or 0 is available.
+                $currencyId          = (int) $row['currency_id'];
+                $spentInCurrency     = $row['sum'];
+                $perDay              = '0';
+                if (0 !== $days && -1 === bccomp($spentInCurrency, '0')) {
+                    $perDay = bcdiv($spentInCurrency, (string) $days);
+                }
+
+                Log::debug(sprintf('Spent %s %s', $row['currency_code'], $row['sum']));
+
+                $return[$currencyId] = [
+                    'key'                     => sprintf('left-to-spend-in-%s', $row['currency_code']),
+                    'title'                   => trans('firefly.spent'),
+                    'no_available_budgets'    => true,
+                    'monetary_value'          => $spentInCurrency,
+                    'currency_id'             => (string) $row['currency_id'],
+                    'currency_code'           => $row['currency_code'],
+                    'currency_symbol'         => $row['currency_symbol'],
+                    'currency_decimal_places' => $row['currency_decimal_places'],
+                    'value_parsed'            => app('amount')->formatFlat($row['currency_symbol'], $row['currency_decimal_places'], $spentInCurrency, false),
+                    'local_icon'              => 'money',
+                    'sub_title'               => app('amount')->formatFlat(
+                        $row['currency_symbol'],
+                        $row['currency_decimal_places'],
+                        $perDay,
+                        false
+                    ),
+                ];
+            }
+
+            //            $amount = '0';
+            //            // $days
+            //            // fill in by money spent, just count it.
+            //            $currency              = $this->nativeCurrency;
+            //            $return[$currency->id] = [
+            //                'key'                     => sprintf('left-to-spend-in-%s', $currency->code),
+            //                'title'                   => trans('firefly.box_left_to_spend_in_currency', ['currency' => $currency->symbol]),
+            //                'monetary_value'          => '0',
+            //                'no_available_budgets'    => true,
+            //                'currency_id'             => (string) $currency->id,
+            //                'currency_code'           => $currency->code,
+            //                'currency_symbol'         => $currency->symbol,
+            //                'currency_decimal_places' => $currency->decimal_places,
+            //                'value_parsed'            => app('amount')->formatFlat($currency->symbol, $currency->decimal_places, '0', false),
+            //                'local_icon'              => 'money',
+            //                'sub_title'               => app('amount')->formatFlat(
+            //                    $currency->symbol,
+            //                    $currency->decimal_places,
+            //                    '0',
+            //                    false
+            //                ),
+            //            ];
         }
 
-        return $return;
+        return array_values($return);
     }
 
     private function getNetWorthInfo(Carbon $end): array

app/Factory/PiggyBankFactory.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Factory;
 
+use FireflyIII\Events\Model\PiggyBank\ChangedAmount;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\TransactionCurrency;
@@ -237,20 +238,46 @@ class PiggyBankFactory
             }
         }
 
-
         /** @var array $info */
         foreach ($accounts as $info) {
             $account = $this->accountRepository->find((int) ($info['account_id'] ?? 0));
             if (null === $account) {
+                Log::debug(sprintf('Account #%d not found, skipping.', (int) ($info['account_id'] ?? 0)));
+
                 continue;
             }
             if (array_key_exists('current_amount', $info) && null !== $info['current_amount']) {
+                // an amount is set, first check out if there is a difference with the previous amount.
+                $previous                 = $toBeLinked[$account->id]['current_amount'] ?? '0';
+                $diff                     = bcsub($info['current_amount'], $previous);
+
+                // create event for difference.
+                if (0 !== bccomp($diff, '0')) {
+                    Log::debug(sprintf('[a] Will save event for difference %s (previous value was %s)', $diff, $previous));
+                    event(new ChangedAmount($piggyBank, $diff, null, null));
+                }
+
                 $toBeLinked[$account->id] = ['current_amount' => $info['current_amount']];
                 Log::debug(sprintf('[a] Will link account #%d with amount %s', $account->id, $info['current_amount']));
             }
             if (array_key_exists('current_amount', $info) && null === $info['current_amount']) {
+                // an amount is set, first check out if there is a difference with the previous amount.
+                $previous                 = $toBeLinked[$account->id]['current_amount'] ?? '0';
+                $diff                     = bcsub('0', $previous);
+
+                // create event for difference.
+                if (0 !== bccomp($diff, '0')) {
+                    Log::debug(sprintf('[b] Will save event for difference %s (previous value was %s)', $diff, $previous));
+                    event(new ChangedAmount($piggyBank, $diff, null, null));
+                }
+
+                // no amount set, use previous amount or go to ZERO.
                 $toBeLinked[$account->id] = ['current_amount' => $toBeLinked[$account->id]['current_amount'] ?? '0'];
                 Log::debug(sprintf('[b] Will link account #%d with amount %s', $account->id, $toBeLinked[$account->id]['current_amount'] ?? '0'));
+
+                // create event:
+                Log::debug('linkToAccountIds: Trigger change for positive amount [b].');
+                event(new ChangedAmount($piggyBank, $toBeLinked[$account->id]['current_amount'], null, null));
             }
             if (!array_key_exists('current_amount', $info)) {
                 $toBeLinked[$account->id] ??= [];
@@ -258,6 +285,11 @@ class PiggyBankFactory
             }
         }
         Log::debug(sprintf('Link information: %s', json_encode($toBeLinked)));
-        $piggyBank->accounts()->sync($toBeLinked);
+        if (0 !== count($toBeLinked)) {
+            $piggyBank->accounts()->sync($toBeLinked);
+        }
+        if (0 === count($toBeLinked)) {
+            Log::warning('No accounts to link to piggy bank, will not change whatever is there now.');
+        }
     }
 }

app/Handlers/Observer/PiggyBankEventObserver.php

@@ -45,7 +45,13 @@ class PiggyBankEventObserver
 
     private function updateNativeAmount(PiggyBankEvent $event): void
     {
-        if (!Amount::convertToNative($event->piggyBank->accounts()->first()->user)) {
+        $user                 = $event->piggyBank->accounts()->first()?->user;
+        if (null === $user) {
+            Log::warning('Piggy bank seems to have no accounts. Break.');
+
+            return;
+        }
+        if (!Amount::convertToNative($user)) {
             return;
         }
         $userCurrency         = app('amount')->getNativeCurrencyByUserGroup($event->piggyBank->accounts()->first()->user->userGroup);

app/Helpers/Collector/Extensions/CollectorProperties.php

@@ -55,6 +55,7 @@ trait CollectorProperties
     private HasMany $query;
     private ?int    $startRow;
     private array   $stringFields;
+    private array   $booleanFields;
     /*
      * This array is used to collect ALL tags the user may search for (using 'setTags').
      * This way the user can call 'setTags' multiple times and get a joined result.

app/Helpers/Collector/GroupCollector.php

@@ -82,6 +82,7 @@ class GroupCollector implements GroupCollectorInterface
         $this->hasJoinedAttTables   = false;
         $this->expandGroupSearch    = false;
         $this->hasJoinedMetaTables  = false;
+        $this->booleanFields        = ['balance_dirty'];
         $this->integerFields        = [
             'transaction_group_id',
             'user_id',
@@ -100,7 +101,7 @@ class GroupCollector implements GroupCollectorInterface
             'category_id',
             'budget_id',
         ];
-        $this->stringFields         = ['amount', 'foreign_amount', 'native_amount', 'native_foreign_amount'];
+        $this->stringFields         = ['amount', 'foreign_amount', 'native_amount', 'native_foreign_amount', 'balance_after'];
         $this->total                = 0;
         $this->fields               = [
             // group
@@ -131,6 +132,8 @@ class GroupCollector implements GroupCollectorInterface
 
             // currency info:
             'source.amount as amount',
+            'source.balance_after as balance_after',
+            'source.balance_dirty as balance_dirty',
             'source.native_amount as native_amount',
             'source.transaction_currency_id as currency_id',
             'currency.code as currency_code',
@@ -596,6 +599,9 @@ class GroupCollector implements GroupCollectorInterface
         // convert values to integers:
         $result                  = $this->convertToInteger($result);
 
+        // convert to boolean
+        $result                  = $this->convertToBoolean($result);
+
         // convert back to strings because SQLite is dumb like that.
         $result                  = $this->convertToStrings($result);
 
@@ -653,6 +659,15 @@ class GroupCollector implements GroupCollectorInterface
         return $array;
     }
 
+    private function convertToBoolean(array $array): array
+    {
+        foreach ($this->booleanFields as $field) {
+            $array[$field] = array_key_exists($field, $array) ? (bool) $array[$field] : null;
+        }
+
+        return $array;
+    }
+
     private function convertToStrings(array $array): array
     {
         foreach ($this->stringFields as $field) {

app/Http/Controllers/Account/ShowController.php

@@ -145,6 +145,7 @@ class ShowController extends Controller
         $collector->setExpandGroupSearch(true);
         $groups           = $collector->getPaginatedGroups();
 
+
         Log::debug('End collect transactions');
         Timer::stop('collection');
 

app/Http/Controllers/Budget/IndexController.php

@@ -177,7 +177,7 @@ class IndexController extends Controller
             $array['end_date']        = $entry->end_date;
 
             // spent in period:
-            $spentArr                 = $this->opsRepository->sumExpenses($entry->start_date, $entry->end_date, null, null, $entry->transactionCurrency);
+            $spentArr                 = $this->opsRepository->sumExpenses($entry->start_date, $entry->end_date, null, null, $entry->transactionCurrency, false);
             $array['spent']           = $spentArr[$entry->transaction_currency_id]['sum'] ?? '0';
             $array['native_spent']    = $this->convertToNative && $entry->transaction_currency_id !== $this->defaultCurrency->id ? $converter->convert($entry->transactionCurrency, $this->defaultCurrency, $entry->start_date, $array['spent']) : null;
             // budgeted in period:
@@ -235,7 +235,7 @@ class IndexController extends Controller
 
             /** @var TransactionCurrency $currency */
             foreach ($currencies as $currency) {
-                $spentArr = $this->opsRepository->sumExpenses($start, $end, null, new Collection([$current]), $currency);
+                $spentArr = $this->opsRepository->sumExpenses($start, $end, null, new Collection([$current]), $currency, false);
                 if (array_key_exists($currency->id, $spentArr) && array_key_exists('sum', $spentArr[$currency->id])) {
                     $array['spent'][$currency->id]['spent']                   = $spentArr[$currency->id]['sum'];
                     $array['spent'][$currency->id]['currency_id']             = $currency->id;

app/Http/Controllers/Budget/ShowController.php

@@ -175,9 +175,10 @@ class ShowController extends Controller
             throw new FireflyException('This budget limit is not part of this budget.');
         }
 
-        $page        = (int) $request->get('page');
-        $pageSize    = (int) app('preferences')->get('listPageSize', 50)->data;
-        $subTitle    = trans(
+        $currencySymbol = $budgetLimit->transactionCurrency->symbol;
+        $page           = (int) $request->get('page');
+        $pageSize       = (int) app('preferences')->get('listPageSize', 50)->data;
+        $subTitle       = trans(
             'firefly.budget_in_period',
             [
                 'name'     => $budget->name,
@@ -186,23 +187,26 @@ class ShowController extends Controller
                 'currency' => $budgetLimit->transactionCurrency->name,
             ]
         );
+        if ($this->convertToNative) {
+            $currencySymbol = $this->defaultCurrency->symbol;
+        }
 
         // collector:
         /** @var GroupCollectorInterface $collector */
-        $collector   = app(GroupCollectorInterface::class);
+        $collector      = app(GroupCollectorInterface::class);
 
         $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date)->withAccountInformation()
             ->setBudget($budget)->setLimit($pageSize)->setPage($page)->withBudgetInformation()->withCategoryInformation()
         ;
-        $groups      = $collector->getPaginatedGroups();
+        $groups         = $collector->getPaginatedGroups();
         $groups->setPath(route('budgets.show.limit', [$budget->id, $budgetLimit->id]));
 
         /** @var Carbon $start */
-        $start       = session('first', today(config('app.timezone'))->startOfYear());
-        $end         = today(config('app.timezone'));
-        $attachments = $this->repository->getAttachments($budget);
-        $limits      = $this->getLimits($budget, $start, $end);
+        $start          = session('first', today(config('app.timezone'))->startOfYear());
+        $end            = today(config('app.timezone'));
+        $attachments    = $this->repository->getAttachments($budget);
+        $limits         = $this->getLimits($budget, $start, $end);
 
-        return view('budgets.show', compact('limits', 'attachments', 'budget', 'budgetLimit', 'groups', 'subTitle'));
+        return view('budgets.show', compact('limits', 'attachments', 'budget', 'budgetLimit', 'groups', 'subTitle', 'currencySymbol'));
     }
 }

app/Http/Controllers/Chart/AccountController.php

@@ -82,13 +82,16 @@ class AccountController extends Controller
      */
     public function expenseAccounts(): JsonResponse
     {
-        Log::debug('RevenueAccounts');
+        Log::debug('ExpenseAccounts');
 
         /** @var Carbon $start */
         $start         = clone session('start', today(config('app.timezone'))->startOfMonth());
 
         /** @var Carbon $end */
         $end           = clone session('end', today(config('app.timezone'))->endOfMonth());
+        $start->startOfDay();
+        $end->endOfDay();
+
         $cache         = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
@@ -97,7 +100,6 @@ class AccountController extends Controller
         if ($cache->has()) {
             return response()->json($cache->get());
         }
-        $start->subDay();
 
         // prep some vars:
         $currencies    = [];
@@ -557,6 +559,10 @@ class AccountController extends Controller
 
         /** @var Carbon $end */
         $end           = clone session('end', today(config('app.timezone'))->endOfMonth());
+
+        $start->startOfDay();
+        $end->endOfDay();
+
         $cache         = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
@@ -565,7 +571,6 @@ class AccountController extends Controller
         if ($cache->has()) {
             return response()->json($cache->get());
         }
-        $start->subDay();
 
         // prep some vars:
         $currencies    = [];

app/Http/Controllers/Chart/BillController.php

@@ -179,7 +179,7 @@ class BillController extends Controller
             }
             $amount                         = bcmul($journal['amount'], '-1');
             if ($this->convertToNative && $currencyId !== $journal['currency_id']) {
-                $amount = bcmul($journal['native_amount'], '-1');
+                $amount = bcmul($journal['native_amount'] ?? '0', '-1');
             }
             if ($this->convertToNative && $currencyId === $journal['foreign_currency_id']) {
                 $amount = bcmul($journal['foreign_amount'], '-1');

app/Http/Controllers/Chart/BudgetController.php

@@ -172,13 +172,13 @@ class BudgetController extends Controller
         $budgetCollection                       = new Collection([$budget]);
         $currency                               = $budgetLimit->transactionCurrency;
         if ($this->convertToNative) {
-            $amount   = $budgetLimit->native_amount ?? '0';
+            $amount   = $budgetLimit->native_amount ?? $amount;
             $currency = $this->defaultCurrency;
         }
 
         while ($start <= $end) {
             $current          = clone $start;
-            $expenses         = $this->opsRepository->sumExpenses($current, $current, null, $budgetCollection, $budgetLimit->transactionCurrency);
+            $expenses         = $this->opsRepository->sumExpenses($current, $current, null, $budgetCollection, $budgetLimit->transactionCurrency, $this->convertToNative);
             $spent            = $expenses[$currency->id]['sum'] ?? '0';
             $amount           = bcadd($amount, $spent);
             $format           = $start->isoFormat((string) trans('config.month_and_day_js', [], $locale));
@@ -191,6 +191,7 @@ class BudgetController extends Controller
         $data['datasets'][0]['currency_symbol'] = $currency->symbol;
         $data['datasets'][0]['currency_code']   = $currency->code;
         $cache->store($data);
+        // var_dump($data);exit;
 
         return response()->json($data);
     }
@@ -214,7 +215,7 @@ class BudgetController extends Controller
         if (null !== $budgetLimit) {
             $start = $budgetLimit->start_date;
             $end   = $budgetLimit->end_date;
-            $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date)->setCurrency($budgetLimit->transactionCurrency);
+            $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date)->setNormalCurrency($budgetLimit->transactionCurrency);
         }
         $cache->addProperty($start);
         $cache->addProperty($end);
@@ -296,7 +297,7 @@ class BudgetController extends Controller
         if (null !== $budgetLimit) {
             $start = $budgetLimit->start_date;
             $end   = $budgetLimit->end_date;
-            $collector->setCurrency($budgetLimit->transactionCurrency);
+            $collector->setNormalCurrency($budgetLimit->transactionCurrency);
         }
         $cache->addProperty($start);
         $cache->addProperty($end);
@@ -378,7 +379,7 @@ class BudgetController extends Controller
         if (null !== $budgetLimit) {
             $start = $budgetLimit->start_date;
             $end   = $budgetLimit->end_date;
-            $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date)->setCurrency($budgetLimit->transactionCurrency);
+            $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date)->setNormalCurrency($budgetLimit->transactionCurrency);
         }
         $cache->addProperty($start);
         $cache->addProperty($end);

app/Http/Controllers/PiggyBank/EditController.php

@@ -78,13 +78,14 @@ class EditController extends Controller
         $startDate    = $piggyBank->start_date?->format('Y-m-d');
 
         $preFilled    = [
-            'name'          => $piggyBank->name,
-            'target_amount' => app('steam')->bcround($piggyBank->target_amount, $piggyBank->transactionCurrency->decimal_places),
-            'target_date'   => $targetDate,
-            'start_date'    => $startDate,
-            'accounts'      => [],
-            'object_group'  => null !== $piggyBank->objectGroups->first() ? $piggyBank->objectGroups->first()->title : '',
-            'notes'         => null === $note ? '' : $note->text,
+            'name'                    => $piggyBank->name,
+            'transaction_currency_id' => (int) $piggyBank->transaction_currency_id,
+            'target_amount'           => app('steam')->bcround($piggyBank->target_amount, $piggyBank->transactionCurrency->decimal_places),
+            'target_date'             => $targetDate,
+            'start_date'              => $startDate,
+            'accounts'                => [],
+            'object_group'            => null !== $piggyBank->objectGroups->first() ? $piggyBank->objectGroups->first()->title : '',
+            'notes'                   => null === $note ? '' : $note->text,
         ];
         foreach ($piggyBank->accounts as $account) {
             $preFilled['accounts'][] = $account->id;

app/Http/Controllers/Rule/EditController.php

@@ -135,7 +135,7 @@ class EditController extends Controller
 
         // get rule trigger for update / store-journal:
         $primaryTrigger = $this->ruleRepos->getPrimaryTrigger($rule);
-        $subTitle       = (string) trans('firefly.edit_rule', ['title' => $rule->title]);
+        $subTitle       = (string) trans('firefly.edit_rule', ['nr' => $rule->order, 'title' => $rule->title]);
 
         // put previous url in session if not redirect from store (not "return_to_edit").
         if (true !== session('rules.edit.fromUpdate')) {

app/Http/Middleware/TrustProxies.php

@@ -32,11 +32,11 @@ use Symfony\Component\HttpFoundation\Request;
 class TrustProxies extends Middleware
 {
     // After...
-    protected $headers
-        = Request::HEADER_X_FORWARDED_FOR
+    protected $headers = Request::HEADER_X_FORWARDED_FOR
         | Request::HEADER_X_FORWARDED_HOST
         | Request::HEADER_X_FORWARDED_PORT
         | Request::HEADER_X_FORWARDED_PROTO
+        | Request::HEADER_X_FORWARDED_PREFIX
         | Request::HEADER_X_FORWARDED_AWS_ELB;
 
     /**

app/Http/Requests/PiggyBankUpdateRequest.php

@@ -49,12 +49,13 @@ class PiggyBankUpdateRequest extends FormRequest
     {
         $accounts = $this->get('accounts');
         $data     = [
-            'name'               => $this->convertString('name'),
-            'start_date'         => $this->getCarbonDate('start_date'),
-            'target_amount'      => trim($this->convertString('target_amount')),
-            'target_date'        => $this->getCarbonDate('target_date'),
-            'notes'              => $this->stringWithNewlines('notes'),
-            'object_group_title' => $this->convertString('object_group'),
+            'name'                    => $this->convertString('name'),
+            'start_date'              => $this->getCarbonDate('start_date'),
+            'target_amount'           => trim($this->convertString('target_amount')),
+            'target_date'             => $this->getCarbonDate('target_date'),
+            'transaction_currency_id' => $this->convertInteger('transaction_currency_id'),
+            'notes'                   => $this->stringWithNewlines('notes'),
+            'object_group_title'      => $this->convertString('object_group'),
         ];
         if (!is_array($accounts)) {
             $accounts = [];
@@ -75,15 +76,16 @@ class PiggyBankUpdateRequest extends FormRequest
         $piggy = $this->route()->parameter('piggyBank');
 
         return [
-            'name'          => sprintf('required|min:1|max:255|uniquePiggyBankForUser:%d', $piggy->id),
-            'accounts'      => 'required|array',
-            'accounts.*'    => 'required|belongsToUser:accounts',
-            'target_amount' => ['nullable', new IsValidPositiveAmount()],
-            'start_date'    => 'date',
-            'target_date'   => 'date|nullable',
-            'order'         => 'integer|max:32768|min:1',
-            'object_group'  => 'min:0|max:255',
-            'notes'         => 'min:1|max:32768|nullable',
+            'name'                    => sprintf('required|min:1|max:255|uniquePiggyBankForUser:%d', $piggy->id),
+            'accounts'                => 'required|array',
+            'accounts.*'              => 'required|belongsToUser:accounts',
+            'target_amount'           => ['nullable', new IsValidPositiveAmount()],
+            'start_date'              => 'date',
+            'transaction_currency_id' => 'exists:transaction_currencies,id',
+            'target_date'             => 'date|nullable',
+            'order'                   => 'integer|max:32768|min:1',
+            'object_group'            => 'min:0|max:255',
+            'notes'                   => 'min:1|max:32768|nullable',
         ];
     }
 

app/Notifications/Admin/UnknownUserLoginAttempt.php

@@ -80,9 +80,10 @@ class UnknownUserLoginAttempt extends Notification
     {
         $settings = ReturnsSettings::getSettings('ntfy', 'owner', null);
         $message  = new Message();
+        $ip       = Request::ip();
         $message->topic($settings['ntfy_topic']);
         $message->title((string) trans('email.unknown_user_subject'));
-        $message->body((string) trans('email.unknown_user_message', ['address' => $this->address]));
+        $message->body((string) trans('email.unknown_user_message', ['address' => $this->address, 'ip' => $ip]));
 
         return $message;
     }
@@ -92,7 +93,9 @@ class UnknownUserLoginAttempt extends Notification
      */
     public function toPushover(OwnerNotifiable $notifiable): PushoverMessage
     {
-        return PushoverMessage::create((string) trans('email.unknown_user_message', ['address' => $this->address]))
+        $ip = Request::ip();
+
+        return PushoverMessage::create((string) trans('email.unknown_user_message', ['address' => $this->address, 'ip' => $ip]))
             ->title((string) trans('email.unknown_user_subject'))
         ;
     }
@@ -102,8 +105,10 @@ class UnknownUserLoginAttempt extends Notification
      */
     public function toSlack(OwnerNotifiable $notifiable): SlackMessage
     {
+        $ip = Request::ip();
+
         return new SlackMessage()->content(
-            (string) trans('email.unknown_user_body', ['address' => $this->address])
+            (string) trans('email.unknown_user_body', ['address' => $this->address, 'ip' => $ip])
         );
     }
 

app/Notifications/Security/UserFailedLoginAttempt.php

@@ -105,7 +105,7 @@ class UserFailedLoginAttempt extends Notification
     public function via(User $notifiable): array
     {
         $channels   = ReturnsAvailableChannels::returnChannels('user', $notifiable);
-        $isDemoSite = FireflyConfig::get('is_demo_site',false)->data
+        $isDemoSite = FireflyConfig::get('is_demo_site', false)->data;
         if (true === $isDemoSite) {
             return array_diff($channels, ['mail']);
         }

app/Notifications/Test/OwnerTestNotificationEmail.php

@@ -64,7 +64,7 @@ class OwnerTestNotificationEmail extends Notification
      */
     public function via(OwnerNotifiable $notifiable): array
     {
-        $isDemoSite = FireflyConfig::get('is_demo_site',false)->data
+        $isDemoSite = FireflyConfig::get('is_demo_site', false)->data;
         if (true === $isDemoSite) {
             return [];
         }

app/Notifications/Test/UserTestNotificationEmail.php

@@ -61,7 +61,7 @@ class UserTestNotificationEmail extends Notification
      */
     public function via(User $notifiable): array
     {
-        $isDemoSite = FireflyConfig::get('is_demo_site',false)->data
+        $isDemoSite = FireflyConfig::get('is_demo_site', false)->data;
         if (true === $isDemoSite) {
             return [];
         }

app/Notifications/User/NewAccessToken.php

@@ -103,7 +103,7 @@ class NewAccessToken extends Notification
     public function via(User $notifiable): array
     {
         $channels   = ReturnsAvailableChannels::returnChannels('user', $notifiable);
-        $isDemoSite = FireflyConfig::get('is_demo_site',false)->data
+        $isDemoSite = FireflyConfig::get('is_demo_site', false)->data;
         if (true === $isDemoSite) {
             return array_diff($channels, ['mail']);
         }

app/Repositories/Budget/AvailableBudgetRepository.php

@@ -149,8 +149,9 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface, U
             $currencyId          = $convertToNative && $availableBudget->transaction_currency_id !== $default->id ? $default->id : $availableBudget->transaction_currency_id;
             $field               = $convertToNative && $availableBudget->transaction_currency_id !== $default->id ? 'native_amount' : 'amount';
             $return[$currencyId] ??= '0';
-            $return[$currencyId] = bcadd($return[$currencyId], $availableBudget->{$field});
-            Log::debug(sprintf('Add #%d %s (%s) for a total of %s', $currencyId, $availableBudget->{$field}, $field, $return[$currencyId]));
+            $amount              = '' === (string) $availableBudget->{$field} ? '0' : (string) $availableBudget->{$field};
+            $return[$currencyId] = bcadd($return[$currencyId], $amount);
+            Log::debug(sprintf('Add #%d %s (%s) for a total of %s', $currencyId, $amount, $field, $return[$currencyId]));
         }
 
         return $return;

app/Repositories/Budget/OperationsRepository.php

@@ -201,9 +201,10 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
         Carbon               $end,
         ?Collection          $accounts = null,
         ?Collection          $budgets = null,
-        ?TransactionCurrency $currency = null
+        ?TransactionCurrency $currency = null,
+        bool                 $convertToNative = false
     ): array {
-        Log::debug(sprintf('Start of %s.', __METHOD__));
+        Log::debug(sprintf('Start of %s(date, date, array, array, "%s", "%s").', __METHOD__, $currency?->code, var_export($convertToNative, true)));
         // this collector excludes all transfers TO liabilities (which are also withdrawals)
         // because those expenses only become expenses once they move from the liability to the friend.
         // 2024-12-24 disable the exclusion for now.
@@ -235,10 +236,12 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
             $budgets = $this->getBudgets();
         }
         if (null !== $currency) {
-            Log::debug(sprintf('Limit to currency %s', $currency->code));
-            $collector->setCurrency($currency);
+            Log::debug(sprintf('Limit to normal currency %s', $currency->code));
+            $collector->setNormalCurrency($currency);
+        }
+        if ($budgets->count() > 0) {
+            $collector->setBudgets($budgets);
         }
-        $collector->setBudgets($budgets);
         $journals   = $collector->getExtractedJournals();
 
         // same but for transactions in the foreign currency:
@@ -246,7 +249,9 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
             Log::debug('STOP looking for transactions in the foreign currency.');
         }
         $summarizer = new TransactionSummarizer($this->user);
+        // 2025-04-21 overrule "convertToNative" because in this particular view, we never want to do this.
+        $summarizer->setConvertToNative($convertToNative);
 
-        return $summarizer->groupByCurrencyId($journals);
+        return $summarizer->groupByCurrencyId($journals, 'negative', false);
     }
 }

app/Repositories/PiggyBank/ModifiesPiggyBanks.php

@@ -31,6 +31,7 @@ use FireflyIII\Models\Account;
 use FireflyIII\Models\Note;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\ObjectGroup\CreatesObjectGroups;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
@@ -223,6 +224,8 @@ trait ModifiesPiggyBanks
         $factory       = new PiggyBankFactory();
         $factory->user = $this->user;
 
+        // the piggy bank currency is set or updated FIRST, if it exists.
+
         $factory->linkToAccountIds($piggyBank, $data['accounts'] ?? []);
 
 
@@ -280,6 +283,13 @@ trait ModifiesPiggyBanks
         if (array_key_exists('name', $data) && '' !== $data['name']) {
             $piggyBank->name = $data['name'];
         }
+        if (array_key_exists('transaction_currency_id', $data) && is_int($data['transaction_currency_id'])) {
+            $currency = TransactionCurrency::find($data['transaction_currency_id']);
+            if (null !== $currency) {
+                $piggyBank->transaction_currency_id = $currency->id;
+            }
+        }
+
         if (array_key_exists('target_amount', $data) && '' !== $data['target_amount']) {
             $piggyBank->target_amount = $data['target_amount'];
         }

app/Services/Internal/Support/JournalServiceTrait.php

@@ -35,7 +35,9 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\Rules\UniqueIban;
 use FireflyIII\Support\NullArrayObject;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Trait JournalServiceTrait
@@ -53,7 +55,7 @@ trait JournalServiceTrait
     protected function getAccount(string $transactionType, string $direction, array $data): ?Account
     {
         // some debug logging:
-        app('log')->debug(sprintf('Now in getAccount(%s)', $direction), $data);
+        Log::debug(sprintf('Now in getAccount(%s)', $direction), $data);
 
         // expected type of source account, in order of preference
         /** @var array $array */
@@ -63,7 +65,7 @@ trait JournalServiceTrait
 
         // and now try to find it, based on the type of transaction.
         $message       = 'Transaction = %s, %s account should be in: %s. Direction is %s.';
-        app('log')->debug(sprintf($message, $transactionType, $direction, implode(', ', $expectedTypes[$transactionType] ?? ['UNKNOWN']), $direction));
+        Log::debug(sprintf($message, $transactionType, $direction, implode(', ', $expectedTypes[$transactionType] ?? ['UNKNOWN']), $direction));
 
         $result        = $this->findAccountById($data, $expectedTypes[$transactionType]);
         $result        = $this->findAccountByIban($result, $data, $expectedTypes[$transactionType]);
@@ -77,7 +79,7 @@ trait JournalServiceTrait
         // this account. In such a case, the name search must be retried with a new name.
         if (null !== $nameResult && null === $numberResult && null === $ibanResult && '' !== (string) $data['iban'] && '' !== (string) $nameResult->iban) {
             $data['name'] = sprintf('%s (%s)', $data['name'], $data['iban']);
-            app('log')->debug(sprintf('Search again using the new name, "%s".', $data['name']));
+            Log::debug(sprintf('Search again using the new name, "%s".', $data['name']));
             $result       = $this->findAccountByName(null, $data, $expectedTypes[$transactionType]);
         }
 
@@ -87,7 +89,7 @@ trait JournalServiceTrait
         // if the result is NULL but the ID is set, an account could exist of the wrong type.
         // that data can be used to create a new account of the right type.
         if (null === $result && null !== $data['id'] && null !== $creatableType) {
-            app('log')->debug(sprintf('Account #%d may exist and be of the wrong type, use data to create one of the right type.', $data['id']));
+            Log::debug(sprintf('Account #%d may exist and be of the wrong type, use data to create one of the right type.', $data['id']));
             $temp = $this->findAccountById(['id' => $data['id']], []);
             if (null !== $temp) {
                 $tempData = [
@@ -100,11 +102,11 @@ trait JournalServiceTrait
             }
         }
         if (null === $result && null !== $creatableType) {
-            app('log')->debug('If nothing is found, create it.');
+            Log::debug('If nothing is found, create it.');
             $result = $this->createAccount($result, $data, $creatableType);
         }
         if (null === $result) {
-            app('log')->debug('If cant be created, return cash account.');
+            Log::debug('If cant be created, return cash account.');
             $result = $this->getCashAccount($result, $data, $expectedTypes[$transactionType]);
         }
 
@@ -117,21 +119,21 @@ trait JournalServiceTrait
         if (null !== $data['id']) {
             $search = $this->accountRepository->find((int) $data['id']);
             if (null !== $search && in_array($search->accountType->type, $types, true)) {
-                app('log')->debug(
+                Log::debug(
                     sprintf('Found "account_id" object: #%d, "%s" of type %s (1)', $search->id, $search->name, $search->accountType->type)
                 );
 
                 return $search;
             }
             if (null !== $search && 0 === count($types)) {
-                app('log')->debug(
+                Log::debug(
                     sprintf('Found "account_id" object: #%d, "%s" of type %s (2)', $search->id, $search->name, $search->accountType->type)
                 );
 
                 return $search;
             }
         }
-        app('log')->debug(sprintf('Found no account by ID #%d of types', $data['id']), $types);
+        Log::debug(sprintf('Found no account by ID #%d of types', $data['id']), $types);
 
         return null;
     }
@@ -139,12 +141,12 @@ trait JournalServiceTrait
     private function findAccountByIban(?Account $account, array $data, array $types): ?Account
     {
         if (null !== $account) {
-            app('log')->debug(sprintf('Already have account #%d ("%s"), return that.', $account->id, $account->name));
+            Log::debug(sprintf('Already have account #%d ("%s"), return that.', $account->id, $account->name));
 
             return $account;
         }
         if (null === $data['iban'] || '' === $data['iban']) {
-            app('log')->debug('IBAN is empty, will not search for IBAN.');
+            Log::debug('IBAN is empty, will not search for IBAN.');
 
             return null;
         }
@@ -154,11 +156,11 @@ trait JournalServiceTrait
         $source ??= $this->accountRepository->findByIbanNull($data['iban'], $types);
 
         if (null !== $source) {
-            app('log')->debug(sprintf('Found "account_iban" object: #%d, %s', $source->id, $source->name));
+            Log::debug(sprintf('Found "account_iban" object: #%d, %s', $source->id, $source->name));
 
             return $source;
         }
-        app('log')->debug(sprintf('Found no account with IBAN "%s" of expected types', $data['iban']), $types);
+        Log::debug(sprintf('Found no account with IBAN "%s" of expected types', $data['iban']), $types);
 
         return null;
     }
@@ -166,12 +168,12 @@ trait JournalServiceTrait
     private function findAccountByNumber(?Account $account, array $data, array $types): ?Account
     {
         if (null !== $account) {
-            app('log')->debug(sprintf('Already have account #%d ("%s"), return that.', $account->id, $account->name));
+            Log::debug(sprintf('Already have account #%d ("%s"), return that.', $account->id, $account->name));
 
             return $account;
         }
         if (null === $data['number'] || '' === $data['number']) {
-            app('log')->debug('Account number is empty, will not search for account number.');
+            Log::debug('Account number is empty, will not search for account number.');
 
             return null;
         }
@@ -182,12 +184,12 @@ trait JournalServiceTrait
         $source ??= $this->accountRepository->findByAccountNumber((string) $data['number'], $types);
 
         if (null !== $source) {
-            app('log')->debug(sprintf('Found account: #%d, %s', $source->id, $source->name));
+            Log::debug(sprintf('Found account: #%d, %s', $source->id, $source->name));
 
             return $source;
         }
 
-        app('log')->debug(sprintf('Found no account with account number "%s" of expected types', $data['number']), $types);
+        Log::debug(sprintf('Found no account with account number "%s" of expected types', $data['number']), $types);
 
         return null;
     }
@@ -195,12 +197,12 @@ trait JournalServiceTrait
     private function findAccountByName(?Account $account, array $data, array $types): ?Account
     {
         if (null !== $account) {
-            app('log')->debug(sprintf('Already have account #%d ("%s"), return that.', $account->id, $account->name));
+            Log::debug(sprintf('Already have account #%d ("%s"), return that.', $account->id, $account->name));
 
             return $account;
         }
         if (null === $data['name'] || '' === $data['name']) {
-            app('log')->debug('Account name is empty, will not search for account name.');
+            Log::debug('Account name is empty, will not search for account name.');
 
             return null;
         }
@@ -212,11 +214,11 @@ trait JournalServiceTrait
         $source ??= $this->accountRepository->findByName($data['name'], $types);
 
         if (null !== $source) {
-            app('log')->debug(sprintf('Found "account_name" object: #%d, %s', $source->id, $source->name));
+            Log::debug(sprintf('Found "account_name" object: #%d, %s', $source->id, $source->name));
 
             return $source;
         }
-        app('log')->debug(sprintf('Found no account with account name "%s" of expected types', $data['name']), $types);
+        Log::debug(sprintf('Found no account with account name "%s" of expected types', $data['name']), $types);
 
         return null;
     }
@@ -243,10 +245,10 @@ trait JournalServiceTrait
      */
     private function createAccount(?Account $account, array $data, string $preferredType): ?Account
     {
-        app('log')->debug('Now in createAccount()', $data);
+        Log::debug('Now in createAccount()', $data);
         // return new account.
         if (null !== $account) {
-            app('log')->debug(
+            Log::debug(
                 sprintf(
                     'Was given %s account #%d ("%s") so will simply return that.',
                     $account->accountType->type,
@@ -262,23 +264,32 @@ trait JournalServiceTrait
             }
             // fix name of account if only IBAN is given:
             if ('' === (string) $data['name'] && '' !== (string) $data['iban']) {
-                app('log')->debug(sprintf('Account name is now IBAN ("%s")', $data['iban']));
+                Log::debug(sprintf('Account name is now IBAN ("%s")', $data['iban']));
                 $data['name'] = $data['iban'];
             }
             // fix name of account if only number is given:
             if ('' === (string) $data['name'] && '' !== (string) $data['number']) {
-                app('log')->debug(sprintf('Account name is now account number ("%s")', $data['number']));
+                Log::debug(sprintf('Account name is now account number ("%s")', $data['number']));
                 $data['name'] = $data['number'];
             }
             // if name is still NULL, return NULL.
             if ('' === (string) $data['name']) {
-                app('log')->debug('Account name is still NULL, return NULL.');
+                Log::debug('Account name is still NULL, return NULL.');
 
                 return null;
             }
+            // 2025-04-19 sanity check on IBAN.
+            $validator = new UniqueIban(null, $preferredType);
+            if ('' !== (string) $data['iban'] && !$validator->passes('iban', $data['iban'])) {
+                Log::warning(sprintf('IBAN "%s" is already in use, quietly ignore it.', $data['iban']));
+                $data['iban'] = null;
+            }
+
+
+
             // $data['name'] = $data['name'] ?? '(no name)';
 
-            $account = $this->accountRepository->store(
+            $account   = $this->accountRepository->store(
                 [
                     'account_type_id'   => null,
                     'account_type_name' => $preferredType,
@@ -314,7 +325,7 @@ trait JournalServiceTrait
             && in_array(AccountTypeEnum::CASH->value, $types, true)) {
             $account = $this->accountRepository->getCashAccount();
         }
-        app('log')->debug('Cannot return cash account, return input instead.');
+        Log::debug('Cannot return cash account, return input instead.');
 
         return $account;
     }
@@ -327,7 +338,7 @@ trait JournalServiceTrait
         if ('' === $amount) {
             throw new FireflyException(sprintf('The amount cannot be an empty string: "%s"', $amount));
         }
-        app('log')->debug(sprintf('Now in getAmount("%s")', $amount));
+        Log::debug(sprintf('Now in getAmount("%s")', $amount));
         if (0 === bccomp('0', $amount)) {
             throw new FireflyException(sprintf('The amount seems to be zero: "%s"', $amount));
         }
@@ -338,21 +349,21 @@ trait JournalServiceTrait
     protected function getForeignAmount(?string $amount): ?string
     {
         if (null === $amount) {
-            app('log')->debug('No foreign amount info in array. Return NULL');
+            Log::debug('No foreign amount info in array. Return NULL');
 
             return null;
         }
         if ('' === $amount) {
-            app('log')->debug('Foreign amount is empty string, return NULL.');
+            Log::debug('Foreign amount is empty string, return NULL.');
 
             return null;
         }
         if (0 === bccomp('0', $amount)) {
-            app('log')->debug('Foreign amount is 0.0, return NULL.');
+            Log::debug('Foreign amount is 0.0, return NULL.');
 
             return null;
         }
-        app('log')->debug(sprintf('Foreign amount is %s', $amount));
+        Log::debug(sprintf('Foreign amount is %s', $amount));
 
         return $amount;
     }
@@ -366,7 +377,7 @@ trait JournalServiceTrait
         }
         $budget = $this->budgetRepository->findBudget($data['budget_id'], $data['budget_name']);
         if (null !== $budget) {
-            app('log')->debug(sprintf('Link budget #%d to journal #%d', $budget->id, $journal->id));
+            Log::debug(sprintf('Link budget #%d to journal #%d', $budget->id, $journal->id));
             $journal->budgets()->sync([$budget->id]);
 
             return;
@@ -379,7 +390,7 @@ trait JournalServiceTrait
     {
         $category = $this->categoryRepository->findCategory($data['category_id'], $data['category_name']);
         if (null !== $category) {
-            app('log')->debug(sprintf('Link category #%d to journal #%d', $category->id, $journal->id));
+            Log::debug(sprintf('Link category #%d to journal #%d', $category->id, $journal->id));
             $journal->categories()->sync([$category->id]);
 
             return;
@@ -399,7 +410,7 @@ trait JournalServiceTrait
             }
             $note->text = $notes;
             $note->save();
-            app('log')->debug(sprintf('Stored notes for journal #%d', $journal->id));
+            Log::debug(sprintf('Stored notes for journal #%d', $journal->id));
 
             return;
         }
@@ -412,18 +423,18 @@ trait JournalServiceTrait
      */
     protected function storeTags(TransactionJournal $journal, ?array $tags): void
     {
-        app('log')->debug('Now in storeTags()', $tags ?? []);
+        Log::debug('Now in storeTags()', $tags ?? []);
         $this->tagFactory->setUser($journal->user);
         $set = [];
         if (!is_array($tags)) {
-            app('log')->debug('Tags is not an array, break.');
+            Log::debug('Tags is not an array, break.');
 
             return;
         }
-        app('log')->debug('Start of loop.');
+        Log::debug('Start of loop.');
         foreach ($tags as $string) {
             $string = (string) $string;
-            app('log')->debug(sprintf('Now at tag "%s"', $string));
+            Log::debug(sprintf('Now at tag "%s"', $string));
             if ('' !== $string) {
                 $tag = $this->tagFactory->findOrCreate($string);
                 if (null !== $tag) {
@@ -432,8 +443,8 @@ trait JournalServiceTrait
             }
         }
         $set = array_unique($set);
-        app('log')->debug('End of loop.');
-        app('log')->debug(sprintf('Total nr. of tags: %d', count($tags)), $tags);
+        Log::debug('End of loop.');
+        Log::debug(sprintf('Total nr. of tags: %d', count($tags)), $tags);
         $journal->tags()->sync($set);
     }
 }

app/Support/Export/ExportDataGenerator.php

@@ -57,6 +57,7 @@ use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\User;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 use League\Csv\CannotInsertRecord;
 use League\Csv\Exception;
 use League\Csv\Writer;

app/Support/Http/Controllers/AugumentData.php

@@ -38,6 +38,7 @@ use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Trait AugumentData
@@ -167,6 +168,8 @@ trait AugumentData
      */
     protected function getLimits(Budget $budget, Carbon $start, Carbon $end): Collection // get data + augment with info
     {
+        Log::debug('In getLimits');
+
         /** @var OperationsRepositoryInterface $opsRepository */
         $opsRepository    = app(OperationsRepositoryInterface::class);
 
@@ -195,24 +198,30 @@ trait AugumentData
 
         /** @var BudgetLimit $entry */
         foreach ($set as $entry) {
-            $currency     = $entry->transactionCurrency;
+            Log::debug(sprintf('Now at budget limit #%d', $entry->id));
+            $currency            = $entry->transactionCurrency;
             if ($this->convertToNative) {
                 // the sumExpenses method already handles this.
                 $currency = $this->defaultCurrency;
             }
 
             // clone because these objects change each other.
-            $currentStart = clone $entry->start_date;
-            $currentEnd   = null === $entry->end_date ? null : clone $entry->end_date;
+            $currentStart        = clone $entry->start_date;
+            $currentEnd          = null === $entry->end_date ? null : clone $entry->end_date;
 
             if (null === $currentEnd) {
                 $currentEnd = clone $currentStart;
                 $currentEnd->addMonth();
             }
+            // native amount.
+            $expenses            = $opsRepository->sumExpenses($currentStart, $currentEnd, null, $budgetCollection, $entry->transactionCurrency, $this->convertToNative);
+            $spent               = $expenses[$currency->id]['sum'] ?? '0';
+            $entry->native_spent = $spent;
 
-            $expenses     = $opsRepository->sumExpenses($currentStart, $currentEnd, null, $budgetCollection, $currency);
-            $spent        = $expenses[$currency->id]['sum'] ?? '0';
-            $entry->spent = $spent;
+            // normal amount:
+            $expenses            = $opsRepository->sumExpenses($currentStart, $currentEnd, null, $budgetCollection, $entry->transactionCurrency, false);
+            $spent               = $expenses[$entry->transactionCurrency->id]['sum'] ?? '0';
+            $entry->spent        = $spent;
 
             $limits->push($entry);
         }

app/Support/Report/Summarizer/TransactionSummarizer.php

@@ -51,7 +51,7 @@ class TransactionSummarizer
 
     public function groupByCurrencyId(array $journals, string $method = 'negative', bool $includeForeign = true): array
     {
-        Log::debug(sprintf('Now in groupByCurrencyId(array, "%s")', $method));
+        Log::debug(sprintf('Now in groupByCurrencyId([%d journals], "%s")', count($journals), $method));
         $array = [];
         foreach ($journals as $journal) {
             $field                        = 'amount';
@@ -71,6 +71,7 @@ class TransactionSummarizer
             $foreignCurrencyDecimalPlaces = null;
 
             if ($this->convertToNative) {
+                Log::debug('convertToNative is true.');
                 // if convert to native, use the native amount yes or no?
                 $useNative  = $this->default->id !== (int) $journal['currency_id'];
                 $useForeign = $this->default->id === (int) $journal['foreign_currency_id'];
@@ -94,6 +95,7 @@ class TransactionSummarizer
                 }
             }
             if (!$this->convertToNative) {
+                Log::debug('convertToNative is false.');
                 // use foreign amount?
                 $foreignCurrencyId = (int) $journal['foreign_currency_id'];
                 if (0 !== $foreignCurrencyId) {
@@ -224,4 +226,10 @@ class TransactionSummarizer
 
         return $array;
     }
+
+    public function setConvertToNative(bool $convertToNative): void
+    {
+        Log::debug(sprintf('Overrule convertToNative to become %s', var_export($convertToNative, true)));
+        $this->convertToNative = $convertToNative;
+    }
 }

app/Validation/AccountValidator.php

@@ -250,7 +250,7 @@ class AccountValidator
      */
     protected function findExistingAccount(array $validTypes, array $data, bool $inverse = false): ?Account
     {
-        app('log')->debug('Now in findExistingAccount', $data);
+        app('log')->debug('Now in findExistingAccount', [$validTypes, $data]);
         app('log')->debug('The search will be reversed!');
         $accountId     = array_key_exists('id', $data) ? $data['id'] : null;
         $accountIban   = array_key_exists('iban', $data) ? $data['iban'] : null;

changelog.md

@@ -3,6 +3,39 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 6.2.12 - 2025-04-21
+
+### Fixed
+
+- [Issue 9755](https://github.com/firefly-iii/firefly-iii/issues/9755) (Unable to create transactions with non-native currency accounts when "display amounts in native currency" is enabled) reported by @dicksonleong
+- [Issue 9867](https://github.com/firefly-iii/firefly-iii/issues/9867) (Transactions from Jan 31 being counted in February) reported by @edbingo
+- [Issue 9878](https://github.com/firefly-iii/firefly-iii/issues/9878) (Piggy bank currency - wrong setting displayed or setting not saved) reported by @dethegeek
+- [Issue 10068](https://github.com/firefly-iii/firefly-iii/issues/10068) (Export Data isn't exporting all transactions in the data) reported by @firsttiger
+- [Discussion 10162](https://github.com/orgs/firefly-iii/discussions/10162) (Reverse proxy and `X-Forwarded-Prefix` header) started by @frenchu
+
+## 6.2.11 - 2025-04-21
+
+### Added
+
+- Support for Persian (`fa_IR`)
+- Add expiry details for personal access tokens
+
+### Changed
+
+- [PR 10039](https://github.com/firefly-iii/firefly-iii/pull/10039) (update check: consider cron succesfull when disabled or too frequent) reported by @ovv
+- Update currency list and update exchange rates
+
+### Fixed
+
+- [Issue 9398](https://github.com/firefly-iii/firefly-iii/issues/9398) (Expand email settings to allow self-signed certificates) reported by @SoulSeekkor
+- [Issue 9858](https://github.com/firefly-iii/firefly-iii/issues/9858) (Homepage "left to spend" count two times an expense with "foreign amount") reported by @M4xS0ch
+- [Issue 10015](https://github.com/firefly-iii/firefly-iii/issues/10015) ("It looks like this IBAN is already in use." when editing asset account.) reported by @wolph
+- [Issue 10025](https://github.com/firefly-iii/firefly-iii/issues/10025) (Liabilities not counted in income and expenses) reported by @BhasherBEL
+- [Issue 10068](https://github.com/firefly-iii/firefly-iii/issues/10068) (Export Data isn't exporting all transactions in the data) reported by @firsttiger
+- [Issue 10069](https://github.com/firefly-iii/firefly-iii/issues/10069) (Undefined array key "foreign_currency_decimal_places") reported by @akong-carbon6
+- [Issue 10114](https://github.com/firefly-iii/firefly-iii/issues/10114) (Budget for foreign currency not getting updated when a transaction refers to it) reported by @srikakulamts
+- [Issue 10150](https://github.com/firefly-iii/firefly-iii/issues/10150) (Mass deletion of initial balance throws 404 and doesn't delete) reported by @Tyler-Angell
+
 ## 6.2.10 - 2025-03-22
 
 ### Added

composer.lock

@@ -1010,16 +1010,16 @@
         },
         {
             "name": "firebase/php-jwt",
-            "version": "v6.11.0",
+            "version": "v6.11.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/firebase/php-jwt.git",
-                "reference": "8f718f4dfc9c5d5f0c994cdfd103921b43592712"
+                "reference": "d1e91ecf8c598d073d0995afa8cd5c75c6e19e66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/8f718f4dfc9c5d5f0c994cdfd103921b43592712",
-                "reference": "8f718f4dfc9c5d5f0c994cdfd103921b43592712",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/d1e91ecf8c598d073d0995afa8cd5c75c6e19e66",
+                "reference": "d1e91ecf8c598d073d0995afa8cd5c75c6e19e66",
                 "shasum": ""
             },
             "require": {
@@ -1067,9 +1067,9 @@
             ],
             "support": {
                 "issues": "https://github.com/firebase/php-jwt/issues",
-                "source": "https://github.com/firebase/php-jwt/tree/v6.11.0"
+                "source": "https://github.com/firebase/php-jwt/tree/v6.11.1"
             },
-            "time": "2025-01-23T05:11:06+00:00"
+            "time": "2025-04-09T20:32:01+00:00"
         },
         {
             "name": "fruitcake/php-cors",
@@ -1878,16 +1878,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.44.2",
+            "version": "v11.44.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "f85216c82cbd38b66d67ebd20ea762cb3751a4b4"
+                "reference": "00bc6ac91a6d577bf051c18ddaa638c0d221e1c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/f85216c82cbd38b66d67ebd20ea762cb3751a4b4",
-                "reference": "f85216c82cbd38b66d67ebd20ea762cb3751a4b4",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/00bc6ac91a6d577bf051c18ddaa638c0d221e1c7",
+                "reference": "00bc6ac91a6d577bf051c18ddaa638c0d221e1c7",
                 "shasum": ""
             },
             "require": {
@@ -2089,7 +2089,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-03-12T14:34:30+00:00"
+            "time": "2025-04-25T12:40:47+00:00"
         },
         {
             "name": "laravel/passport",
@@ -2228,16 +2228,16 @@
         },
         {
             "name": "laravel/sanctum",
-            "version": "v4.0.8",
+            "version": "v4.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/sanctum.git",
-                "reference": "ec1dd9ddb2ab370f79dfe724a101856e0963f43c"
+                "reference": "4e4ced5023e9d8949214e0fb43d9f4bde79c7166"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sanctum/zipball/ec1dd9ddb2ab370f79dfe724a101856e0963f43c",
-                "reference": "ec1dd9ddb2ab370f79dfe724a101856e0963f43c",
+                "url": "https://api.github.com/repos/laravel/sanctum/zipball/4e4ced5023e9d8949214e0fb43d9f4bde79c7166",
+                "reference": "4e4ced5023e9d8949214e0fb43d9f4bde79c7166",
                 "shasum": ""
             },
             "require": {
@@ -2288,7 +2288,7 @@
                 "issues": "https://github.com/laravel/sanctum/issues",
                 "source": "https://github.com/laravel/sanctum"
             },
-            "time": "2025-01-26T19:34:36+00:00"
+            "time": "2025-04-22T13:53:47+00:00"
         },
         {
             "name": "laravel/serializable-closure",
@@ -2618,16 +2618,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.6.1",
+            "version": "2.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "d990688c91cedfb69753ffc2512727ec646df2ad"
+                "reference": "06c3b0bf2540338094575612f4a1778d0d2d5e94"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/d990688c91cedfb69753ffc2512727ec646df2ad",
-                "reference": "d990688c91cedfb69753ffc2512727ec646df2ad",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/06c3b0bf2540338094575612f4a1778d0d2d5e94",
+                "reference": "06c3b0bf2540338094575612f4a1778d0d2d5e94",
                 "shasum": ""
             },
             "require": {
@@ -2721,7 +2721,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-29T14:10:59+00:00"
+            "time": "2025-04-18T21:09:27+00:00"
         },
         {
             "name": "league/config",
@@ -3472,22 +3472,22 @@
         },
         {
             "name": "mailersend/laravel-driver",
-            "version": "v2.8.0",
+            "version": "v2.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mailersend/mailersend-laravel-driver.git",
-                "reference": "b28fde8f6ec0cd5406100abf05f7899935e71652"
+                "reference": "87fd5ab76808bbaac9221be0d306baef13e98725"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mailersend/mailersend-laravel-driver/zipball/b28fde8f6ec0cd5406100abf05f7899935e71652",
-                "reference": "b28fde8f6ec0cd5406100abf05f7899935e71652",
+                "url": "https://api.github.com/repos/mailersend/mailersend-laravel-driver/zipball/87fd5ab76808bbaac9221be0d306baef13e98725",
+                "reference": "87fd5ab76808bbaac9221be0d306baef13e98725",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "illuminate/support": "^9.0 || ^10.0  || ^11.0 || ^12.0",
-                "mailersend/mailersend": "^0.8.0 || ^0.23.0 || ^0.24.0 || ^0.30.0",
+                "mailersend/mailersend": "^0.31.0",
                 "nyholm/psr7": "^1.5",
                 "php": ">=8.0",
                 "php-http/guzzle7-adapter": "^1.0",
@@ -3535,22 +3535,22 @@
             ],
             "support": {
                 "issues": "https://github.com/mailersend/mailersend-laravel-driver/issues",
-                "source": "https://github.com/mailersend/mailersend-laravel-driver/tree/v2.8.0"
+                "source": "https://github.com/mailersend/mailersend-laravel-driver/tree/v2.9.1"
             },
-            "time": "2025-03-06T16:55:40+00:00"
+            "time": "2025-04-09T09:33:07+00:00"
         },
         {
             "name": "mailersend/mailersend",
-            "version": "v0.30.0",
+            "version": "v0.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mailersend/mailersend-php.git",
-                "reference": "7ac40e50fa914a506c58d13c82dbf0d3bf0a6487"
+                "reference": "513ff83ee768526055ad52987cde401ea7218c67"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mailersend/mailersend-php/zipball/7ac40e50fa914a506c58d13c82dbf0d3bf0a6487",
-                "reference": "7ac40e50fa914a506c58d13c82dbf0d3bf0a6487",
+                "url": "https://api.github.com/repos/mailersend/mailersend-php/zipball/513ff83ee768526055ad52987cde401ea7218c67",
+                "reference": "513ff83ee768526055ad52987cde401ea7218c67",
                 "shasum": ""
             },
             "require": {
@@ -3602,9 +3602,9 @@
             ],
             "support": {
                 "issues": "https://github.com/mailersend/mailersend-php/issues",
-                "source": "https://github.com/mailersend/mailersend-php/tree/v0.30.0"
+                "source": "https://github.com/mailersend/mailersend-php/tree/v0.31.0"
             },
-            "time": "2025-03-06T15:45:57+00:00"
+            "time": "2025-04-03T12:16:11+00:00"
         },
         {
             "name": "monolog/monolog",
@@ -3965,38 +3965,39 @@
         },
         {
             "name": "nunomaduro/collision",
-            "version": "v8.7.0",
+            "version": "v8.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/collision.git",
-                "reference": "586cb8181a257a2152b6a855ca8d9598878a1a26"
+                "reference": "4cf9f3b47afff38b139fb79ce54fc71799022ce8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/586cb8181a257a2152b6a855ca8d9598878a1a26",
-                "reference": "586cb8181a257a2152b6a855ca8d9598878a1a26",
+                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/4cf9f3b47afff38b139fb79ce54fc71799022ce8",
+                "reference": "4cf9f3b47afff38b139fb79ce54fc71799022ce8",
                 "shasum": ""
             },
             "require": {
-                "filp/whoops": "^2.17.0",
+                "filp/whoops": "^2.18.0",
                 "nunomaduro/termwind": "^2.3.0",
                 "php": "^8.2.0",
-                "symfony/console": "^7.2.1"
+                "symfony/console": "^7.2.5"
             },
             "conflict": {
-                "laravel/framework": "<11.39.1 || >=13.0.0",
-                "phpunit/phpunit": "<11.5.3 || >=12.0.0"
+                "laravel/framework": "<11.44.2 || >=13.0.0",
+                "phpunit/phpunit": "<11.5.15 || >=13.0.0"
             },
             "require-dev": {
-                "larastan/larastan": "^2.10.0",
-                "laravel/framework": "^11.44.2",
+                "brianium/paratest": "^7.8.3",
+                "larastan/larastan": "^3.2",
+                "laravel/framework": "^11.44.2 || ^12.6",
                 "laravel/pint": "^1.21.2",
                 "laravel/sail": "^1.41.0",
                 "laravel/sanctum": "^4.0.8",
                 "laravel/tinker": "^2.10.1",
-                "orchestra/testbench-core": "^9.12.0",
-                "pestphp/pest": "^3.7.4",
-                "sebastian/environment": "^6.1.0 || ^7.2.0"
+                "orchestra/testbench-core": "^9.12.0 || ^10.1",
+                "pestphp/pest": "^3.8.0",
+                "sebastian/environment": "^7.2.0 || ^8.0"
             },
             "type": "library",
             "extra": {
@@ -4059,7 +4060,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2025-03-14T22:37:40+00:00"
+            "time": "2025-04-03T14:33:09+00:00"
         },
         {
             "name": "nunomaduro/termwind",
@@ -5830,16 +5831,16 @@
         },
         {
             "name": "rcrowe/twigbridge",
-            "version": "v0.14.4",
+            "version": "v0.14.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rcrowe/TwigBridge.git",
-                "reference": "4fddf45ae010bfc75535ad9ab141301908117f34"
+                "reference": "88c83c9658a2c029c64ec80dd8a15d5a67433ac4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rcrowe/TwigBridge/zipball/4fddf45ae010bfc75535ad9ab141301908117f34",
-                "reference": "4fddf45ae010bfc75535ad9ab141301908117f34",
+                "url": "https://api.github.com/repos/rcrowe/TwigBridge/zipball/88c83c9658a2c029c64ec80dd8a15d5a67433ac4",
+                "reference": "88c83c9658a2c029c64ec80dd8a15d5a67433ac4",
                 "shasum": ""
             },
             "require": {
@@ -5896,9 +5897,9 @@
             ],
             "support": {
                 "issues": "https://github.com/rcrowe/TwigBridge/issues",
-                "source": "https://github.com/rcrowe/TwigBridge/tree/v0.14.4"
+                "source": "https://github.com/rcrowe/TwigBridge/tree/v0.14.5"
             },
-            "time": "2025-02-25T15:40:57+00:00"
+            "time": "2025-04-18T18:48:57+00:00"
         },
         {
             "name": "spatie/backtrace",
@@ -6360,16 +6361,16 @@
         },
         {
             "name": "spatie/laravel-package-tools",
-            "version": "1.92.0",
+            "version": "1.92.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-package-tools.git",
-                "reference": "dd46cd0ed74015db28822d88ad2e667f4496a6f6"
+                "reference": "d20b1969f836d210459b78683d85c9cd5c5f508c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/dd46cd0ed74015db28822d88ad2e667f4496a6f6",
-                "reference": "dd46cd0ed74015db28822d88ad2e667f4496a6f6",
+                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/d20b1969f836d210459b78683d85c9cd5c5f508c",
+                "reference": "d20b1969f836d210459b78683d85c9cd5c5f508c",
                 "shasum": ""
             },
             "require": {
@@ -6380,6 +6381,7 @@
                 "mockery/mockery": "^1.5",
                 "orchestra/testbench": "^7.7|^8.0|^9.0|^10.0",
                 "pestphp/pest": "^1.23|^2.1|^3.1",
+                "phpunit/php-code-coverage": "^9.0|^10.0|^11.0",
                 "phpunit/phpunit": "^9.5.24|^10.5|^11.5",
                 "spatie/pest-plugin-test-time": "^1.1|^2.2"
             },
@@ -6408,7 +6410,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/laravel-package-tools/issues",
-                "source": "https://github.com/spatie/laravel-package-tools/tree/1.92.0"
+                "source": "https://github.com/spatie/laravel-package-tools/tree/1.92.4"
             },
             "funding": [
                 {
@@ -6416,7 +6418,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-03-27T08:34:10+00:00"
+            "time": "2025-04-11T15:27:14+00:00"
         },
         {
             "name": "spatie/period",
@@ -10028,16 +10030,16 @@
     "packages-dev": [
         {
             "name": "barryvdh/laravel-debugbar",
-            "version": "v3.15.2",
+            "version": "v3.15.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-debugbar.git",
-                "reference": "0bc1e1361e7fffc2be156f46ad1fba6927c01729"
+                "reference": "c0667ea91f7185f1e074402c5788195e96bf8106"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/0bc1e1361e7fffc2be156f46ad1fba6927c01729",
-                "reference": "0bc1e1361e7fffc2be156f46ad1fba6927c01729",
+                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/c0667ea91f7185f1e074402c5788195e96bf8106",
+                "reference": "c0667ea91f7185f1e074402c5788195e96bf8106",
                 "shasum": ""
             },
             "require": {
@@ -10048,9 +10050,6 @@
                 "php-debugbar/php-debugbar": "~2.1.1",
                 "symfony/finder": "^6|^7"
             },
-            "conflict": {
-                "maximebf/debugbar": "*"
-            },
             "require-dev": {
                 "mockery/mockery": "^1.3.3",
                 "orchestra/testbench-dusk": "^7|^8|^9|^10",
@@ -10100,7 +10099,7 @@
             ],
             "support": {
                 "issues": "https://github.com/barryvdh/laravel-debugbar/issues",
-                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.15.2"
+                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.15.4"
             },
             "funding": [
                 {
@@ -10112,7 +10111,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-02-25T15:25:22+00:00"
+            "time": "2025-04-16T06:32:06+00:00"
         },
         {
             "name": "barryvdh/laravel-ide-helper",
@@ -10262,16 +10261,16 @@
         },
         {
             "name": "cloudcreativity/json-api-testing",
-            "version": "v6.1.0",
+            "version": "v6.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cloudcreativity/json-api-testing.git",
-                "reference": "6c7a09b75e4ea250983d5b80f6120f15db9914cb"
+                "reference": "bb2ff0a87013d40781ca7f959023491d6f1b4ed2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cloudcreativity/json-api-testing/zipball/6c7a09b75e4ea250983d5b80f6120f15db9914cb",
-                "reference": "6c7a09b75e4ea250983d5b80f6120f15db9914cb",
+                "url": "https://api.github.com/repos/cloudcreativity/json-api-testing/zipball/bb2ff0a87013d40781ca7f959023491d6f1b4ed2",
+                "reference": "bb2ff0a87013d40781ca7f959023491d6f1b4ed2",
                 "shasum": ""
             },
             "require": {
@@ -10279,7 +10278,7 @@
                 "illuminate/contracts": "^10.0|^11.0|^12.0",
                 "illuminate/support": "^10.0|^11.0|^12.0",
                 "php": "^8.2",
-                "phpunit/phpunit": "^10.5|^11.0"
+                "phpunit/phpunit": "^10.5|^11.0|^12.0"
             },
             "type": "library",
             "extra": {
@@ -10314,9 +10313,9 @@
             ],
             "support": {
                 "issues": "https://github.com/cloudcreativity/json-api/issues",
-                "source": "https://github.com/cloudcreativity/json-api-testing/tree/v6.1.0"
+                "source": "https://github.com/cloudcreativity/json-api-testing/tree/v6.2.0"
             },
-            "time": "2025-02-24T20:34:56+00:00"
+            "time": "2025-04-09T19:15:46+00:00"
         },
         {
             "name": "composer/class-map-generator",
@@ -10586,16 +10585,16 @@
         },
         {
             "name": "iamcal/sql-parser",
-            "version": "v0.5",
+            "version": "v0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/iamcal/SQLParser.git",
-                "reference": "644fd994de3b54e5d833aecf406150aa3b66ca88"
+                "reference": "947083e2dca211a6f12fb1beb67a01e387de9b62"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/iamcal/SQLParser/zipball/644fd994de3b54e5d833aecf406150aa3b66ca88",
-                "reference": "644fd994de3b54e5d833aecf406150aa3b66ca88",
+                "url": "https://api.github.com/repos/iamcal/SQLParser/zipball/947083e2dca211a6f12fb1beb67a01e387de9b62",
+                "reference": "947083e2dca211a6f12fb1beb67a01e387de9b62",
                 "shasum": ""
             },
             "require-dev": {
@@ -10621,46 +10620,46 @@
             "description": "MySQL schema parser",
             "support": {
                 "issues": "https://github.com/iamcal/SQLParser/issues",
-                "source": "https://github.com/iamcal/SQLParser/tree/v0.5"
+                "source": "https://github.com/iamcal/SQLParser/tree/v0.6"
             },
-            "time": "2024-03-22T22:46:32+00:00"
+            "time": "2025-03-17T16:59:46+00:00"
         },
         {
             "name": "larastan/larastan",
-            "version": "v3.2.0",
+            "version": "v3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/larastan/larastan.git",
-                "reference": "d84d5a3b6536a586899ad6855a3e098473703690"
+                "reference": "1042fa0c2ee490bb6da7381f3323f7292ad68222"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/d84d5a3b6536a586899ad6855a3e098473703690",
-                "reference": "d84d5a3b6536a586899ad6855a3e098473703690",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/1042fa0c2ee490bb6da7381f3323f7292ad68222",
+                "reference": "1042fa0c2ee490bb6da7381f3323f7292ad68222",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "iamcal/sql-parser": "^0.5.0",
-                "illuminate/console": "^11.41.3 || ^12.0",
-                "illuminate/container": "^11.41.3 || ^12.0",
-                "illuminate/contracts": "^11.41.3 || ^12.0",
-                "illuminate/database": "^11.41.3 || ^12.0",
-                "illuminate/http": "^11.41.3 || ^12.0",
-                "illuminate/pipeline": "^11.41.3 || ^12.0",
-                "illuminate/support": "^11.41.3 || ^12.0",
+                "iamcal/sql-parser": "^0.6.0",
+                "illuminate/console": "^11.44.2 || ^12.4.1",
+                "illuminate/container": "^11.44.2 || ^12.4.1",
+                "illuminate/contracts": "^11.44.2 || ^12.4.1",
+                "illuminate/database": "^11.44.2 || ^12.4.1",
+                "illuminate/http": "^11.44.2 || ^12.4.1",
+                "illuminate/pipeline": "^11.44.2 || ^12.4.1",
+                "illuminate/support": "^11.44.2 || ^12.4.1",
                 "php": "^8.2",
-                "phpstan/phpstan": "^2.1.3"
+                "phpstan/phpstan": "^2.1.11"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^12.0",
-                "laravel/framework": "^11.41.3 || ^12.0",
-                "mockery/mockery": "^1.6",
-                "nikic/php-parser": "^5.3",
-                "orchestra/canvas": "^v9.1.3 || ^10.0",
-                "orchestra/testbench-core": "^9.5.2 || ^10.0",
-                "phpstan/phpstan-deprecation-rules": "^2.0.0",
-                "phpunit/phpunit": "^10.5.35 || ^11.3.6"
+                "doctrine/coding-standard": "^13",
+                "laravel/framework": "^11.44.2 || ^12.7.2",
+                "mockery/mockery": "^1.6.12",
+                "nikic/php-parser": "^5.4",
+                "orchestra/canvas": "^v9.2.2 || ^10.0.1",
+                "orchestra/testbench-core": "^9.12.0 || ^10.1",
+                "phpstan/phpstan-deprecation-rules": "^2.0.1",
+                "phpunit/phpunit": "^10.5.35 || ^11.5.15"
             },
             "suggest": {
                 "orchestra/testbench": "Using Larastan for analysing a package needs Testbench"
@@ -10689,13 +10688,9 @@
                 {
                     "name": "Can Vural",
                     "email": "can9119@gmail.com"
-                },
-                {
-                    "name": "Nuno Maduro",
-                    "email": "enunomaduro@gmail.com"
                 }
             ],
-            "description": "Larastan - Discover bugs in your code without running it. A phpstan/phpstan wrapper for Laravel",
+            "description": "Larastan - Discover bugs in your code without running it. A phpstan/phpstan extension for Laravel",
             "keywords": [
                 "PHPStan",
                 "code analyse",
@@ -10708,7 +10703,7 @@
             ],
             "support": {
                 "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v3.2.0"
+                "source": "https://github.com/larastan/larastan/tree/v3.4.0"
             },
             "funding": [
                 {
@@ -10716,7 +10711,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-03-14T21:54:26+00:00"
+            "time": "2025-04-22T09:44:59+00:00"
         },
         {
             "name": "laravel-json-api/testing",
@@ -11222,16 +11217,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.11",
+            "version": "2.1.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "8ca5f79a8f63c49b2359065832a654e1ec70ac30"
+                "reference": "96dde49e967c0c22812bcfa7bda4ff82c09f3b0c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8ca5f79a8f63c49b2359065832a654e1ec70ac30",
-                "reference": "8ca5f79a8f63c49b2359065832a654e1ec70ac30",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/96dde49e967c0c22812bcfa7bda4ff82c09f3b0c",
+                "reference": "96dde49e967c0c22812bcfa7bda4ff82c09f3b0c",
                 "shasum": ""
             },
             "require": {
@@ -11276,7 +11271,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-03-24T13:45:00+00:00"
+            "time": "2025-04-16T13:19:18+00:00"
         },
         {
             "name": "phpstan/phpstan-deprecation-rules",
@@ -11698,16 +11693,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "11.5.15",
+            "version": "11.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "4b6a4ee654e5e0c5e1f17e2f83c0f4c91dee1f9c"
+                "reference": "fc3e887c7f3f9917e1bf61e523413d753db00a17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4b6a4ee654e5e0c5e1f17e2f83c0f4c91dee1f9c",
-                "reference": "4b6a4ee654e5e0c5e1f17e2f83c0f4c91dee1f9c",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fc3e887c7f3f9917e1bf61e523413d753db00a17",
+                "reference": "fc3e887c7f3f9917e1bf61e523413d753db00a17",
                 "shasum": ""
             },
             "require": {
@@ -11779,7 +11774,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.15"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.18"
             },
             "funding": [
                 {
@@ -11790,12 +11785,20 @@
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
                 },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-03-23T16:02:11+00:00"
+            "time": "2025-04-22T06:09:49+00:00"
         },
         {
             "name": "sebastian/cli-parser",

config/cer.php

@@ -28,48 +28,53 @@ return [
     'download_enabled' => env('ENABLE_EXTERNAL_RATES', false),
 
     // if currencies are added, default rates must be added as well!
-    // last exchange rate update: 2024-12-30
     // source: https://www.xe.com/currencyconverter/
-    'date'             => '2024-12-30',
+    'date'             => '2025-04-15',
 
     // all rates are from EUR to $currency:
     'rates'            => [
         // europa
         'EUR' => 1,
         'HUF' => 410.79798,
-        'GBP' => 0.82858703,
-        'UAH' => 43.485934,
-        'PLN' => 4.2708542,
-        'TRY' => 36.804124,
+        'GBP' => 0.86003261,
+        'UAH' => 46.867455,
+        'PLN' => 4.2802098,
+        'TRY' => 43.180054,
         'DKK' => 7.4591,
-        'RON' => 4.9768699,
+        'RON' => 7.4648336,
 
         // Americas
-        'USD' => 1.0430046,
-        'BRL' => 6.4639113,
-        'CAD' => 1.5006908,
-        'MXN' => 21.249542,
+        'USD' => 1.1349044,
+        'BRL' => 6.6458518,
+        'CAD' => 1.575105,
+        'MXN' => 22.805278,
 
         // Oceania currencies
-        'IDR' => 16860.057,
-        'AUD' => 1.6705648,
-        'NZD' => 1.8436945,
+        'IDR' => 19070.382,
+        'AUD' => 1.787202,
+        'NZD' => 1.9191078,
 
         // africa
-        'EGP' => 53.038174,
-        'MAD' => 10.521629,
-        'ZAR' => 19.460263,
+        'EGP' => 57.874172,
+        'MAD' => 10.549438,
+        'ZAR' => 21.444356,
 
         // asia
-        'JPY' => 164.74767,
-        'RMB' => 7.6138994,
-        'CNY' => 7.6138994,
-        'RUB' => 108.56771,
-        'INR' => 89.157391,
+        'JPY' => 162.47195,
+        'RMB' => 8.2849977,
+        'CNY' => 8.2849977,
+        'RUB' => 93.34423,
+        'INR' => 97.572815,
 
         // int
-        'ILS' => 3.8428028,
-        'CHF' => 0.94044969,
+        'ILS' => 4.1801786,
+        'CHF' => 0.92683126,
         'HRK' => 7.5345, // replaced by EUR
+
+        'ISK' => 145.10532,
+        'NOK' => 11.980824,
+        'SEK' => 11.08809,
+        'HKD' => 8.8046322,
+        'CZK' => 25.092213,
     ],
 ];

config/firefly.php

@@ -78,7 +78,7 @@ return [
         'running_balance_column' => env('USE_RUNNING_BALANCE', false),
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'develop/2025-04-03',
+    'version'                      => 'develop/2025-04-26',
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 25,
 
@@ -156,7 +156,7 @@ return [
         'sv_SE' => ['name_locale' => 'Svenska', 'name_english' => 'Swedish'],
         //        // 'tlh_AA' => ['name_locale' => 'tlhIngan Hol', 'name_english' => 'Klingon'],
         'tr_TR' => ['name_locale' => 'Türkçe', 'name_english' => 'Turkish'],
-        'uk_UA' => ['name_locale' => 'Ukranian', 'name_english' => 'Ukranian'],
+        'uk_UA' => ['name_locale' => 'Українська', 'name_english' => 'Ukrainian'],
         'vi_VN' => ['name_locale' => 'Tiếng Việt', 'name_english' => 'Vietnamese'],
         'zh_TW' => ['name_locale' => 'Chinese Traditional', 'name_english' => 'Chinese Traditional'],
         'zh_CN' => ['name_locale' => 'Chinese Simplified', 'name_english' => 'Chinese Simplified'],

config/mail.php

@@ -37,14 +37,19 @@ return [
 
     'mailers'  => [
         'smtp'       => [
-            'transport'   => 'smtp',
-            'host'        => envNonEmpty('MAIL_HOST', 'smtp.mailtrap.io'),
-            'port'        => (int) env('MAIL_PORT', 2525),
-            'encryption'  => envNonEmpty('MAIL_ENCRYPTION', 'tls'),
-            'username'    => envNonEmpty('MAIL_USERNAME', 'user@example.com'),
-            'password'    => envNonEmpty('MAIL_PASSWORD', 'password'),
-            'timeout'     => null,
-            'verify_peer' => null !== env('MAIL_ENCRYPTION'),
+            'transport'         => 'smtp',
+            'host'              => envNonEmpty('MAIL_HOST', 'smtp.mailtrap.io'),
+            'port'              => (int) env('MAIL_PORT', 2525),
+            'encryption'        => envNonEmpty('MAIL_ENCRYPTION', 'tls'),
+            'username'          => envNonEmpty('MAIL_USERNAME', 'user@example.com'),
+            'password'          => envNonEmpty('MAIL_PASSWORD', 'password'),
+            'timeout'           => null,
+            'scheme'            => env('MAIL_SCHEME'),
+            'url'               => env('MAIL_URL'),
+            'local_domain'      => env('MAIL_EHLO_DOMAIN', parse_url(env('APP_URL', 'http://localhost'), PHP_URL_HOST)),
+            'verify_peer'       => env('MAIL_VERIFY_PEER', true),
+            'allow_self_signed' => env('MAIL_ALLOW_SELF_SIGNED', false),
+            'verify_peer_name'  => env('MAIL_VERIFY_PEER_NAME', true),
         ],
         'mailersend' => [
             'transport' => 'mailersend',

config/translations.php

@@ -139,6 +139,7 @@ return [
             'firefly' => [
                 'administrations_page_title',
                 'administrations_index_menu',
+                'expires_at',
                 'temp_administrations_introduction',
                 'administration_currency_form_help',
                 'administrations_page_edit_sub_title_js',

database/seeders/TransactionCurrencySeeder.php

@@ -69,10 +69,14 @@ class TransactionCurrencySeeder extends Seeder
         $currencies[] = ['code' => 'RUB', 'name' => 'Russian ruble', 'symbol' => '₽', 'decimal_places' => 2];
         $currencies[] = ['code' => 'INR', 'name' => 'Indian rupee', 'symbol' => '₹', 'decimal_places' => 2];
 
-        // PLEASE ADD NEW CURRENCIES BELOW THIS LINE
+        // ALL NEW CURRENCIES BELOW THIS LINE
         $currencies[] = ['code' => 'ILS', 'name' => 'Israeli new shekel', 'symbol' => '₪', 'decimal_places' => 2];
         $currencies[] = ['code' => 'CHF', 'name' => 'Swiss franc', 'symbol' => 'CHF', 'decimal_places' => 2];
         $currencies[] = ['code' => 'HRK', 'name' => 'Croatian kuna', 'symbol' => 'kn', 'decimal_places' => 2];
+        $currencies[] = ['code' => 'HKD', 'name' => 'Hong Kong dollar', 'symbol' => 'HK$', 'decimal_places' => 2];
+        $currencies[] = ['code' => 'CHF', 'name' => 'Swiss franc', 'symbol' => 'CHF', 'decimal_places' => 2];
+        $currencies[] = ['code' => 'NOK', 'name' => 'Norwegian krone', 'symbol' => 'kr.', 'decimal_places' => 2];
+        $currencies[] = ['code' => 'CZK', 'name' => 'Czech koruna', 'symbol' => 'Kč', 'decimal_places' => 2];
 
         foreach ($currencies as $currency) {
             if (null === TransactionCurrency::where('code', $currency['code'])->first()) {

public/v1/js/ff/index.js

@@ -62,6 +62,7 @@ function drawChart() {
             // net worth
             var net_worth = [];
             var keepGreen = false;
+            var makeBlue = false;
 
             for (key in data) {
                 // balance
@@ -82,7 +83,11 @@ function drawChart() {
                 if (key.substring(0, 17) === 'left-to-spend-in-') {
                     left_to_spend_top.push(data[key].value_parsed);
                     left_to_spend_bottom.push(data[key].sub_title);
-                    if (parseFloat(data[key].monetary_value) > 0) {
+                    if(true === data[key].no_available_budgets) {
+                        makeBlue = true;
+                        $('#box-left-to-spend-text').text(data[key].title);
+                    }
+                    if(false === data[key].no_available_budgets && parseFloat(data[key].monetary_value) > 0) {
                         keepGreen = true;
                     }
                 }
@@ -95,6 +100,9 @@ function drawChart() {
             if(!keepGreen) {
                 $('#box-left-to-spend-box').removeClass('bg-green-gradient').addClass('bg-red-gradient')
             }
+            if(makeBlue) {
+                $('#box-left-to-spend-box').removeClass('bg-red-gradient').removeClass('bg-green-gradient').addClass('bg-blue-gradient')
+            }
 
             // balance
             $('#box-balance-sums').html(balance_top.join(', '));

resources/assets/v1/src/components/passport/PersonalAccessTokens.vue

@@ -47,6 +47,7 @@
             <thead>
             <tr>
               <th scope="col">{{ $t('firefly.name') }}</th>
+              <th scope="col">{{ $t('firefly.expires_at') }}</th>
               <th scope="col"></th>
             </tr>
             </thead>
@@ -57,6 +58,10 @@
               <td style="vertical-align: middle;">
                 {{ token.name }}
               </td>
+                <!-- expires at -->
+              <td style="vertical-align: middle;">
+                {{ new Date(token.expires_at).toLocaleString() }}
+              </td>
 
               <!-- Delete Button -->
               <td style="vertical-align: middle;">
@@ -232,7 +237,7 @@ export default {
     },
 
     /**
-     * Get all of the available scopes.
+     * Get all the available scopes.
      */
     getScopes() {
       axios.get('./oauth/scopes')

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

@@ -216,7 +216,7 @@ export default {
           }
         },
         selectedItem: function (e) {
-          console.log('In SelectedItem()');
+          // console.log('In SelectedItem()');
           if (typeof this.name === 'undefined') {
             // console.log('Is undefined');
             return;

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

@@ -540,12 +540,18 @@ export default {
                     allowed_types: window.expectedSourceTypes.destination[this.ucFirst(transaction.type)]
                 }
             };
+            // console.log('Destination currency id is ' + result.destination_account.currency_id);
             // if transaction type is transfer, the destination currency_id etc. MUST match the actual account currency info.
-            if ('transfer' === transaction.type && null !== transaction.foreign_currency_code) {
+            // OR if the transaction type is a withdrawal, and the destination account is a liability account, same as above.
+            if (
+                ('transfer' === transaction.type && null !== transaction.foreign_currency_code) ||
+                ('withdrawal' === transaction.type && ['Loan', 'Debt', 'Mortgage'].includes(transaction.destination_type) && null !== transaction.foreign_currency_code)
+            ) {
                 result.destination_account.currency_id = transaction.foreign_currency_id;
                 result.destination_account.currency_name = transaction.foreign_currency_name;
                 result.destination_account.currency_code = transaction.foreign_currency_code;
                 result.destination_account.currency_decimal_places = transaction.foreign_currency_decimal_places;
+                // console.log('Set destination currency_id to ' + result.destination_account.currency_id);
             }
 
 

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

@@ -137,7 +137,6 @@ export default {
                 // lock dropdown list on currencyID of destination.
                 for (const key in this.currencies) {
                     if (this.currencies.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
-
                         if (
                             parseInt(this.currencies[key].id) === parseInt(this.destination.currency_id)
                         ) {

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Financial administrations",
         "administrations_index_menu": "Financial administrations",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
         "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
         "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Financial administrations",
         "administrations_index_menu": "Financial administrations",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
         "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
         "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Financial administrations",
         "administrations_index_menu": "Financial administrations",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
         "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
         "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",
@@ -103,7 +104,7 @@
         "profile_oauth_confidential": "Soukrom\u00e1 aplikace",
         "profile_oauth_confidential_help": "Po\u017eadovat aby se klienti autorizovali. Soukrom\u00e9 aplikace mohou bezpe\u010dn\u011b pracovat s p\u0159\u00edstupov\u00fdmi \u00fadaji bez toho aby je zve\u0159ejnily. Ve\u0159ejn\u00e9 aplikace, nativn\u00ed nebo JavaScriptov\u00e9 SPA, toho schopn\u00e9 nejsou.",
         "multi_account_warning_unknown": "Depending on the type of transaction you create, the source and\/or destination account of subsequent splits may be overruled by whatever is defined in the first split of the transaction.",
-        "multi_account_warning_withdrawal": "Zdrojov\u00fd \u00fa\u010del v\u0161ech n\u00e1sleduj\u00edc\u00edch rozd\u011blen\u00ed je ovl\u00e1dan\u00fd zdrojov\u00fdm \u00fa\u010dtem prvn\u00edho rozd\u011blen\u00ed transakce.",
+        "multi_account_warning_withdrawal": "Zdrojov\u00fd \u00fa\u010det cel\u00e9 transakce je ovl\u00e1dan\u00fd prvn\u00edm rozd\u011blen\u00edm.",
         "multi_account_warning_deposit": "C\u00edlov\u00fd \u00fa\u010del v\u0161ech n\u00e1sleduj\u00edc\u00edch rozd\u011blen\u00ed je ovl\u00e1dan\u00fd c\u00edlov\u00fdm \u00fa\u010dtem prvn\u00edho rozd\u011blen\u00ed transakce.",
         "multi_account_warning_transfer": "Zdrojov\u00fd i c\u00edlov\u00fd \u00fa\u010det v\u0161ech n\u00e1sleduj\u00edc\u00edch rozd\u011blen\u00ed jsou ovl\u00e1d\u00e1ny zdrojov\u00fdm a c\u00edlov\u00fdm \u00fa\u010dtem prvn\u00edho rozd\u011blen\u00ed transakce.",
         "webhook_trigger_STORE_TRANSACTION": "Po vytvo\u0159en\u00ed transakce",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Financial administrations",
         "administrations_index_menu": "Financial administrations",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
         "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
         "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Finanzverwaltungen",
         "administrations_index_menu": "Finanzverwaltung",
+        "expires_at": "G\u00fcltig bis",
         "temp_administrations_introduction": "Firefly III wird bald die M\u00f6glichkeit erhalten, mehrere Finanzverwaltungen zu verwalten. Im Moment verf\u00fcgen Sie nur \u00fcber eine. Sie k\u00f6nnen den Titel dieser Verwaltung und ihre eigene W\u00e4hrung festlegen. Dies ersetzt die bisherige Einstellung, bei der Sie Ihre \u201eStandardw\u00e4hrung\u201c festlegen konnten. Diese Einstellung ist jetzt an die Finanzverwaltung gebunden und kann f\u00fcr jede Verwaltung unterschiedlich sein.",
         "administration_currency_form_help": "Es kann l\u00e4nger dauern, bis die Seite geladen ist, wenn Sie die Landesw\u00e4hrung \u00e4ndern, da die Buchungen m\u00f6glicherweise in Ihre (neue) Landesw\u00e4hrung umgerechnet werden m\u00fcssen.",
         "administrations_page_edit_sub_title_js": "Finanzverwaltung \u201e{title}\u201c bearbeiten",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Financial administrations",
         "administrations_index_menu": "Financial administrations",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
         "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
         "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Financial administrations",
         "administrations_index_menu": "Financial administrations",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
         "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
         "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Financial administrations",
         "administrations_index_menu": "Financial administrations",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
         "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
         "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Financial administrations",
         "administrations_index_menu": "Financial administrations",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
         "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
         "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Financial administrations",
         "administrations_index_menu": "Financial administrations",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
         "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
         "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Financial administrations",
         "administrations_index_menu": "Financial administrations",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
         "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
         "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Administrations financi\u00e8res",
         "administrations_index_menu": "Administrations financi\u00e8res",
+        "expires_at": "Expire le",
         "temp_administrations_introduction": "Firefly III aura bient\u00f4t la possibilit\u00e9 de g\u00e9rer plusieurs administrations financi\u00e8res. Pour le moment, vous n'en avez qu'une. Vous pouvez d\u00e9finir le titre de cette administration et de sa devise locale. Cela remplace le param\u00e8tre pr\u00e9c\u00e9dent o\u00f9 vous d\u00e9finissiez votre \"devise par d\u00e9faut\". Ce param\u00e8tre est d\u00e9sormais li\u00e9 \u00e0 l'administration financi\u00e8re et peut \u00eatre diff\u00e9rent par administration.",
         "administration_currency_form_help": "La page peut mettre longtemps \u00e0 charger si vous modifiez la devise locale, car des op\u00e9rations peuvent n\u00e9cessiter une conversion vers votre (nouvelle) devise locale.",
         "administrations_page_edit_sub_title_js": "Modifier l'administration financi\u00e8re \"{title}\"",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Financial administrations",
         "administrations_index_menu": "Financial administrations",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
         "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
         "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Financial administrations",
         "administrations_index_menu": "Financial administrations",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
         "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
         "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Amministrazioni finanziarie",
         "administrations_index_menu": "Amministrazioni finanziarie",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III avr\u00e0 presto la possibilit\u00e0 di gestire pi\u00f9 amministrazioni finanziarie. In questo momento, hai solo il titolo. Puoi impostare il titolo di questa amministrazione e la sua valuta nativa. Questo sostituisce l'impostazione precedente, in cui si impostava la \"valuta predefinita\". Questa situazione \u00e8 ora legata all'amministrazione finanziaria e pu\u00f2 essere diversa per amministrazione.",
         "administration_currency_form_help": "Se modifichi la valuta nativa, il caricamento della pagina potrebbe richiedere molto tempo, poich\u00e9 potrebbe essere necessario convertire la transazione nella (nuova) valuta nativa.",
         "administrations_page_edit_sub_title_js": "Modifica amministrazione finanziaria \"{title}\"",
@@ -30,7 +31,7 @@
         "apply_rules_checkbox": "Applica le regole",
         "fire_webhooks_checkbox": "Esegui webhook",
         "no_budget_pointer": "Sembra che tu non abbia ancora dei budget. Dovresti crearne alcuni nella pagina dei <a href=\"budgets\">budget<\/a>. I budget possono aiutarti a tenere traccia delle spese.",
-        "no_bill_pointer": "Sembra che tu non abbia ancora un abbonamento. Dovresti crearne alcuni sulla pagina <a href=\"subscriptions\">abbonamento<\/a>. Gli abbonamenti possono aiutarti a tenere traccia delle spese.",
+        "no_bill_pointer": "Sembra che tu non abbia ancora un pagamento ricorrente. Dovresti crearne alcuni sulla pagina <a href=\"subscriptions\">pagamenti ricorrenti<\/a>. I pagamenti ricorrenti possono aiutarti a tenere traccia delle spese.",
         "source_account": "Conto di origine",
         "hidden_fields_preferences": "Puoi abilitare maggiori opzioni per le transazioni nelle tue <a href=\"preferences\">impostazioni<\/a>.",
         "destination_account": "Conto destinazione",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Financial administrations",
         "administrations_index_menu": "Financial administrations",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
         "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
         "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Financial administrations",
         "administrations_index_menu": "Financial administrations",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
         "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
         "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Financial administrations",
         "administrations_index_menu": "Financial administrations",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
         "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
         "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Grootboeken",
         "administrations_index_menu": "Grootboeken",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III krijgt binnenkort het vermogen om meerdere grootboeken te beheren. Op dit moment kan dat nog niet. Je kan de titel van dit grootboek instellen en de basisvaluta. Dit vervangt de voorgaande manier waarop je je \"standaardvaluta\" zou instellen. Deze instelling is nu gekoppeld aan dit grootboek, en kan per grootboek verschillend zijn.",
         "administration_currency_form_help": "Het wijzigen van deze instelling betekent dat heel veel transacties omgerekend moeten worden naar je nieuwe basisvaluta en dat kan lang duren.",
         "administrations_page_edit_sub_title_js": "Wijzig grootboek \"{title}\"",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Financial administrations",
         "administrations_index_menu": "Financial administrations",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
         "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
         "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Ustawienia finansowe",
         "administrations_index_menu": "Ustawienia finansowe",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III wkr\u00f3tce uzyska mo\u017cliwo\u015b\u0107 zarz\u0105dzania wieloma ustawieniami finansowymi. W tej chwili jest tylko jedno domy\u015blne ustawienie. Mo\u017cesz ustawi\u0107 jego tytu\u0142 i natywn\u0105 walut\u0119. To zast\u0119puje poprzednie ustawienia, w kt\u00f3rym mo\u017cna by\u0142o ustawi\u0107 \"domy\u015bln\u0105 walut\u0119\". Jest ona obecnie powi\u0105zana z wybranym ustawieniem finansowym i mo\u017ce by\u0107 zmienione w tej zak\u0142adce.",
         "administration_currency_form_help": "Wczytywanie strony mo\u017ce zaj\u0105\u0107 du\u017co czasu, je\u015bli zmienisz natywn\u0105 walut\u0119, poniewa\u017c transakcja mo\u017ce wymaga\u0107 przewalutowania na (now\u0105) natywn\u0105 walut\u0119.",
         "administrations_page_edit_sub_title_js": "Edytuj ustawienia finansowe \"{title}\"",

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

@@ -1,10 +1,11 @@
 {
     "firefly": {
-        "administrations_page_title": "Financial administrations",
-        "administrations_index_menu": "Financial administrations",
-        "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
-        "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
-        "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",
+        "administrations_page_title": "Administra\u00e7\u00e3o financeira",
+        "administrations_index_menu": "Administra\u00e7\u00e3o financeira",
+        "expires_at": "Expira em",
+        "temp_administrations_introduction": "O Firefly III ter\u00e1 em breve a capacidade de gerir m\u00faltiplas administra\u00e7\u00f5es financeiras. Neste momento, voc\u00ea tem apenas um. Voc\u00ea pode definir o t\u00edtulo desta administra\u00e7\u00e3o e sua moeda nativa. Isso substitui a configura\u00e7\u00e3o anterior onde voc\u00ea definiria sua \"moeda padr\u00e3o\". Esta defini\u00e7\u00e3o est\u00e1 agora ligada \u00e0 administra\u00e7\u00e3o financeira e pode ser diferente por administra\u00e7\u00e3o.",
+        "administration_currency_form_help": "A p\u00e1gina poder\u00e1 levar muito tempo para ser carregada, se voc\u00ea alterar a moeda nativa, porque a transa\u00e7\u00e3o precisar\u00e1 ser convertida para a sua (nova) moeda nativa.",
+        "administrations_page_edit_sub_title_js": "Editar administra\u00e7\u00e3o financeira \"{title}\"",
         "table": "Tabela",
         "welcome_back": "O que est\u00e1 acontecendo?",
         "flash_error": "Erro!",
@@ -15,11 +16,11 @@
         "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",
+        "is_reconciled": "Est\u00e1 reconciliado",
         "split": "Dividir",
         "single_split": "Divis\u00e3o",
-        "not_enough_currencies": "Not enough currencies",
-        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
+        "not_enough_currencies": "Moedas insuficientes",
+        "not_enough_currencies_enabled": "Se voc\u00ea tem apenas uma moeda ativada, n\u00e3o h\u00e1 necessidade de adicionar taxas de c\u00e2mbio.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transa\u00e7\u00e3o #{ID} (\"{title}\")<\/a> foi salva.",
         "webhook_stored_link": "<a href=\"transactions\/show\/{ID}\">Webhooh #{ID} (\"{title}\")<\/a> foi salva.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") foi atualizado.",
@@ -30,7 +31,7 @@
         "apply_rules_checkbox": "Aplicar regras",
         "fire_webhooks_checkbox": "Acionar webhooks",
         "no_budget_pointer": "Parece que voc\u00ea ainda n\u00e3o tem or\u00e7amentos. Voc\u00ea deve criar alguns na p\u00e1gina de <a href=\"budgets\">or\u00e7amentos<\/a>. Or\u00e7amentos podem ajud\u00e1-lo a manter o controle das despesas.",
-        "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": "Parece que voc\u00ea n\u00e3o tem assinatura ainda. Voc\u00ea deve criar alguma na p\u00e1gina de <a href=\"subscriptions\">assinaturas<\/a>. Assinaturas podem ajud\u00e1-lo a manter o controle das despesas.",
         "source_account": "Conta origem",
         "hidden_fields_preferences": "Voc\u00ea pode habilitar mais op\u00e7\u00f5es de transa\u00e7\u00e3o em suas <a href=\"preferences\">prefer\u00eancias<\/a>.",
         "destination_account": "Conta destino",
@@ -42,10 +43,10 @@
         "submit": "Enviar",
         "amount": "Valor",
         "date": "Data",
-        "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s) unless you remove the reconciliation flag.",
+        "is_reconciled_fields_dropped": "Como a transa\u00e7\u00e3o est\u00e1 reconciliada, voc\u00ea n\u00e3o pode atualizar as contas, nem o(s) valor(es) at\u00e9 voc\u00ea remover o indicador de reconcilia\u00e7\u00e3o.",
         "tags": "Tags",
         "no_budget": "(sem or\u00e7amento)",
-        "no_bill": "(no subscription)",
+        "no_bill": "(sem assinatura)",
         "category": "Categoria",
         "attachments": "Anexos",
         "notes": "Notas",
@@ -61,7 +62,7 @@
         "destination_account_reconciliation": "Voc\u00ea n\u00e3o pode editar a conta destino de uma transa\u00e7\u00e3o de reconcilia\u00e7\u00e3o.",
         "source_account_reconciliation": "Voc\u00ea n\u00e3o pode editar a conta de origem de uma transa\u00e7\u00e3o de reconcilia\u00e7\u00e3o.",
         "budget": "Or\u00e7amento",
-        "bill": "Subscription",
+        "bill": "Assinatura",
         "you_create_withdrawal": "Voc\u00ea est\u00e1 criando uma sa\u00edda.",
         "you_create_transfer": "Voc\u00ea est\u00e1 criando uma transfer\u00eancia.",
         "you_create_deposit": "Voc\u00ea est\u00e1 criando uma entrada.",
@@ -139,21 +140,21 @@
         "response": "Resposta",
         "visit_webhook_url": "Acesse a URL do webhook",
         "reset_webhook_secret": "Redefinir chave do webhook",
-        "header_exchange_rates": "Exchange rates",
-        "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">the documentation<\/a>.",
-        "exchange_rates_from_to": "Between {from} and {to} (and the other way around)",
-        "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.",
-        "header_exchange_rates_rates": "Exchange rates",
-        "header_exchange_rates_table": "Table with exchange rates",
-        "help_rate_form": "On this day, how many {to} will you get for one {from}?",
-        "add_new_rate": "Add a new exchange rate",
-        "save_new_rate": "Save new rate"
+        "header_exchange_rates": "Taxa de c\u00e2mbio",
+        "exchange_rates_intro": "O Firefly III suporta o download e uso de taxas de c\u00e2mbio. Leia mais sobre isso <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">na documenta\u00e7\u00e3o<\/a>.",
+        "exchange_rates_from_to": "Entre {from} e {to} (e vice-versa)",
+        "exchange_rates_intro_rates": "O Firefly III usa as seguintes taxas de c\u00e2mbio. A inversa \u00e9 automaticamente calculada quando n\u00e3o \u00e9 fornecida. Se n\u00e3o existir nenhuma taxa de c\u00e2mbio para a data da transa\u00e7\u00e3o, o Firefly III voltar\u00e1 no tempo para encontrar uma. Se nenhum estiver presente, a taxa \"1\" ser\u00e1 usada.",
+        "header_exchange_rates_rates": "Taxa de c\u00e2mbio",
+        "header_exchange_rates_table": "Tabela com taxas de c\u00e2mbio",
+        "help_rate_form": "Neste dia, quantos {to} voc\u00ea receber\u00e1 por um {from}?",
+        "add_new_rate": "Adicionar uma nova taxa de c\u00e2mbio",
+        "save_new_rate": "Salvar nova taxa"
     },
     "form": {
         "url": "URL",
         "active": "Ativo",
         "interest_date": "Data do juros",
-        "administration_currency": "Native currency",
+        "administration_currency": "Moeda nativa",
         "title": "T\u00edtulo",
         "date": "Data",
         "book_date": "Data de lan\u00e7amento",
@@ -168,12 +169,12 @@
         "webhook_delivery": "Entrega",
         "from_currency_to_currency": "{from} &rarr; {to}",
         "to_currency_from_currency": "{to} &rarr; {from}",
-        "rate": "Rate"
+        "rate": "Taxa"
     },
     "list": {
         "title": "T\u00edtulo",
         "active": "Est\u00e1 ativo?",
-        "native_currency": "Native currency",
+        "native_currency": "Moeda nativa",
         "trigger": "Gatilho",
         "response": "Resposta",
         "delivery": "Entrega",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Financial administrations",
         "administrations_index_menu": "Financial administrations",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
         "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
         "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Financial administrations",
         "administrations_index_menu": "Financial administrations",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
         "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
         "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "\u0424\u0438\u043d\u0430\u043d\u0441\u043e\u0432\u044b\u0435 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u044b",
         "administrations_index_menu": "\u0424\u0438\u043d\u0430\u043d\u0441\u043e\u0432\u044b\u0435 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u044b",
+        "expires_at": "\u0418\u0441\u0442\u0435\u043a\u0430\u0435\u0442",
         "temp_administrations_introduction": "Firefly III \u0432\u0441\u043a\u043e\u0440\u0435 \u043f\u043e\u043b\u0443\u0447\u0438\u0442 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c \u0443\u043f\u0440\u0430\u0432\u043b\u044f\u0442\u044c \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u0438\u043c\u0438 \u0444\u0438\u043d\u0430\u043d\u0441\u043e\u0432\u044b\u043c\u0438 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f\u043c\u0438. \u0421\u0435\u0439\u0447\u0430\u0441 \u0443 \u0432\u0430\u0441 \u0435\u0441\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0430 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f. \u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0437\u0430\u0434\u0430\u0442\u044c \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u044d\u0442\u043e\u0439 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u0438 \u0435\u0435 \u043e\u0441\u043d\u043e\u0432\u043d\u0443\u044e \u0432\u0430\u043b\u044e\u0442\u0443. \u042d\u0442\u043e \u0437\u0430\u043c\u0435\u043d\u044f\u0435\u0442 \u043f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0438\u0439 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440, \u0432 \u043a\u043e\u0442\u043e\u0440\u043e\u043c \u0432\u044b \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u043b\u0438 \"\u0432\u0430\u043b\u044e\u0442\u0443 \u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e\". \u0412 \u043d\u0430\u0441\u0442\u043e\u044f\u0449\u0435\u0435 \u0432\u0440\u0435\u043c\u044f \u044d\u0442\u0430 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0441\u0432\u044f\u0437\u0430\u043d\u0430 \u0441 \u0444\u0438\u043d\u0430\u043d\u0441\u043e\u0432\u043e\u0439 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0435\u0439 \u0438 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u0440\u0430\u0437\u043b\u0438\u0447\u043d\u043e\u0439 \u0434\u043b\u044f \u043a\u0430\u0436\u0434\u043e\u0433\u043e \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0430.",
         "administration_currency_form_help": "\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b \u043c\u043e\u0436\u0435\u0442 \u0437\u0430\u043d\u044f\u0442\u044c \u043c\u043d\u043e\u0433\u043e \u0432\u0440\u0435\u043c\u0435\u043d\u0438, \u0435\u0441\u043b\u0438 \u0432\u044b \u0438\u0437\u043c\u0435\u043d\u0438\u0442\u0435 \u043e\u0441\u043d\u043e\u0432\u043d\u0443\u044e \u0432\u0430\u043b\u044e\u0442\u0443, \u043f\u043e\u0442\u043e\u043c\u0443 \u0447\u0442\u043e \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0430 \u0432 \u043d\u043e\u0432\u0443\u044e \u043e\u0441\u043d\u043e\u0432\u043d\u0443\u044e \u0432\u0430\u043b\u044e\u0442\u0443.",
         "administrations_page_edit_sub_title_js": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0444\u0438\u043d\u0430\u043d\u0441\u0430\u043c\u0438 \"{title}\"",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Financial administrations",
         "administrations_index_menu": "Financial administrations",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
         "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
         "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Finan\u010dne administracije",
         "administrations_index_menu": "Finan\u010dne administracije",
+        "expires_at": "Pote\u010de ob",
         "temp_administrations_introduction": "Firefly III bo kmalu dobil mo\u017enost upravljanja ve\u010d finan\u010dnih administracij. Trenutno imate samo eno. Nastavite lahko naziv te administracije in njeno doma\u010do valuto. To nadome\u0161\u010da prej\u0161njo nastavitev, kjer bi nastavili svojo \"privzeto valuto\". Ta nastavitev je zdaj vezana na finan\u010dno administracijo in se lahko razlikuje glede na administracijo.",
         "administration_currency_form_help": "\u010ce spremenite doma\u010do valuto, lahko traja dolgo \u010dasa, da se stran nalo\u017ei, ker bo transakcijo morda treba pretvoriti v va\u0161o (novo) doma\u010do valuto.",
         "administrations_page_edit_sub_title_js": "Uredi finan\u010dno administracijo \"{title}\"",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Financial administrations",
         "administrations_index_menu": "Financial administrations",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
         "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
         "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Financial administrations",
         "administrations_index_menu": "Financial administrations",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
         "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
         "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "\u0424\u0456\u043d\u0430\u043d\u0441\u043e\u0432\u0456 \u0430\u0434\u043c\u0456\u043d\u0456\u0441\u0442\u0440\u0430\u0446\u0456\u0457",
         "administrations_index_menu": "\u0424\u0456\u043d\u0430\u043d\u0441\u043e\u0432\u0456 \u0430\u0434\u043c\u0456\u043d\u0456\u0441\u0442\u0440\u0430\u0446\u0456\u0457",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
         "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
         "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "Financial administrations",
         "administrations_index_menu": "Financial administrations",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
         "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
         "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",

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

@@ -2,9 +2,10 @@
     "firefly": {
         "administrations_page_title": "\u8d22\u52a1\u7ba1\u7406",
         "administrations_index_menu": "\u8d22\u52a1\u7ba1\u7406",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III \u4e0d\u4e45\u5c06\u80fd\u591f\u7ba1\u7406\u591a\u4e2a\u8d22\u52a1\u7ba1\u7406\u3002 \u73b0\u5728\uff0c\u4f60\u53ea\u80fd\u6709\u4e00\u4e2a\u8d22\u52a1\u7ba1\u7406\u3002\u4f60\u53ef\u4ee5\u8bbe\u7f6e\u8fd9\u4e2a\u8d22\u52a1\u7ba1\u7406\u7684\u6807\u9898\u53ca\u5176\u5f53\u5730\u8d27\u5e01\u3002 \u8fd9\u5c06\u53d6\u4ee3\u60a8\u5148\u524d\u8bbe\u7f6e\u7684\u201c\u9ed8\u8ba4\u8d27\u5e01\u201d\u3002 \u8fd9\u79cd\u8bbe\u7f6e\u73b0\u5728\u4e0e\u8d22\u52a1\u7ba1\u7406\u6302\u94a9\uff0c\u6bcf\u4e2a\u7ba1\u7406\u53ef\u4ee5\u6709\u4e0d\u540c\u7684\u8bbe\u7f6e\u3002",
-        "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
-        "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",
+        "administration_currency_form_help": "\u5982\u679c\u60a8\u66f4\u6539\u672c\u5730\u8d27\u5e01\uff0c\u9875\u9762\u52a0\u8f7d\u53ef\u80fd\u9700\u8981\u5f88\u957f\u65f6\u95f4\uff0c\u56e0\u4e3a\u4ea4\u6613\u53ef\u80fd\u9700\u8981\u8f6c\u6362\u4e3a\u60a8\u7684(\u65b0)\u672c\u5730\u8d27\u5e01\u3002",
+        "administrations_page_edit_sub_title_js": "\u7f16\u8f91\u8d22\u52a1\u7ba1\u7406{title}",
         "table": "\u8868\u683c",
         "welcome_back": "\u4eca\u5929\u7406\u8d22\u4e86\u5417\uff1f",
         "flash_error": "\u9519\u8bef\uff01",
@@ -140,12 +141,12 @@
         "visit_webhook_url": "\u8bbf\u95ee webhook URL",
         "reset_webhook_secret": "\u91cd\u7f6e webhook \u5bc6\u94a5",
         "header_exchange_rates": "\u6c47\u7387",
-        "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">the documentation<\/a>.",
-        "exchange_rates_from_to": "Between {from} and {to} (and the other way around)",
-        "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": "Frefly III \u652f\u6301\u4e0b\u8f7d\u548c\u4f7f\u7528\u6c47\u7387\u3002\u8bf7\u5728 <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">\u8fd9\u4efd\u6587\u6863<\/a>\u4e2d\u9605\u8bfb\u66f4\u591a\u3002",
+        "exchange_rates_from_to": "\u4ece {from} \u5230 {to} \u7684\u6c47\u7387\uff08\u4ee5\u53ca\u53cd\u5411\uff09",
+        "exchange_rates_intro_rates": "Firefly III \u91c7\u7528\u4ee5\u4e0b\u6c47\u7387\u3002\u5982\u679c\u6ca1\u6709\u63d0\u4f9b\u53cd\u5411\u6c47\u7387\u5219\u81ea\u52a8\u8ba1\u7b97\u3002 \u5982\u679c\u4ea4\u6613\u65e5\u671f\u4e0d\u5b58\u5728\u6c47\u7387\uff0cFifrefly III \u5c06\u5bfb\u627e\u524d\u4e00\u4e2a\u53ef\u7528\u65e5\u671f\u7684\u6c47\u7387\u3002 \u5982\u679c\u6ca1\u6709\uff0c\u5c06\u6309\u6c47\u7387\u4e3a 1 \u8fdb\u884c\u8ba1\u7b97\u3002",
         "header_exchange_rates_rates": "\u6c47\u7387",
-        "header_exchange_rates_table": "Table with exchange rates",
-        "help_rate_form": "On this day, how many {to} will you get for one {from}?",
+        "header_exchange_rates_table": "\u6c47\u7387\u8868",
+        "help_rate_form": "\u5728\u8fd9\u4e00\u5929\uff0c\u4f60\u80fd\u4ece\u6bcf 1 \u4e2a\u5355\u4f4d\u7684 {from} \u83b7\u5f97\u591a\u5c11 {to}\uff1f",
         "add_new_rate": "\u6dfb\u52a0\u65b0\u6c47\u7387",
         "save_new_rate": "\u4fdd\u5b58\u65b0\u6c47\u7387"
     },
@@ -168,7 +169,7 @@
         "webhook_delivery": "\u53d1\u9001\u683c\u5f0f",
         "from_currency_to_currency": "{from}&rarr;{to}",
         "to_currency_from_currency": "{to}&rarr;{from}",
-        "rate": "\u8bc4\u7ea7"
+        "rate": "\u6c47\u7387"
     },
     "list": {
         "title": "\u6807\u9898",

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

@@ -2,6 +2,7 @@
     "firefly": {
         "administrations_page_title": "\u591a\u500b\u8ca1\u52d9\u7ba1\u7406",
         "administrations_index_menu": "\u591a\u500b\u8ca1\u52d9\u7ba1\u7406",
+        "expires_at": "Expires at",
         "temp_administrations_introduction": "Firefly III \u5373\u5c07\u652f\u63f4\u540c\u6642\u7ba1\u7406\u591a\u500b\u8ca1\u52d9\u7ba1\u7406\u3002\u76ee\u524d\u60a8\u53ea\u6709\u4e00\u500b\u3002\u60a8\u53ef\u5728\u6b64\u8a2d\u5b9a\u5176\u6a19\u984c\u8207\u672c\u5e63\uff0c\u9019\u53d6\u4ee3\u4e86\u5148\u524d\u7684\u300c\u9810\u8a2d\u8ca8\u5e63\u300d\u8a2d\u5b9a\u3002\u6b64\u8a2d\u5b9a\u73fe\u5728\u7d81\u5b9a\u65bc\u8a72\u8ca1\u52d9\u7ba1\u7406\uff0c\u4e26\u53ef\u56e0\u4e0d\u540c\u8ca1\u52d9\u7ba1\u7406\u800c\u7570\u3002",
         "administration_currency_form_help": "\u5982\u679c\u60a8\u66f4\u6539\u4e86\u672c\u5e63\uff0c\u53ef\u80fd\u9700\u8981\u4e00\u6bb5\u6642\u9593\u624d\u80fd\u8f09\u5165\u9801\u9762\uff0c\u56e0\u70ba\u4ea4\u6613\u53ef\u80fd\u9700\u8981\u8f49\u63db\u70ba\uff08\u65b0\uff09\u672c\u5e63\u3002",
         "administrations_page_edit_sub_title_js": "\u7de8\u8f2f\u8ca1\u52d9\u7ba1\u7406\u300c{title}\u300d",

resources/assets/v2/package.json

@@ -27,7 +27,7 @@
         "chartjs-adapter-date-fns": "^3.0.0",
         "chartjs-chart-sankey": "^0.14.0",
         "date-fns": "^4.0.0",
-        "i18next": "^24.2.0",
+        "i18next": "^25.0.1",
         "i18next-chained-backend": "^4.6.2",
         "i18next-http-backend": "^3.0.1",
         "i18next-localstorage-backend": "^4.2.0",

resources/lang/en_US/email.php

@@ -64,8 +64,8 @@ return [
 
     // unknown user login attempt
     'unknown_user_subject'                        => 'An unknown user tried to log in',
-    'unknown_user_body'                           => 'An unknown user tried to log in to Firefly III. The email address they used was ":address".',
-    'unknown_user_message'                        => 'The email address they used was ":address".',
+    'unknown_user_body'                           => 'An unknown user (:ip) tried to log in to Firefly III. The email address they used was ":address".',
+    'unknown_user_message'                        => 'The email address they (:ip) used was ":address".',
 
     // known user login attempt
     'failed_login_subject'                        => 'Firefly III detected a failed login attempt',

resources/lang/en_US/firefly.php

@@ -802,7 +802,7 @@ return [
     'action_value'                                            => 'Action value',
     'stop_executing_other_actions'                            => 'Stop executing other actions',
     'add_rule_action'                                         => 'Add new action',
-    'edit_rule'                                               => 'Edit rule ":title"',
+    'edit_rule'                                               => 'Edit rule #:nr ":title"',
     'delete_rule'                                             => 'Delete rule ":title"',
     'update_rule'                                             => 'Update rule',
     'test_rule_triggers'                                      => 'See matching transactions',
@@ -2447,6 +2447,7 @@ return [
     'min-amount'                                              => 'Minimum amount',
     'journal-amount'                                          => 'Current subscription entry',
     'name'                                                    => 'Name',
+    'expires_at'                                              => 'Expires at',
     'date'                                                    => 'Date',
     'date_and_time'                                           => 'Date and time',
     'time'                                                    => 'Time',

resources/lang/en_US/list.php

@@ -43,6 +43,7 @@ return [
     'recurring_transaction'   => 'Recurring transaction',
     'next_due'                => 'Next due',
     'transaction_type'        => 'Type',
+    'running_balance'         => 'Running balance',
     'lastActivity'            => 'Last activity',
     'balanceDiff'             => 'Balance difference',
     'other_meta_data'         => 'Other meta data',

resources/views/budgets/index.twig

@@ -314,6 +314,7 @@
                                         {% endif %}
                                     </td>
                                     <td class="hidden-sm hidden-xs spent" data-id="{{ budget.id }}" style="text-align:right;">
+
                                         {% for spentInfo in budget.spent %}
                                             {{ formatAmountBySymbol(spentInfo.spent, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }}
                                             {% if 0 == activeDaysPassed %}

resources/views/budgets/show.twig

@@ -167,7 +167,10 @@
                                     <td style="width:33%;">{{ 'spent'|_ }}</td>
                                     <td>
                                         {% if convertToNative %}
-                                            {{ formatAmountBySymbol(limit.spent, defaultCurrency.symbol, defaultCurrency.decimal_places) }}
+                                            {{ formatAmountBySymbol(limit.spent, limit.transactionCurrency.symbol, limit.transactionCurrency.decimal_places) }}
+                                            {% if limit.native_spent %}
+                                                ({{ formatAmountBySymbol(limit.native_spent, defaultCurrency.symbol, defaultCurrency.decimal_places) }})
+                                            {% endif %}
                                         {% else %}
                                             {{ formatAmountBySymbol(limit.spent, limit.transactionCurrency.symbol, limit.transactionCurrency.decimal_places) }}
                                         {% endif %}
@@ -215,7 +218,7 @@
         {% if budgetLimit.id %}
         budgetLimitID = {{ budgetLimit.id }};
         var budgetChartUrl = '{{ route('chart.budget.budget-limit', [budget.id, budgetLimit.id] ) }}';
-        var currencySymbol = '{{ budgetLimit.transactionCurrency.symbol }}';
+        var currencySymbol = '{{ currencySymbol }}';
         var expenseCategoryUrl = '{{ route('chart.budget.expense-category', [budget.id, budgetLimit.id]) }}';
         var expenseAssetUrl = '{{ route('chart.budget.expense-asset', [budget.id, budgetLimit.id]) }}';
         var expenseExpenseUrl = '{{ route('chart.budget.expense-expense', [budget.id, budgetLimit.id]) }}';

resources/views/json/piggy-banks.twig

@@ -10,7 +10,7 @@
                 <div class="progress-bar" role="progressbar" aria-valuenow="{{ entry.percentage }}" aria-valuemin="0" aria-valuemax="100"
                      style="width: {{ entry.percentage }}%;">
                     {% if entry.percentage >=20 %}
-                        {% if convertToNative %}
+                        {% if convertToNative and 0 != avg.native_amount %}
                             {{ formatAmountBySymbol(entry.native_amount, entry.native_currency_symbol, entry.native_currency_decimal_places, false) }}
                             ({{ formatAmountBySymbol(entry.amount, entry.currency_symbol, entry.currency_decimal_places, false) }})
                         {% else %}
@@ -20,7 +20,7 @@
                 </div>
                 {% if entry.percentage < 20 %}
                     &nbsp;
-                    {% if convertToNative %}
+                    {% if convertToNative and 0 != avg.native_amount %}
                         {{ formatAmountBySymbol(entry.native_amount, entry.native_currency_symbol, entry.native_currency_decimal_places, false) }}
                         ({{ formatAmountBySymbol(entry.amount, entry.currency_symbol, entry.currency_decimal_places, false) }})
                     {% else %}

resources/views/list/groups.twig

@@ -33,6 +33,9 @@
         <th class="hidden-xs">&nbsp;</th>
         <th>{{ trans('list.description') }}</th>
         <th>{{ trans('list.amount') }}</th>
+        {% if config('firefly.feature_flags.running_balance_column') %}
+        <th>{{ trans('list.running_balance') }}</th>
+        {% endif %}
         <th>{{ trans('list.date') }}</th>
         <th>{{ trans('list.source_account') }}</th>
         <th>{{ trans('list.destination_account') }}</th>
@@ -250,6 +253,13 @@
                         {% endif %}
                     {% endif %}
                 </td>
+                {% if config('firefly.feature_flags.running_balance_column') %}
+                <td>
+                    {% if null == transaction.balance_dirty or false == transaction.balance_dirty %}
+                    {{ formatAmountBySymbol(transaction.balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                    {% endif %}
+                </td>
+                {% endif %}
                 <td style=" {{ style|raw }}">
                     {{ transaction.date.isoFormat(monthAndDayFormat) }}
                 </td>
@@ -295,6 +305,7 @@
                             <ul class="dropdown-menu dropdown-menu-right" role="menu">
                                 <li><a href="{{ route('transactions.edit', [group.id]) }}"><span
                                             class="fa fa-fw fa-pencil"></span> {{ 'edit'|_ }}</a></li>
+                                {% if transaction.transaction_type_type != 'Reconciliation' and transaction.transaction_type_type != 'Opening balance' and transaction.transaction_type_type != 'Liability credit' %}
                                 <li><a href="{{ route('transactions.delete', [group.id]) }}"><span
                                             class="fa fa-fw fa-trash"></span> {{ 'delete'|_ }}</a></li>
                                 <li><a href="#" data-id="{{ group.id }}" class="clone-transaction"><span
@@ -305,6 +316,7 @@
                                     <a href="{{ route('rules.create-from-journal', [transaction.transaction_journal_id]) }}"><span
                                             class="fa fa-fw fa-random"></span> {{ 'create_rule_from_transaction'|_ }}
                                     </a></li>
+                                {% endif %}
                             </ul>
                         </div>
                     </td>
@@ -316,12 +328,14 @@
                     </td>
                 {% endif %}
                 <td style="{{ style|raw }}" class="hidden-xs">
+                    {% if transaction.transaction_type_type != 'Reconciliation' and transaction.transaction_type_type != 'Opening balance' and transaction.transaction_type_type != 'Liability credit' %}
                     <div class="pull-right">
                         <input id="list_{{ transaction.transaction_journal_id }}"
                                value="{{ transaction.transaction_journal_id }}"
                                name="journals[{{ transaction.transaction_journal_id }}]"
                                type="checkbox" class="mass-select form-check-inline"
                                data-value="{{ transaction.transaction_journal_id }}"/>
+                        {% endif %}
                     </div>
                 </td>
             </tr>

resources/views/piggy-banks/edit.twig

@@ -23,7 +23,7 @@
                     <div class="box-body">
                         {{ ExpandedForm.text('name') }}
                         {{ ExpandedForm.amountNoCurrency('target_amount') }}
-                        {{ CurrencyForm.currencyList('transaction_currency_id', null, {helpText:'piggy_default_currency'|_}) }}
+                        {{ CurrencyForm.currencyList('transaction_currency_id', preFilled.transaction_currency_id, {helpText:'piggy_default_currency'|_}) }}
                         {{ AccountForm.assetLiabilityMultiAccountList('accounts', preFilled.accounts, {label: 'saveOnAccounts'|_, helpText: 'piggy_account_currency_match'|_   }) }}
 
                     </div>

resources/views/transactions/show.twig

@@ -19,8 +19,11 @@
                             {# edit + delete #}
                             <li><a href="{{ route('transactions.edit', [transactionGroup.id]) }}"><span
                                         class="fa fa-pencil"></span> {{ 'edit'|_ }}</a></li>
+                            {% if groupArray.transactions[0].type != 'reconciliation' and groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'liability credit' %}
                             <li><a href="{{ route('transactions.delete', [transactionGroup.id]) }}"><span
                                         class="fa fa-trash"></span> {{ 'delete'|_ }}</a></li>
+                            {% endif %}
+                            {% if groupArray.transactions[0].type != 'reconciliation' and groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'liability credit' %}
                             <li role="separator" class="divider"></li>
 
                             {# convert to different type #}
@@ -42,6 +45,7 @@
                                             class="fa fa-exchange"></span> {{ 'convert_to_transfer'|_ }}</a></li>
                             {% endif %}
 
+
                             {#  clone #}
                             {% if groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'reconciliation' %}
                                 <li role="separator" class="divider"></li>
@@ -50,6 +54,7 @@
                                 <li><a href="#" class="clone-transaction-and-edit" data-id="{{ transactionGroup.id }}"><span
                                             class="fa fa-copy"></span> {{ 'clone_and_edit'|_ }}</a></li>
                             {% endif %}
+                            {% endif %}
 
                         </ul>
                     </div>
@@ -223,12 +228,15 @@
                                 {# edit + delete #}
                                 <li><a href="{{ route('transactions.edit', [transactionGroup.id]) }}"><span
                                             class="fa fa-pencil"></span> {{ 'edit'|_ }}</a></li>
+                                {% if groupArray.transactions[0].type != 'reconciliation' and groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'liability credit' %}
                                 <li><a href="{{ route('transactions.delete', [transactionGroup.id]) }}"><span
                                             class="fa fa-trash"></span> {{ 'delete'|_ }}</a></li>
+                                {% endif %}
                                 {% if journal.reconciled %}
                                 <li><a class="reconcile-button" href="{{ route('transactions.unreconcile', [journal.transaction_journal_id]) }}"><span
                                             class="fa fa-history"></span> {{ 'unreconcile'|_ }}</a></li>
                                 {% endif %}
+                                {% if groupArray.transactions[0].type != 'reconciliation' and groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'liability credit' %}
                                 <li role="separator" class="divider"></li>
 
                                 {# convert to different type #}
@@ -273,6 +281,7 @@
                                     <a href="{{ route('recurring.create-from-journal', [journal.transaction_journal_id]) }}"><span
                                             class="fa fa-fw fa-paint-brush"></span>{{ 'create_recurring_from_transaction'|_ }}
                                     </a></li>
+                                {% endif %}
                             </ul>
                         </div>
                     </div>

routes/breadcrumbs.php

@@ -994,7 +994,7 @@ Breadcrumbs::for(
     'rules.edit',
     static function (Generator $breadcrumbs, Rule $rule): void {
         $breadcrumbs->parent('rules.index');
-        $breadcrumbs->push(trans('firefly.edit_rule', ['title' => $rule->title]), route('rules.edit', [$rule]));
+        $breadcrumbs->push(trans('firefly.edit_rule', ['nr' => $rule->order, 'title' => $rule->title]), route('rules.edit', [$rule]));
     }
 );
 Breadcrumbs::for(