github-starred/actual
2
0
Fork 0
mirror of https://github.com/actualbudget/actual.git synced 2026-05-06 07:01:45 -05:00
Code Issues 1.5k Packages Projects Releases 54 Wiki Activity

[PR #2684] [MERGED] Custom Reports: Include current #46275

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

📋 Pull Request Information

Original PR: https://github.com/actualbudget/actual/pull/2684
Author: @carkom
Created: 4/29/2024
Status: ✅ Merged
Merged: 6/17/2024
Merged by: @carkom

Base: master ← Head: CRIncludeCurrent

📝 Commits (10+)

  • a3322f3 include current
  • e095349 notes
  • fb27606 Merge branch 'master' into CRIncludeCurrent
  • 0c2d4e0 label change
  • a5aa868 Merge remote-tracking branch 'upstream/master' into CRIncludeCurrent
  • 10785a8 add migration and fix merge issues
  • dbdca78 fix extra year/month
  • efb21b8 default and disabled lists
  • 153dade default on
  • 191019f Merge branch 'master' into CRIncludeCurrent

📊 Changes

14 files changed (+117 additions, -17 deletions)

View changed files

📝 packages/desktop-client/src/components/reports/ReportOptions.ts (+14 -10)
📝 packages/desktop-client/src/components/reports/ReportSidebar.tsx (+42 -3)
📝 packages/desktop-client/src/components/reports/disabledList.ts (+26 -0)
📝 packages/desktop-client/src/components/reports/getLiveRange.ts (+4 -1)
📝 packages/desktop-client/src/components/reports/reportRanges.ts (+1 -1)
📝 packages/desktop-client/src/components/reports/reports/CustomReport.tsx (+8 -0)
📝 packages/desktop-client/src/components/reports/reports/GetCardData.tsx (+1 -0)
➕ packages/loot-core/migrations/1716359441000_include_current.sql (+5 -0)
📝 packages/loot-core/src/client/data-hooks/reports.ts (+1 -0)
📝 packages/loot-core/src/server/aql/schema/index.ts (+1 -0)
📝 packages/loot-core/src/server/reports/app.ts (+2 -0)
📝 packages/loot-core/src/shared/months.ts (+4 -2)
📝 packages/loot-core/src/types/models/reports.d.ts (+2 -0)
➕ upcoming-release-notes/2684.md (+6 -0)

📄 Description

Testing an option to add/remove current interval to "live" ranges.

WARNING: Do not use live budget files with this PR as it contains a migration. Please use a copy or a test budget ONLY.

I still need to add a migration so that it can be saved as part of the report. Holding off on that right now as I don't want it to mess up anyone's budget file.

🔄 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/2684 **Author:** [@carkom](https://github.com/carkom) **Created:** 4/29/2024 **Status:** ✅ Merged **Merged:** 6/17/2024 **Merged by:** [@carkom](https://github.com/carkom) **Base:** `master` ← **Head:** `CRIncludeCurrent` --- ### 📝 Commits (10+) - [`a3322f3`](https://github.com/actualbudget/actual/commit/a3322f3f785658b7cf82aa12b131ad6d0adaac3d) include current - [`e095349`](https://github.com/actualbudget/actual/commit/e095349126a15c24c59ba2e551131db87e081e74) notes - [`fb27606`](https://github.com/actualbudget/actual/commit/fb276069de2e814e154806daed7155c143826a7c) Merge branch 'master' into CRIncludeCurrent - [`0c2d4e0`](https://github.com/actualbudget/actual/commit/0c2d4e0388c6bc4fabad640aa8fff9f0616e8a42) label change - [`a5aa868`](https://github.com/actualbudget/actual/commit/a5aa8689ff8f5c244e8c3d73d855c5d7ea697018) Merge remote-tracking branch 'upstream/master' into CRIncludeCurrent - [`10785a8`](https://github.com/actualbudget/actual/commit/10785a8ad3d10d1a5ad363f71b0176744b22961f) add migration and fix merge issues - [`dbdca78`](https://github.com/actualbudget/actual/commit/dbdca78e80756a51b4dbb5e201ca5b7c5f9950f5) fix extra year/month - [`efb21b8`](https://github.com/actualbudget/actual/commit/efb21b850a1805df7b99ffe03d16abc3dc139a91) default and disabled lists - [`153dade`](https://github.com/actualbudget/actual/commit/153dadedd04a653e2115bc9bcfa640362e2e3520) default on - [`191019f`](https://github.com/actualbudget/actual/commit/191019f09ad255c78d1611c6a820720670e279e1) Merge branch 'master' into CRIncludeCurrent ### 📊 Changes **14 files changed** (+117 additions, -17 deletions) <details> <summary>View changed files</summary> 📝 `packages/desktop-client/src/components/reports/ReportOptions.ts` (+14 -10) 📝 `packages/desktop-client/src/components/reports/ReportSidebar.tsx` (+42 -3) 📝 `packages/desktop-client/src/components/reports/disabledList.ts` (+26 -0) 📝 `packages/desktop-client/src/components/reports/getLiveRange.ts` (+4 -1) 📝 `packages/desktop-client/src/components/reports/reportRanges.ts` (+1 -1) 📝 `packages/desktop-client/src/components/reports/reports/CustomReport.tsx` (+8 -0) 📝 `packages/desktop-client/src/components/reports/reports/GetCardData.tsx` (+1 -0) ➕ `packages/loot-core/migrations/1716359441000_include_current.sql` (+5 -0) 📝 `packages/loot-core/src/client/data-hooks/reports.ts` (+1 -0) 📝 `packages/loot-core/src/server/aql/schema/index.ts` (+1 -0) 📝 `packages/loot-core/src/server/reports/app.ts` (+2 -0) 📝 `packages/loot-core/src/shared/months.ts` (+4 -2) 📝 `packages/loot-core/src/types/models/reports.d.ts` (+2 -0) ➕ `upcoming-release-notes/2684.md` (+6 -0) </details> ### 📄 Description Testing an option to add/remove current interval to "live" ranges. WARNING: Do not use live budget files with this PR as it contains a migration. Please use a copy or a test budget ONLY. ~I still need to add a migration so that it can be saved as part of the report. Holding off on that right now as I don't want it to mess up anyone's budget file.~ --- <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 08:22:04 -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#46275
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?