gnucash stable: Bug 798864 - Budget Reporting on select reports are wrong

[Christopher Lam]

Updated	 via  https://github.com/Gnucash/gnucash/commit/bff78f62 (commit)
	from  https://github.com/Gnucash/gnucash/commit/b1cf200a (commit)



commit bff78f620a67829740a40efd94399aebabf645da
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Mon Apr 17 12:48:16 2023 +0800

    Bug 798864 - Budget Reporting on select reports are wrong
    
    net-income must add income and expense accounts. recalculate the
    net-income from budget amounts, instead of calculating from
    revenue-total and expense-total which were negated for presentation.
    
    this fixes a test which was testing incorrect amounts

diff --git a/gnucash/report/reports/standard/budget-income-statement.scm b/gnucash/report/reports/standard/budget-income-statement.scm
index ca1bbc8729..87fb10e1d6 100644
--- a/gnucash/report/reports/standard/budget-income-statement.scm
+++ b/gnucash/report/reports/standard/budget-income-statement.scm
@@ -428,7 +428,11 @@
               (gnc:get-assoc-account-balances-total expense-account-balances))
 
              (net-income
-              (gnc:collector- revenue-total expense-total))
+              (gnc:collector-
+               (gnc:get-assoc-account-balances-total
+                (get-assoc-account-balances-budget
+                 budget (append revenue-accounts expense-accounts)
+                 period-start period-end gnc:budget-account-get-net))))
 
              (table-env
               (list
diff --git a/gnucash/report/reports/standard/test/test-budget.scm b/gnucash/report/reports/standard/test/test-budget.scm
index 621d1c3d5d..ac032ba930 100644
--- a/gnucash/report/reports/standard/test/test-budget.scm
+++ b/gnucash/report/reports/standard/test/test-budget.scm
@@ -179,7 +179,7 @@
          sxml))
 
       (test-equal "net loss for budget"
-        '("Net loss for Budget test budget" "$285.00")
+        '("Net income for Budget test budget" "$105.00")
         ((sxpath '(// table // (tr 2) // table // (tr 5) // *text*))
          sxml)))))
 



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