From 77099e35458835b1ed7a3bee6aafd41db5a00581 Mon Sep 17 00:00:00 2001 From: Derek Atkins Date: Sun, 12 Feb 2006 20:29:05 +0000 Subject: [PATCH] Boris Zbarsky's advanced-portfolio patch. (#311549) * src/report/standard-reports/advanced-portfolio.scm: Apply dividend and brokerage to moneyin and moneyout to more accurately reflect account activity. Fixes bug #311549. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@13242 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 5 +++++ src/report/standard-reports/advanced-portfolio.scm | 2 ++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5783c29337..acbd355e2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,11 @@ Try to fix transactions that have no currency, perhaps because of a log replay. Workaround for bug #143720. + Boris Zbarsky's advanced-portfolio patch. + * src/report/standard-reports/advanced-portfolio.scm: + Apply dividend and brokerage to moneyin and moneyout to more + accurately reflect account activity. Fixes bug #311549. + 2006-02-11 Derek Atkins * src/report/report-gnome/gnc-plugin-page-report.c: diff --git a/src/report/standard-reports/advanced-portfolio.scm b/src/report/standard-reports/advanced-portfolio.scm index c4e897c568..1478bd3c0e 100644 --- a/src/report/standard-reports/advanced-portfolio.scm +++ b/src/report/standard-reports/advanced-portfolio.scm @@ -226,6 +226,8 @@ ;; (gnc:debug "totalunits" totalunits) ;; (gnc:debug "totalunityears" totalunityears) + (moneyincoll 'minusmerge dividendcoll #f) + (moneyoutcoll 'minusmerge brokeragecoll #f) (gaincoll 'merge moneyoutcoll #f) (gaincoll 'add (gnc:gnc-monetary-commodity value) (gnc:gnc-monetary-amount value)) (gaincoll 'merge moneyincoll #f)