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

reg: test and fix for --average, broken since 1.12 (#1003)

Browse Source
This commit is contained in:
Simon Michael 2019-04-06 10:59:54 -07:00
parent 71f9b74b0e
commit 13dc1096a5
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hledger-lib/Hledger/Reports/PostingsReport.hs
View File

@ -81,7 +81,7 @@ postingsReport opts q j = (totallabel, items)
startbal | average_ opts = if historical then precedingavg else 0 startbal | average_ opts = if historical then precedingavg else 0
| otherwise = if historical then precedingsum else 0 | otherwise = if historical then precedingsum else 0
startnum = if historical then length precedingps + 1 else 1 startnum = if historical then length precedingps + 1 else 1
runningcalc | average_ opts = \i avg amt -> divideMixedAmount (fromIntegral i) avg + amt - avg -- running average runningcalc | average_ opts = \i avg amt -> avg + divideMixedAmount (fromIntegral i) (amt - avg) -- running average
| otherwise = \_ bal amt -> bal + amt -- running total | otherwise = \_ bal amt -> bal + amt -- running total
totallabel = "Total" totallabel = "Total"

18
tests/register/average.test Normal file
View File

@ -0,0 +1,18 @@
2019-1-1
(a) 1.0
2019-1-2
(a) 1
2019-1-3
(a) 1
2019-1-4
(a) 1
$ hledger -f- register -A
2019/01/01 (a) 1.0 1.0
2019/01/02 (a) 1.0 1.0
2019/01/03 (a) 1.0 1.0
2019/01/04 (a) 1.0 1.0
>=