Skip to content

A local-first personal finance app

Fix copy last month's budget including hidden categories (#5735)

mgibson-scottlogic413398531c4a
diff --git a/packages/loot-core/src/server/budget/actions.ts b/packages/loot-core/src/server/budget/actions.ts
index 234e217f07..00361b6296 100644
--- a/packages/loot-core/src/server/budget/actions.ts
+++ b/packages/loot-core/src/server/budget/actions.ts
@@ -60,6 +60,8 @@ function dbMonth(month: string): number {
// TODO: complete list of fields.
type BudgetData = {
is_income: 1 | 0;
+ hidden: 1 | 0;
+ group_hidden: 1 | 0;
category: string;
amount: number;
};
@@ -70,11 +72,16 @@ function getBudgetData<T extends BudgetTable>(
): Promise<BudgetData[]> {
return db.all<
(db.DbReflectBudget | db.DbZeroBudget) &
- Pick<db.DbViewCategory, 'is_income'>
+ Pick<
+ db.DbViewCategoryWithGroupHidden,
+ 'is_income' | 'hidden' | 'group_hidden'
+ >
>(
`
- SELECT b.*, c.is_income FROM v_categories c
- LEFT JOIN ${table} b ON b.category = c.id
+ SELECT b.*, c.is_income, c.hidden, g.hidden AS group_hidden
+ FROM ${table} b
+ LEFT JOIN categories c ON b.category = c.id
+ LEFT JOIN category_groups g ON c.cat_group = g.id
WHERE c.tombstone = 0 AND b.month = ?
`,
[month],
@@ -215,6 +222,9 @@ export async function copyPreviousMonth({
if (prevBudget.is_income === 1 && !isReflectBudget()) {
return;
}
+ if (prevBudget.hidden === 1 || prevBudget.group_hidden === 1) {
+ return;
+ }
setBudget({
category: prevBudget.category,
month,
diff --git a/upcoming-release-notes/5735.md b/upcoming-release-notes/5735.md
new file mode 100644
index 0000000000..d52af563b1
--- /dev/null
+++ b/upcoming-release-notes/5735.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [mgibson-scottlogic]
+---
+
+Exclude hidden categories from "Copy last month's budget" when copying whole month