Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Fix #12776
James Cole5be673ed9fe8
diff --git a/changelog.md b/changelog.mdindex 068da88b45..fbe8066c25 100644--- a/changelog.md+++ b/changelog.md@@ -20,6 +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## v6.7.1 - 2026-09-15diff --git a/resources/assets/v3/js/pages/transactions/create.js b/resources/assets/v3/js/pages/transactions/create.jsindex e9f6e57ce2..cd60d8b238 100644--- a/resources/assets/v3/js/pages/transactions/create.js+++ b/resources/assets/v3/js/pages/transactions/create.js@@ -68,6 +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";window.enableDates = false;@@ -111,6 +114,9 @@ let create = function () {rulesButton: true,webhooksButton: true,categorySelectVisible: false,+ descriptionSelectVisible: false,+ sourceSelectVisible: false,+ destinationSelectVisible: false,// some properties that must all be true before the user can be redirected safely.storedGroup: false,storedLinks: false,@@ -186,6 +192,9 @@ let create = function () {parseTotalAmount: parseTotalAmount,processUploadError: processUploadError,keyUpFromCategory: keyUpFromCategory,+ keyUpFromSource: keyUpFromSource,+ keyUpFromDestination: keyUpFromDestination,+ keyUpFromDescription: keyUpFromDescription,changedAmount: changedAmount,changedForeignAmount: changedForeignAmount,showMessageOrRedirectUser: showMessageOrRedirectUser,diff --git a/resources/assets/v3/js/pages/transactions/edit.js b/resources/assets/v3/js/pages/transactions/edit.jsindex 39c766d9db..3bf8a21525 100644--- a/resources/assets/v3/js/pages/transactions/edit.js+++ b/resources/assets/v3/js/pages/transactions/edit.js@@ -42,6 +42,9 @@ import sidebar from "../shared/sidebar.js";import { disableSplitInputs } from "./shared/disable-split-inputs.js";import { parseTotalAmount } from "./shared/parse-total-amount.js";import { keyUpFromCategory } from "./shared/keyup-from-category.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";import { changedAmount } from "./shared/changed-amount.js";import { changedForeignAmount } from "./shared/changed-foreign-amount.js";import { parseErrors } from "./shared/parse-errors.js";@@ -106,6 +109,10 @@ let transactions = function () {resetButton: true,rulesButton: true,webhooksButton: true,+ categorySelectVisible: false,+ descriptionSelectVisible: false,+ sourceSelectVisible: false,+ destinationSelectVisible: false,// some properties that must all be true before the user can be redirected safely.storedGroup: false,storedLinks: false,@@ -172,6 +179,9 @@ let transactions = function () {disableSplitInputs: disableSplitInputs,processUploadError: processUploadError,keyUpFromCategory: keyUpFromCategory,+ keyUpFromSource: keyUpFromSource,+ keyUpFromDestination: keyUpFromDestination,+ keyUpFromDescription: keyUpFromDescription,changedAmount: changedAmount,changedForeignAmount: changedForeignAmount,showMessageOrRedirectUser: showMessageOrRedirectUser,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.jsindex 0cf6d5f771..f16d4f17a6 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@@ -19,11 +19,11 @@*/export function keyUpFromCategory(e) {+ let target = e.currentTarget.nextSibling;+ setTimeout(() => {+ this.formStates.categorySelectVisible = target.classList.contains("show");+ }, 600);if (e.key === "Enter" && false === this.formStates.categorySelectVisible) {this.save();- return;}- this.formStates.categorySelectVisible = document- .querySelector("input.ac-category")- .nextSibling.classList.contains("show");}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.jsnew file mode 100644index 0000000000..b50e4d2361--- /dev/null+++ b/resources/assets/v3/js/pages/transactions/shared/keyup-from-description.js@@ -0,0 +1,29 @@+/*+ * keyup-from-category.js+ * Copyright (c) 2026 [email protected]+ *+ * This file is part of Firefly III (https://github.com/firefly-iii).+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License as+ * published by the Free Software Foundation, either version 3 of the+ * License, or (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <https://www.gnu.org/licenses/>.+ */++export function keyUpFromDescription(e) {+ let target = e.currentTarget.nextSibling;+ setTimeout(() => {+ this.formStates.descriptionSelectVisible = target.classList.contains("show");+ }, 600);+ 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.jsnew file mode 100644index 0000000000..b7803742f4--- /dev/null+++ b/resources/assets/v3/js/pages/transactions/shared/keyup-from-destination.js@@ -0,0 +1,29 @@+/*+ * keyup-from-category.js+ * Copyright (c) 2026 [email protected]+ *+ * This file is part of Firefly III (https://github.com/firefly-iii).+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License as+ * published by the Free Software Foundation, either version 3 of the+ * License, or (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <https://www.gnu.org/licenses/>.+ */++export function keyUpFromDestination(e) {+ let target = e.currentTarget.nextSibling;+ setTimeout(() => {+ this.formStates.destinationSelectVisible = target.classList.contains("show");+ }, 600);+ if (e.key === "Enter" && false === this.formStates.destinationSelectVisible) {+ this.save();+ }+}diff --git a/resources/assets/v3/js/pages/transactions/shared/keyup-from-source.js b/resources/assets/v3/js/pages/transactions/shared/keyup-from-source.jsnew file mode 100644index 0000000000..e5e57e0864--- /dev/null+++ b/resources/assets/v3/js/pages/transactions/shared/keyup-from-source.js@@ -0,0 +1,29 @@+/*+ * keyup-from-category.js+ * Copyright (c) 2026 [email protected]+ *+ * This file is part of Firefly III (https://github.com/firefly-iii).+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License as+ * published by the Free Software Foundation, either version 3 of the+ * License, or (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <https://www.gnu.org/licenses/>.+ */++export function keyUpFromSource(e) {+ let target = e.currentTarget.nextSibling;+ setTimeout(() => {+ this.formStates.sourceSelectVisible = target.classList.contains("show");+ }, 600);+ if (e.key === "Enter" && false === this.formStates.sourceSelectVisible) {+ this.save();+ }+}diff --git a/resources/views/partials/form/transaction/date-fields.blade.php b/resources/views/partials/form/transaction/date-fields.blade.phpindex a285e733a8..d78b4af614 100644--- a/resources/views/partials/form/transaction/date-fields.blade.php+++ b/resources/views/partials/form/transaction/date-fields.blade.php@@ -10,6 +10,7 @@<input type="date"class="form-control":id="key + '_' + index"+ @keyup.enter="save()"x-model="transaction[key]":data-index="index"placeholder="">diff --git a/resources/views/partials/form/transaction/description.blade.php b/resources/views/partials/form/transaction/description.blade.phpindex a0c3cb3bcf..079daaf626 100644--- a/resources/views/partials/form/transaction/description.blade.php+++ b/resources/views/partials/form/transaction/description.blade.php@@ -7,7 +7,7 @@<input type="text" class="form-control ac-description":id="'description_' + index"@change="changedDescription"- @keyup.enter="save()"+ @keyup="keyUpFromDescription"x-model="transaction.description":class="{'is-invalid': transaction.errors.description.length > 0, 'form-control': true}":data-index="index"diff --git a/resources/views/partials/form/transaction/destination-account.blade.php b/resources/views/partials/form/transaction/destination-account.blade.phpindex f8752afa82..52b59a5acc 100644--- a/resources/views/partials/form/transaction/destination-account.blade.php+++ b/resources/views/partials/form/transaction/destination-account.blade.php@@ -10,6 +10,7 @@:id="'dest_' + index"x-model="transaction.destination_account.alpine_name":data-index="index"+ @keyup="keyUpFromDestination"@changed="changedDestinationAccount"x-bind:disabled="true===transaction.destination_account.disabled"x-bind:readonly="true===transaction.destination_account.disabled"diff --git a/resources/views/partials/form/transaction/source-account.blade.php b/resources/views/partials/form/transaction/source-account.blade.phpindex 2318aa67c2..28ff668d79 100644--- a/resources/views/partials/form/transaction/source-account.blade.php+++ b/resources/views/partials/form/transaction/source-account.blade.php@@ -10,6 +10,7 @@:id="'source_' + index"x-model="transaction.source_account.alpine_name":data-index="index"+ @keyup="keyUpFromSource"x-bind:disabled="true===transaction.source_account.disabled"x-bind:readonly="true===transaction.source_account.disabled"@changed="changedSourceAccount"