r16851 - gnucash/trunk/src - fix more report references to use report-guid, fixes "Print Invoice" crasher.

[Andrew Sackville-West]

Author: andrewsw
Date: 2008-01-10 14:01:03 -0500 (Thu, 10 Jan 2008)
New Revision: 16851
Trac: http://svn.gnucash.org/trac/changeset/16851

Modified:
   gnucash/trunk/src/business/business-reports/easy-invoice.scm
   gnucash/trunk/src/business/business-reports/fancy-invoice.scm
   gnucash/trunk/src/business/business-reports/invoice.scm
   gnucash/trunk/src/business/business-reports/payables.scm
   gnucash/trunk/src/business/business-reports/receivables.scm
   gnucash/trunk/src/report/standard-reports/register.scm
Log:
fix more report references to use report-guid, fixes "Print Invoice" crasher.


Modified: gnucash/trunk/src/business/business-reports/easy-invoice.scm
===================================================================
--- gnucash/trunk/src/business/business-reports/easy-invoice.scm	2008-01-10 03:30:48 UTC (rev 16850)
+++ gnucash/trunk/src/business/business-reports/easy-invoice.scm	2008-01-10 19:01:03 UTC (rev 16851)
@@ -851,20 +851,22 @@
 
     document))
 
+(define easy-invoice-guid "67112f318bef4fc496bdc27d106bbda4")
+
 (gnc:define-report
  'version 1
  'name (N_ "Easy Invoice")
- 'report-guid "67112f318bef4fc496bdc27d106bbda4"
+ 'report-guid easy-invoice-guid
  'menu-path (list gnc:menuname-business-reports)
  'options-generator options-generator
  'renderer reg-renderer
  'in-menu? #t)
 
 (define (gnc:easy-invoice-report-create-internal invoice)
-  (let* ((options (gnc:make-report-options (N_ "Easy Invoice")))
+  (let* ((options (gnc:make-report-options easy-invoice-guid))
          (invoice-op (gnc:lookup-option options invoice-page invoice-name)))
 
     (gnc:option-set-value invoice-op invoice)
-    (gnc:make-report (N_ "Easy Invoice") options)))
+    (gnc:make-report easy-invoice-guid options)))
 
 (export gnc:easy-invoice-report-create-internal)

Modified: gnucash/trunk/src/business/business-reports/fancy-invoice.scm
===================================================================
--- gnucash/trunk/src/business/business-reports/fancy-invoice.scm	2008-01-10 03:30:48 UTC (rev 16850)
+++ gnucash/trunk/src/business/business-reports/fancy-invoice.scm	2008-01-10 19:01:03 UTC (rev 16851)
@@ -955,20 +955,22 @@
 
     document))
 
+(define fancy-invoice-guid "3ce293441e894423a2425d7a22dd1ac6")
+
 (gnc:define-report
  'version 1
  'name (N_ "Fancy Invoice")
- 'report-guid "3ce293441e894423a2425d7a22dd1ac6"
+ 'report-guid fancy-invoice-guid
  'menu-path (list gnc:menuname-business-reports)
  'options-generator options-generator
  'renderer reg-renderer
  'in-menu? #t)
 
 (define (gnc:fancy-invoice-report-create-internal invoice)
-  (let* ((options (gnc:make-report-options (N_ "Fancy Invoice")))
+  (let* ((options (gnc:make-report-options fancy-invoice-guid))
          (invoice-op (gnc:lookup-option options invoice-page invoice-name)))
 
     (gnc:option-set-value invoice-op invoice)
-    (gnc:make-report (N_ "Fancy Invoice") options)))
+    (gnc:make-report fancy-invoice-guid options)))
 
 (export gnc:fancy-invoice-report-create-internal)

Modified: gnucash/trunk/src/business/business-reports/invoice.scm
===================================================================
--- gnucash/trunk/src/business/business-reports/invoice.scm	2008-01-10 03:30:48 UTC (rev 16850)
+++ gnucash/trunk/src/business/business-reports/invoice.scm	2008-01-10 19:01:03 UTC (rev 16851)
@@ -747,20 +747,22 @@
 
     document))
 
