Enable mapping in register

sboehler · Aug 13, 2022 · 4910db8 · 4910db8
1 parent 39dbbf4
commit 4910db8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/cmd/register/register.go b/cmd/register/register.go
@@ -142,6 +142,7 @@ func (r runner) execute(cmd *cobra.Command, args []string) error {
 			},
 			ShowCommodities: r.showCommodities,
 			Valuation:       valuation,
+			Mapping:         r.mapping.Value(),
 		}
 		ctx = cmd.Context()
 	)

diff --git a/lib/journal/report/register/register.go b/lib/journal/report/register/register.go
@@ -21,6 +21,7 @@ type Register struct {
 
 	ShowCommodities bool
 	Valuation       *journal.Commodity
+	Mapping         journal.Mapping
 }
 
 // Add adds another day.
@@ -47,12 +48,14 @@ func (r *Register) Add(d *ast.Day) {
 			}
 
 			if inCr && r.Filter.MatchAccount(b.Debit) {
-				ca := amounts.Key{Account: b.Debit, Commodity: commodity}
+				acc := b.Debit.Map(r.Mapping)
+				ca := amounts.Key{Account: acc, Commodity: commodity}
 				vals[ca] = vals[ca].Sub(value)
 
 			}
 			if inDr && r.Filter.MatchAccount(b.Credit) {
-				ca := amounts.Key{Account: b.Credit, Commodity: commodity}
+				acc := b.Credit.Map(r.Mapping)
+				ca := amounts.Key{Account: acc, Commodity: commodity}
 				vals[ca] = vals[ca].Add(value)
 			}
 		}