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

Bug #632931 - Advanced portfolio: add "rate of gain" column

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22354 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Geert Janssens 2012-09-02 19:49:01 +00:00
parent b0b8d064aa
commit 02970201a0
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/report/standard-reports/advanced-portfolio.scm
View File

@ -715,6 +715,16 @@
(gnc:make-html-table-header-cell/markup "number-cell" gain) (gnc:make-html-table-header-cell/markup "number-cell" gain)
(gnc:make-html-table-header-cell/markup "number-cell" ugain) (gnc:make-html-table-header-cell/markup "number-cell" ugain)
(gnc:make-html-table-header-cell/markup "number-cell" bothgain) (gnc:make-html-table-header-cell/markup "number-cell" bothgain)
(gnc:make-html-table-header-cell/markup "number-cell"
(let* ((moneyinvalue (gnc-numeric-to-double
(gnc:gnc-monetary-amount moneyin)))
(bothgainvalue (gnc-numeric-to-double
(gnc:gnc-monetary-amount bothgain)))
)
(if (= 0.0 moneyinvalue)
""
(sprintf #f "%.2f%%" (* 100 (/ bothgainvalue moneyinvalue)))))
)
(gnc:make-html-table-header-cell/markup "number-cell" income))) (gnc:make-html-table-header-cell/markup "number-cell" income)))
(if (not ignore-brokerage-fees) (if (not ignore-brokerage-fees)
(append! activecols (list (gnc:make-html-table-header-cell/markup "number-cell" brokerage)))) (append! activecols (list (gnc:make-html-table-header-cell/markup "number-cell" brokerage))))
@ -726,7 +736,7 @@
(gnc:gnc-monetary-amount totalreturn))) (gnc:gnc-monetary-amount totalreturn)))
) )
(if (= 0.0 moneyinvalue) (if (= 0.0 moneyinvalue)
(sprintf #f "%.2f%%" moneyinvalue) ""
(sprintf #f "%.2f%%" (* 100 (/ totalreturnvalue moneyinvalue)))))) (sprintf #f "%.2f%%" (* 100 (/ totalreturnvalue moneyinvalue))))))
) )
) )
@ -846,6 +856,7 @@
(_ "Realized Gain") (_ "Realized Gain")
(_ "Unrealized Gain") (_ "Unrealized Gain")
(_ "Total Gain") (_ "Total Gain")
(_ "Rate of Gain")
(_ "Income"))) (_ "Income")))
(if (not ignore-brokerage-fees) (if (not ignore-brokerage-fees)
@ -907,6 +918,16 @@
"total-number-cell" sum-total-ugain) "total-number-cell" sum-total-ugain)
(gnc:make-html-table-cell/markup (gnc:make-html-table-cell/markup
"total-number-cell" sum-total-both-gains) "total-number-cell" sum-total-both-gains)
(gnc:make-html-table-cell/markup
"total-number-cell"
(let* ((totalinvalue (gnc-numeric-to-double
(gnc:gnc-monetary-amount sum-total-moneyin)))
(totalgainvalue (gnc-numeric-to-double
(gnc:gnc-monetary-amount sum-total-both-gains)))
)
(if (= 0.0 totalinvalue)
""
(sprintf #f "%.2f%%" (* 100 (/ totalgainvalue totalinvalue))))))
(gnc:make-html-table-cell/markup (gnc:make-html-table-cell/markup
"total-number-cell" sum-total-income))) "total-number-cell" sum-total-income)))
(if (not ignore-brokerage-fees) (if (not ignore-brokerage-fees)
@ -924,7 +945,7 @@
(gnc:gnc-monetary-amount sum-total-totalreturn))) (gnc:gnc-monetary-amount sum-total-totalreturn)))
) )
(if (= 0.0 totalinvalue) (if (= 0.0 totalinvalue)
(sprintf #f "%.2f%%" totalinvalue) ""
(sprintf #f "%.2f%%" (* 100 (/ totalreturnvalue totalinvalue)))))) (sprintf #f "%.2f%%" (* 100 (/ totalreturnvalue totalinvalue))))))
)) ))