Add per-transaction exclude-from-budget flag across all budget math

Author: rollecode

CHANGELOG.md

@@ -1,3 +1,8 @@
+### 3.15.0: 2026-07-11
+
+* Add a per-transaction "exclude from budget" toggle in the transaction editor: an excluded row drops out of every budget figure (daily budget, category activity and available, Ready to Assign, cash flow, income, spending trends) but keeps affecting the real account balance and staying in the ledger, and shows an "Ei budjetissa" badge
+* Net excluded transactions out of the budgetable balance so Ready to Assign and the daily budget stay consistent while the real account balance still reflects the money that moved
+
 ### 3.14.2: 2026-07-11
 
 * Fix every transfer opening with an empty Vastatili ("Ei toista tiliä"): the edit dialog always reset the counterpart to blank, so a paired transfer looked counterpart-less and saving it stripped the counterpart off; the dialog now pre-selects the real counterpart account parsed from the transfer's "Transfer : <account>" leg

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dough",
-  "version": "3.14.2",
+  "version": "3.15.0",
   "private": true,
   "scripts": {
     "dev": "next dev -H 0.0.0.0 -p 3030",

src/app/(app)/dashboard/page.tsx

@@ -241,11 +241,13 @@ export default function DashboardPage() {
   // Real income from YNAB month budget (matches YNAB's own reports)
   const realIncome = data.monthBudget.income;
 
-  // Available = total checking + savings accounts (excluding budget-excluded accounts)
+  // Available = budgetable checking + savings (excluding budget-excluded accounts). Each account's
+  // balance is netted against its budget-excluded transactions, so an excluded outflow does not shrink
+  // the spendable pool the daily budget divides up (the money still shows in the real account balance).
   const availableBalance = Math.round(
     data.summary.accounts
       .filter((a) => (a.type === "checking" || a.type === "savings") && !excludedAccountIds.includes(a.id))
-      .reduce((s, a) => s + a.balance, 0) * 100
+      .reduce((s, a) => s + a.balance - (a.budgetExcludedNet || 0), 0) * 100
   ) / 100;
 
   // Upcoming income = active, unmatched income sources with expected_day still ahead
@@ -281,10 +283,10 @@ export default function DashboardPage() {
     return false;
   };
   const todaySpentAll = data.transactions
-    .filter((t) => t.date === todayStr && t.amount < 0 && !isTransfer(t.payee, t.category) && !isFixedCost(t.payee, t.category))
+    .filter((t) => t.date === todayStr && t.amount < 0 && !t.excluded && !isTransfer(t.payee, t.category) && !isFixedCost(t.payee, t.category))
     .reduce((s, t) => s + Math.abs(t.amount), 0);
   const todaySpentPersonal = data.transactions
-    .filter((t) => t.date === todayStr && t.amount < 0 && !isTransfer(t.payee, t.category) && !isFixedCost(t.payee, t.category)
+    .filter((t) => t.date === todayStr && t.amount < 0 && !t.excluded && !isTransfer(t.payee, t.category) && !isFixedCost(t.payee, t.category)
       && (linkedAccountIds.length === 0 || linkedAccountIds.includes(t.account_id || "")))
     .reduce((s, t) => s + Math.abs(t.amount), 0);
 
@@ -401,7 +403,7 @@ export default function DashboardPage() {
   // Burn rate = average daily real spending this month
   const daysPassed = now.getDate();
   const realSpendingTotal = data.transactions
-    .filter((t) => t.amount < 0 && !isTransfer(t.payee, t.category))
+    .filter((t) => t.amount < 0 && !t.excluded && !isTransfer(t.payee, t.category))
     .reduce((s, t) => s + Math.abs(t.amount), 0);
   const dailyBurnRate = daysPassed > 0 ? Math.round((realSpendingTotal / daysPassed) * 100) / 100 : 0;
 
@@ -426,7 +428,7 @@ export default function DashboardPage() {
     data.transactions
       .filter((t) => {
         const day = parseInt(t.date.split("-")[2], 10);
-        return day >= start && day <= end && t.amount < 0 && !isTransfer(t.payee, t.category);
+        return day >= start && day <= end && t.amount < 0 && !t.excluded && !isTransfer(t.payee, t.category);
       })
       .reduce((s, t) => s + Math.abs(t.amount), 0);
 
@@ -440,7 +442,7 @@ export default function DashboardPage() {
 
   // Personal spending share: configured % or calculated from actual spending ratio
   const personalMonthSpend = data.transactions
-    .filter((t) => t.amount < 0 && !isTransfer(t.payee, t.category)
+    .filter((t) => t.amount < 0 && !t.excluded && !isTransfer(t.payee, t.category)
       && (linkedAccountIds.length === 0 || linkedAccountIds.includes(t.account_id || "")))
     .reduce((s, t) => s + Math.abs(t.amount), 0);
   const calculatedShare = realSpendingTotal > 0 ? personalMonthSpend / realSpendingTotal : 0.5;
@@ -451,7 +453,7 @@ export default function DashboardPage() {
   // Build spending chart data from transactions (exclude transfers)
   const spendingByDay: Record<string, number> = {};
   const sortedTx = [...data.transactions]
-    .filter((t) => t.amount < 0 && !isTransfer(t.payee, t.category))
+    .filter((t) => t.amount < 0 && !t.excluded && !isTransfer(t.payee, t.category))
     .sort((a, b) => a.date.localeCompare(b.date));
 
   let cumulative = 0;
@@ -474,7 +476,7 @@ export default function DashboardPage() {
     discretionaryByDay[day] = Math.round(discCumulative);
   }
   const discretionarySpendingTrue = data.transactions
-    .filter((t) => t.amount < 0 && !isTransfer(t.payee, t.category) && !isFixedCost(t.payee, t.category))
+    .filter((t) => t.amount < 0 && !t.excluded && !isTransfer(t.payee, t.category) && !isFixedCost(t.payee, t.category))
     .reduce((s, t) => s + Math.abs(t.amount), 0);
   const dailyDiscretionaryTrue = daysPassed > 0 ? Math.round((discretionarySpendingTrue / daysPassed) * 100) / 100 : 0;
 

src/app/(app)/transactions/page.tsx

@@ -13,6 +13,7 @@ import { DateField } from "@/components/ui/date-field";
 import { Label } from "@/components/ui/label";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
+import { Switch } from "@/components/ui/switch";
 import {
   Dialog,
   DialogContent,
@@ -97,6 +98,7 @@ export default function TransactionsPage() {
   const [editTx, setEditTx] = useState<{ id: string; payee: string; amount: number; category: string; memo: string | null; account_id: string; date: string } | null>(null);
   const [editType, setEditType] = useState<"expense" | "income" | "transfer">("expense");
   const [editTransferTo, setEditTransferTo] = useState("");
+  const [editExcluded, setEditExcluded] = useState(false);
   const [editSuggestions, setEditSuggestions] = useState<string[]>([]);
   const [editSaving, setEditSaving] = useState(false);
   const [splitMode, setSplitMode] = useState(false);
@@ -182,6 +184,7 @@ export default function TransactionsPage() {
           category,
           inflow,
           transfer_account_id: editType === "transfer" && editTransferTo ? editTransferTo : undefined,
+          budget_excluded: editExcluded,
         }),
       });
       const result = await res.json();
@@ -303,6 +306,7 @@ export default function TransactionsPage() {
       setEditTx({ id: t.id, payee: t.payee, amount: t.amount, category: t.category, memo: t.memo, account_id: t.account_id || "", date: t.date });
       setEditType(isTransfer(t.payee, t.category) ? "transfer" : t.amount > 0 ? "income" : "expense");
       setEditTransferTo(isTransfer(t.payee, t.category) ? counterpartIdFor(t.payee) : "");
+      setEditExcluded(!!t.excluded);
       setSplitMode(false);
       setSplitLines([]);
       window.history.replaceState({}, "", "/transactions");
@@ -456,6 +460,7 @@ export default function TransactionsPage() {
               setEditTx({ id: tx.id, payee: tx.payee, amount: tx.amount, category: tx.category, memo: tx.memo, account_id: tx.account_id || "", date: tx.date });
               setEditType(txIsTransfer ? "transfer" : tx.amount > 0 ? "income" : "expense");
               setEditTransferTo(txIsTransfer ? counterpartIdFor(tx.payee) : "");
+              setEditExcluded(!!tx.excluded);
               if (tx.isSplit && tx.parts) {
                 setSplitMode(true);
                 setSplitLines(tx.parts.map((p) => ({ category: p.category, amount: String(Math.abs(p.amount)) })));
@@ -494,6 +499,7 @@ export default function TransactionsPage() {
                   <p className="list-item-name">{tx.payee}</p>
                   {txIsTransfer && <Badge variant="secondary">{locale === "fi" ? "Siirto" : "Transfer"}</Badge>}
                   {tx.isSplit && <Badge variant="secondary">{locale === "fi" ? "Jaettu" : "Split"}</Badge>}
+                  {tx.excluded && <Badge variant="secondary">{locale === "fi" ? "Ei budjetissa" : "Excluded"}</Badge>}
                 </div>
                 <p className="list-item-meta">{(() => {
                   const acct = allAccounts.find((a) => a.id === tx.account_id)?.name || "";
@@ -638,6 +644,13 @@ export default function TransactionsPage() {
                 <Label>{locale === "fi" ? "Kuvaus" : "Memo"}</Label>
                 <PayeeInput value={editTx.memo || ""} onChange={(v) => setEditTx({ ...editTx, memo: v })} payees={memos} placeholder={locale === "fi" ? "esim. bussikortti" : "e.g. bus card"} />
               </div>
+              <div className="form-field">
+                <div className="settings-row">
+                  <Switch checked={editExcluded} onCheckedChange={setEditExcluded} />
+                  <Label>{locale === "fi" ? "Jätä pois budjetista" : "Exclude from budget"}</Label>
+                </div>
+                <p className="settings-help">{locale === "fi" ? "Ei lasketa mihinkään budjettilukuun (päiväbudjetti, kategoriat, kassavirta, tulot). Tilin saldo muuttuu silti." : "Left out of every budget figure (daily budget, categories, cash flow, income). The account balance still changes."}</p>
+              </div>
               <div className="insp-actions">
                 <Button onClick={handleEditSave} disabled={editSaving}>
                   {editSaving ? <Loader2 className="icon-sm animate-spin" /> : (locale === "fi" ? "Tallenna" : "Save")}

src/app/api/chat/route.ts

@@ -6,7 +6,7 @@ import { getDb } from "@/lib/db";
 import { getYnabToken, getYnabBudgetId } from "@/lib/household";
 import { localDateIso } from "@/lib/date-utils";
 import { eventBus } from "@/lib/event-bus";
-import { cashFlowHistory } from "@/lib/budget-math";
+import { cashFlowHistory, budgetExcludedNetByAccount, NOT_BUDGET_EXCLUDED } from "@/lib/budget-math";
 
 export async function POST(request: Request) {
   try {
@@ -69,9 +69,12 @@ export async function POST(request: Request) {
           ).all() as { id: string; name: string; type: string; balance: number }[];
           const accountSource = localAccounts.length > 0 ? localAccounts : summary.accounts;
 
+          // Budgetable balance: net out budget-excluded transactions on the budgeted accounts (see
+          // summary route) so the daily budget ignores money the household chose to exclude.
+          const chatExcludedNet = budgetExcludedNetByAccount(getDb());
           const checkingSavings = accountSource
             .filter((a: any) => (a.type === "checking" || a.type === "savings") && !excludedIds.includes(a.id))
-            .reduce((s: number, a: any) => s + a.balance, 0);
+            .reduce((s: number, a: any) => s + a.balance - (chatExcludedNet.get(a.id) || 0), 0);
 
           // Load account notes for AI context
           const accountNotesRows = getDb()
@@ -127,7 +130,7 @@ export async function POST(request: Request) {
 
           // Use local transactions table for recent transactions — always fresh
           const recentTx = chatDb.prepare(
-            "SELECT t.date, t.payee, t.amount, t.category, u.display_name as spender FROM transactions t LEFT JOIN users u ON t.user_id = u.id WHERE t.payee NOT LIKE 'Transfer%' AND t.payee NOT LIKE 'Starting Balance%' AND t.payee NOT LIKE 'Reconciliation%' GROUP BY t.ynab_id ORDER BY t.date DESC LIMIT 10"
+            "SELECT t.date, t.payee, t.amount, t.category, u.display_name as spender FROM transactions t LEFT JOIN users u ON t.user_id = u.id WHERE t.payee NOT LIKE 'Transfer%' AND t.payee NOT LIKE 'Starting Balance%' AND t.payee NOT LIKE 'Reconciliation%' AND COALESCE(t.budget_excluded, 0) = 0 GROUP BY t.ynab_id ORDER BY t.date DESC LIMIT 10"
           ).all() as { date: string; payee: string; amount: number; category: string; spender: string | null }[];
 
           // Load recurring bills with paid/overdue status
@@ -300,7 +303,7 @@ export async function POST(request: Request) {
           const debtNames: string[] = debts.map((d: { name: string }) => d.name.toLowerCase());
           const debtNameSet = new Set(debtNames);
           const todayTxRows = chatDb.prepare(
-            "SELECT amount, payee, category FROM transactions WHERE date = ? AND amount < 0 AND payee NOT LIKE 'Transfer%' AND payee NOT LIKE 'Starting Balance%' GROUP BY ynab_id"
+            "SELECT amount, payee, category FROM transactions WHERE date = ? AND amount < 0 AND payee NOT LIKE 'Transfer%' AND payee NOT LIKE 'Starting Balance%' AND " + NOT_BUDGET_EXCLUDED + " GROUP BY ynab_id"
           ).all(todayStr) as { amount: number; payee: string; category: string }[];
           const isFixedCost = (p: string, c: string) => {
             const pl = p.toLowerCase(); const cl = c.toLowerCase();
@@ -316,7 +319,7 @@ export async function POST(request: Request) {
           const monthStart = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}-01`;
           const localMonthlyExpenses = Math.round(
             (chatDb.prepare(
-              "SELECT COALESCE(SUM(ABS(amount)), 0) as total FROM (SELECT amount FROM transactions WHERE date >= ? AND amount < 0 AND payee NOT LIKE 'Transfer%' AND payee NOT LIKE 'Starting Balance%' AND payee NOT LIKE 'Reconciliation%' AND category != 'Uncategorized' GROUP BY ynab_id)"
+              "SELECT COALESCE(SUM(ABS(amount)), 0) as total FROM (SELECT amount FROM transactions WHERE date >= ? AND amount < 0 AND payee NOT LIKE 'Transfer%' AND payee NOT LIKE 'Starting Balance%' AND payee NOT LIKE 'Reconciliation%' AND category != 'Uncategorized' AND " + NOT_BUDGET_EXCLUDED + " GROUP BY ynab_id)"
             ).get(monthStart) as { total: number }).total * 100
           ) / 100;
           const daysToNextIncome = (() => {

src/app/api/heatmap/route.ts

@@ -1,6 +1,7 @@
 import { NextResponse } from "next/server";
 import { getSession } from "@/lib/auth";
 import { getDb } from "@/lib/db";
+import { NOT_BUDGET_EXCLUDED } from "@/lib/budget-math";
 
 export async function GET() {
   try {
@@ -14,7 +15,7 @@ export async function GET() {
     const sinceDate = `${since.getFullYear()}-${String(since.getMonth() + 1).padStart(2, "0")}-01`;
 
     const transactions = db.prepare(
-      "SELECT date, payee, amount, category FROM transactions WHERE date >= ? AND amount < 0 GROUP BY ynab_id ORDER BY date ASC"
+      "SELECT date, payee, amount, category FROM transactions WHERE date >= ? AND amount < 0 AND " + NOT_BUDGET_EXCLUDED + " GROUP BY ynab_id ORDER BY date ASC"
     ).all(sinceDate) as { date: string; payee: string; amount: number; category: string }[];
 
     console.debug("[heatmap] Loaded", transactions.length, "transactions since", sinceDate);

src/app/api/summary/route.ts

@@ -4,7 +4,7 @@ import { getDb } from "@/lib/db";
 import { getYnabToken, getYnabBudgetId, getHouseholdSetting, getBudgetMode } from "@/lib/household";
 import { DEFAULT_SUMMARY_INSTRUCTIONS } from "@/lib/ai/default-prompts";
 import { resolveDayInMonth, dateForDayInMonth, formatDate } from "@/lib/date-utils";
-import { cashFlowHistory } from "@/lib/budget-math";
+import { cashFlowHistory, budgetExcludedNetByAccount, NOT_BUDGET_EXCLUDED } from "@/lib/budget-math";
 import { spawn } from "child_process";
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
@@ -82,9 +82,14 @@ export async function GET(request: Request) {
     const excludedRaw = getExcludedSetting("budget_excluded_accounts");
     const excludedIds: string[] = excludedRaw ? JSON.parse(excludedRaw) : [];
 
+    // Budgetable checking+savings balance: real balances of the budgeted accounts, with the net of
+    // any budget-excluded transactions on those accounts pulled back out (an excluded outflow moved
+    // the real balance but must not shrink the daily budget). Accounts already excluded at the
+    // account level drop out entirely, balance and excluded transactions alike.
+    const excludedNetByAccount = budgetExcludedNetByAccount(db);
     const checkingSavings = summary.accounts
       .filter((a: any) => (a.type === "checking" || a.type === "savings") && !excludedIds.includes(a.id))
-      .reduce((s: number, a: any) => s + a.balance, 0);
+      .reduce((s: number, a: any) => s + a.balance - (excludedNetByAccount.get(a.id) || 0), 0);
 
     // Load account notes for context
     const accountNotesRows = db
@@ -103,7 +108,7 @@ export async function GET(request: Request) {
     // Use local transactions table for fresh data (same as dashboard)
     const monthStart = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}-01`;
     const localTx = db.prepare(
-      "SELECT date, payee, amount, category FROM transactions WHERE date >= ? GROUP BY ynab_id ORDER BY date DESC"
+      "SELECT date, payee, amount, category FROM transactions WHERE date >= ? AND " + NOT_BUDGET_EXCLUDED + " GROUP BY ynab_id ORDER BY date DESC"
     ).all(monthStart) as { date: string; payee: string; amount: number; category: string }[];
     const realExpenses = localTx.filter((t) => t.amount < 0 && !t.payee.startsWith("Transfer") && !t.payee.startsWith("Starting Balance") && !t.payee.startsWith("Reconciliation") && t.category !== "Uncategorized");
     const realIncome = localTx.filter((t) => t.amount > 0 && !t.payee.startsWith("Transfer") && !t.payee.startsWith("Starting Balance") && !t.payee.startsWith("Reconciliation"));

src/app/api/transactions/list/route.ts

@@ -23,10 +23,10 @@ export async function GET(request: Request) {
     // Same-day tie-break on MAX(rowid) DESC (the autoincrement primary key = insertion order), so a
     // just-added transaction lands at the top of its day. The output alias `id` is ynab_id (a random
     // local_<uuid> for new rows), so ordering by it would scatter same-day items arbitrarily.
-    const transactions = db.prepare(
-      "SELECT ynab_id as id, date, amount, payee, category, memo, approved, cleared, account_id, COALESCE(split_group, '') AS split_group " +
+    const transactions = (db.prepare(
+      "SELECT ynab_id as id, date, amount, payee, category, memo, approved, cleared, account_id, COALESCE(split_group, '') AS split_group, COALESCE(budget_excluded, 0) AS budget_excluded " +
         "FROM transactions WHERE date >= ? AND date <= ? GROUP BY ynab_id ORDER BY date DESC, MAX(rowid) DESC"
-    ).all(start, end);
+    ).all(start, end) as { budget_excluded: number }[]).map((t) => ({ ...t, excluded: !!t.budget_excluded }));
 
     console.debug("[transactions/list] month", month, "->", (transactions as unknown[]).length, "transactions");
     return NextResponse.json({ transactions });