gnucash maint: Revert "Bug 798425 - Cash flow - Option / Account: Include Trading Accounts EXCLUDES them"

[Christopher Lam]

Updated	 via  https://github.com/Gnucash/gnucash/commit/01e1b922 (commit)
	from  https://github.com/Gnucash/gnucash/commit/06402578 (commit)



commit 01e1b92254e444a411f4a9b27998a223429165d8
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Mon Jan 24 05:13:20 2022 +0800

    Revert "Bug 798425 - Cash flow - Option / Account: Include Trading Accounts EXCLUDES them"
    
    This reverts commit 1d28f28e03018df5906a8620daa490aa451b5f59. The
    original code was fine: enabling "Include Trading Accounts" should
    consider these accounts as part of the account selection.

diff --git a/gnucash/report/reports/cash-flow-calc.scm b/gnucash/report/reports/cash-flow-calc.scm
index 808e0d325..472c484f0 100644
--- a/gnucash/report/reports/cash-flow-calc.scm
+++ b/gnucash/report/reports/cash-flow-calc.scm
@@ -65,7 +65,7 @@
                 ((null? s-account)
                  (format #t "WARNING: s-account is NULL for split: ~a\n"
                          (gncSplitGetGUID s)))
-                ((or (and (not include-trading-accounts)
+                ((or (and include-trading-accounts
                           (eqv? (xaccAccountGetType s-account)
                                 ACCT-TYPE-TRADING))
                      (member s-account accounts)



Summary of changes:
 gnucash/report/reports/cash-flow-calc.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)