gnucash master: Multiple changes pushed

[Christopher Lam]

Updated	 via  https://github.com/Gnucash/gnucash/commit/240cbbe8 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/8f60a6c6 (commit)
	from  https://github.com/Gnucash/gnucash/commit/5660fde3 (commit)



commit 240cbbe8e84f3a382b17e5d43a623b96fe8e282c
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Tue Jun 9 22:37:58 2020 +0800

    [test-cash-flow] include new dependency cash-flow-calc
    
    fixes travis failure

diff --git a/gnucash/report/reports/standard/test/test-cash-flow.scm b/gnucash/report/reports/standard/test/test-cash-flow.scm
index 89b8398f8..80a49e78c 100644
--- a/gnucash/report/reports/standard/test/test-cash-flow.scm
+++ b/gnucash/report/reports/standard/test/test-cash-flow.scm
@@ -2,6 +2,7 @@
 (use-modules (gnucash app-utils))
 (use-modules (tests test-engine-extras))
 (use-modules (gnucash reports standard cash-flow))
+(use-modules (gnucash reports cash-flow-calc))
 (use-modules (gnucash report))
 
 (define (run-test)

commit 8f60a6c617f60c1eeafb69b1da983c2e74f224e3
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Tue Jun 9 22:23:39 2020 +0800

    Bug 797786: [balsheet-pnl] balance sheet includes closing entries
    
    this commit ensures balance-sheet balances do not ignore closing
    entries. ensures equity section includes closing balances from
    profit&loss. an addendum to b000d4114

diff --git a/gnucash/report/reports/standard/balsheet-pnl.scm b/gnucash/report/reports/standard/balsheet-pnl.scm
index 6037ef786..319f0218c 100644
--- a/gnucash/report/reports/standard/balsheet-pnl.scm
+++ b/gnucash/report/reports/standard/balsheet-pnl.scm
@@ -937,7 +937,7 @@ also show overall period profit & loss."))
      ((eq? report-type 'balsheet)
       (let* ((get-cell-monetary-fn
               (lambda (account col-idx)
-                (list-ref (assoc-ref accounts-balances account) col-idx)))
+                (list-ref (assoc-ref accounts-balances-with-closing account) col-idx)))
 
              ;; an alist of (cons account vector-of-splits) where each
              ;; split is the last one at date boundary
@@ -960,7 +960,7 @@ also show overall period profit & loss."))
              ;; asset and liabilities at report dates
              (asset-liability-balances
               (sum-balances-of-accounts
-               accounts-balances asset-liability gnc:monetaries-add))
+               accounts-balances-with-closing asset-liability gnc:monetaries-add))
 
              ;; a vector of collectors whereby collector is the sum of
              ;; incomes and expenses at report dates



Summary of changes:
 gnucash/report/reports/standard/balsheet-pnl.scm        | 4 ++--
 gnucash/report/reports/standard/test/test-cash-flow.scm | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)