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

Fixing bs/is/cf --flat regressions (#566)

Browse Source 
* fixing bs/is/cf --flat regressions

* fixed Tree forcing for non-period reports
This commit is contained in:
Justin Le 2017-06-07 07:03:13 -07:00 committed by Simon Michael
parent 30a018337c
commit 6857cd64a8
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hledger/Hledger/Cli/BalanceView.hs
View File

@ -168,6 +168,19 @@ balanceviewReport BalanceView{..} CliOpts{command_=cmd, reportopts_=ropts, rawop
PeriodChange -> "(Balance Changes)"
CumulativeChange -> "(Cumulative Ending Balances)"
HistoricalBalance -> "(Historical Ending Balances)"
ropts' = ropts { balancetype_ = balancetype }
ropts' = treeIfNotPeriod $ ropts { balancetype_ = balancetype }
-- For --historical/--cumulative, we must use multiBalanceReport.
-- (This forces --no-elide.)
-- These settings format the output in a way that we can convert to
-- a normal balance report using singleBalanceReport. See
-- Balance.hs for more information.
treeIfNotPeriod
| flat_ ropts = id
| otherwise = case (balancetype, interval_ ropts) of
(HistoricalBalance, NoInterval) -> \o ->
o { accountlistmode_ = ALTree }
(CumulativeChange , NoInterval) -> \o ->
o { accountlistmode_ = ALTree }
_ -> id
merging (Table hLeft hTop dat) (Table hLeft' _ dat') =
Table (T.Group DoubleLine [hLeft, hLeft']) hTop (dat ++ dat')