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

[equity-statement] compact functions and use collector arithmetic

Browse Source
This commit is contained in:
Christopher Lam
2019-09-29 18:36:25 +08:00
parent 5aa59e0ce1
commit 307ca4e27d
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
gnucash/report/standard-reports/equity-statement.scm
View File

@@ -371,22 +371,17 @@
amount report-commodity exchange-fn)))))
(label (if neg? (or neg-label pos-label) pos-label))
(pos-bal (if neg?
(let ((bal (gnc:make-commodity-collector)))
(bal 'minusmerge amount #f)
bal)
(gnc:collector- amount)
amount))
(bal (gnc:sum-collector-commodity
pos-bal report-commodity exchange-fn))
(balance
(or (and (gnc:uniform-commodity? pos-bal report-commodity)
bal)
(and show-fcur?
(gnc-commodity-table
pos-bal report-commodity exchange-fn))
bal
))
(column (or col 0))
)
pos-bal report-commodity exchange-fn))
(balance
(cond
((gnc:uniform-commodity? pos-bal report-commodity) bal)
(show-fcur? (gnc-commodity-table
pos-bal report-commodity exchange-fn))
(else bal)))
(column (or col 0)))
(gnc:html-table-add-labeled-amount-line!
table 3 row-style rule?
label 0 1 "text-cell"
@@ -408,9 +403,11 @@
(define (unrealized-gains-at-date book-balance exchange-fn date)
(define weighted-fn
(gnc:case-exchange-fn 'weighted-average report-commodity date))
(gnc:collector-
(gnc:sum-collector-commodity book-balance report-commodity exchange-fn)
(gnc:sum-collector-commodity book-balance report-commodity weighted-fn)))
(gnc:monetaries-add (gnc:sum-collector-commodity
book-balance report-commodity exchange-fn)
(gnc:monetary-neg
(gnc:sum-collector-commodity
book-balance report-commodity weighted-fn))))
;; If you ask me, any outstanding(TM) retained earnings and
;; unrealized gains should be added directly into equity,