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

;lib: accountTransactionsReport: clarify

Browse Source
This commit is contained in:
Simon Michael 2021-07-30 09:09:31 -10:00
parent 9df574b3c0
commit 2f819725e5
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hledger-lib/Hledger/Reports/AccountTransactionsReport.hs
View File

@ -48,10 +48,9 @@ import Hledger.Utils
-- - the transaction as seen in the context of the current account and query, -- - the transaction as seen in the context of the current account and query,
-- which means: -- which means:
-- --
-- - the transaction date is set to the "transaction context date", -- - the transaction date is set to the "transaction context date":
-- which can be different from the transaction's general date: -- the earliest of the transaction date and any other posting dates
-- if postings to the current account (and matched by the report query) -- of postings to the current account (matched by the report query).
-- have their own dates, it's the earliest of these dates.
-- --
-- - the transaction's postings are filtered, excluding any which are not -- - the transaction's postings are filtered, excluding any which are not
-- matched by the report query -- matched by the report query
@ -128,6 +127,12 @@ accountTransactionsReport rspec@ReportSpec{_rsReportOpts=ropts} j thisacctq = it
. ptraceAtWith 5 (("ts1:\n"++).pshowTransactions.jtxns) . ptraceAtWith 5 (("ts1:\n"++).pshowTransactions.jtxns)
-- apply any cur:SYM filters in reportq -- apply any cur:SYM filters in reportq
$ if queryIsNull symq then j else filterJournalAmounts symq j $ if queryIsNull symq then j else filterJournalAmounts symq j
where
-- accountTransactionsReportItem will keep transactions of any date which have any posting inside the report period.
-- Should we also require that transaction date is inside the report period ?
-- Should we be filtering by reportq here to apply other query terms (?)
-- Make it an option for now.
filtertxns = txn_dates_ ropts
startbal startbal
| balanceaccum_ ropts == Historical = sumPostings priorps | balanceaccum_ ropts == Historical = sumPostings priorps
@ -145,12 +150,6 @@ accountTransactionsReport rspec@ReportSpec{_rsReportOpts=ropts} j thisacctq = it
mstartdate = queryStartDate (date2_ ropts) reportq mstartdate = queryStartDate (date2_ ropts) reportq
datelessreportq = filterQuery (not . queryIsDateOrDate2) reportq datelessreportq = filterQuery (not . queryIsDateOrDate2) reportq
-- accountTransactionsReportItem will keep transactions of any date which have any posting inside the report period.
-- Should we also require that transaction date is inside the report period ?
-- Should we be filtering by reportq here to apply other query terms (?)
-- Make it an option for now.
filtertxns = txn_dates_ ropts
items = reverse $ accountTransactionsReportItems reportq thisacctq startbal maNegate transactions items = reverse $ accountTransactionsReportItems reportq thisacctq startbal maNegate transactions
pshowTransactions :: [Transaction] -> String pshowTransactions :: [Transaction] -> String