From 768ce8e92e8cf1aa484927538112325cc0d9e1b0 Mon Sep 17 00:00:00 2001
From: Bel LaPointe <153096461+breel-render@users.noreply.github.com>
Date: Thu, 3 Apr 2025 12:25:39 -0600
Subject: [PATCH] cumulative bal in reg includes bpis

---
 cmd/cli/main.go        | 4 ++--
 src/ledger/balances.go | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmd/cli/main.go b/cmd/cli/main.go
index 2239ca2..3a5cc17 100644
--- a/cmd/cli/main.go
+++ b/cmd/cli/main.go
@@ -97,7 +97,7 @@ func Main() {
 		transactions := deltas.Transactions()
 
 		for i, transaction := range transactions {
-			balances := ledger.Deltas(transaction).Like(q).Group(group).Balances().WithBPIs(bpis).Nonzero()
+			balances := ledger.Deltas(transaction).Like(q).Group(group).Balances().WithBPIsAt(bpis, transaction[0].Date).Nonzero()
 			shouldPrint := false
 			shouldPrint = shouldPrint || len(balances) > 2
 			if config.Query.NoExchanging {
@@ -110,7 +110,7 @@ func Main() {
 			}
 			if shouldPrint {
 				fmt.Printf("%s\t%s\n", transaction[0].Date, transaction[0].Description)
-				FPrintBalances(os.Stdout, "\t\t", balances, transactions[:i+1].Deltas().Like(q).Group(group).Balances())
+				FPrintBalances(os.Stdout, "\t\t", balances, transactions[:i+1].Deltas().Like(q).Group(group).Balances().WithBPIsAt(bpis, transaction[0].Date).Nonzero())
 			}
 		}
 	default:
diff --git a/src/ledger/balances.go b/src/ledger/balances.go
index a6695b9..8ad1eb0 100644
--- a/src/ledger/balances.go
+++ b/src/ledger/balances.go
@@ -157,7 +157,7 @@ func (balances Balances) WithBPIsAt(bpis BPIs, date string) Balances {
 			if k2 == USD {
 				result[k][USD] = result[k][USD] + v2
 			} else if scalar := bpis[k2].Lookup(date); scalar != nil {
-				result[k][USD] = result[k][USD] + *scalar*v2
+				result[k][USD] = result[k][USD] + v2*(*scalar)
 			} else {
 				result[k][k2] = result[k][k2] + v2
 			}