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

[cash-flow] preprocess accounts/money-in/out-accounts

Browse Source 
this avoids set! calls
This commit is contained in:
Christopher Lam 2019-03-07 20:45:24 +08:00
parent c7f7f078ec
commit edd87fa47c
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnucash/report/standard-reports/cash-flow.scm
View File

@ -160,7 +160,8 @@
(filter (lambda (acc) (not (member acc accounts))) (filter (lambda (acc) (not (member acc accounts)))
(if show-subaccts? (if show-subaccts?
(gnc:acccounts-get-all-subaccounts accounts) (gnc:acccounts-get-all-subaccounts accounts)
'()))))) '()))))
(accounts (sort accounts account-full-name<?)))
(define (add-accounts-flow accounts accounts-alist) (define (add-accounts-flow accounts accounts-alist)
(let loop ((accounts accounts) (let loop ((accounts accounts)
@ -244,19 +245,19 @@
(cons 'report-currency report-currency) (cons 'report-currency report-currency)
(cons 'include-trading-accounts include-trading-accounts) (cons 'include-trading-accounts include-trading-accounts)
(cons 'to-report-currency to-report-currency))))) (cons 'to-report-currency to-report-currency)))))
(let ((money-in-accounts (cdr (assq 'money-in-accounts result))) (let ((money-in-accounts (sort
(cdr (assq 'money-in-accounts result))
account-full-name<?))
(money-in-alist (cdr (assq 'money-in-alist result))) (money-in-alist (cdr (assq 'money-in-alist result)))
(money-in-collector (cdr (assq 'money-in-collector result))) (money-in-collector (cdr (assq 'money-in-collector result)))
(money-out-accounts (cdr (assq 'money-out-accounts result))) (money-out-accounts (sort
(cdr (assq 'money-out-accounts result))
account-full-name<?))
(money-out-alist (cdr (assq 'money-out-alist result))) (money-out-alist (cdr (assq 'money-out-alist result)))
(money-out-collector (cdr (assq 'money-out-collector result)))) (money-out-collector (cdr (assq 'money-out-collector result))))
(money-diff-collector 'merge money-in-collector #f) (money-diff-collector 'merge money-in-collector #f)
(money-diff-collector 'minusmerge money-out-collector #f) (money-diff-collector 'minusmerge money-out-collector #f)
(set! accounts (sort accounts account-full-name<?))
(set! money-in-accounts (sort money-in-accounts account-full-name<?))
(set! money-out-accounts (sort money-out-accounts account-full-name<?))
(gnc:html-document-add-object! (gnc:html-document-add-object!
doc doc
(gnc:make-html-text (_ "Selected Accounts"))) (gnc:make-html-text (_ "Selected Accounts")))