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

[net-charts] deoptimize accounts-list

Browse Source 
This aims to partially undo commit 8aed5c3f66.
This commit is contained in:
Christopher Lam 2018-09-12 17:28:26 +08:00
parent 77063afa73
commit 941acee04e
1 changed files with 10 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
gnucash/report/standard-reports/net-charts.scm
View File

@ -33,8 +33,6 @@
(use-modules (gnucash gnc-module)) (use-modules (gnucash gnc-module))
(use-modules (gnucash gettext)) (use-modules (gnucash gettext))
(use-modules (gnucash report report-system report-collectors))
(use-modules (gnucash report report-system collectors))
(use-modules (gnucash report standard-reports category-barchart)) ; for guids of called reports (use-modules (gnucash report standard-reports category-barchart)) ; for guids of called reports
(gnc:module-load "gnucash/report/report-system" 0) (gnc:module-load "gnucash/report/report-system" 0)
@ -306,50 +304,16 @@
(if (if
(not (null? accounts)) (not (null? accounts))
(let* ((the-account-destination-alist (let* ((assets-list (process-datelist
(if inc-exp? (if inc-exp?
(append (map (lambda (account) (cons account 'asset)) accounts
(assoc-ref classified-accounts ACCT-TYPE-INCOME))
(map (lambda (account) (cons account 'liability))
(assoc-ref classified-accounts ACCT-TYPE-EXPENSE)))
(append (map (lambda (account) (cons account 'asset))
(assoc-ref classified-accounts ACCT-TYPE-ASSET)) (assoc-ref classified-accounts ACCT-TYPE-ASSET))
(map (lambda (account) (cons account 'liability)) dates-list #t))
(assoc-ref classified-accounts ACCT-TYPE-LIABILITY))))) (liability-list (process-datelist
(account-reformat (if inc-exp? (if inc-exp?
(lambda (account result) accounts
(map (lambda (collector date-interval) (assoc-ref classified-accounts ACCT-TYPE-LIABILITY))
(gnc:monetary-neg (collector->monetary collector (second date-interval)))) dates-list #f))
result dates-list))
(lambda (account result)
(let ((commodity-collector (gnc:make-commodity-collector)))
(collector-end (fold (lambda (next date list-collector)
(commodity-collector 'merge next #f)
(collector-add list-collector
(collector->monetary
commodity-collector date)))
(collector-into-list)
result
dates-list))))))
(work (category-by-account-report-work inc-exp?
dates-list
the-account-destination-alist
(lambda (account date)
(make-gnc-collector-collector))
account-reformat))
(rpt (category-by-account-report-do-work work (cons 50 90)))
(assets (assoc-ref rpt 'asset))
(liabilities (assoc-ref rpt 'liability))
(assets-list (if assets
(car assets)
(map (lambda (d)
(gnc:make-gnc-monetary report-currency 0))
dates-list)))
(liability-list (if liabilities
(car liabilities)
(map (lambda (d)
(gnc:make-gnc-monetary report-currency 0))
dates-list)))
(net-list (map monetary+ assets-list liability-list)) (net-list (map monetary+ assets-list liability-list))
;; Here the date strings for the x-axis labels are ;; Here the date strings for the x-axis labels are
;; created. ;; created.