From 107acdb36b0a24d22769e1209bf26437e0d8bbcf Mon Sep 17 00:00:00 2001
From: Matiss Janis Aboltins <matiss@mja.lv>
Date: Thu, 21 Mar 2024 19:13:59 +0000
Subject: [PATCH] :bug: (report) do not include offbudget transfers in
cash-flow card expenses (#2485)
---
.../reports/spreadsheets/cash-flow-spreadsheet.tsx | 7 +------
upcoming-release-notes/2485.md | 6 ++++++
2 files changed, 7 insertions(+), 6 deletions(-)
create mode 100644 upcoming-release-notes/2485.md
diff --git a/packages/desktop-client/src/components/reports/spreadsheets/cash-flow-spreadsheet.tsx b/packages/desktop-client/src/components/reports/spreadsheets/cash-flow-spreadsheet.tsx
index 55519b604..ff94d1cb7 100644
--- a/packages/desktop-client/src/components/reports/spreadsheets/cash-flow-spreadsheet.tsx
+++ b/packages/desktop-client/src/components/reports/spreadsheets/cash-flow-spreadsheet.tsx
@@ -19,12 +19,7 @@ export function simpleCashFlow(start, end) {
.filter({
$and: [{ date: { $gte: start } }, { date: { $lte: end } }],
'account.offbudget': false,
- $or: [
- {
- 'payee.transfer_acct.offbudget': true,
- 'payee.transfer_acct': null,
- },
- ],
+ 'payee.transfer_acct': null,
})
.calculate({ $sum: '$amount' });
}
diff --git a/upcoming-release-notes/2485.md b/upcoming-release-notes/2485.md
new file mode 100644
index 000000000..14895b2ea
--- /dev/null
+++ b/upcoming-release-notes/2485.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [MatissJanis]
+---
+
+Do not include off-budget transfers in the expenses calculation for cash-flow card (align it with the cash-flow reports page).
--
GitLab