web: make a filtered account register's Total column positive, like a journal register

This commit is contained in:
Simon Michael 2011-06-13 21:39:00 +00:00
parent 1a88879734
commit b137a346c0

View File

@ -114,7 +114,7 @@ registerReport opts fspec j = (totallabel,postingsToRegisterReportItems ps nullp
-- Does not handle reporting intervals. -- Does not handle reporting intervals.
-- --
accountRegisterReport :: [Opt] -> Journal -> Matcher -> AccountName -> RegisterReport accountRegisterReport :: [Opt] -> Journal -> Matcher -> AccountName -> RegisterReport
accountRegisterReport opts j m a = (label, postingsToRegisterReportItems displayps nullposting startbal (-)) accountRegisterReport opts j m a = (label, postingsToRegisterReportItems displayps nullposting startbal sumfn)
where where
-- displayps' | interval == NoInterval = displayps -- displayps' | interval == NoInterval = displayps
-- | otherwise = summarisePostingsByInterval interval depth empty filterspan displayps -- | otherwise = summarisePostingsByInterval interval depth empty filterspan displayps
@ -129,9 +129,9 @@ accountRegisterReport opts j m a = (label, postingsToRegisterReportItems display
-- starting balance: if we are filtering by a start date and nothing else -- starting balance: if we are filtering by a start date and nothing else
-- else, the sum of postings to this account before it; otherwise zero. -- else, the sum of postings to this account before it; otherwise zero.
(startbal,label) | matcherIsNull m = (nullmixedamt,balancelabel) (startbal,label, sumfn) | matcherIsNull m = (nullmixedamt,balancelabel,(-))
| matcherIsStartDateOnly effective m = (sumPostings priorps,balancelabel) | matcherIsStartDateOnly effective m = (sumPostings priorps,balancelabel,(-))
| otherwise = (nullmixedamt,totallabel) | otherwise = (nullmixedamt,totallabel,(+))
where where
priorps = -- ltrace "priorps" $ priorps = -- ltrace "priorps" $
filter (matchesPosting filter (matchesPosting