mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
[reports] use new function names
gnc:accounts-and-all-descendants-sorted gnc-accounts-and-all-descendants
This commit is contained in:
parent
d2ad1aa35d
commit
560f31250e
@ -697,7 +697,7 @@
|
||||
(for-each
|
||||
(lambda (acct)
|
||||
(this-collector 'merge (get-balance acct-balances acct) #f))
|
||||
(gnc:accounts-and-all-descendants (list account)))
|
||||
(cons account (gnc-account-get-descendants-sorted account)))
|
||||
this-collector))
|
||||
|
||||
(let lp ((accounts (if less-p (sort accts less-p) accts))
|
||||
|
@ -296,7 +296,7 @@
|
||||
(accounts (get-option gnc:pagename-accounts (N_ "Accounts")))
|
||||
(dosubs? (get-option gnc:pagename-accounts optname-subacct))
|
||||
(accounts (if dosubs?
|
||||
(gnc:accounts-and-all-descendants accounts)
|
||||
(gnc-accounts-and-all-descendants accounts)
|
||||
accounts))
|
||||
(plot-type (get-option gnc:pagename-display (N_ "Plot Type")))
|
||||
(show-plot? (get-option gnc:pagename-display (N_ "Show plot")))
|
||||
|
@ -186,7 +186,7 @@
|
||||
;; needed so as to amortize the cpu time properly.
|
||||
(gnc:report-percent-done 1)
|
||||
(set! commodity-list (gnc:accounts-get-commodities
|
||||
(gnc:accounts-and-all-descendants accounts)
|
||||
(gnc-accounts-and-all-descendants accounts)
|
||||
report-currency))
|
||||
(gnc:report-percent-done 5)
|
||||
(set! exchange-fn (gnc:case-exchange-time-fn
|
||||
@ -208,7 +208,7 @@
|
||||
(gnc:report-percent-done 25)
|
||||
(if dosubs?
|
||||
(set! accounts
|
||||
(gnc:accounts-and-all-descendants accounts)))
|
||||
(gnc-accounts-and-all-descendants accounts)))
|
||||
(gnc:report-percent-done 30)
|
||||
|
||||
(xaccQueryAddAccountMatch
|
||||
|
@ -444,7 +444,7 @@
|
||||
(gnc:html-document-add-object!
|
||||
doc (gnc:html-make-rates-table
|
||||
report-commodity price-fn
|
||||
(gnc:accounts-and-all-descendants accounts))))))
|
||||
(gnc-accounts-and-all-descendants accounts))))))
|
||||
|
||||
(gnc:report-finished)
|
||||
doc))
|
||||
|
@ -686,7 +686,7 @@
|
||||
optname-period-collapse-after)))
|
||||
(doc (gnc:make-html-document))
|
||||
(accounts (if show-subaccts?
|
||||
(gnc:accounts-and-all-descendants accounts)
|
||||
(gnc-accounts-and-all-descendants accounts)
|
||||
accounts)))
|
||||
;; end of defines
|
||||
|
||||
|
@ -156,7 +156,7 @@
|
||||
|
||||
;;add subaccounts if requested
|
||||
(accounts (if show-subaccts?
|
||||
(gnc:accounts-and-all-descendants accounts)
|
||||
(gnc-accounts-and-all-descendants accounts)
|
||||
accounts))
|
||||
(accounts (sort accounts gnc:account-full-name<?)))
|
||||
|
||||
|
@ -294,7 +294,7 @@ developing over time"))
|
||||
|
||||
(else
|
||||
(let* ((commodity-list (gnc:accounts-get-commodities
|
||||
(gnc:accounts-and-all-descendants accounts)
|
||||
(gnc-accounts-and-all-descendants accounts)
|
||||
report-currency))
|
||||
(exchange-fn (gnc:case-exchange-time-fn
|
||||
price-source report-currency
|
||||
@ -394,7 +394,7 @@ developing over time"))
|
||||
#:nosplit->elt (gnc:make-gnc-monetary comm 0)))))
|
||||
;; all selected accounts (of report-specific type), *and*
|
||||
;; their descendants (of any type) need to be scanned.
|
||||
(gnc:accounts-and-all-descendants accounts)))
|
||||
(gnc-accounts-and-all-descendants accounts)))
|
||||
|
||||
;; Creates the <balance-list> to be used in the function
|
||||
;; below.
|
||||
|
@ -299,7 +299,7 @@
|
||||
|
||||
(gnc:report-percent-done 1)
|
||||
(set! commodity-list (gnc:accounts-get-commodities
|
||||
(gnc:accounts-and-all-descendants accounts)
|
||||
(gnc-accounts-and-all-descendants accounts)
|
||||
report-currency))
|
||||
(gnc:report-percent-done 10)
|
||||
(set! exchange-fn (gnc:case-exchange-time-fn
|
||||
|
@ -195,7 +195,7 @@
|
||||
;(gnc:debug "accounts" accounts)
|
||||
(if (not (null? accounts))
|
||||
(let* ((commodity-list (gnc:accounts-get-commodities
|
||||
(gnc:accounts-and-all-descendants accounts)
|
||||
(gnc-accounts-and-all-descendants accounts)
|
||||
currency))
|
||||
(pricedb (gnc-pricedb-get-db (gnc-get-current-book)))
|
||||
(exchange-fn (gnc:case-exchange-fn price-source currency to-date))
|
||||
|
@ -232,10 +232,10 @@
|
||||
(define (default-testing-options)
|
||||
(let ((options (gnc:make-report-options rpt-uuid)))
|
||||
(set-option! options "Accounts" "Sales"
|
||||
(gnc:accounts-and-all-descendants
|
||||
(gnc-accounts-and-all-descendants
|
||||
(list (get-acct "Income"))))
|
||||
(set-option! options "Accounts" "Purchases"
|
||||
(gnc:accounts-and-all-descendants
|
||||
(gnc-accounts-and-all-descendants
|
||||
(list (get-acct "Expenses"))))
|
||||
(set-option! options "Accounts" "Tax Accounts"
|
||||
(list (get-acct "Purchases VAT")
|
||||
|
Loading…
Reference in New Issue
Block a user