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

imp: print, close: disambiguate balance assertion/assignment amount also (#2176)

Browse Source 
Add a trailing decimal mark when necessary to disambiguate a single
digit group mark in the balance assertion/assignment amount, also.
This commit is contained in:
Simon Michael 2024-02-25 16:47:58 -10:00
parent 4c3deeb2ae
commit d3ad743b36
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,7 +188,7 @@ balassertTotInc amt = Just $ nullassertion{baamount=amt, batotal=True, bainclusi
-- | Render a balance assertion, as the =[=][*] symbol and expected amount. -- | Render a balance assertion, as the =[=][*] symbol and expected amount.
showBalanceAssertion :: BalanceAssertion -> WideBuilder showBalanceAssertion :: BalanceAssertion -> WideBuilder
showBalanceAssertion ba = showBalanceAssertion ba =
singleton '=' <> eq <> ast <> singleton ' ' <> showAmountB def{displayZeroCommodity=True} (baamount ba) singleton '=' <> eq <> ast <> singleton ' ' <> showAmountB def{displayZeroCommodity=True, displayForceDecimalMark=True} (baamount ba)
where where
eq = if batotal ba then singleton '=' else mempty eq = if batotal ba then singleton '=' else mempty
ast = if bainclusive ba then singleton '*' else mempty ast = if bainclusive ba then singleton '*' else mempty

23
hledger/test/close.test
View File

@ -234,7 +234,28 @@ $ hledger -f- close
> /999999-12-31 closing balances/ > /999999-12-31 closing balances/
>= >=
# ** 15. "override the closing date ... by specifying a report period, where last day of the report period will be the closing date" # ** 16. "override the closing date ... by specifying a report period, where last day of the report period will be the closing date"
$ hledger -f- close -e 100000-01-01 $ hledger -f- close -e 100000-01-01
> /99999-12-31 closing balances/ > /99999-12-31 closing balances/
>= >=
# ** 17. Not specific to close, but easy to reproduce with it: trailing decimal marks should be added
# in balance assertion/assignment amounts also, like posting amounts. (#2076)
<
2000-01-01
(assets:a) $1,000.00
(assets:b) $1000
$ hledger -f- close --migrate -e 2001
2000-12-31 closing balances ; start:
assets:a $-1,000.00 = $0.00
assets:b $-1,000. = $0
equity:opening/closing balances
2001-01-01 opening balances ; start:
assets:a $1,000.00 = $1,000.00
assets:b $1,000. = $1,000.
equity:opening/closing balances
>=