Skip to content

Firefly III: a personal finances manager

🤖 Auto commit for release 'v6.7.2' on 2026-09-16

JC5eef271dd4b76
diff --git a/app/Api/V1/Controllers/Chart/BudgetController.php b/app/Api/V1/Controllers/Chart/BudgetController.php
index 6cb86a223e..7557ac737c 100644
--- a/app/Api/V1/Controllers/Chart/BudgetController.php
+++ b/app/Api/V1/Controllers/Chart/BudgetController.php
@@ -83,7 +83,7 @@ final class BudgetController extends Controller
/**
* @throws FireflyException
*/
- public function overviewWithBudgetLimits(DateRangeRequest $request): JsonResponse
+ public function overview(DateRangeRequest $request): JsonResponse
{
/** @var Carbon $start */
$start = $request->attributes->get('start');
@@ -98,7 +98,7 @@ final class BudgetController extends Controller
/** @var Budget $budget */
foreach ($budgets as $budget) {
// could return multiple arrays, so merge.
- $data = array_merge($data, $this->processBudgetAndLimits($budget, $start, $end));
+ $data = array_merge($data, $this->processBudget($budget, $start, $end));
}
return response()->json($this->clean($data));
@@ -107,7 +107,7 @@ final class BudgetController extends Controller
/**
* @throws FireflyException
*/
- public function overview(DateRangeRequest $request): JsonResponse
+ public function overviewWithBudgetLimits(DateRangeRequest $request): JsonResponse
{
/** @var Carbon $start */
$start = $request->attributes->get('start');
@@ -118,10 +118,11 @@ final class BudgetController extends Controller
// code from FrontpageChartGenerator, but not in separate class
$budgets = $this->repository->getActiveBudgets();
$data = [];
+
/** @var Budget $budget */
foreach ($budgets as $budget) {
// could return multiple arrays, so merge.
- $data = array_merge($data, $this->processBudget($budget, $start, $end));
+ $data = array_merge($data, $this->processBudgetAndLimits($budget, $start, $end));
}
return response()->json($this->clean($data));
@@ -253,6 +254,7 @@ final class BudgetController extends Controller
];
$return[] = $current;
}
+
return $return;
}
@@ -262,21 +264,22 @@ final class BudgetController extends Controller
private function processBudgetAndLimits(Budget $budget, Carbon $start, Carbon $end): array
{
// prep function
- $converter = new ExchangeRateConverter();
- $currencies = [$this->primaryCurrency->id => $this->primaryCurrency];
- $rows= [];
+ $converter = new ExchangeRateConverter();
+ $currencies = [$this->primaryCurrency->id => $this->primaryCurrency];
+ $rows = [];
// get all limits:
- $limits = $this->blRepository->getBudgetLimits($budget, $start, $end);
- $spentAll = $this->opsRepository->listExpenses($start, $end, null, new Collection()->push($budget));
- $allExpenses = $this->processExpenses($budget->id, $spentAll, $start, $end);
+ $limits = $this->blRepository->getBudgetLimits($budget, $start, $end);
+ $spentAll = $this->opsRepository->listExpenses($start, $end, null, new Collection()->push($budget));
+ $allExpenses = $this->processExpenses($budget->id, $spentAll, $start, $end);
+
/** @var BudgetLimit $limit */
foreach ($limits as $limit) {
- $spentLimit = $this->opsRepository->listExpenses($limit->start_date, $limit->end_date, null, new Collection()->push($budget));
+ $spentLimit = $this->opsRepository->listExpenses($limit->start_date, $limit->end_date, null, new Collection()->push($budget));
$limitExpenses = $this->processExpenses($budget->id, $spentLimit, $start, $end);
foreach ($limitExpenses as $currencyId => $row) {
// also process the data in $allExpenses.
- if(array_key_exists($currencyId, $allExpenses)) {
+ if (array_key_exists($currencyId, $allExpenses)) {
$allExpenses[$currencyId]['spent'] = bcadd($allExpenses[$currencyId]['spent'], bcmul($row['spent'], '-1'));
}
@@ -287,21 +290,21 @@ final class BudgetController extends Controller
$row['pc_left'] = '0';
$row['pc_overspent'] = '0';
- $row['budgeted'] = $limit->amount;
- $row['start'] = $limit->start_date;
- $row['end'] = $limit->end_date;
- $row['left'] = bcsub((string)$row['budgeted'], bcmul((string)$row['spent'], '-1'));
- $row['overspent'] = bcmul($row['left'], '-1');
- $row['left'] = 1 === bccomp($row['left'], '0') ? $row['left'] : '0';
- $row['overspent'] = 1 === bccomp($row['overspent'], '0') ? $row['overspent'] : '0';
+ $row['budgeted'] = $limit->amount;
+ $row['start'] = $limit->start_date;
+ $row['end'] = $limit->end_date;
+ $row['left'] = bcsub((string) $row['budgeted'], bcmul((string) $row['spent'], '-1'));
+ $row['overspent'] = bcmul($row['left'], '-1');
+ $row['left'] = 1 === bccomp($row['left'], '0') ? $row['left'] : '0';
+ $row['overspent'] = 1 === bccomp($row['overspent'], '0') ? $row['overspent'] : '0';
// convert data if necessary.
if ($this->convertToPrimary && $currencyId !== $this->primaryCurrency->id) {
$currencies[$currencyId] ??= Amount::getTransactionCurrencyById($currencyId);
- $row['pc_budgeted'] = $converter->convert($currencies[$currencyId], $this->primaryCurrency, $start, $row['budgeted']);
- $row['pc_spent'] = $converter->convert($currencies[$currencyId], $this->primaryCurrency, $start, $row['spent']);
- $row['pc_left'] = $converter->convert($currencies[$currencyId], $this->primaryCurrency, $start, $row['left']);
- $row['pc_overspent'] = $converter->convert($currencies[$currencyId], $this->primaryCurrency, $start, $row['overspent']);
+ $row['pc_budgeted'] = $converter->convert($currencies[$currencyId], $this->primaryCurrency, $start, $row['budgeted']);
+ $row['pc_spent'] = $converter->convert($currencies[$currencyId], $this->primaryCurrency, $start, $row['spent']);
+ $row['pc_left'] = $converter->convert($currencies[$currencyId], $this->primaryCurrency, $start, $row['left']);
+ $row['pc_overspent'] = $converter->convert($currencies[$currencyId], $this->primaryCurrency, $start, $row['overspent']);
}
if ($this->convertToPrimary && $currencyId === $this->primaryCurrency->id) {
$row['pc_budgeted'] = $row['budgeted'];
@@ -309,17 +312,21 @@ final class BudgetController extends Controller
$row['pc_left'] = $row['left'];
$row['pc_overspent'] = $row['overspent'];
}
- $rows[] = $row;
+ $rows[] = $row;
}
}
// still need to process the "main" spentAll to see if anything is left.
// is always an array
- $return = [];
+ $return = [];
foreach ($rows as $row) {
-
$current = [
- 'label' => sprintf('%s (%s - %s)', $budget->name, $row['start']->isoFormat($this->monthAndDayFormat), $row['end']->isoFormat($this->monthAndDayFormat)),
+ 'label' => sprintf(
+ '%s (%s - %s)',
+ $budget->name,
+ $row['start']->isoFormat($this->monthAndDayFormat),
+ $row['end']->isoFormat($this->monthAndDayFormat)
+ ),
'currency_id' => (string) $row['currency_id'],
'currency_name' => $row['currency_name'],
'currency_code' => $row['currency_code'],
@@ -347,9 +354,9 @@ final class BudgetController extends Controller
];
$return[] = $current;
}
- /// process main "left over" array.
- foreach($allExpenses as $currencyId => $row) {
- if(bccomp($row['spent'], '0') !== 0) {
+ // / process main "left over" array.
+ foreach ($allExpenses as $currencyId => $row) {
+ if (0 !== bccomp($row['spent'], '0')) {
// primary currency entries
$row['pc_budgeted'] = '0';
$row['pc_spent'] = '0';
@@ -359,10 +366,10 @@ final class BudgetController extends Controller
// convert data if necessary.
if ($this->convertToPrimary && $currencyId !== $this->primaryCurrency->id) {
$currencies[$currencyId] ??= Amount::getTransactionCurrencyById($currencyId);
- $row['pc_budgeted'] = $converter->convert($currencies[$currencyId], $this->primaryCurrency, $start, $row['budgeted']);
- $row['pc_spent'] = $converter->convert($currencies[$currencyId], $this->primaryCurrency, $start, $row['spent']);
- $row['pc_left'] = $converter->convert($currencies[$currencyId], $this->primaryCurrency, $start, $row['left']);
- $row['pc_overspent'] = $converter->convert($currencies[$currencyId], $this->primaryCurrency, $start, $row['overspent']);
+ $row['pc_budgeted'] = $converter->convert($currencies[$currencyId], $this->primaryCurrency, $start, $row['budgeted']);
+ $row['pc_spent'] = $converter->convert($currencies[$currencyId], $this->primaryCurrency, $start, $row['spent']);
+ $row['pc_left'] = $converter->convert($currencies[$currencyId], $this->primaryCurrency, $start, $row['left']);
+ $row['pc_overspent'] = $converter->convert($currencies[$currencyId], $this->primaryCurrency, $start, $row['overspent']);
}
if ($this->convertToPrimary && $currencyId === $this->primaryCurrency->id) {
$row['pc_budgeted'] = $row['budgeted'];
@@ -371,7 +378,7 @@ final class BudgetController extends Controller
$row['pc_overspent'] = $row['overspent'];
}
- $current = [
+ $current = [
'label' => sprintf('%s %s', $budget->name, trans('firefly.spent_outside_chart')),
'currency_id' => (string) $row['currency_id'],
'currency_name' => $row['currency_name'],
@@ -398,9 +405,10 @@ final class BudgetController extends Controller
'overspent' => $row['pc_overspent'],
],
];
- $return[] = $current;
+ $return[] = $current;
}
}
+
return $return;
}
diff --git a/app/Api/V1/Controllers/Controller.php b/app/Api/V1/Controllers/Controller.php
index 29ce282429..907abea5cc 100644
--- a/app/Api/V1/Controllers/Controller.php
+++ b/app/Api/V1/Controllers/Controller.php
@@ -62,6 +62,7 @@ abstract class Controller extends BaseController
use DispatchesJobs;
use ValidatesRequests;
use ValidatesUserGroupTrait;
+
protected string $monthAndDayFormat;
protected const string CONTENT_TYPE = 'application/vnd.api+json';
@@ -85,9 +86,9 @@ abstract class Controller extends BaseController
$this->middleware(function ($request, $next) {
$this->parameters = $this->getParameters();
if (auth()->check()) {
- $language = Steam::getLanguage();
- $this->convertToPrimary = Amount::convertToPrimary();
- $this->primaryCurrency = Amount::getPrimaryCurrency();
+ $language = Steam::getLanguage();
+ $this->convertToPrimary = Amount::convertToPrimary();
+ $this->primaryCurrency = Amount::getPrimaryCurrency();
$locale = Steam::getLocale();
$this->monthAndDayFormat = (string) trans('config.month_and_day_js', [], $locale);
app()->setLocale($language);
diff --git a/app/Api/V1/Controllers/Insight/Income/TagController.php b/app/Api/V1/Controllers/Insight/Income/TagController.php
index df99eef909..94be2ae461 100644
--- a/app/Api/V1/Controllers/Insight/Income/TagController.php
+++ b/app/Api/V1/Controllers/Insight/Income/TagController.php
@@ -158,7 +158,10 @@ final class TagController extends Controller
'currency_id' => (string) $foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
- $response[$foreignKey]['difference'] = bcadd((string) $response[$foreignKey]['difference'], Steam::positive($journal['foreign_amount']));
+ $response[$foreignKey]['difference'] = bcadd(
+ (string) $response[$foreignKey]['difference'],
+ Steam::positive($journal['foreign_amount'])
+ );
$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];
}
}
diff --git a/app/Api/V1/Controllers/Insight/Transfer/TagController.php b/app/Api/V1/Controllers/Insight/Transfer/TagController.php
index f92a7aa9f0..b7b85fd376 100644
--- a/app/Api/V1/Controllers/Insight/Transfer/TagController.php
+++ b/app/Api/V1/Controllers/Insight/Transfer/TagController.php
@@ -155,7 +155,10 @@ final class TagController extends Controller
'currency_id' => (string) $foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
- $response[$foreignKey]['difference'] = bcadd((string) $response[$foreignKey]['difference'], Steam::positive($journal['foreign_amount']));
+ $response[$foreignKey]['difference'] = bcadd(
+ (string) $response[$foreignKey]['difference'],
+ Steam::positive($journal['foreign_amount'])
+ );
$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // intentional float
}
}
diff --git a/app/Http/Controllers/Budget/BudgetLimitController.php b/app/Http/Controllers/Budget/BudgetLimitController.php
index 2edb4f5531..d461374baa 100644
--- a/app/Http/Controllers/Budget/BudgetLimitController.php
+++ b/app/Http/Controllers/Budget/BudgetLimitController.php
@@ -198,7 +198,13 @@ final class BudgetLimitController extends Controller
if ($request->expectsJson()) {
$array = $limit->toArray();
// add some extra metadata:
- $spentArr = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection()->push($budget), $currency);
+ $spentArr = $this->opsRepository->sumExpenses(
+ $limit->start_date,
+ $limit->end_date,
+ null,
+ new Collection()->push($budget),
+ $currency
+ );
$array['spent'] = $spentArr[$currency->id]['sum'] ?? '0';
$array['left_formatted'] = Amount::formatAnything($limit->transactionCurrency, bcadd($array['spent'], (string) $array['amount']));
$array['amount_formatted'] = Amount::formatAnything($limit->transactionCurrency, $limit['amount']);
diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.php
index 65429e59c1..52c6f900e3 100644
--- a/app/Http/Controllers/Budget/IndexController.php
+++ b/app/Http/Controllers/Budget/IndexController.php
@@ -272,7 +272,10 @@ final class IndexController extends Controller
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]['spent_outside'] = Steam::negative(bcsub($spentInLimits[$currency->id], $spentArr[$currency->id]['sum']));
+ $array['spent'][$currency->id]['spent_outside'] = Steam::negative(bcsub(
+ $spentInLimits[$currency->id],
+ $spentArr[$currency->id]['sum']
+ ));
$array['spent'][$currency->id]['currency_id'] = $currency->id;
$array['spent'][$currency->id]['currency_symbol'] = $currency->symbol;
$array['spent'][$currency->id]['currency_decimal_places'] = $currency->decimal_places;
diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php
index ad724137dc..f4b32fe5c5 100644
--- a/app/Http/Controllers/Chart/BudgetController.php
+++ b/app/Http/Controllers/Chart/BudgetController.php
@@ -539,7 +539,13 @@ final class BudgetController extends Controller
}
// get spent amount in this period for this currency.
- $sum = $this->opsRepository->sumExpenses($currentStart, $currentEnd, $accounts, new Collection()->push($budget), $currency);
+ $sum = $this->opsRepository->sumExpenses(
+ $currentStart,
+ $currentEnd,
+ $accounts,
+ new Collection()->push($budget),
+ $currency
+ );
$amount = Steam::positive($sum[$currency->id]['sum'] ?? '0');
$chartData[0]['entries'][$title] = Steam::bcround($amount, $currency->decimal_places);
diff --git a/app/Jobs/CreateAutoBudgetLimits.php b/app/Jobs/CreateAutoBudgetLimits.php
index 476da65ac3..affea656a0 100644
--- a/app/Jobs/CreateAutoBudgetLimits.php
+++ b/app/Jobs/CreateAutoBudgetLimits.php
@@ -132,7 +132,13 @@ class CreateAutoBudgetLimits implements ShouldQueue
// if has one, calculate expenses and use that as a base.
$repository = app(OperationsRepositoryInterface::class);
$repository->setUser($autoBudget->budget->user);
- $spent = $repository->sumExpenses($previousStart, $previousEnd, null, new Collection()->push($autoBudget->budget), $autoBudget->transactionCurrency);
+ $spent = $repository->sumExpenses(
+ $previousStart,
+ $previousEnd,
+ null,
+ new Collection()->push($autoBudget->budget),
+ $autoBudget->transactionCurrency
+ );
$currencyId = $autoBudget->transaction_currency_id;
$spentAmount = $spent[$currencyId]['sum'] ?? '0';
Log::debug(sprintf('Spent in previous budget period (%s-%s) is %s', $previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d'), $spentAmount));
@@ -222,7 +228,13 @@ class CreateAutoBudgetLimits implements ShouldQueue
// if has one, calculate expenses and use that as a base.
$repository = app(OperationsRepositoryInterface::class);
$repository->setUser($autoBudget->budget->user);
- $spent = $repository->sumExpenses($previousStart, $previousEnd, null, new Collection()->push($autoBudget->budget), $autoBudget->transactionCurrency);
+ $spent = $repository->sumExpenses(
+ $previousStart,
+ $previousEnd,
+ null,
+ new Collection()->push($autoBudget->budget),
+ $autoBudget->transactionCurrency
+ );
$currencyId = $autoBudget->transaction_currency_id;
$spentAmount = $spent[$currencyId]['sum'] ?? '0';
Log::debug(sprintf('Spent in previous budget period (%s-%s) is %s', $previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d'), $spentAmount));
diff --git a/app/Support/Http/Controllers/AugumentData.php b/app/Support/Http/Controllers/AugumentData.php
index a3a940b1ba..a507156873 100644
--- a/app/Support/Http/Controllers/AugumentData.php
+++ b/app/Support/Http/Controllers/AugumentData.php
@@ -222,7 +222,14 @@ trait AugumentData
$currentEnd->addMonth();
}
// primary currency amount.
- $expenses = $opsRepository->sumExpenses($currentStart, $currentEnd, null, $budgetCollection, $entry->transactionCurrency, $this->convertToPrimary);
+ $expenses = $opsRepository->sumExpenses(
+ $currentStart,
+ $currentEnd,
+ null,
+ $budgetCollection,
+ $entry->transactionCurrency,
+ $this->convertToPrimary
+ );
$spent = $expenses[$currency->id]['sum'] ?? '0';
$entry->pc_spent = $spent;
diff --git a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php b/app/Support/JsonApi/Enrichments/RecurringEnrichment.php
index d0c09bf027..2428353cb0 100644
--- a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/RecurringEnrichment.php
@@ -354,7 +354,11 @@ class RecurringEnrichment implements EnrichmentInterface
/** @var RecurrenceRepetition $repetition */
foreach ($set as $repetition) {
- $recurrence = $this->collection->filter(static fn (Recurrence $item): bool => (int) $item->id === (int) $repetition->recurrence_id)->first();
+ $recurrence = $this->collection->filter(
+ static fn (Recurrence $item): bool => (int) $item->id === (int) $repetition->recurrence_id
+ )
+ ->first()
+ ;
$fromDate = clone ($recurrence->latest_date ?? $recurrence->first_date);
$recurrenceId = (int) $repetition->recurrence_id;
$repId = (int) $repetition->id;
diff --git a/changelog.md b/changelog.md
index fbe8066c25..7ce502c32c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -20,7 +20,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- [Issue 12766](https://github.com/firefly-iii/firefly-iii/issues/12766) (Transaction Journals in the same Transaction Group have different `dates`) reported by @gthbusrr
- [Issue 12740](https://github.com/firefly-iii/firefly-iii/issues/12740) (Custom date range does not work) reported by @JC5
- [Issue 12764](https://github.com/firefly-iii/firefly-iii/issues/12764) (Restore Categories in transaction view) reported by @CountMurphy
-- #12776
+- [Issue 12776](https://github.com/firefly-iii/firefly-iii/issues/12776) (Validating new transaction title suggestion with Enter key submits the form) reported by @ThibaultNocchi
## v6.7.1 - 2026-09-15
diff --git a/config/firefly.php b/config/firefly.php
index ac7206fdf0..c0b0a32dd5 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -79,7 +79,7 @@ return [
// see cer.php for exchange rates feature flag.
],
'version' => '6.7.2',
-'build_time' => 1789542658,
+'build_time' => 1789544851,
'api_version' => '2.1.0', // field is no longer used.
'db_version' => 28, // field is no longer used.
diff --git a/resources/assets/v3/js/pages/dashboard/dashboard.js b/resources/assets/v3/js/pages/dashboard/dashboard.js
index 44cf1dc233..388bd3bfc2 100644
--- a/resources/assets/v3/js/pages/dashboard/dashboard.js
+++ b/resources/assets/v3/js/pages/dashboard/dashboard.js
@@ -54,11 +54,12 @@ let index = function () {
drawMultiCurrencyChart(
"stacked-column",
"api/v1/chart/budget/overview-with-limits?start=" +
- format(start, "yyyy-LL-dd") +
- "&end=" +
- format(end, "yyyy-LL-dd"),
+ format(start, "yyyy-LL-dd") +
+ "&end=" +
+ format(end, "yyyy-LL-dd"),
"budgets-chart",
- value, false
+ value,
+ false,
);
});
},
diff --git a/resources/assets/v3/js/pages/transactions/create.js b/resources/assets/v3/js/pages/transactions/create.js
index cd60d8b238..a1fd2498e9 100644
--- a/resources/assets/v3/js/pages/transactions/create.js
+++ b/resources/assets/v3/js/pages/transactions/create.js
@@ -68,9 +68,9 @@ import { autoStep } from "./shared/auto-step.js";
import { respondToTabSwitch } from "./shared/respond-to-tab-switch.js";
import { loadTransactionLinks } from "./shared/load-transaction-links.js";
import Alpine from "alpinejs";
-import {keyUpFromSource} from "./shared/keyup-from-source.js";
-import {keyUpFromDestination} from "./shared/keyup-from-destination.js";
-import {keyUpFromDescription} from "./shared/keyup-from-description.js";
+import { keyUpFromSource } from "./shared/keyup-from-source.js";
+import { keyUpFromDestination } from "./shared/keyup-from-destination.js";
+import { keyUpFromDescription } from "./shared/keyup-from-description.js";
window.enableDates = false;
diff --git a/resources/assets/v3/js/pages/transactions/shared/keyup-from-category.js b/resources/assets/v3/js/pages/transactions/shared/keyup-from-category.js
index f16d4f17a6..909195e3fb 100644
--- a/resources/assets/v3/js/pages/transactions/shared/keyup-from-category.js
+++ b/resources/assets/v3/js/pages/transactions/shared/keyup-from-category.js
@@ -21,7 +21,8 @@
export function keyUpFromCategory(e) {
let target = e.currentTarget.nextSibling;
setTimeout(() => {
- this.formStates.categorySelectVisible = target.classList.contains("show");
+ this.formStates.categorySelectVisible =
+ target.classList.contains("show");
}, 600);
if (e.key === "Enter" && false === this.formStates.categorySelectVisible) {
this.save();
diff --git a/resources/assets/v3/js/pages/transactions/shared/keyup-from-description.js b/resources/assets/v3/js/pages/transactions/shared/keyup-from-description.js
index b50e4d2361..09c1e61de7 100644
--- a/resources/assets/v3/js/pages/transactions/shared/keyup-from-description.js
+++ b/resources/assets/v3/js/pages/transactions/shared/keyup-from-description.js
@@ -21,9 +21,13 @@
export function keyUpFromDescription(e) {
let target = e.currentTarget.nextSibling;
setTimeout(() => {
- this.formStates.descriptionSelectVisible = target.classList.contains("show");
+ this.formStates.descriptionSelectVisible =
+ target.classList.contains("show");
}, 600);
- if (e.key === "Enter" && false === this.formStates.descriptionSelectVisible) {
+ if (
+ e.key === "Enter" &&
+ false === this.formStates.descriptionSelectVisible
+ ) {
this.save();
}
}
diff --git a/resources/assets/v3/js/pages/transactions/shared/keyup-from-destination.js b/resources/assets/v3/js/pages/transactions/shared/keyup-from-destination.js
index b7803742f4..adc0d08e66 100644
--- a/resources/assets/v3/js/pages/transactions/shared/keyup-from-destination.js
+++ b/resources/assets/v3/js/pages/transactions/shared/keyup-from-destination.js
@@ -21,9 +21,13 @@
export function keyUpFromDestination(e) {
let target = e.currentTarget.nextSibling;
setTimeout(() => {
- this.formStates.destinationSelectVisible = target.classList.contains("show");
+ this.formStates.destinationSelectVisible =
+ target.classList.contains("show");
}, 600);
- if (e.key === "Enter" && false === this.formStates.destinationSelectVisible) {
+ if (
+ e.key === "Enter" &&
+ false === this.formStates.destinationSelectVisible
+ ) {
this.save();
}
}
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index dd43e179d0..304027c623 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -1827,7 +1827,7 @@ return [
'spent_this_period' => 'Spent on this budget',
'spent_this_period_per_day' => 'Spent on this budget per day (:days day(s))',
'spent_in_budget_limit_outside_period' => 'Spent on this budget, but NOT in this period',
- 'spent_outside_chart' => '(outside of pre-set budget amounts)',
+ 'spent_outside_chart' => '(outside of pre-set budget amounts)',
'spent_in_budget_limit_outside_period_per_day' => 'Spent on this budget, but NOT in this period per day (:days day(s))',
'left_in_budget_limit_overview' => 'Left in this budget',
'left_in_budget_limit_per_day' => 'Left in this budget per day (:days day(s))',