diff --git a/frontend/src/pages/inspect/GeneralJournalTab.tsx b/frontend/src/pages/inspect/GeneralJournalTab.tsx
index 2789a9d2..14f3b479 100644
--- a/frontend/src/pages/inspect/GeneralJournalTab.tsx
+++ b/frontend/src/pages/inspect/GeneralJournalTab.tsx
@@ -139,12 +139,11 @@ export default function GeneralJournalTab() {
,
- // Transaction row entries
+ // Transaction row entries — date+description merged into one cell
...tx.rows.map(row => (
-
-
+
();
long priorBalance = 0;
+ var profitLossStart = new DateTime(from.Year, 1, 1);
+ var accountTypeMap = allAccounts.ToDictionary(a => a.FinancialAccountId, a => a.AccountType);
foreach (var acctId in accountIds)
{
- priorBalance += await repo.GetAccountBalanceCents(acctId, from);
+ var isBalanceAccount = accountTypeMap.TryGetValue(acctId, out var acctType)
+ && (acctType == UsingCash.Common.Enums.FinancialAccountType.Asset
+ || acctType == UsingCash.Common.Enums.FinancialAccountType.Debt);
+
+ if (isBalanceAccount)
+ {
+ priorBalance += await repo.GetAccountBalanceCents(acctId, from);
+ }
+ else if (profitLossStart < from)
+ {
+ var priorRows = await repo.GetRowsForAccountInRange(acctId, profitLossStart, from);
+ priorBalance += priorRows.Sum(r => r.AmountCents);
+ }
+
var rows = await repo.GetRowsForAccountInRange(acctId, from, to);
allRows.AddRange(rows.Select(r => (r, acctId)));
}