diff --git a/app/Console/Commands/Upgrade/UpgradesDatabase.php b/app/Console/Commands/Upgrade/UpgradesDatabase.php index 6f5b679266..9a3d1a9310 100644 --- a/app/Console/Commands/Upgrade/UpgradesDatabase.php +++ b/app/Console/Commands/Upgrade/UpgradesDatabase.php @@ -54,21 +54,21 @@ class UpgradesDatabase extends Command { $this->callInitialCommands(); $commands = [ - 'upgrade:480-transaction-identifiers', - 'upgrade:480-migrate-to-groups', - 'upgrade:480-account-currencies', - 'upgrade:480-transfer-currencies', - 'upgrade:480-currency-information', - 'upgrade:480-notes', - 'upgrade:480-attachments', - 'upgrade:480-bills-to-rules', - 'upgrade:480-budget-limit-currencies', - 'upgrade:480-cc-liabilities', - 'upgrade:480-journal-meta-data', - 'upgrade:480-account-meta', - 'upgrade:481-recurrence-meta', - 'upgrade:500-tag-locations', - 'upgrade:560-liabilities', +// 'upgrade:480-transaction-identifiers', +// 'upgrade:480-migrate-to-groups', +// 'upgrade:480-account-currencies', +// 'upgrade:480-transfer-currencies', +// 'upgrade:480-currency-information', +// 'upgrade:480-notes', +// 'upgrade:480-attachments', +// 'upgrade:480-bills-to-rules', +// 'upgrade:480-budget-limit-currencies', +// 'upgrade:480-cc-liabilities', +// 'upgrade:480-journal-meta-data', +// 'upgrade:480-account-meta', +// 'upgrade:481-recurrence-meta', +// 'upgrade:500-tag-locations', +// 'upgrade:560-liabilities', 'upgrade:600-liabilities', 'upgrade:550-budget-limit-periods', 'upgrade:600-rule-actions', diff --git a/resources/assets/v3/js/pages/transactions/shared/clear-fields.js b/resources/assets/v3/js/pages/transactions/shared/clear-fields.js index 2e677246a8..06790349af 100644 --- a/resources/assets/v3/js/pages/transactions/shared/clear-fields.js +++ b/resources/assets/v3/js/pages/transactions/shared/clear-fields.js @@ -27,6 +27,7 @@ export function clearSourceAccount(index) { export function clearDestinationAccount(index) { this.entries[index].destination_account = getAccount(); + this.entries[index].destination_account.alpine_name = null; // very sneaky trick. this.detectTransactionType(); } export function clearDescription(index) { diff --git a/resources/assets/v3/js/pages/transactions/shared/disable-split-inputs.js b/resources/assets/v3/js/pages/transactions/shared/disable-split-inputs.js index 0737c9d456..1ec9977e15 100644 --- a/resources/assets/v3/js/pages/transactions/shared/disable-split-inputs.js +++ b/resources/assets/v3/js/pages/transactions/shared/disable-split-inputs.js @@ -68,7 +68,11 @@ export function disableSplitInputs() { this.entries[i].date_disabled = true; // if is withdrawal, pre-fill the destination account with the first entry's destination account. - if ("withdrawal" === this.groupProperties.transactionType) { + // unless the user changes it, in which case we will not overwrite it. + if ( + "" === this.entries[i].destination_account.alpine_name && + "withdrawal" === this.groupProperties.transactionType) { + console.log('Prefill destination account #', i, this.entries[i].destination_account); this.entries[i].destination_account = JSON.parse( JSON.stringify(this.entries[i - 1].destination_account), ); //structuredClone();