gnucash maint: [report-utilities] further deprecations

[Christopher Lam]

Updated	 via  https://github.com/Gnucash/gnucash/commit/0ca468e0 (commit)
	from  https://github.com/Gnucash/gnucash/commit/64dedccf (commit)



commit 0ca468e0a160a8263680348c5dd340f3d50788b1
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sun Sep 20 22:41:17 2020 +0800

    [report-utilities] further deprecations
    
    * deprecate unused functions
    * last deprecation for gnc:query-set-match-non-voids-only!

diff --git a/gnucash/report/report-utilities.scm b/gnucash/report/report-utilities.scm
index 1bb86baf3..2571a52df 100644
--- a/gnucash/report/report-utilities.scm
+++ b/gnucash/report/report-utilities.scm
@@ -504,6 +504,7 @@
 ;; b) the result is sign reversed. Returns a commodity-collector.
 (define (gnc:accounts-get-comm-total-profit accounts 
 					    get-balance-fn)
+  (issue-deprecation-warning "gnc:accounts-get-comm-total-profit deprecated.")
   (gnc:accounts-get-balance-helper
    (gnc:filter-accountlist-type (list ACCT-TYPE-INCOME ACCT-TYPE-EXPENSE) accounts)
    get-balance-fn
@@ -514,6 +515,7 @@
 ;; the result is sign reversed. Returns a commodity-collector.
 (define (gnc:accounts-get-comm-total-income accounts 
 					    get-balance-fn)
+  (issue-deprecation-warning "gnc:accounts-get-comm-total-income deprecated.")
   (gnc:accounts-get-balance-helper
    (gnc:filter-accountlist-type (list ACCT-TYPE-INCOME) accounts)
    get-balance-fn
@@ -524,6 +526,7 @@
 ;; the result is sign reversed. Returns a commodity-collector.
 (define (gnc:accounts-get-comm-total-expense accounts 
                                              get-balance-fn)
+  (issue-deprecation-warning "gnc:accounts-get-comm-total-expense deprecated.")
   (gnc:accounts-get-balance-helper
    (gnc:filter-accountlist-type (list ACCT-TYPE-EXPENSE) accounts)
    get-balance-fn
@@ -696,7 +699,8 @@ query instead.")
              (regexp (get-val 'regexp))
              (closing (get-val 'closing)))
         (qof-query-set-book query (gnc-get-current-book))
-        (gnc:query-set-match-non-voids-only! query (gnc-get-current-book))
+        (xaccQueryAddClearedMatch
+         query (logand CLEARED-ALL (lognot CLEARED-VOIDED)) QOF-QUERY-AND)
         (xaccQueryAddAccountMatch query account-list QOF-GUID-MATCH-ANY QOF-QUERY-AND)
         (xaccQueryAddDateMatchTT
          query



Summary of changes:
 gnucash/report/report-utilities.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)