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

2001-05-03 Robert Graham Merkel <rgmerk@mira.net>

Browse Source 
* src/scm/report/transaction-report.scm: fix bug with secondary
	subheadings.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@4108 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Dave Peticolas 2001-05-03 08:12:56 +00:00
parent 4371051fee
commit 677b4196a7
2 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2001-05-03 Robert Graham Merkel <rgmerk@mira.net>
* src/scm/report/transaction-report.scm: fix bug with secondary
subheadings.
2001-05-03 Dave Peticolas <dave@krondo.com>
* many files: fix spelling errors

44
src/scm/report/transaction-report.scm
View File

@ -696,6 +696,37 @@ and Income accounts")))))
(total-collector 'add
(gnc:gnc-monetary-commodity split-value)
(gnc:gnc-monetary-amount split-value))
(if (and primary-subtotal-pred
(or (not next)
(and next
(not (primary-subtotal-pred current next)))))
(begin
(if secondary-subtotal-pred
(begin
(add-subtotal-row table width
secondary-subtotal-collector
def:secondary-subtotal-style)
(secondary-subtotal-collector 'reset #f #f)))
(add-subtotal-row table width
primary-subtotal-collector
def:primary-subtotal-style)
(primary-subtotal-collector 'reset #f #f)
(if next
(begin
(primary-subheading-renderer
next table width def:primary-subtotal-style)
(if secondary-subtotal-pred
(secondary-subheading-renderer
next
table
width def:secondary-subtotal-style)))))
(if (and secondary-subtotal-pred
(or (not next)
(and next
@ -706,18 +737,7 @@ and Income accounts")))))
(secondary-subtotal-collector 'reset #f #f)
(if next
(secondary-subheading-renderer
next table width def:secondary-subtotal-style))))
(if (and primary-subtotal-pred
(or (not next)
(and next
(not (primary-subtotal-pred current next)))))
(begin (add-subtotal-row table width
primary-subtotal-collector
def:primary-subtotal-style)
(primary-subtotal-collector 'reset #f #f)
(if next
(primary-subheading-renderer
next table width def:primary-subtotal-style))))
next table width def:secondary-subtotal-style)))))
(do-rows-with-subtotals rest
table
used-columns