From 0132ed7bea40f418d953406cd3c4096346325398 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Wed, 30 Apr 2014 17:20:02 -0700 Subject: [PATCH] balance: a fix for starting balance with --date2 --- hledger-lib/Hledger/Reports/MultiBalanceReports.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hledger-lib/Hledger/Reports/MultiBalanceReports.hs b/hledger-lib/Hledger/Reports/MultiBalanceReports.hs index fc294c62f..ca85b18f8 100644 --- a/hledger-lib/Hledger/Reports/MultiBalanceReports.hs +++ b/hledger-lib/Hledger/Reports/MultiBalanceReports.hs @@ -72,13 +72,14 @@ multiBalanceReport opts q j = MultiBalanceReport (displayspans, items, totals) depth = queryDepth depthq depthless = dbg "depthless" . filterQuery (not . queryIsDepth) datelessq = dbg "datelessq" $ filterQuery (not . queryIsDate) q - precedingq = dbg "precedingq" $ And [datelessq, Date $ DateSpan Nothing (spanStart reportspan)] + dateqcons = if date2_ opts then Date2 else Date + precedingq = dbg "precedingq" $ And [datelessq, dateqcons $ DateSpan Nothing (spanStart reportspan)] requestedspan = dbg "requestedspan" $ queryDateSpan (date2_ opts) q -- span specified by -b/-e/-p options and query args requestedspan' = dbg "requestedspan'" $ requestedspan `spanDefaultsFrom` journalDateSpan (date2_ opts) j -- if open-ended, close it using the journal's end dates intervalspans = dbg "intervalspans" $ splitSpan (intervalFromOpts opts) requestedspan' -- interval spans enclosing it reportspan = dbg "reportspan" $ DateSpan (maybe Nothing spanStart $ headMay intervalspans) -- the requested span enlarged to a whole number of intervals (maybe Nothing spanEnd $ lastMay intervalspans) - newdatesq = dbg "newdateq" $ (if date2_ opts then Date2 else Date) reportspan + newdatesq = dbg "newdateq" $ dateqcons reportspan reportq = dbg "reportq" $ depthless $ And [datelessq, newdatesq] -- user's query enlarged to whole intervals and with no depth limit ps :: [Posting] =