gnucash maint: [balsheet-pnl] Amendment to previous commit.
Christopher Lam
clam at code.gnucash.org
Mon Feb 15 19:57:04 EST 2021
Updated via https://github.com/Gnucash/gnucash/commit/7b5f5a85 (commit)
from https://github.com/Gnucash/gnucash/commit/b4e99a30 (commit)
commit 7b5f5a8560ae732113b97437afcb464ac3b72ec4
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Tue Feb 16 08:55:02 2021 +0800
[balsheet-pnl] Amendment to previous commit.
b4e99a304 had another bug.
Monthly pnl from 1-jan to 31-dec uses list of dates (1-jan 1-feb
... 1-dec 31-dec) The last period 1-dec to 31-dec needs to retrieve
price on 31-dec rather than 30-dec, so, is handled differently to
return 31-dec.
We can now reuse col-idx->price-date as the 'enddate' for pnl column
data.
diff --git a/gnucash/report/reports/standard/balsheet-pnl.scm b/gnucash/report/reports/standard/balsheet-pnl.scm
index 18d22d4c7..fa4f4b1c6 100644
--- a/gnucash/report/reports/standard/balsheet-pnl.scm
+++ b/gnucash/report/reports/standard/balsheet-pnl.scm
@@ -820,6 +820,7 @@ also show overall period profit & loss."))
((eq? price-source 'pricedb-latest) (current-time))
((eq? col-idx 'overall-period) enddate)
((eq? report-type 'balsheet) (vector-ref report-dates-vec col-idx))
+ ((= col-idx (- num-report-dates 2)) enddate)
((eq? report-type 'pnl)
(decdate (vector-ref report-dates-vec (1+ col-idx)) DayDelta)))))
@@ -1168,14 +1169,10 @@ also show overall period profit & loss."))
optname-include-overall-period))
(col-idx->datepair
(lambda (idx)
- (cond
- ((eq? idx 'overall-period)
- (cons startdate enddate))
- ((= idx (- num-report-dates 2))
- (cons (vector-ref report-dates-vec idx) enddate))
- (else
- (cons (vector-ref report-dates-vec idx)
- (decdate (vector-ref report-dates-vec (1+ idx)) DayDelta))))))
+ (cons (if (eq? idx 'overall-period)
+ startdate
+ (vector-ref report-dates-vec idx))
+ (col-idx->price-date idx))))
(col-idx->monetarypair (lambda (balancelist idx)
(if (eq? idx 'overall-period)
Summary of changes:
gnucash/report/reports/standard/balsheet-pnl.scm | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
More information about the gnucash-changes
mailing list