github-starred/actual
2
0
Fork 0
mirror of https://github.com/actualbudget/actual.git synced 2026-05-21 06:31:58 -05:00
Code Issues 2.1k Packages Projects Releases 57 Wiki Activity

[PR #6055] [CLOSED] Custom Reports: Ignore Parent Amount if Any Child Matches (Notes) #48118

New Issue
Closed
opened 2026-04-26 10:03:47 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-26 10:03:47 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/actualbudget/actual/pull/6055
Author: @olaberglund
Created: 11/2/2025
Status: ❌ Closed

Base: master ← Head: fix/5640-ignore-parent-data-if-child-is-included

📝 Commits (7)

  • 3917daf add notoneof operator
  • f4421ff fetch grouped splits transactions, to be used for keeping parent or children tr
  • 5c75b46 Update VRT screenshots
  • 69c653f exclude parent if any subtr matches, use parent otherwise
  • 7280ebd apply same logic elsewhere where affected; refactor
  • 1a7b7d9 refactor: use constant
  • a909177 [autofix.ci] apply automated fixes

📊 Changes

7 files changed (+180 additions, -107 deletions)

View changed files

📝 packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Donut-Graph-and-checks-the-visuals-1-chromium-linux.png (+0 -0)
📝 packages/desktop-client/src/components/reports/ReportOptions.ts (+11 -0)
📝 packages/desktop-client/src/components/reports/spreadsheets/custom-spreadsheet.ts (+8 -27)
📝 packages/desktop-client/src/components/reports/spreadsheets/grouped-spreadsheet.ts (+8 -27)
📝 packages/desktop-client/src/components/reports/spreadsheets/makeQuery.ts (+131 -8)
📝 packages/desktop-client/src/components/reports/spreadsheets/spending-spreadsheet.ts (+15 -45)
📝 packages/loot-core/src/server/aql/compiler.ts (+7 -0)

📄 Description

Fixes #5640

For custom report filters with note conditions: if any child transaction's notes match the condition, exclude the parent transaction in the amount calculation. Otherwise, exclude the children transactions if only the parent matched.

Excluding the other (if both parent and child matched) avoids double counting.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/actualbudget/actual/pull/6055 **Author:** [@olaberglund](https://github.com/olaberglund) **Created:** 11/2/2025 **Status:** ❌ Closed **Base:** `master` ← **Head:** `fix/5640-ignore-parent-data-if-child-is-included` --- ### 📝 Commits (7) - [`3917daf`](https://github.com/actualbudget/actual/commit/3917daf899e7138e34243e392f5b4f440b5a7193) add notoneof operator - [`f4421ff`](https://github.com/actualbudget/actual/commit/f4421ff53447cfcef33ce2b38a41b07507f5d141) fetch grouped splits transactions, to be used for keeping parent or children tr - [`5c75b46`](https://github.com/actualbudget/actual/commit/5c75b46ea64ddedfb6b6c36cd74f61a3951577ba) Update VRT screenshots - [`69c653f`](https://github.com/actualbudget/actual/commit/69c653fc1aaf858b06f492ec091935837831aa52) exclude parent if any subtr matches, use parent otherwise - [`7280ebd`](https://github.com/actualbudget/actual/commit/7280ebd72e4d4d46a7c275b983bbc81fe6cf2bbe) apply same logic elsewhere where affected; refactor - [`1a7b7d9`](https://github.com/actualbudget/actual/commit/1a7b7d98e0b9607a4dfe96f0fd980b0fdc356cc0) refactor: use constant - [`a909177`](https://github.com/actualbudget/actual/commit/a9091773cff1ddbe7493b7ffbb1963c9820a9e8c) [autofix.ci] apply automated fixes ### 📊 Changes **7 files changed** (+180 additions, -107 deletions) <details> <summary>View changed files</summary> 📝 `packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Donut-Graph-and-checks-the-visuals-1-chromium-linux.png` (+0 -0) 📝 `packages/desktop-client/src/components/reports/ReportOptions.ts` (+11 -0) 📝 `packages/desktop-client/src/components/reports/spreadsheets/custom-spreadsheet.ts` (+8 -27) 📝 `packages/desktop-client/src/components/reports/spreadsheets/grouped-spreadsheet.ts` (+8 -27) 📝 `packages/desktop-client/src/components/reports/spreadsheets/makeQuery.ts` (+131 -8) 📝 `packages/desktop-client/src/components/reports/spreadsheets/spending-spreadsheet.ts` (+15 -45) 📝 `packages/loot-core/src/server/aql/compiler.ts` (+7 -0) </details> ### 📄 Description Fixes #5640 For custom report filters with note conditions: if any child transaction's notes match the condition, exclude the parent transaction in the amount calculation. Otherwise, exclude the children transactions if only the parent matched. Excluding the other (if both parent and child matched) avoids double counting. <!-- Thank you for submitting a pull request! Make sure to follow the instructions to write release notes for your PR — it should only take a minute or two: https://github.com/actualbudget/docs#writing-good-release-notes. Try running yarn generate:release-notes *before* pushing your PR for an interactive experience. --> --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-04-26 10:03:47 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
AI generated
API
bank sync
budgeting
bug
can’t replicate
dependencies
docker
documentation
electron
experimental feature
feature
feedback
goal templates
good first issue
help wanted
importers
maintenance
needs info
needs testing
needs triage
needs votes
openid
payees
pull-request
Mirrored from GitHub Pull Request
 regression
reports
responsive
rules
schedules
server
✨ merged
split transactions
tech debt
theme
transaction import
transaction reconciliation
transactions
translations
upstream
user interface
✅ approved
wontfix
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/actual#48118
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?