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

[trial-balance] upgrade coll-plus and coll-minus to report-wide fns

Browse Source
This commit is contained in:
Christopher Lam 2019-09-19 21:07:41 +08:00
parent f88c54bb50
commit acf359a797
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gnucash/report/standard-reports/trial-balance.scm
View File

@ -316,6 +316,19 @@
options)) options))
;; (coll-plus collectors ...) equiv to (+ collectors ...)
(define (coll-plus . collectors)
(let ((res (gnc:make-commodity-collector)))
(for-each (lambda (coll) (res 'merge coll #f)) collectors)
res))
;; (coll-minus collectors ...) equiv to (- collector0 collector1 ...)
(define (coll-minus . collectors)
(let ((res (gnc:make-commodity-collector)))
(res 'merge (car collectors) #f)
(for-each (lambda (coll) (res 'minusmerge coll #f)) (cdr collectors))
res))
;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; trial-balance-renderer ;; trial-balance-renderer
;; set up the document and add the table ;; set up the document and add the table
@ -665,12 +678,6 @@
splits) splits)
total)) total))
(define (coll-minus . collectors)
(let ((res (gnc:make-commodity-collector)))
(res 'merge (car collectors) #f)
(for-each (lambda (mon) (res 'minusmerge mon #f)) (cdr collectors))
res))
(while (< row rows) (while (< row rows)
(let* ((env (gnc:html-acct-table-get-row-env acct-table row)) (let* ((env (gnc:html-acct-table-get-row-env acct-table row))
(acct (get-val env 'account)) (acct (get-val env 'account))