From ddec50eca8f19c98ad496fd9d08b4a50906f507a Mon Sep 17 00:00:00 2001 From: MK13 Date: Wed, 1 Sep 2021 11:11:02 +0200 Subject: [PATCH] #27 Transaction import: recurring transaction list not only active --- .../java/de/financer/controller/TransactionController.java | 2 +- financer-web-client/src/main/resources/static/changelog.txt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/financer-web-client/src/main/java/de/financer/controller/TransactionController.java b/financer-web-client/src/main/java/de/financer/controller/TransactionController.java index bdf481d..361b7c9 100644 --- a/financer-web-client/src/main/java/de/financer/controller/TransactionController.java +++ b/financer-web-client/src/main/java/de/financer/controller/TransactionController.java @@ -292,7 +292,7 @@ public class TransactionController { model.addAttribute("fromAccounts", fromAccounts); model.addAttribute("toAccounts", toAccounts); - final ResponseEntity> response = new GetAllActiveRecurringTransactionsTemplate() + final ResponseEntity> response = new GetAllRecurringTransactionsTemplate() .exchange(this.financerConfig); final List recurringTransactionList = new ArrayList<>(); final RecurringTransaction emptyRecurring = new RecurringTransaction(); diff --git a/financer-web-client/src/main/resources/static/changelog.txt b/financer-web-client/src/main/resources/static/changelog.txt index ecfcdb3..fd518d0 100644 --- a/financer-web-client/src/main/resources/static/changelog.txt +++ b/financer-web-client/src/main/resources/static/changelog.txt @@ -1,5 +1,6 @@ -v48 -> v40: -- +v48 -> v49: +- #27 The recurring transaction selection during transaction import now contains all recurring transaction instead of + only the active ones v47 -> v48: - Added new property 'transaction type' to a transaction, denoting the type of the transaction, e.g. asset swap,