+(define invoice-report-guid "5123a759ceb9483abf2182d01c140e8d")
+
 (gnc:define-report
  'version 1
  'name (N_ "Printable Invoice")
- 'report-guid "5123a759ceb9483abf2182d01c140e8d"
+ 'report-guid invoice-report-guid
  'menu-path (list gnc:menuname-business-reports)
  'options-generator options-generator
  'renderer reg-renderer
  'in-menu? #t)
 
 (define (gnc:invoice-report-create-internal invoice)
-  (let* ((options (gnc:make-report-options (N_ "Printable Invoice")))
+  (let* ((options (gnc:make-report-options invoice-report-guid))
          (invoice-op (gnc:lookup-option options invoice-page invoice-name)))
 
     (gnc:option-set-value invoice-op invoice)
-    (gnc:make-report (N_ "Printable Invoice") options)))
+    (gnc:make-report invoice-report-guid options)))
 
 (export gnc:invoice-report-create-internal)

Modified: gnucash/trunk/src/business/business-reports/payables.scm
===================================================================
--- gnucash/trunk/src/business/business-reports/payables.scm	2008-01-10 03:30:48 UTC (rev 16850)
+++ gnucash/trunk/src/business/business-reports/payables.scm	2008-01-10 19:01:03 UTC (rev 16851)
@@ -62,22 +62,24 @@
     (gnc:debug "payables-account" payables-account)
     (aging-renderer report-obj this-acc payables-account #f)))
 
+(define payables-aging-guid "e57770f2dbca46619d6dac4ac5469b50")
+
 ;; Here we define the actual report with gnc:define-report
 (gnc:define-report
  'version 1
  'name (N_ "Payable Aging")
- 'report-guid "e57770f2dbca46619d6dac4ac5469b50"
+ 'report-guid payables-aging-guid
  'menu-path (list gnc:menuname-business-reports)
  'options-generator options-generator
  'renderer payables-renderer
  'in-menu? #t)
 
 (define (payables-report-create-internal acct)
-  (let* ((options (gnc:make-report-options (N_ "Payable Aging")))
+  (let* ((options (gnc:make-report-options payables-aging-guid))
 	 (acct-op (gnc:lookup-option options acc-page this-acc)))
 
     (gnc:option-set-value acct-op acct)
-    (gnc:make-report "Payable Aging" options)))
+    (gnc:make-report payables-aging-guid options)))
 
 (define (gnc:payables-report-create-internal
 	 account split query journal? double? title

Modified: gnucash/trunk/src/business/business-reports/receivables.scm
===================================================================
--- gnucash/trunk/src/business/business-reports/receivables.scm	2008-01-10 03:30:48 UTC (rev 16850)
+++ gnucash/trunk/src/business/business-reports/receivables.scm	2008-01-10 19:01:03 UTC (rev 16851)
@@ -63,22 +63,24 @@
 
     (aging-renderer report-obj this-acc receivables-account #t)))
 
+(define receivables-aging-guid "9cf76bed17f14401b8e3e22d0079cb98")
+
 ;; Here we define the actual report with gnc:define-report
 (gnc:define-report
  'version 1
  'name (N_ "Receivable Aging")
- 'report-guid "9cf76bed17f14401b8e3e22d0079cb98"
+ 'report-guid receivables-aging-guid
  'menu-path (list gnc:menuname-business-reports)
  'options-generator options-generator
  'renderer receivables-renderer
  'in-menu? #t)
 
 (define (receivables-report-create-internal acct)
-  (let* ((options (gnc:make-report-options (N_ "Receivable Aging")))
+  (let* ((options (gnc:make-report-options receivables-aging-guid))
 	 (acct-op (gnc:lookup-option options acc-page this-acc)))
 
     (gnc:option-set-value acct-op acct)
-    (gnc:make-report "Receivable Aging" options)))
+    (gnc:make-report receivables-aging-guid options)))
 
 (define (gnc:receivables-report-create-internal
 	 account split query journal? double? title

Modified: gnucash/trunk/src/report/standard-reports/register.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/register.scm	2008-01-10 03:30:48 UTC (rev 16850)
+++ gnucash/trunk/src/report/standard-reports/register.scm	2008-01-10 19:01:03 UTC (rev 16851)
@@ -604,17 +604,26 @@
 
     document))
 
+(define register-report-guid "22104e02654c4adba844ee75a3f8d173")
+
+;; we get called from elsewhere... but this doesn't work FIX-ME, find
+;; out how to get report-guid's exported from report into the report
+;; system at large. might have to define this at the report-system
+;; level to get them read by other reports. Look at the aging reports
+;; for suggestions, perhaps
+(export register-report-guid)
+
 (gnc:define-report
  'version 1
  'name (N_ "Register")
- 'report-guid "22104e02654c4adba844ee75a3f8d173"
+ 'report-guid register-report-guid
  'options-generator options-generator
  'renderer reg-renderer
  'in-menu? #f)
 
 (define (gnc:register-report-create-internal invoice? query journal? double?
                                              title debit-string credit-string)
-  (let* ((options (gnc:make-report-options "Register"))
+  (let* ((options (gnc:make-report-options register-report-guid))
          (query-op (gnc:lookup-option options "__reg" "query"))
          (journal-op (gnc:lookup-option options "__reg" "journal"))
          (double-op (gnc:lookup-option options "__reg" "double"))
@@ -634,6 +643,6 @@
     (gnc:option-set-value title-op title)
     (gnc:option-set-value debit-op debit-string)
     (gnc:option-set-value credit-op credit-string)
-    (gnc:make-report "Register" options)))
+    (gnc:make-report register-report-guid options)))
 
 (export gnc:register-report-create-internal)