IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-progress' into maint #1493

Browse Source
This commit is contained in:
Christopher Lam 2023-01-09 13:32:29 +08:00
commit f081a2066e
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gnucash/report/reports/standard/balsheet-pnl.scm
View File

@ -47,13 +47,6 @@
(split-balance-with-closing col-datum-get-split-balance-with-closing)
(split-value-balance col-datum-get-split-value-balance))
(define FOOTER-TEXT
(gnc:make-html-text
(G_ "WARNING: Foreign currency conversions, and unrealized gains
calculations are not confirmed correct. This report may be modified
without notice. Bug reports are very welcome at
https://bugs.gnucash.org/")))
;; define all option's names and help text so that they are properly
(define optname-startdate (N_ "Start Date"))
@ -769,11 +762,17 @@ also show overall period profit & loss."))
(cons acc (map col-datum-get-split-balance-with-closing cols-data))))
accounts-cols-data))
(exchange-fn (and common-currency
(gnc:case-exchange-time-fn
price-source common-currency
(map xaccAccountGetCommodity accounts) enddate
#f #f)))
;; generate an exchange-fn for date, and cache its result.
(get-date-exchange-fn
(let ((h (make-hash-table)))
(lambda (date)
(or (hashv-ref h date)
(let ((exchangefn (gnc:case-exchange-time-fn
price-source common-currency
(map xaccAccountGetCommodity accounts)
date #f #f)))
(hashv-set! h date exchangefn)
exchangefn)))))
;; from col-idx, find effective date to retrieve pricedb
;; entry or to limit transactions to calculate average-cost
@ -799,9 +798,9 @@ also show overall period profit & loss."))
(gnc:gnc-monetary-commodity monetary)
common-currency))
(has-price? (gnc:gnc-monetary-commodity monetary))
(exchange-fn
monetary common-currency
(col-idx->price-date col-idx)))))
(let* ((col-date (col-idx->price-date col-idx))
(exchange-fn (get-date-exchange-fn col-date)))
(exchange-fn monetary common-currency col-date)))))
;; the following function generates an gnc:html-text object
;; to dump exchange rate for a particular column. From the
@ -1279,9 +1278,6 @@ also show overall period profit & loss."))
(gnc:html-document-add-object!
doc multicol-table))
(gnc:html-document-add-object!
doc FOOTER-TEXT)
(gnc:report-finished)
;; (gnc:html-document-set-style-text!
;; doc " table, td{ border-width: 1px; border-style:solid; border-color: lightgray; border-collapse: collapse}")
@ -1294,7 +1290,7 @@ also show overall period profit & loss."))
'version 1
'name balsheet-reportname
'report-guid "065d5d5a77ba11e8b31e83ada73c5eea"
'menu-path (list gnc:menuname-experimental)
'menu-path (list gnc:menuname-asset-liability)
'options-generator (lambda () (multicol-report-options-generator 'balsheet))
'renderer (lambda (rpt) (multicol-report-renderer rpt 'balsheet)))
@ -1302,7 +1298,7 @@ also show overall period profit & loss."))
'version 1
'name pnl-reportname
'report-guid "0e94fd0277ba11e8825d43e27232c9d4"
'menu-path (list gnc:menuname-experimental)
'menu-path (list gnc:menuname-income-expense)
'options-generator (lambda () (multicol-report-options-generator 'pnl))
'renderer (lambda (rpt) (multicol-report-renderer rpt 'pnl)))