From 788021f5a4ca69017cd1cfdd2513d14128dcc37a Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Wed, 1 Jun 2016 10:48:57 -0700
Subject: [PATCH] ui: make --real/-R affect register/txn screens (#354)

---
 hledger-lib/Hledger/Query.hs                       |  5 +++++
 hledger-lib/Hledger/Reports/TransactionsReports.hs | 12 +++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/hledger-lib/Hledger/Query.hs b/hledger-lib/Hledger/Query.hs
index 29a804254..f90a10ac4 100644
--- a/hledger-lib/Hledger/Query.hs
+++ b/hledger-lib/Hledger/Query.hs
@@ -24,6 +24,7 @@ module Hledger.Query (
   queryIsDateOrDate2,
   queryIsStartDateOnly,
   queryIsSym,
+  queryIsReal,
   queryStartDate,
   queryEndDate,
   queryDateSpan,
@@ -455,6 +456,10 @@ queryIsSym :: Query -> Bool
 queryIsSym (Sym _) = True
 queryIsSym _ = False
 
+queryIsReal :: Query -> Bool
+queryIsReal (Real _) = True
+queryIsReal _ = False
+
 -- | Does this query specify a start date and nothing else (that would
 -- filter postings prior to the date) ?
 -- When the flag is true, look for a starting secondary date instead.
diff --git a/hledger-lib/Hledger/Reports/TransactionsReports.hs b/hledger-lib/Hledger/Reports/TransactionsReports.hs
index d4336d7d6..f4bdcd21f 100644
--- a/hledger-lib/Hledger/Reports/TransactionsReports.hs
+++ b/hledger-lib/Hledger/Reports/TransactionsReports.hs
@@ -37,6 +37,7 @@ import qualified Data.Text as T
 import Hledger.Data
 import Hledger.Query
 import Hledger.Reports.ReportOptions
+-- import Hledger.Utils.Debug
 
 
 -- | A transactions report includes a list of transactions
@@ -114,10 +115,15 @@ type AccountTransactionsReportItem =
 accountTransactionsReport :: ReportOpts -> Journal -> Query -> Query -> AccountTransactionsReport
 accountTransactionsReport opts j q thisacctquery = (label, items)
  where
-     -- transactions with excluded currencies removed
+     -- transactions with excluded currencies and excluded virtual postings removed
      ts1 = jtxns $
-           filterJournalAmounts (filterQuery queryIsSym q) $
-           journalSelectingAmountFromOpts opts j
+           (if queryIsNull realq then id else filterJournalPostings realq) $ -- apply Real filter if it's in q
+           (if queryIsNull symq  then id else filterJournalAmounts symq) $   -- apply any cur:SYM filters in q
+           journalSelectingAmountFromOpts opts j  -- convert amounts to cost basis if -B
+        where
+          realq = filterQuery queryIsReal q
+          symq  = filterQuery queryIsSym q
+
      -- affecting this account
      ts2 = filter (matchesTransaction thisacctquery) ts1
      -- with dates adjusted for account transactions report