admin/acmcc
1
0
Fork 0
mirror of https://github.com/renee-png/acmcc.git synced 2026-06-21 01:40:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Accounting reports: BvA column shading + reconciliation archived-account fix

Browse Source 
Budget vs Actuals: shade the Budget / Actual / Variance / Variance % columns
in a light→dark grey gradient with left vertical borders so they're easy to
tell apart (shared BVA_COL styles applied to header, group-total and detail
rows; variance text bumped to emerald/red-700 for contrast on the darker fills).

Reconciliation R2: reconcile() classified GL lines via the active-only account
list and dropped lines on archived accounts, so the "Assets = Liabilities +
Equity (incl. net income)" check went out of balance by the archived balance
(e.g. VW's archived 4016 Renters Insurance Income, -$75). Feed reconcile any
account referenced by glCumulative but missing from the active list (joined
metadata), matching the Balance Sheet builder; once every line is typed, R2
reduces to R1 and passes whenever the ledger balances. Also tightens R3/R4.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
renee-png
2026-06-17 11:53:07 -04:00
parent 61b9933bea
commit 0fadfcd2d2
1 changed files with 42 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/accounting/AccountingReportsPage.tsx
+42 -18
View File
@@ -1257,6 +1257,19 @@ function ReconciliationReport({ d, currency }: { d: any; currency: string }) {
id: a.id, type: a.type, name: a.name, id: a.id, type: a.type, name: a.name,
is_cash: !!a.is_bank || /cash|undeposited/i.test(String(a.name || "")), is_cash: !!a.is_bank || /cash|undeposited/i.test(String(a.name || "")),
})); }));
// Archived accounts are excluded from d.accounts, but their GL lines remain in
// glCumulative. Without their type, reconcile() drops those lines (if (!a) continue)
// and the Balance Sheet check (R2) goes out of balance by exactly the dropped
// amount — e.g. an archived income account that still holds a balance. Add any
// GL-referenced account missing from the active list, using the joined meta, so
// reconcile classifies them just like the Balance Sheet builder does.
const knownAcctIds = new Set(accounts.map((a) => a.id));
for (const l of (d.glCumulative ?? []) as any[]) {
const meta = l.accounts; const id = l.account_id;
if (!meta || !id || knownAcctIds.has(id)) continue;
knownAcctIds.add(id);
accounts.push({ id, type: meta.type, name: meta.name, is_cash: /cash|undeposited/i.test(String(meta.name || "")) });
}
const lines: RecLine[] = ((d.glCumulative ?? []) as any[]).map((l) => ({ const lines: RecLine[] = ((d.glCumulative ?? []) as any[]).map((l) => ({
account_id: l.account_id, date: String(l.journal_entries?.date ?? ""), account_id: l.account_id, date: String(l.journal_entries?.date ?? ""),
debit: Number(l.debit || 0), credit: Number(l.credit || 0), debit: Number(l.debit || 0), credit: Number(l.credit || 0),
@@ -1935,6 +1948,17 @@ function computeBvaActuals(actualsData: any): Record<string, number> {
return m; return m;
} }
// Budget vs. Actuals column shading — a light→dark grey gradient with left
// vertical borders so the Budget / Actual / Variance / Variance % columns are
// easy to tell apart. Applied to the header, group-total and detail cells.
const BVA_COL = {
budget: "text-right tabular-nums border-l border-gray-300 bg-gray-50",
actual: "text-right tabular-nums border-l border-gray-300 bg-gray-100",
variance: "text-right tabular-nums border-l border-gray-300 bg-gray-200/70",
pct: "text-right tabular-nums border-l border-gray-300 bg-gray-300/50",
cmp: "text-right tabular-nums border-l border-gray-300",
};
function BudgetVsActuals({ companyId, from, to, currency, companyName, rangeLabel, logoUrl }: { companyId: string; from: string; to: string; currency: string; companyName: string; rangeLabel: string; logoUrl?: string | null }) { function BudgetVsActuals({ companyId, from, to, currency, companyName, rangeLabel, logoUrl }: { companyId: string; from: string; to: string; currency: string; companyName: string; rangeLabel: string; logoUrl?: string | null }) {
const { data: budgets = [] } = useQuery({ const { data: budgets = [] } = useQuery({
queryKey: ["budgets-active", companyId], queryKey: ["budgets-active", companyId],
@@ -2198,12 +2222,12 @@ function BudgetVsActuals({ companyId, from, to, currency, companyName, rangeLabe
<TableHeader> <TableHeader>
<TableRow> <TableRow>
<TableHead>Account</TableHead> <TableHead>Account</TableHead>
<TableHead className="text-right">Budget</TableHead> <TableHead className={BVA_COL.budget}>Budget</TableHead>
<TableHead className="text-right">Actual</TableHead> <TableHead className={BVA_COL.actual}>Actual</TableHead>
<TableHead className="text-right">Variance</TableHead> <TableHead className={BVA_COL.variance}>Variance</TableHead>
<TableHead className="text-right">Variance %</TableHead> <TableHead className={BVA_COL.pct}>Variance %</TableHead>
{cmpOn && <TableHead className="text-right">Compare</TableHead>} {cmpOn && <TableHead className={BVA_COL.cmp}>Compare</TableHead>}
{cmpOn && <TableHead className="text-right">Δ vs Compare</TableHead>} {cmpOn && <TableHead className={BVA_COL.cmp}>Δ vs Compare</TableHead>}
</TableRow> </TableRow>
</TableHeader> </TableHeader>
<TableBody> <TableBody>
@@ -2220,12 +2244,12 @@ function BudgetVsActuals({ companyId, from, to, currency, companyName, rangeLabe
<Fragment key={t.value}> <Fragment key={t.value}>
<TableRow className="bg-muted/60 font-semibold"> <TableRow className="bg-muted/60 font-semibold">
<TableCell>{t.label}</TableCell> <TableCell>{t.label}</TableCell>
<TableCell className="text-right tabular-nums">{money(totalB, currency)}</TableCell> <TableCell className={BVA_COL.budget}>{money(totalB, currency)}</TableCell>
<TableCell className="text-right tabular-nums">{money(totalA, currency)}</TableCell> <TableCell className={BVA_COL.actual}>{money(totalA, currency)}</TableCell>
<TableCell className={`text-right tabular-nums ${totalFavorable ? "text-emerald-600" : "text-red-600"}`}>{money(totalVar, currency)}</TableCell> <TableCell className={`${BVA_COL.variance} ${totalFavorable ? "text-emerald-700" : "text-red-700"}`}>{money(totalVar, currency)}</TableCell>
<TableCell className={`text-right tabular-nums ${totalFavorable ? "text-emerald-600" : "text-red-600"}`}>{totalB ? `${totalPct.toFixed(1)}%` : "—"}</TableCell> <TableCell className={`${BVA_COL.pct} ${totalFavorable ? "text-emerald-700" : "text-red-700"}`}>{totalB ? `${totalPct.toFixed(1)}%` : "—"}</TableCell>
{cmpOn && <TableCell className="text-right tabular-nums">{money(totalC, currency)}</TableCell>} {cmpOn && <TableCell className={BVA_COL.cmp}>{money(totalC, currency)}</TableCell>}
{cmpOn && <TableCell className="text-right tabular-nums">{money(totalA - totalC, currency)}</TableCell>} {cmpOn && <TableCell className={BVA_COL.cmp}>{money(totalA - totalC, currency)}</TableCell>}
</TableRow> </TableRow>
{(groupedOrdered[t.value] ?? []).map((a: any) => { {(groupedOrdered[t.value] ?? []).map((a: any) => {
const b = budgetByAcct[a.id] ?? 0; const b = budgetByAcct[a.id] ?? 0;
@@ -2241,12 +2265,12 @@ function BudgetVsActuals({ companyId, from, to, currency, companyName, rangeLabe
<span className={depth === 0 ? "font-semibold" : "font-medium"}>{a.name}</span> <span className={depth === 0 ? "font-semibold" : "font-medium"}>{a.name}</span>
{a.code && <span className="text-xs text-muted-foreground font-mono ml-2">{a.code}</span>} {a.code && <span className="text-xs text-muted-foreground font-mono ml-2">{a.code}</span>}
</TableCell> </TableCell>
<TableCell className="text-right tabular-nums">{money(b, currency)}</TableCell> <TableCell className={BVA_COL.budget}>{money(b, currency)}</TableCell>
<TableCell className="text-right tabular-nums">{money(ac, currency)}</TableCell> <TableCell className={BVA_COL.actual}>{money(ac, currency)}</TableCell>
<TableCell className={`text-right tabular-nums ${fav ? "text-emerald-600" : "text-red-600"}`}>{money(v, currency)}</TableCell> <TableCell className={`${BVA_COL.variance} ${fav ? "text-emerald-700" : "text-red-700"}`}>{money(v, currency)}</TableCell>
<TableCell className={`text-right tabular-nums ${fav ? "text-emerald-600" : "text-red-600"}`}>{b ? `${pct.toFixed(1)}%` : "—"}</TableCell> <TableCell className={`${BVA_COL.pct} ${fav ? "text-emerald-700" : "text-red-700"}`}>{b ? `${pct.toFixed(1)}%` : "—"}</TableCell>
{cmpOn && <TableCell className="text-right tabular-nums">{money(c, currency)}</TableCell>} {cmpOn && <TableCell className={BVA_COL.cmp}>{money(c, currency)}</TableCell>}
{cmpOn && <TableCell className="text-right tabular-nums">{money(ac - c, currency)}</TableCell>} {cmpOn && <TableCell className={BVA_COL.cmp}>{money(ac - c, currency)}</TableCell>}
</TableRow> </TableRow>
); );
})} })}