From edbb713cf814b6506b4d51fe9975f188717c2c3e Mon Sep 17 00:00:00 2001
From: Stephen Morgan <morgan.stephen99@gmail.com>
Date: Sat, 3 Apr 2021 16:35:58 +1100
Subject: [PATCH] lib,cli: Fix ledgerDateSpan, so that in takes transaction
 dates into account.

---
 hledger-lib/Hledger/Data/Ledger.hs    | 4 +---
 hledger/Hledger/Cli/Commands/Stats.hs | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/hledger-lib/Hledger/Data/Ledger.hs b/hledger-lib/Hledger/Data/Ledger.hs
index 4a5969848..fc6cc251f 100644
--- a/hledger-lib/Hledger/Data/Ledger.hs
+++ b/hledger-lib/Hledger/Data/Ledger.hs
@@ -31,9 +31,7 @@ import Text.Printf
 import Hledger.Utils.Test
 import Hledger.Data.Types
 import Hledger.Data.Account
-import Hledger.Data.Dates (daysSpan)
 import Hledger.Data.Journal
-import Hledger.Data.Posting (postingDate)
 import Hledger.Query
 
 
@@ -94,7 +92,7 @@ ledgerPostings = journalPostings . ljournal
 -- | The (fully specified) date span containing all the ledger's (filtered) transactions,
 -- or DateSpan Nothing Nothing if there are none.
 ledgerDateSpan :: Ledger -> DateSpan
-ledgerDateSpan = daysSpan . map postingDate . ledgerPostings
+ledgerDateSpan = journalDateSpanBothDates . ljournal
 
 -- | All commodities used in this ledger.
 ledgerCommodities :: Ledger -> [CommoditySymbol]
diff --git a/hledger/Hledger/Cli/Commands/Stats.hs b/hledger/Hledger/Cli/Commands/Stats.hs
index 200da0d24..3ebe5f45a 100644
--- a/hledger/Hledger/Cli/Commands/Stats.hs
+++ b/hledger/Hledger/Cli/Commands/Stats.hs
@@ -46,7 +46,7 @@ stats opts@CliOpts{reportspec_=rspec} j = do
   d <- getCurrentDay
   let q = rsQuery rspec
       l = ledgerFromJournal q j
-      reportspan = (ledgerDateSpan l) `spanDefaultsFrom` (queryDateSpan False q)
+      reportspan = ledgerDateSpan l `spanDefaultsFrom` queryDateSpan False q
       intervalspans = splitSpan (interval_ $ rsOpts rspec) reportspan
       showstats = showLedgerStats l d
       s = intercalate "\n" $ map showstats intervalspans