IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-20 11:48:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

[Bug 797520] Balance Sheet (Multicolumn) the retained earnings amount in the equity section has its sign reversed

Browse Source 
c21bb66d6 had a regression: income-expense-balances was originally
negated, only to be negated again for use in retained-earnings-fn. The
previous change forgot to negate income-expense-balances.

This commit removes the negation before use of income-expense-balances
in retained-earnings-fn, thereby simplifying code.
This commit is contained in:
Christopher Lam 2019-12-09 18:20:57 +08:00
parent 6266ca2f12
commit e40bee0ff6
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnucash/report/standard-reports/balsheet-pnl.scm
View File

@ -1034,12 +1034,9 @@ also show overall period profit & loss."))
(if (and common-currency
(every has-price?
(gnc:accounts-get-commodities income-expense #f)))
(gnc:monetary-neg
(monetaries->exchanged income-expense-balance
common-currency price-source date))
(map
gnc:monetary-neg
(income-expense-balance 'format gnc:make-gnc-monetary #f))))))
(monetaries->exchanged income-expense-balance
common-currency price-source date)
(income-expense-balance 'format gnc:make-gnc-monetary #f)))))
(chart (and-let* (include-chart?
incr

17
gnucash/report/standard-reports/test/test-balsheet-pnl.scm
View File

@ -535,7 +535,22 @@
"$320.00" "#200.00 " "$100,000.00" "$117,529.00" "$9,500.00" "$9,500.00"
"$500.00" "$9,000.00" "$9,500.00" "$103,600.00" "$4,429.00" "$0.00"
"$108,029.00" "1 FUNDS $350.00" "#1.00 $1.60")
(sxml->table-row-col sxml 1 #f 4)))))
(sxml->table-row-col sxml 1 #f 4)))
;; the following includes non-zero retained earnings of $1,270
(set-option! multi-bs-options "General" "End Date"
(cons 'absolute (gnc-dmy2time64 1 3 1980)))
(set-option! multi-bs-options "General" "Period duration" #f)
(let ((sxml (options->sxml multicol-balsheet-uuid multi-bs-options
"multicol-balsheet-retained")))
(test-equal "bal-1/3/80"
'("$123,319.00" "$123,319.00" "$5,129.00" "$2,000.00" "$3,029.00"
"$0.00" "$100.00" "$17,000.00" "$2,000.00" "$15,000.00" "30 FUNDS "
"$1,190.00" "$1,190.00" "#700.00 " "$100,000.00" "$123,319.00"
"$9,500.00" "$9,500.00" "$500.00" "$9,000.00" "$9,500.00"
"$103,600.00" "$8,949.00" "$1,270.00" "$113,819.00" "1 FUNDS $500.00"
"#1.00 $1.70")
(sxml->table-row-col sxml 1 #f 2)))))
(define (multicol-pnl-tests)
(define (default-testing-options)