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

fix: cur: in posting-based reports filters multicommodity amounts again [#2396]

Browse Source
This commit is contained in:
Simon Michael 2025-06-03 17:03:31 -10:00
parent 6daba4edb8
commit b67379c3d8
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -600,7 +600,7 @@ is simpler, and we think it's otherwise equivalent.
-} -}
-- | Like 'journalValueAndFilterPostings', but takes a 'PriceOracle' as an argument. -- | Like 'journalValueAndFilterPostings', but takes a 'PriceOracle' as an argument.
journalValueAndFilterPostingsWith :: ReportSpec -> Journal -> PriceOracle -> Journal journalValueAndFilterPostingsWith :: ReportSpec -> Journal -> PriceOracle -> Journal
journalValueAndFilterPostingsWith = _journalValueAndFilterPostingsWith143 journalValueAndFilterPostingsWith = _journalValueAndFilterPostingsWith1431
-- 1.42 -- 1.42
-- #2371 This goes wrong with complex boolean queries, splitting them apart in a lossy way. -- #2371 This goes wrong with complex boolean queries, splitting them apart in a lossy way.
@ -620,11 +620,20 @@ journalValueAndFilterPostingsWith = _journalValueAndFilterPostingsWith143
-- 1.43 -- 1.43
-- XXX #2396 This goes wrong with cur:. filterJournal*Postings keep all postings containing the matched commodity, -- XXX #2396 This goes wrong with cur:. filterJournal*Postings keep all postings containing the matched commodity,
-- but do not remove the unmatched commodities from multicommodity postings, as filterJournalAmounts would. -- but do not remove the unmatched commodities from multicommodity postings, as filterJournalAmounts would.
_journalValueAndFilterPostingsWith143 rspec@ReportSpec{_rsQuery = q, _rsReportOpts = ropts} = -- _journalValueAndFilterPostingsWith143 rspec@ReportSpec{_rsQuery = q, _rsReportOpts = ropts} =
journalApplyValuationFromOptsWith rspec . -- journalApplyValuationFromOptsWith rspec .
dbg1With (\j1 -> "j1" <> pshow (jtxns j1)) . -- dbg1With (\j1 -> "j1" <> pshow (jtxns j1)) .
(if related_ ropts then filterJournalRelatedPostings else filterJournalPostings) q -- (if related_ ropts then filterJournalRelatedPostings else filterJournalPostings) q
-- 1.43.1
_journalValueAndFilterPostingsWith1431 rspec@ReportSpec{_rsQuery = q, _rsReportOpts = ropts} =
journalApplyValuationFromOptsWith rspec . filterjournal q
where
filterjournal q2 =
filterJournalAmounts (filterQuery queryIsAmtOrSym q2) . -- an extra amount filtering pass for #2396
(if related_ ropts then filterJournalRelatedPostings q2 else filterJournalPostings q2)
-- | Convert this journal's postings' amounts to cost and/or to value, if specified
-- by options (-B/--cost/-V/-X/--value etc.). Strip prices if not needed. This -- by options (-B/--cost/-V/-X/--value etc.). Strip prices if not needed. This
-- should be the main stop for performing costing and valuation. The exception is -- should be the main stop for performing costing and valuation. The exception is
-- whenever you need to perform valuation _after_ summing up amounts, as in a -- whenever you need to perform valuation _after_ summing up amounts, as in a