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

[balsheet-pnl] compact functions

Browse Source 
readability fixes
This commit is contained in:
Christopher Lam 2019-11-24 21:57:00 +08:00
parent d6a5c8ba54
commit aa451bc89d
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -814,24 +814,20 @@ also show overall period profit & loss."))
;; into report-currency if the latter exists. The price
;; applicable the the col-idx column is used. If the monetary
;; cannot be converted (eg. missing price) then it is not converted.
(convert-curr-fn (lambda (monetary col-idx)
(and common-currency
(not (gnc-commodity-equal
(gnc:gnc-monetary-commodity monetary)
common-currency))
(has-price? (gnc:gnc-monetary-commodity monetary))
(let ((date
(cond
((eq? price-source 'pricedb-latest)
(current-time))
((eq? col-idx 'overall-period)
(last report-dates))
(else
(list-ref report-dates
(case report-type
((balsheet) col-idx)
((pnl) (1+ col-idx))))))))
(exchange-fn monetary common-currency date)))))
(convert-curr-fn
(lambda (monetary col-idx)
(and common-currency
(not (gnc-commodity-equal
(gnc:gnc-monetary-commodity monetary)
common-currency))
(has-price? (gnc:gnc-monetary-commodity monetary))
(exchange-fn
monetary common-currency
(cond
((eq? price-source 'pricedb-latest) (current-time))
((eq? col-idx 'overall-period) (last report-dates))
((eq? report-type 'balsheet) (list-ref report-dates col-idx))
((eq? report-type 'pnl) (list-ref report-dates (1+ col-idx))))))))
;; the following function generates an gnc:html-text object
;; to dump exchange rate for a particular column. From the
@ -930,9 +926,7 @@ also show overall period profit & loss."))
((eq? report-type 'balsheet)
(let* ((get-cell-monetary-fn
(lambda (account col-idx)
(let ((account-balance-list (assoc-ref accounts-balances account)))
(and account-balance-list
(list-ref account-balance-list col-idx)))))
(list-ref (assoc-ref accounts-balances account) col-idx)))
;; an alist of (cons account vector-of-splits) where each
;; split is the last one at date boundary
@ -1017,6 +1011,7 @@ also show overall period profit & loss."))
(map
gnc:monetary-neg
(income-expense-balance 'format gnc:make-gnc-monetary #f))))))
(chart (and include-chart? incr
(gnc:make-report-anchor
networth-barchart-uuid report-obj