r15592 - gnucash/branches/remove-group2/src - Get all the reports working.

[David Hampton]

Author: hampton
Date: 2007-02-17 18:25:37 -0500 (Sat, 17 Feb 2007)
New Revision: 15592
Trac: http://svn.gnucash.org/trac/changeset/15592

Modified:
   gnucash/branches/remove-group2/src/engine/engine.i
   gnucash/branches/remove-group2/src/report/locale-specific/us/taxtxf-de_DE.scm
   gnucash/branches/remove-group2/src/report/locale-specific/us/taxtxf.scm
   gnucash/branches/remove-group2/src/report/report-system/report-utilities.scm
   gnucash/branches/remove-group2/src/report/standard-reports/transaction.scm
Log:
Get all the reports working.

Modified: gnucash/branches/remove-group2/src/engine/engine.i
===================================================================
--- gnucash/branches/remove-group2/src/engine/engine.i	2007-02-17 19:59:43 UTC (rev 15591)
+++ gnucash/branches/remove-group2/src/engine/engine.i	2007-02-17 23:25:37 UTC (rev 15592)
@@ -86,9 +86,13 @@
 %include <Split.h>
 %include <engine-helpers.h>
 AccountList * gnc_account_get_children (const Account *account);
+AccountList * gnc_account_get_children_sorted (const Account *account);
 AccountList * gnc_account_get_descendants (const Account *account);
+AccountList * gnc_account_get_descendants_sorted (const Account *account);
 %ignore gnc_account_get_children;
+%ignore gnc_account_get_children_sorted;
 %ignore gnc_account_get_descendants;
+%ignore gnc_account_get_descendants_sorted;
 %include <Account.h>
 %include <Transaction.h>
 %include <gnc-pricedb.h>

Modified: gnucash/branches/remove-group2/src/report/locale-specific/us/taxtxf-de_DE.scm
===================================================================
--- gnucash/branches/remove-group2/src/report/locale-specific/us/taxtxf-de_DE.scm	2007-02-17 19:59:43 UTC (rev 15591)
+++ gnucash/branches/remove-group2/src/report/locale-specific/us/taxtxf-de_DE.scm	2007-02-17 23:25:37 UTC (rev 15592)
@@ -460,7 +460,7 @@
               gen)	       		; no kids, return input
           (apply max (gnc:account-map-children
                       (lambda (x) (num-generations x (+ 1 gen)))
-                      children)))))
+                      account)))))
 
   (gnc:report-starting reportname)
   (let* ((from-value (gnc:date-option-absolute-time 

Modified: gnucash/branches/remove-group2/src/report/locale-specific/us/taxtxf.scm
===================================================================
--- gnucash/branches/remove-group2/src/report/locale-specific/us/taxtxf.scm	2007-02-17 19:59:43 UTC (rev 15591)
+++ gnucash/branches/remove-group2/src/report/locale-specific/us/taxtxf.scm	2007-02-17 23:25:37 UTC (rev 15592)
@@ -437,7 +437,7 @@
               gen)	       		; no kids, return input
           (apply max (gnc:account-map-children
                       (lambda (x) (num-generations x (+ 1 gen)))
-                      children)))))
+                      account)))))
 
   (gnc:report-starting reportname)
   (let* ((from-value (gnc:date-option-absolute-time 

Modified: gnucash/branches/remove-group2/src/report/report-system/report-utilities.scm
===================================================================
--- gnucash/branches/remove-group2/src/report/report-system/report-utilities.scm	2007-02-17 19:59:43 UTC (rev 15591)
+++ gnucash/branches/remove-group2/src/report/report-system/report-utilities.scm	2007-02-17 23:25:37 UTC (rev 15592)
@@ -463,7 +463,7 @@
       (if include-children?
 	  (for-each 
 	   (lambda (x) 
-	     (gnc:commodity-collector-merge balance-collector x))
+	     (gnc-commodity-collector-merge balance-collector x))
 	   (gnc:account-map-descendants
 	    (lambda (child)
 	      (gnc:account-get-comm-balance-at-date child date #f))

Modified: gnucash/branches/remove-group2/src/report/standard-reports/transaction.scm
===================================================================
--- gnucash/branches/remove-group2/src/report/standard-reports/transaction.scm	2007-02-17 19:59:43 UTC (rev 15591)
+++ gnucash/branches/remove-group2/src/report/standard-reports/transaction.scm	2007-02-17 23:25:37 UTC (rev 15592)
@@ -585,10 +585,10 @@
     "b" (N_ "Filter on these accounts")
     (lambda ()
       ;; FIXME : gnc:get-current-accounts disappeared.
-      (let ((current-accounts '())
-	    (root (gnc-get-current-root-account))
-	    (num-accounts (gnc-account-n-children root))
-	    (first-account (gnc-account-nth-child root 0)))
+      (let* ((current-accounts '())
+	     (root (gnc-get-current-root-account))
+	     (num-accounts (gnc-account-n-children root))
+	     (first-account (gnc-account-nth-child root 0)))
 	(cond ((not (null? current-accounts))
 	       (list (car current-accounts)))
 	      ((> num-accounts 0) (list first-account))