separate account types in balancesheet, show totals with consistent layout

hledger/Hledger/Cli/Balancesheet.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE QuasiQuotes #-}
 {-|
 
 The @balancesheet@ command prints a fairly standard balance sheet.
@@ -10,7 +11,9 @@ module Hledger.Cli.Balancesheet (
 ) where
 
 import Data.List
+import qualified Data.Text.Lazy.IO as LT
 import Test.HUnit
+import Text.Shakespeare.Text
 
 import Hledger
 import Prelude hiding (putStr)
@@ -22,10 +25,26 @@ import Hledger.Cli.Balance
 -- | Print a standard balancesheet.
 balancesheet :: CliOpts -> Journal -> IO ()
 balancesheet CliOpts{reportopts_=ropts} j = do
-  let lines = case formatFromOpts ropts of
+  -- let lines = case formatFromOpts ropts of Left err, Right ...
-            Left err -> [err]
+  d <- getCurrentDay
-            Right _ -> accountsReportAsText ropts $ accountsReport2 ropts (journalBalanceSheetAccountQuery j) j
+  let m = queryFromOpts ropts d
-  putStr $ unlines lines
+      assetreport@(_,assets)          = accountsReport2 ropts (And [m, journalAssetAccountQuery j]) j
+      liabilityreport@(_,liabilities) = accountsReport2 ropts (And [m, journalLiabilityAccountQuery j]) j
+      equityreport@(_,equity)         = accountsReport2 ropts (And [m, journalEquityAccountQuery j]) j
+      total = assets + liabilities + equity
+  LT.putStr $ [lt|Balance Sheet
+
+Assets:
+#{unlines $ accountsReportAsText ropts assetreport}
+Liabilities:
+#{unlines $ accountsReportAsText ropts liabilityreport}
+Equity:
+#{unlines $ accountsReportAsText ropts equityreport}
+
+Total:
+--------------------
+#{padleft 20 $ showMixedAmountWithoutPrice total}
+|]
 
 tests_Hledger_Cli_Balancesheet = TestList
  [

hledger/Hledger/Cli/Incomestatement.hs

@@ -33,7 +33,9 @@ Revenues:
 Expenses:
 #{unlines $ accountsReportAsText ropts expensereport}
 
-Total: #{show total}
+Total:
+--------------------
+#{padleft 20 $ showMixedAmountWithoutPrice total}
 |]
 
 tests_Hledger_Cli_Incomestatement :: Test