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

bs/cf/is: fix subtitle appearing above total (and put on one line) (#527)

Browse Source
This commit is contained in:
Simon Michael 2017-03-30 17:18:30 -07:00
parent afd58b8451
commit b82e800ae6
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,13 +117,13 @@ balanceviewReport :: BalanceView -> CliOpts -> Journal -> IO ()
balanceviewReport BalanceView{..} CliOpts{reportopts_=ropts, rawopts_=raw} j = do
currDay <- getCurrentDay
let q0 = queryFromOpts currDay ropts'
let title = bvtitle ++ maybe "" (' ':) balanceclarification
case interval_ ropts' of
NoInterval -> do
let (views, amt) =
foldMap (uncurry (balanceviewQueryReport ropts' q0 j))
bvqueries
mapM_ putStrLn (bvtitle : "" : views)
mapM_ putStrLn balanceclarification
mapM_ putStrLn (title : "" : views)
unless (no_total_ ropts') . mapM_ putStrLn $
[ "Total:"
@ -151,8 +151,7 @@ balanceviewReport BalanceView{..} CliOpts{reportopts_=ropts, rawopts_=raw} j = d
(sumAmts ++ (if row_total_ ropts' then [totsum] else [])
++ (if average_ ropts' then [totavg] else [])
)
putStrLn bvtitle
mapM_ putStrLn balanceclarification
putStrLn title
putStrLn $ renderBalanceReportTable ropts totTabl
where
overwriteBalanceType =

3
tests/cashflow/cashflow.test
View File

@ -182,8 +182,7 @@ Cashflow Statement
# 6. Multicolumn test (historical)
hledger -f sample.journal cashflow -p 'monthly in 2008' -A --historical
>>>
Cashflow Statement
(Historical Ending Balances)
Cashflow Statement (Historical Ending Balances)
|| 2008/01/31 2008/02/29 2008/03/31 2008/04/30 2008/05/31 2008/06/30 2008/07/31 2008/08/31 2008/09/30 2008/10/31 2008/11/30 2008/12/31 Average
======================++==========================================================================================================================================================

3
tests/incomestatement/incomestatement.test
View File

@ -214,8 +214,7 @@ Income Statement
# 6. Multicolumn test (historical)
hledger -f sample.journal incomestatement -p 'monthly in 2008' --historical
>>>
Income Statement
(Historical Ending Balances)
Income Statement (Historical Ending Balances)
|| 2008/01/31 2008/02/29 2008/03/31 2008/04/30 2008/05/31 2008/06/30 2008/07/31 2008/08/31 2008/09/30 2008/10/31 2008/11/30 2008/12/31
===================++=================================================================================================================================================