r16869 - gnucash/trunk/src/report - fix several report-guid references

[Andrew Sackville-West]

Author: andrewsw
Date: 2008-01-17 00:27:53 -0500 (Thu, 17 Jan 2008)
New Revision: 16869
Trac: http://svn.gnucash.org/trac/changeset/16869

Modified:
   gnucash/trunk/src/report/standard-reports/category-barchart.scm
   gnucash/trunk/src/report/standard-reports/general-journal.scm
   gnucash/trunk/src/report/utility-reports/welcome-to-gnucash.scm
Log:
fix several report-guid references

in general-journal, Welcome to Gnucash report ;) and possibly in
category-barchart.scm


Modified: gnucash/trunk/src/report/standard-reports/category-barchart.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/category-barchart.scm	2008-01-16 16:35:52 UTC (rev 16868)
+++ gnucash/trunk/src/report/standard-reports/category-barchart.scm	2008-01-17 05:27:53 UTC (rev 16869)
@@ -170,7 +170,7 @@
 ;; constant over the whole report period. Note that this might get
 ;; *really* complicated.
 
-(define (category-barchart-renderer report-obj reportname 
+(define (category-barchart-renderer report-obj reportname reportguid 
                                     account-types do-intervals?)
   ;; A helper functions for looking up option values.
   (define (get-option section name)
@@ -437,7 +437,7 @@
                    (set! all-data
                          (append start
                                  (list (list (_ "Other") other-sum))))
-                   (let* ((options (gnc:make-report-options reportname))
+                   (let* ((options (gnc:make-report-options reportguid))
                           (id #f))
                      ;; now copy all the options
                      (gnc:options-copy-values 
@@ -448,7 +448,7 @@
                                          optname-accounts)
                       (map car finish))
                      ;; Set the URL to point to this report.
-                     (set! id (gnc:make-report reportname options))
+                     (set! id (gnc:make-report reportguid options))
                      (set! other-anchor (gnc:report-anchor-text id)))))
              
              
@@ -498,7 +498,7 @@
                              ;; immediate subaccounts of this account
                              ;; (and including this account).
                              (gnc:make-report-anchor
-                              reportname
+                              reportguid
                               report-obj
                               (list
                                (list gnc:pagename-accounts optname-accounts
@@ -550,7 +550,8 @@
       'options-generator (lambda () (options-generator (cadr l) (cadr tip-and-rev)))
       'renderer (lambda (report-obj)
 		  (category-barchart-renderer report-obj 
-					      (car l) 
+					      (car l)
+					      (car (reverse l))
 					      (cadr l)
 					      (caddr l))))))
  (list 

Modified: gnucash/trunk/src/report/standard-reports/general-journal.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/general-journal.scm	2008-01-16 16:35:52 UTC (rev 16868)
+++ gnucash/trunk/src/report/standard-reports/general-journal.scm	2008-01-17 05:27:53 UTC (rev 16869)
@@ -36,18 +36,19 @@
 
 (define reportname (N_ "General Journal"))
 (define regrptname (N_ "Register"))
+(define regrptguid "22104e02654c4adba844ee75a3f8d173")
 
 ;; report constructor
 
 (define (gnc:make-general-journal-report)
-  (let* ((regrpt (gnc:make-report regrptname)))
+  (let* ((regrpt (gnc:make-report regrptguid)))
     regrpt))
 
 ;; options generator
 
 (define (general-journal-options-generator)
   
-  (let* ((options (gnc:report-template-new-options/name regrptname))
+  (let* ((options (gnc:report-template-new-options/report-guid regrptguid regrptname))
 	 (query (qof-query-create-for-splits))
 	 )
     
@@ -123,7 +124,7 @@
 
 (define (general-journal-renderer report-obj)
   ;; just delegate rendering to the Register Report renderer...
-  ((gnc:report-template-renderer/name regrptname) report-obj))
+  ((gnc:report-template-renderer/report-guid regrptguid regrptname) report-obj))
 
 (gnc:define-report 
  'version 1

Modified: gnucash/trunk/src/report/utility-reports/welcome-to-gnucash.scm
===================================================================
--- gnucash/trunk/src/report/utility-reports/welcome-to-gnucash.scm	2008-01-16 16:35:52 UTC (rev 16868)
+++ gnucash/trunk/src/report/utility-reports/welcome-to-gnucash.scm	2008-01-17 05:27:53 UTC (rev 16869)
@@ -29,13 +29,20 @@
 
 (gnc:module-load "gnucash/report/report-system" 0)
 
+(define multicolumn-guid "d8ba4a2e89e8479ca9f6eccdeb164588")
+(define welcome-guid "65135608f2014c6ca8412793a8cdf169")
+(define acct-summary-guid "3298541c236b494998b236dfad6ad752")
+(define exp-piechart-guid "9bf1892805cb4336be6320fe48ce5446")
+(define inc-piechart-guid "e1bd09b8a1dd49dd85760db9d82b045c")
+(define inc-exp-chart-guid "80769921e87943adade887b9835a7685")
+
 (define (gnc:make-welcome-report)
-  (let* ((view (gnc:make-report "Multicolumn View"))
-         (sub-welcome (gnc:make-report "Welcome to GnuCash"))
-         (sub-accounts (gnc:make-report "Account Summary"))
-         (sub-expense-pie (gnc:make-report "Expense Accounts"))
-         (sub-income-pie (gnc:make-report "Income Accounts"))
-         (sub-bar (gnc:make-report "Income/Expense Chart"))
+  (let* ((view (gnc:make-report multicolumn-guid))
+         (sub-welcome (gnc:make-report welcome-guid))
+         (sub-accounts (gnc:make-report acct-summary-guid))
+         (sub-expense-pie (gnc:make-report exp-piechart-guid))
+         (sub-income-pie (gnc:make-report inc-piechart-guid))
+         (sub-bar (gnc:make-report inc-exp-chart-guid))
          (options #f))
 
     (define (set-option! section name value)