[Gnucash-changes] r13242 - gnucash/trunk - Boris Zbarsky's advanced-portfolio patch. (#311549)

[Derek Atkins]

Author: warlord
Date: 2006-02-12 15:29:05 -0500 (Sun, 12 Feb 2006)
New Revision: 13242
Trac: http://svn.gnucash.org/trac/changeset/13242

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/report/standard-reports/advanced-portfolio.scm
Log:
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.



Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-02-12 20:03:46 UTC (rev 13241)
+++ gnucash/trunk/ChangeLog	2006-02-12 20:29:05 UTC (rev 13242)
@@ -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  <derek at ihtfp.com>
 
 	* src/report/report-gnome/gnc-plugin-page-report.c:

Modified: gnucash/trunk/src/report/standard-reports/advanced-portfolio.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/advanced-portfolio.scm	2006-02-12 20:03:46 UTC (rev 13241)
+++ gnucash/trunk/src/report/standard-reports/advanced-portfolio.scm	2006-02-12 20:29:05 UTC (rev 13242)
@@ -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)