redo bad fix to balancesheet, cashflow, incomestatement commands
I had this crazy idea shakepeare-text interpolation syntax had changed when these failed in hledger-web dev builds. It was CPP of course.
This commit is contained in:
parent
cfbd8bb956
commit
ef73894889
@ -1,4 +1,4 @@
|
||||
{-# LANGUAGE QuasiQuotes, RecordWildCards #-}
|
||||
{-# LANGUAGE QuasiQuotes, RecordWildCards, NoCPP #-}
|
||||
{-|
|
||||
|
||||
The @balancesheet@ command prints a simple balance sheet.
|
||||
@ -32,15 +32,15 @@ balancesheet CliOpts{reportopts_=ropts} j = do
|
||||
LT.putStr $ [lt|Balance Sheet
|
||||
|
||||
Assets:
|
||||
-{unlines $ accountsReportAsText ropts assetreport}
|
||||
#{unlines $ accountsReportAsText ropts assetreport}
|
||||
Liabilities:
|
||||
-{unlines $ accountsReportAsText ropts liabilityreport}
|
||||
#{unlines $ accountsReportAsText ropts liabilityreport}
|
||||
Equity:
|
||||
-{unlines $ accountsReportAsText ropts equityreport}
|
||||
#{unlines $ accountsReportAsText ropts equityreport}
|
||||
|
||||
Total:
|
||||
--------------------
|
||||
-{padleft 20 $ showMixedAmountWithoutPrice total}
|
||||
#{padleft 20 $ showMixedAmountWithoutPrice total}
|
||||
|]
|
||||
|
||||
withoutBeginDate :: ReportOpts -> ReportOpts
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{-# LANGUAGE QuasiQuotes, RecordWildCards #-}
|
||||
{-# LANGUAGE QuasiQuotes, RecordWildCards, NoCPP #-}
|
||||
{-|
|
||||
|
||||
The @cashflow@ command prints a simplified cashflow statement. It just
|
||||
@ -36,11 +36,11 @@ cashflow CliOpts{reportopts_=ropts} j = do
|
||||
LT.putStr $ [lt|Cashflow Statement
|
||||
|
||||
Cash flows:
|
||||
-{unlines $ accountsReportAsText ropts cashreport}
|
||||
#{unlines $ accountsReportAsText ropts cashreport}
|
||||
|
||||
Total:
|
||||
--------------------
|
||||
-{padleft 20 $ showMixedAmountWithoutPrice total}
|
||||
#{padleft 20 $ showMixedAmountWithoutPrice total}
|
||||
|]
|
||||
|
||||
withoutBeginDate :: ReportOpts -> ReportOpts
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{-# LANGUAGE QuasiQuotes, TemplateHaskell, OverloadedStrings #-}
|
||||
{-# LANGUAGE QuasiQuotes, TemplateHaskell, OverloadedStrings, NoCPP #-}
|
||||
{-|
|
||||
|
||||
The @incomestatement@ command prints a simple income statement (profit & loss) report.
|
||||
@ -29,13 +29,13 @@ incomestatement CliOpts{reportopts_=ropts} j = do
|
||||
LT.putStr $ [lt|Income Statement
|
||||
|
||||
Revenues:
|
||||
-{unlines $ accountsReportAsText ropts incomereport}
|
||||
#{unlines $ accountsReportAsText ropts incomereport}
|
||||
Expenses:
|
||||
-{unlines $ accountsReportAsText ropts expensereport}
|
||||
#{unlines $ accountsReportAsText ropts expensereport}
|
||||
|
||||
Total:
|
||||
--------------------
|
||||
-{padleft 20 $ showMixedAmountWithoutPrice total}
|
||||
#{padleft 20 $ showMixedAmountWithoutPrice total}
|
||||
|]
|
||||
|
||||
tests_Hledger_Cli_Incomestatement :: Test
|
||||
|
||||
Loading…
Reference in New Issue
Block a user