gnucash maint: Multiple changes pushed

[Christopher Lam]

Updated	 via  https://github.com/Gnucash/gnucash/commit/aa5bc7d6 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/e52b0793 (commit)
	from  https://github.com/Gnucash/gnucash/commit/95f88848 (commit)



commit aa5bc7d6f565596d1b3652fa37272f7d77ff9b8c
Merge: 95f888489 e52b07934
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Tue Jun 29 18:18:13 2021 +0800

    Merge branch 'equity-statement-net-unrealized' of git://github.com/xuhdev/gnucash into maint


commit e52b0793415c00e8dd56d6d6759858cc76fe6695
Author: Hong Xu <hong at topbug.net>
Date:   Thu Jun 24 13:55:58 2021 -0700

    Bug 798211 - Equity statement double calculates unrealized gain

diff --git a/gnucash/report/reports/standard/equity-statement.scm b/gnucash/report/reports/standard/equity-statement.scm
index 5c0d60994..7e51f8def 100644
--- a/gnucash/report/reports/standard/equity-statement.scm
+++ b/gnucash/report/reports/standard/equity-statement.scm
@@ -375,9 +375,10 @@
 				          start-date))
 
 	       (net-unrealized-gains
-                (unrealized-gains-at-date end-book-balance
-				          end-exchange-fn
-				          end-date))
+                (gnc:collector- (unrealized-gains-at-date end-book-balance
+                                                          end-exchange-fn
+                                                          end-date)
+                                start-unrealized-gains))
 
 	       (equity-closing
                 (gnc:account-get-trans-type-balance-interval-with-closing
@@ -469,8 +470,8 @@
           (unless (gnc-commodity-collector-allzero? net-unrealized-gains)
             (add-report-line
              build-table
-             (G_ "Unrealized Gains")
-             (G_ "Unrealized Losses")
+             (G_ "Unrealized Gains for Period")
+             (G_ "Unrealized Losses for Period")
              net-unrealized-gains
              0 end-exchange-fn #f #f))
 
diff --git a/gnucash/report/reports/standard/test/test-equity-statement.scm b/gnucash/report/reports/standard/test/test-equity-statement.scm
index 90aff7ef3..637b63dee 100644
--- a/gnucash/report/reports/standard/test/test-equity-statement.scm
+++ b/gnucash/report/reports/standard/test/test-equity-statement.scm
@@ -99,7 +99,7 @@
         (sxml->table-row-col sxml 1 5 #f))
 
       (test-equal "unrealized"
-        '("Unrealized Losses" "$1.00")
+        '("Unrealized Losses for Period" "$1.00")
         (sxml->table-row-col sxml 1 6 #f))
 
       (test-equal "inc/dec in capital"



Summary of changes:
 gnucash/report/reports/standard/equity-statement.scm          | 11 ++++++-----
 .../report/reports/standard/test/test-equity-statement.scm    |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)