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

lib: Align postings to unnormalised amount widths.

Browse Source
This commit is contained in:
Stephen Morgan 2020-11-02 15:12:09 +11:00
parent 0bebda7313
commit dcb884c5ff
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,7 +260,7 @@ postingAsLines elideamount onelineamounts pstoalignwith p = concat [
| null (amounts $ pamount p) = [""] | null (amounts $ pamount p) = [""]
| otherwise = lines . fst . showMixedUnnormalised showAmount (Just amtwidth) Nothing False $ pamount p | otherwise = lines . fst . showMixedUnnormalised showAmount (Just amtwidth) Nothing False $ pamount p
where where
amtwidth = maximum $ map (snd . showMixed showAmount (Just 12) Nothing False . pamount) pstoalignwith -- min. 12 for backwards compatibility amtwidth = maximum $ 12 : map (snd . showMixedUnnormalised showAmount Nothing Nothing False . pamount) pstoalignwith -- min. 12 for backwards compatibility
(samelinecomment, newlinecomments) = (samelinecomment, newlinecomments) =
case renderCommentLines (pcomment p) of [] -> ("",[]) case renderCommentLines (pcomment p) of [] -> ("",[])

16
tests/close.test
View File

@ -202,11 +202,11 @@ $ hledger -f- close assets -p 2019 --show-costs -x
$ hledger -f- close -p 2016 assets liabilities --show-costs -x $ hledger -f- close -p 2016 assets liabilities --show-costs -x
2016-12-31 closing balances 2016-12-31 closing balances
assets:bank -5,733.00 EUR = 0.00 EUR assets:bank -5,733.00 EUR = 0.00 EUR
liabilities:employer $-10,000.00 liabilities:employer $-10,000.00
liabilities:employer $5,000.00 @ 0.93 EUR liabilities:employer $5,000.00 @ 0.93 EUR
liabilities:employer $5,000.00 @ 0.95 EUR = $0.00 liabilities:employer $5,000.00 @ 0.95 EUR = $0.00
liabilities:employer -1.00 EUR = 0.00 EUR liabilities:employer -1.00 EUR = 0.00 EUR
equity:opening/closing balances $10,000.00 equity:opening/closing balances $10,000.00
equity:opening/closing balances $-5,000.00 @ 0.93 EUR equity:opening/closing balances $-5,000.00 @ 0.93 EUR
equity:opening/closing balances $-5,000.00 @ 0.95 EUR equity:opening/closing balances $-5,000.00 @ 0.95 EUR
@ -271,9 +271,9 @@ commodity AAA 0.00000000
$ hledger -f- close -p 2019 assets --show-costs -x $ hledger -f- close -p 2019 assets --show-costs -x
2019-12-31 closing balances 2019-12-31 closing balances
assets:aaa AAA -510.00000000 = AAA 0.00000000 assets:aaa AAA -510.00000000 = AAA 0.00000000
assets:usd $-49.50 assets:usd $-49.50
assets:usd $49.390001 @ AAA 10.3528242505 = $0.00 assets:usd $49.390001 @ AAA 10.3528242505 = $0.00
equity:opening/closing balances $49.50 equity:opening/closing balances $49.50
equity:opening/closing balances $-49.390001 @ AAA 10.3528242505 equity:opening/closing balances $-49.390001 @ AAA 10.3528242505
equity:opening/closing balances AAA 510.00000000 equity:opening/closing balances AAA 510.00000000