slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: bal: --declared now respects not:ACCT (fix #1783)

Browse Source
This commit is contained in:
Simon Michael 2021-12-09 12:58:22 -10:00
parent 25598a231f
commit d1a0d37bd1
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hledger-lib/Hledger/Reports/MultiBalanceReport.hs
View File

@ -285,7 +285,7 @@ acctChanges ReportSpec{_rsQuery=query,_rsReportOpts=ReportOpts{accountlistmode_,
declaredacctps = declaredacctps =
[nullposting{paccount=n} | n <- journalLeafAccountNamesDeclared j [nullposting{paccount=n} | n <- journalLeafAccountNamesDeclared j
, acctq `matchesAccount` n] , acctq `matchesAccount` n]
where acctq = dbg3 "acctq" $ filterQuery queryIsAcct query where acctq = dbg3 "acctq" $ filterQueryOrNotQuery queryIsAcct query
filterbydepth = case accountlistmode_ of filterbydepth = case accountlistmode_ of
ALTree -> filter ((depthq `matchesAccount`) . aname) -- a tree - just exclude deeper accounts ALTree -> filter ((depthq `matchesAccount`) . aname) -- a tree - just exclude deeper accounts

20
hledger/test/balance/balance.test
View File

@ -212,13 +212,13 @@ account b
>>>= 0 >>>= 0
# 12. not:ACCT queries work with declared accounts. # 12. not:ACCT queries work with declared accounts.
# hledger -f - balance -NE --declared not:a hledger -f - balance -NE --declared not:a
# <<< <<<
# account a account a
# account a:aa account a:aa
# account a:ab account a:ab
# account a:ac:aca account a:ac:aca
# account b account b
# >>> >>>
# 0 b 0 b
# >>>= 0 >>>= 0