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

balancesheet: ignore start dates, always show the accurate balance from all transactions up to the specified end date

Browse Source
This commit is contained in:
Simon Michael 2012-04-17 02:28:30 +00:00
parent 65a20c6870
commit 88afea8c44
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{-# LANGUAGE QuasiQuotes #-} {-# LANGUAGE QuasiQuotes, RecordWildCards #-}
{-| {-|
The @balancesheet@ command prints a fairly standard balance sheet. The @balancesheet@ command prints a fairly standard balance sheet.
@ -27,7 +27,7 @@ balancesheet :: CliOpts -> Journal -> IO ()
balancesheet CliOpts{reportopts_=ropts} j = do balancesheet CliOpts{reportopts_=ropts} j = do
-- let lines = case formatFromOpts ropts of Left err, Right ... -- let lines = case formatFromOpts ropts of Left err, Right ...
d <- getCurrentDay d <- getCurrentDay
let m = queryFromOpts ropts d let m = queryFromOpts (withoutBeginDate ropts) d
assetreport@(_,assets) = accountsReport2 ropts (And [m, journalAssetAccountQuery j]) j assetreport@(_,assets) = accountsReport2 ropts (And [m, journalAssetAccountQuery j]) j
liabilityreport@(_,liabilities) = accountsReport2 ropts (And [m, journalLiabilityAccountQuery j]) j liabilityreport@(_,liabilities) = accountsReport2 ropts (And [m, journalLiabilityAccountQuery j]) j
equityreport@(_,equity) = accountsReport2 ropts (And [m, journalEquityAccountQuery j]) j equityreport@(_,equity) = accountsReport2 ropts (And [m, journalEquityAccountQuery j]) j
@ -46,6 +46,11 @@ Total:
#{padleft 20 $ showMixedAmountWithoutPrice total} #{padleft 20 $ showMixedAmountWithoutPrice total}
|] |]
withoutBeginDate :: ReportOpts -> ReportOpts
withoutBeginDate ropts@ReportOpts{..} = ropts{begin_=Nothing, period_=p}
where p = case period_ of Nothing -> Nothing
Just (i, DateSpan _ e) -> Just (i, DateSpan Nothing e)
tests_Hledger_Cli_Balancesheet = TestList tests_Hledger_Cli_Balancesheet = TestList
[ [
] ]