Skip to content

Open-source personal finance manager. Self-hosted, privacy-first.

fix: multi-currency balance calculation with account-currency-aware FX conversion

Tássio Noronha4c3cfb926692
diff --git a/backend/app/api/accounts.py b/backend/app/api/accounts.py
index aa60166f..7142378a 100644
--- a/backend/app/api/accounts.py
+++ b/backend/app/api/accounts.py
@@ -48,6 +48,17 @@ async def get_account_summary(
)
if not summary:
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Account not found")
+
+ account = await account_service.get_account(session, account_id, user.id)
+ primary_currency = user.primary_currency
+ if account and account.currency != primary_currency:
+ bal, _ = await convert(session, Decimal(str(summary["current_balance"])), account.currency, primary_currency)
+ inc, _ = await convert(session, Decimal(str(summary["monthly_income"])), account.currency, primary_currency)
+ exp, _ = await convert(session, Decimal(str(summary["monthly_expenses"])), account.currency, primary_currency)
+ summary["current_balance_primary"] = float(bal)
+ summary["monthly_income_primary"] = float(inc)
+ summary["monthly_expenses_primary"] = float(exp)
+
return summary
@@ -66,6 +77,17 @@ async def get_account_balance_history(
)
if history is None:
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Account not found")
+
+ account = await account_service.get_account(session, account_id, user.id)
+ primary_currency = user.primary_currency
+ if account and account.currency != primary_currency:
+ for point in history:
+ point_date = date.fromisoformat(point["date"])
+ converted, _ = await convert(
+ session, Decimal(str(point["balance"])), account.currency, primary_currency, target_date=point_date,
+ )
+ point["balance_primary"] = float(converted)
+
return history
diff --git a/backend/app/schemas/account.py b/backend/app/schemas/account.py
index 77ab62c4..ca7afde6 100644
--- a/backend/app/schemas/account.py
+++ b/backend/app/schemas/account.py
@@ -47,3 +47,6 @@ class AccountSummary(BaseModel):
current_balance: float
monthly_income: float
monthly_expenses: float
+ current_balance_primary: Optional[float] = None
+ monthly_income_primary: Optional[float] = None
+ monthly_expenses_primary: Optional[float] = None
diff --git a/backend/app/services/account_service.py b/backend/app/services/account_service.py
index e61d32ee..b7cc7f64 100644
--- a/backend/app/services/account_service.py
+++ b/backend/app/services/account_service.py
@@ -14,9 +14,15 @@ from app.schemas.account import AccountCreate, AccountUpdate
async def get_accounts(session: AsyncSession, user_id: uuid.UUID, include_closed: bool = False) -> list[dict]:
# Subquery: compute current_balance per account from transactions in one pass
+ # Use amount_primary only when tx currency differs from account currency
+ # (converts foreign txs to account's reporting currency)
+ effective_amount = case(
+ (Transaction.currency == Account.currency, Transaction.amount),
+ else_=func.coalesce(Transaction.amount_primary, Transaction.amount),
+ )
signed_amount = case(
- (Transaction.type == "credit", Transaction.amount),
- else_=-Transaction.amount,
+ (Transaction.type == "credit", effective_amount),
+ else_=-effective_amount,
)
balance_sq = (
@@ -24,6 +30,7 @@ async def get_accounts(session: AsyncSession, user_id: uuid.UUID, include_closed
Transaction.account_id,
func.coalesce(func.sum(signed_amount), 0).label("current_balance"),
)
+ .join(Account, Transaction.account_id == Account.id)
.group_by(Transaction.account_id)
.subquery()
)
@@ -38,6 +45,7 @@ async def get_accounts(session: AsyncSession, user_id: uuid.UUID, include_closed
Transaction.account_id,
func.coalesce(func.sum(signed_amount), 0).label("previous_balance"),
)
+ .join(Account, Transaction.account_id == Account.id)
.where(Transaction.date <= prev_month_end)
.group_by(Transaction.account_id)
.subquery()
@@ -262,6 +270,12 @@ async def get_account_summary(
if not date_to:
date_to = today
+ # Use amount_primary only when tx currency differs from account currency
+ effective_amount = case(
+ (Transaction.currency == account.currency, Transaction.amount),
+ else_=func.coalesce(Transaction.amount_primary, Transaction.amount),
+ )
+
# For bank-connected accounts, use the stored balance from the provider
if account.connection_id:
current_balance = float(account.balance)
@@ -272,8 +286,8 @@ async def get_account_summary(
func.coalesce(
func.sum(
case(
- (Transaction.type == "credit", Transaction.amount),
- else_=-Transaction.amount,
+ (Transaction.type == "credit", effective_amount),
+ else_=-effective_amount,
)
),
0,
@@ -289,7 +303,7 @@ async def get_account_summary(
# Income = SUM of credit transactions in [date_from, date_to] (excluding opening_balance and transfers)
income_result = await session.execute(
- select(func.coalesce(func.sum(Transaction.amount), 0)).where(
+ select(func.coalesce(func.sum(effective_amount), 0)).where(
Transaction.account_id == account_id,
Transaction.type == "credit",
Transaction.source != "opening_balance",
@@ -302,7 +316,7 @@ async def get_account_summary(
# Expenses = SUM of debit transactions in [date_from, date_to] (as positive value, excluding transfers)
expenses_result = await session.execute(
- select(func.coalesce(func.sum(func.abs(Transaction.amount)), 0)).where(
+ select(func.coalesce(func.sum(func.abs(effective_amount)), 0)).where(
Transaction.account_id == account_id,
Transaction.type == "debit",
Transaction.transfer_pair_id.is_(None),
@@ -320,20 +334,26 @@ async def get_account_summary(
}
-def _signed_amount_expr():
- """credit → +amount, debit → −amount."""
+def _signed_amount_expr(account_currency: str):
+ """credit → +amount, debit → −amount.
+ Uses amount_primary only when tx currency differs from account currency."""
+ effective = case(
+ (Transaction.currency == account_currency, Transaction.amount),
+ else_=func.coalesce(Transaction.amount_primary, Transaction.amount),
+ )
return case(
- (Transaction.type == "credit", Transaction.amount),
- else_=-Transaction.amount,
+ (Transaction.type == "credit", effective),
+ else_=-effective,
)
async def _account_balance_at(
- session: AsyncSession, account_id: uuid.UUID, cutoff: _Date
+ session: AsyncSession, account_id: uuid.UUID, cutoff: _Date,
+ account_currency: str = "",
) -> float:
"""Get balance for a single account at a specific date."""
result = await session.execute(
- select(func.coalesce(func.sum(_signed_amount_expr()), 0))
+ select(func.coalesce(func.sum(_signed_amount_expr(account_currency)), 0))
.where(
Transaction.account_id == account_id,
Transaction.date <= cutoff,
@@ -345,16 +365,17 @@ async def _account_balance_at(
async def _account_daily_balance_series(
session: AsyncSession, account_id: uuid.UUID,
date_from: _Date, date_to: _Date,
+ account_currency: str = "",
) -> list[dict]:
"""Build daily balance series for [date_from, date_to] inclusive."""
# Get balance at end of day before range start
- start_balance = await _account_balance_at(session, account_id, date_from - timedelta(days=1))
+ start_balance = await _account_balance_at(session, account_id, date_from - timedelta(days=1), account_currency)
# Get daily deltas within range: group by actual date
result = await session.execute(
select(
Transaction.date,
- func.sum(_signed_amount_expr()),
+ func.sum(_signed_amount_expr(account_currency)),
)
.where(
Transaction.account_id == account_id,
@@ -393,7 +414,7 @@ async def get_account_balance_history(
sign = -1.0 if (account.type == "credit_card" and account.connection_id) else 1.0
- series = await _account_daily_balance_series(session, account_id, date_from, date_to)
+ series = await _account_daily_balance_series(session, account_id, date_from, date_to, account.currency)
if sign != 1.0:
for point in series:
diff --git a/backend/app/services/dashboard_service.py b/backend/app/services/dashboard_service.py
index 4b3d8014..94722794 100644
--- a/backend/app/services/dashboard_service.py
+++ b/backend/app/services/dashboard_service.py
@@ -441,12 +441,19 @@ async def get_projected_transactions(
return projections
-def _signed_balance_expr():
+def _signed_balance_expr(account_currency: str = ""):
"""Reusable SQL expression: credit → +amount, debit → −amount.
- Uses raw amount — suitable for single-account balance calculations."""
+ Uses amount_primary when tx currency differs from account currency."""
+ if account_currency:
+ effective = case(
+ (Transaction.currency == account_currency, Transaction.amount),
+ else_=func.coalesce(Transaction.amount_primary, Transaction.amount),
+ )
+ else:
+ effective = Transaction.amount
return case(
- (Transaction.type == "credit", Transaction.amount),
- else_=-Transaction.amount,
+ (Transaction.type == "credit", effective),
+ else_=-effective,
)
@@ -495,7 +502,7 @@ async def _account_balance_at(
current_bal = -current_bal
# Subtract activity after cutoff to get the balance AT cutoff
delta_after = await session.scalar(
- select(func.coalesce(func.sum(_signed_balance_expr()), 0))
+ select(func.coalesce(func.sum(_signed_balance_expr(account.currency)), 0))
.where(
Transaction.account_id == account.id,
Transaction.date > cutoff,
@@ -505,32 +512,13 @@ async def _account_balance_at(
else:
# Manual: sum signed transactions up to cutoff
result = await session.scalar(
- select(func.coalesce(func.sum(_signed_balance_expr()), 0))
+ select(func.coalesce(func.sum(_signed_balance_expr(account.currency)), 0))
.where(
Transaction.account_id == account.id,
Transaction.date <= cutoff,
)
)
- bal = float(result or 0)
-
- # If zero and no transactions exist before cutoff, carry opening balance back.
- # This handles the common case where a user starts tracking an existing account.
- if bal == 0.0:
- first_txn_date = await session.scalar(
- select(func.min(Transaction.date))
- .where(Transaction.account_id == account.id)
- )
- if first_txn_date is not None and first_txn_date > cutoff:
- opening_bal = await session.scalar(
- select(func.coalesce(func.sum(_signed_balance_expr()), 0))
- .where(
- Transaction.account_id == account.id,
- Transaction.source == "opening_balance",
- )
- )
- bal = float(opening_bal or 0)
-
- return bal
+ return float(result or 0)
async def _total_balance_by_currency(
@@ -561,7 +549,7 @@ async def _balance_at(
total = 0.0
for currency, amount in totals.items():
- converted, _ = await convert(session, Decimal(str(amount)), currency, primary_currency, cutoff)
+ converted, _ = await convert(session, Decimal(str(amount)), currency, primary_currency)
total += float(converted)
return total
@@ -570,13 +558,23 @@ async def _daily_deltas(
session: AsyncSession, user_id: uuid.UUID, start: date, end: date
) -> dict[int, float]:
"""Get daily balance deltas for a date range [start, end).
- Uses amount_primary for multi-currency support.
- Excludes opening_balance transactions because they are already accounted
- for in the starting balance via _account_balance_at's carry-back logic."""
+ Computes per-account in native currency (using amount_primary only for
+ foreign txs within an account), grouped by day and account currency,
+ then converts each currency to primary. This is consistent with _balance_at."""
+ # Use amount_primary only when tx currency differs from account currency
+ effective = case(
+ (Transaction.currency == Account.currency, Transaction.amount),
+ else_=func.coalesce(Transaction.amount_primary, Transaction.amount),
+ )
+ signed = case(
+ (Transaction.type == "credit", effective),
+ else_=-effective,
+ )
result = await session.execute(
select(
func.extract("day", Transaction.date).label("day"),
- func.sum(_signed_primary_expr()),
+ Account.currency,
+ func.sum(signed),
)
.join(Account, Transaction.account_id == Account.id)
.where(
@@ -584,11 +582,30 @@ async def _daily_deltas(
Account.is_closed == False,
Transaction.date >= start,
Transaction.date < end,
- Transaction.source != "opening_balance",
)
- .group_by("day")
+ .group_by("day", Account.currency)
)
- return {int(row[0]): float(row[1] or 0) for row in result.all()}
+ rows = result.all()
+
+ # Check if all same currency — skip conversion
+ currencies_seen = {row[1] for row in rows}
+ if len(currencies_seen) <= 1:
+ return {int(row[0]): float(row[2] or 0) for row in rows}
+
+ # Multiple currencies: convert each to primary
+ user = await session.get(User, user_id)
+ primary_currency = user.primary_currency if user else get_settings().default_currency
+
+ deltas: dict[int, float] = {}
+ for row in rows:
+ day = int(row[0])
+ currency = row[1]
+ amount = float(row[2] or 0)
+ if currency != primary_currency:
+ converted, _ = await convert(session, Decimal(str(amount)), currency, primary_currency)
+ amount = float(converted)
+ deltas[day] = deltas.get(day, 0) + amount
+ return deltas
async def get_balance_history(
diff --git a/backend/tests/test_dashboard_service.py b/backend/tests/test_dashboard_service.py
index 867a3af7..791a0d09 100644
--- a/backend/tests/test_dashboard_service.py
+++ b/backend/tests/test_dashboard_service.py
@@ -145,15 +145,20 @@ async def test_account_balance_at_manual(session: AsyncSession, test_user):
@pytest.mark.asyncio
async def test_account_balance_at_manual_opening_fallback(session: AsyncSession, test_user):
- """Manual account falls back to opening_balance when no transactions before cutoff."""
+ """Opening balance dated after cutoff is not carried back — it appears as a delta on its actual date."""
account = await _make_account(session, test_user.id, "Fallback Bal")
today = date.today()
# Opening balance dated today, cutoff is yesterday
await _add_txn(session, test_user.id, account.id, 5000, "credit", today, source="opening_balance")
+ # Balance at yesterday is 0 — the opening balance hasn't happened yet
bal = await _account_balance_at(session, account, today - timedelta(days=1))
- assert bal == pytest.approx(5000.0)
+ assert bal == pytest.approx(0.0)
+
+ # Balance at today includes the opening balance
+ bal_today = await _account_balance_at(session, account, today)
+ assert bal_today == pytest.approx(5000.0)
@pytest.mark.asyncio
diff --git a/frontend/src/components/app-layout.tsx b/frontend/src/components/app-layout.tsx
index fa221f01..b9b64e12 100644
--- a/frontend/src/components/app-layout.tsx
+++ b/frontend/src/components/app-layout.tsx
@@ -103,7 +103,7 @@ export function AppLayout() {
const allAccounts = accountsList ?? []
const totalBalance = allAccounts.reduce((sum, a) => {
- return sum + Number(a.current_balance)
+ return sum + Number(a.balance_primary ?? a.current_balance)
}, 0)
return (
diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts
index 0653d57d..e4c6e892 100644
--- a/frontend/src/lib/api.ts
+++ b/frontend/src/lib/api.ts
@@ -193,7 +193,7 @@ export const accounts = {
const { data } = await api.get(`/accounts/${id}/summary`, { params: { from, to } })
return data
},
- balanceHistory: async (id: string, from?: string, to?: string): Promise<{ date: string; balance: number }[]> => {
+ balanceHistory: async (id: string, from?: string, to?: string): Promise<{ date: string; balance: number; balance_primary?: number }[]> => {
const { data } = await api.get(`/accounts/${id}/balance-history`, { params: { from, to } })
return data
},
diff --git a/frontend/src/pages/account-detail.tsx b/frontend/src/pages/account-detail.tsx
index e7f36d51..db312522 100644
--- a/frontend/src/pages/account-detail.tsx
+++ b/frontend/src/pages/account-detail.tsx
@@ -54,6 +54,7 @@ export default function AccountDetailPage() {
const [editingTx, setEditingTx] = useState<Transaction | null>(null)
const [filterFrom, setFilterFrom] = useState(defaultFrom)
const [filterTo, setFilterTo] = useState(defaultTo)
+ const [showPrimary, setShowPrimary] = useState(false)
const { data: account, isLoading: accountLoading } = useQuery({
queryKey: ['accounts', id],
@@ -131,31 +132,39 @@ export default function AccountDetailPage() {
onError: () => toast.error(t('common.error')),
})
+ // Whether to use primary currency amounts (for foreign-currency accounts with toggle, or domestic accounts with foreign txs)
+ const isCreditCard = account?.type === 'credit_card'
+ const isForeignCurrency = account ? account.currency !== userCurrency : false
+ const usePrimary = !isForeignCurrency || showPrimary
+ const displayCurrency = (isForeignCurrency && !showPrimary) ? (account?.currency || userCurrency) : userCurrency
+
// Chart data — simple daily balance series
const chartData = useMemo(() => {
if (!balanceHistory) return []
return balanceHistory.map(p => ({
label: formatDateStr(p.date, locale),
date: p.date,
- balance: p.balance,
+ balance: usePrimary ? (p.balance_primary ?? p.balance) : p.balance,
}))
- }, [balanceHistory, locale])
+ }, [balanceHistory, locale, usePrimary])
// Running balance computation for transaction table
- const isCreditCard = account?.type === 'credit_card'
const txWithRunningBalance = useMemo((): TxWithBalance[] => {
if (!txData?.items || summary === undefined) return []
- // Use the last chart point as reference if available, else current_balance
- const endBalance = balanceHistory?.length
- ? balanceHistory[balanceHistory.length - 1].balance
- : summary.current_balance
+ const endBalance = usePrimary
+ ? (balanceHistory?.length
+ ? (balanceHistory[balanceHistory.length - 1].balance_primary ?? balanceHistory[balanceHistory.length - 1].balance)
+ : (summary.current_balance_primary ?? summary.current_balance))
+ : (balanceHistory?.length
+ ? balanceHistory[balanceHistory.length - 1].balance
+ : summary.current_balance)
const sorted = [...txData.items].sort(
(a, b) => new Date(b.date).getTime() - new Date(a.date).getTime()
)
let running = endBalance
return sorted.map((tx) => {
const balanceAtPoint = running
- const amt = Number(tx.amount)
+ const amt = usePrimary && tx.amount_primary != null ? Number(tx.amount_primary) : Number(tx.amount)
if (isCreditCard) {
running -= tx.type === 'debit' ? amt : -amt
} else {
@@ -163,7 +172,7 @@ export default function AccountDetailPage() {
}
return { ...tx, runningBalance: balanceAtPoint }
})
- }, [txData, summary, isCreditCard, balanceHistory])
+ }, [txData, summary, isCreditCard, balanceHistory, usePrimary])
const hasFilters = filterFrom !== defaultFrom() || filterTo !== defaultTo()
@@ -183,8 +192,6 @@ export default function AccountDetailPage() {
return <p className="text-muted-foreground">{t('accounts.notFound')}</p>
}
- const currency = account.currency || userCurrency
-
return (
<div>
{/* Header bar with date range */}
@@ -229,6 +236,22 @@ export default function AccountDetailPage() {
{t('transactions.clearFilters')}
</Button>
)}
+ {isForeignCurrency && (
+ <div className="ml-auto inline-flex rounded-lg border border-border bg-muted p-0.5 text-xs font-medium">
+ <button
+ onClick={() => setShowPrimary(false)}
+ className={`px-3 py-1.5 rounded-md transition-colors ${!showPrimary ? 'bg-card text-foreground shadow-sm' : 'text-muted-foreground hover:text-foreground'}`}
+ >
+ {account.currency}
+ </button>
+ <button
+ onClick={() => setShowPrimary(true)}
+ className={`px-3 py-1.5 rounded-md transition-colors ${showPrimary ? 'bg-card text-foreground shadow-sm' : 'text-muted-foreground hover:text-foreground'}`}
+ >
+ {userCurrency}
+ </button>
+ </div>
+ )}
</div>
</div>
@@ -253,7 +276,10 @@ export default function AccountDetailPage() {
{t('accounts.currentBalance')}
</p>
<p className={`text-base sm:text-2xl font-bold tabular-nums ${(account.type === 'credit_card' ? (summary?.current_balance ?? 0) > 0 : (summary?.current_balance ?? 0) < 0) ? 'text-rose-500' : 'text-foreground'}`}>
- {mask(formatCurrency(summary?.current_balance ?? 0, currency, locale))}
+ {mask(formatCurrency(
+ (showPrimary ? summary?.current_balance_primary : undefined) ?? summary?.current_balance ?? 0,
+ displayCurrency, locale
+ ))}
</p>
</div>
<div className="bg-card rounded-xl border border-border shadow-sm p-3 sm:p-4">
@@ -261,7 +287,10 @@ export default function AccountDetailPage() {
{t('accounts.income')}
</p>
<p className="text-base sm:text-2xl font-bold tabular-nums text-emerald-600">
- {mask(formatCurrency(summary?.monthly_income ?? 0, currency, locale))}
+ {mask(formatCurrency(
+ (showPrimary ? summary?.monthly_income_primary : undefined) ?? summary?.monthly_income ?? 0,
+ displayCurrency, locale
+ ))}
</p>
</div>
<div className="bg-card rounded-xl border border-border shadow-sm p-3 sm:p-4">
@@ -269,7 +298,10 @@ export default function AccountDetailPage() {
{t('accounts.expenses')}
</p>
<p className="text-base sm:text-2xl font-bold tabular-nums text-rose-500">
- {mask(formatCurrency(summary?.monthly_expenses ?? 0, currency, locale))}
+ {mask(formatCurrency(
+ (showPrimary ? summary?.monthly_expenses_primary : undefined) ?? summary?.monthly_expenses ?? 0,
+ displayCurrency, locale
+ ))}
</p>
</div>
</div>
@@ -306,7 +338,7 @@ export default function AccountDetailPage() {
tickFormatter={(v) => {
if (privacyMode) return ''
if (v === 0) return '0'
- return formatCurrency(v, currency, locale).replace(/,00$/, '').replace(/\.00$/, '')
+ return formatCurrency(v, displayCurrency, locale).replace(/,00$/, '').replace(/\.00$/, '')
}}
tick={{ fontSize: 10, fill: 'var(--muted-foreground)' }}
axisLine={false}
@@ -320,7 +352,7 @@ export default function AccountDetailPage() {
/>
<Tooltip
formatter={(value) => [
- value !== null ? (privacyMode ? MASK : formatCurrency(Number(value), currency, locale)) : '\u2014',
+ value !== null ? (privacyMode ? MASK : formatCurrency(Number(value), displayCurrency, locale)) : '\u2014',
t('accounts.currentBalance'),
]}
labelFormatter={(label) => label}
@@ -432,10 +464,15 @@ export default function AccountDetailPage() {
)}
</td>
<td className={`px-3 sm:px-4 py-3 text-right text-xs sm:text-sm font-semibold tabular-nums ${tx.type === 'credit' ? 'text-emerald-600' : 'text-rose-500'}`}>
- {mask(`${tx.type === 'credit' ? '+' : '-'}${formatCurrency(Math.abs(Number(tx.amount)), currency, locale)}`)}
+ {mask(`${tx.type === 'credit' ? '+' : '-'}${formatCurrency(Math.abs(Number(tx.amount)), tx.currency, locale)}`)}
+ {tx.currency !== userCurrency && tx.amount_primary != null && (
+ <span className="block text-[10px] text-muted-foreground tabular-nums">
+ {mask(formatCurrency(Math.abs(tx.amount_primary), userCurrency, locale))}
+ </span>
+ )}
</td>
<td className={`px-4 py-3 text-right tabular-nums text-sm hidden sm:table-cell ${(account.type === 'credit_card' ? tx.runningBalance > 0 : tx.runningBalance < 0) ? 'text-rose-500' : 'text-muted-foreground'}`}>
- {mask(formatCurrency(tx.runningBalance, currency, locale))}
+ {mask(formatCurrency(tx.runningBalance, displayCurrency, locale))}
</td>
</tr>
)
diff --git a/frontend/src/types/index.ts b/frontend/src/types/index.ts
index 35ed1c22..7775ef0f 100644
--- a/frontend/src/types/index.ts
+++ b/frontend/src/types/index.ts
@@ -72,6 +72,9 @@ export interface AccountSummary {
current_balance: number
monthly_income: number
monthly_expenses: number
+ current_balance_primary: number | null
+ monthly_income_primary: number | null
+ monthly_expenses_primary: number | null
}
export interface Transaction {