From 2cc1ec68dfe4ec7a6571b3d92a41fdd75d37313f Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Sun, 17 Mar 2024 08:02:19 +0100 Subject: [PATCH 1/6] Fix #231 --- .../ViewModels/EntityViewModels/TransactionViewModel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenBudgeteer.Core/ViewModels/EntityViewModels/TransactionViewModel.cs b/OpenBudgeteer.Core/ViewModels/EntityViewModels/TransactionViewModel.cs index 9526bd7..a957eb0 100644 --- a/OpenBudgeteer.Core/ViewModels/EntityViewModels/TransactionViewModel.cs +++ b/OpenBudgeteer.Core/ViewModels/EntityViewModels/TransactionViewModel.cs @@ -361,7 +361,7 @@ public static async Task CreateFromBucketMovementAsync(ISe { Id = Guid.Empty, AccountId = Guid.Empty, - Account = new Account(), + Account = new Account(){ IsActive = 1}, Amount = bucketMovement.Amount, Memo = "Bucket Movement", Payee = string.Empty, From f7fe0b227c099a5591e087912c4b350d67145aa8 Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Sun, 17 Mar 2024 08:17:25 +0100 Subject: [PATCH 2/6] Fix #230 --- .../ViewModels/PageViewModels/ImportPageViewModel.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenBudgeteer.Core/ViewModels/PageViewModels/ImportPageViewModel.cs b/OpenBudgeteer.Core/ViewModels/PageViewModels/ImportPageViewModel.cs index a8fc807..e69d7d6 100644 --- a/OpenBudgeteer.Core/ViewModels/PageViewModels/ImportPageViewModel.cs +++ b/OpenBudgeteer.Core/ViewModels/PageViewModels/ImportPageViewModel.cs @@ -407,7 +407,9 @@ private async Task DuplicateCheckOnParsedRecordsAsync() { await Task.Run(() => { - var transactions = ServiceManager.BankTransactionService.GetAll().ToList(); + var transactions = ServiceManager.BankTransactionService + .GetFromAccount(SelectedImportProfile.Account.AccountId) + .ToList(); var parsedRecords = ParsedRecords .Where(i => i.IsValid) .ToList(); From e725d9bbc5b2647632a2c548382dd3b9feaff9dc Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Sun, 17 Mar 2024 08:22:32 +0100 Subject: [PATCH 3/6] Update CHANGELOG.md --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cfe82f0..ff761f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 1.8.1 (2024-xx-xx) + +### :beetle: Bug Fixes + +* Duplicate check on Import Page was showing wrong Account. Now only Transactions of the selected target Account will be considered during the analysis [#230](https://github.com/TheAxelander/OpenBudgeteer/issues/230) +* Bucket Movements were shown with Account `(Inactive)` [#231](https://github.com/TheAxelander/OpenBudgeteer/issues/231) + ## 1.8 (2024-03-16) ### :warning: Breaking Changes From b97caa373edcdc7333e31967f7f799cac1bd744c Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Sun, 17 Mar 2024 08:24:11 +0100 Subject: [PATCH 4/6] Update Version --- OpenBudgeteer.Blazor/Shared/MainLayout.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenBudgeteer.Blazor/Shared/MainLayout.razor b/OpenBudgeteer.Blazor/Shared/MainLayout.razor index 56a39b1..0bc2d8f 100644 --- a/OpenBudgeteer.Blazor/Shared/MainLayout.razor +++ b/OpenBudgeteer.Blazor/Shared/MainLayout.razor @@ -16,7 +16,7 @@ OpenBudgeteer Database: @CurrentDatabase - Version: 1.8 (Change Log) + Version: 1.8.1 (Change Log)
From 84642edaebe0e43867cb6b158e2a182445241931 Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Sun, 17 Mar 2024 08:42:10 +0100 Subject: [PATCH 5/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff761f7..6da2492 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 1.8.1 (2024-xx-xx) +## 1.8.1 (2024-03-17) ### :beetle: Bug Fixes From a9f77ee98eb484830a7f43cb252d0cca863aefcc Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Sun, 17 Mar 2024 08:43:41 +0100 Subject: [PATCH 6/6] Update SECURITY.md --- SECURITY.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index cc56b30..0fcf9c7 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -4,9 +4,9 @@ | Version | Supported | |-------------| ------------------ | -| 1.8 | :white_check_mark: | +| 1.8.1 | :white_check_mark: | | pre-release | :white_check_mark: | -| < 1.8 | :x: | +| < 1.8.1 | :x: | ## Reporting a Vulnerability