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

;journal: a test for inclusive balance assignment, disabled (#1207)

Browse Source 
[ci skip]
This commit is contained in:
Simon Michael 2020-03-05 11:12:25 -08:00
parent 5ed6fe586a
commit f18c74fff7
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hledger-lib/Hledger/Data/Journal.hs
View File

@ -753,6 +753,7 @@ addOrAssignAmountAndCheckAssertionB p@Posting{paccount=acc, pamount=amt, pbalanc
return p return p
-- no explicit posting amount, but there is a balance assignment -- no explicit posting amount, but there is a balance assignment
-- TODO this doesn't yet handle inclusive assignments right, #1207
| Just BalanceAssertion{baamount,batotal} <- mba = do | Just BalanceAssertion{baamount,batotal} <- mba = do
(diff,newbal) <- case batotal of (diff,newbal) <- case batotal of
-- a total balance assignment (==, all commodities) -- a total balance assignment (==, all commodities)
@ -814,7 +815,6 @@ checkBalanceAssertionOneCommodityB p@Posting{paccount=assertedacct} assertedamt
if isinclusive if isinclusive
then then
-- sum the running balances of this account and any of its subaccounts seen so far -- sum the running balances of this account and any of its subaccounts seen so far
-- XXX something wrong here, #1207
withRunningBalance $ \BalancingState{bsBalances} -> withRunningBalance $ \BalancingState{bsBalances} ->
H.foldM H.foldM
(\ibal (acc, amt) -> return $ ibal + (\ibal (acc, amt) -> return $ ibal +

21
tests/journal/balance-assertions.test
View File

@ -139,7 +139,7 @@ hledger -f - stats
# >>>2 # >>>2
# >>>=0 # >>>=0
# 8. resetting a balance # 8. Using balance assignment to set balances.
hledger -f - stats hledger -f - stats
<<< <<<
2013/1/1 2013/1/1
@ -431,3 +431,22 @@ hledger -f- print
>>>2 >>>2
>>>=0 >>>=0
## 25. Inclusive balance assignments also work (#1207).
#hledger -f- print -x
#<<<
#2020-01-25
# (a:aa) 1
#
#2020-01-31
# (a) ==* 1
#
#>>>
#2020-01-25
# (a:aa) 1
#
#2020-01-31
# (a) 0 ==* 1
#
#>>>2
#>>>=0