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

redo bad fix to balancesheet, cashflow, incomestatement commands

Browse Source 
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:
Simon Michael 2012-11-17 03:22:58 +00:00
parent cfbd8bb956
commit ef73894889
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hledger/Hledger/Cli/Balancesheet.hs
View File

@ -1,4 +1,4 @@
{-# LANGUAGE QuasiQuotes, RecordWildCards #-} {-# LANGUAGE QuasiQuotes, RecordWildCards, NoCPP #-}
{-| {-|
The @balancesheet@ command prints a simple balance sheet. The @balancesheet@ command prints a simple balance sheet.
@ -32,15 +32,15 @@ balancesheet CliOpts{reportopts_=ropts} j = do
LT.putStr $ [lt|Balance Sheet LT.putStr $ [lt|Balance Sheet
Assets: Assets:
-{unlines $ accountsReportAsText ropts assetreport} #{unlines $ accountsReportAsText ropts assetreport}
Liabilities: Liabilities:
-{unlines $ accountsReportAsText ropts liabilityreport} #{unlines $ accountsReportAsText ropts liabilityreport}
Equity: Equity:
-{unlines $ accountsReportAsText ropts equityreport} #{unlines $ accountsReportAsText ropts equityreport}
Total: Total:
-------------------- --------------------
-{padleft 20 $ showMixedAmountWithoutPrice total} #{padleft 20 $ showMixedAmountWithoutPrice total}
|] |]
withoutBeginDate :: ReportOpts -> ReportOpts withoutBeginDate :: ReportOpts -> ReportOpts

6
hledger/Hledger/Cli/Cashflow.hs
View File

@ -1,4 +1,4 @@
{-# LANGUAGE QuasiQuotes, RecordWildCards #-} {-# LANGUAGE QuasiQuotes, RecordWildCards, NoCPP #-}
{-| {-|
The @cashflow@ command prints a simplified cashflow statement. It just 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 LT.putStr $ [lt|Cashflow Statement
Cash flows: Cash flows:
-{unlines $ accountsReportAsText ropts cashreport} #{unlines $ accountsReportAsText ropts cashreport}
Total: Total:
-------------------- --------------------
-{padleft 20 $ showMixedAmountWithoutPrice total} #{padleft 20 $ showMixedAmountWithoutPrice total}
|] |]
withoutBeginDate :: ReportOpts -> ReportOpts withoutBeginDate :: ReportOpts -> ReportOpts

8
hledger/Hledger/Cli/Incomestatement.hs
View File

@ -1,4 +1,4 @@
{-# LANGUAGE QuasiQuotes, TemplateHaskell, OverloadedStrings #-} {-# LANGUAGE QuasiQuotes, TemplateHaskell, OverloadedStrings, NoCPP #-}
{-| {-|
The @incomestatement@ command prints a simple income statement (profit & loss) report. 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 LT.putStr $ [lt|Income Statement
Revenues: Revenues:
-{unlines $ accountsReportAsText ropts incomereport} #{unlines $ accountsReportAsText ropts incomereport}
Expenses: Expenses:
-{unlines $ accountsReportAsText ropts expensereport} #{unlines $ accountsReportAsText ropts expensereport}
Total: Total:
-------------------- --------------------
-{padleft 20 $ showMixedAmountWithoutPrice total} #{padleft 20 $ showMixedAmountWithoutPrice total}
|] |]
tests_Hledger_Cli_Incomestatement :: Test tests_Hledger_Cli_Incomestatement :: Test