r22058 - gnucash/trunk/src/report/standard-reports - Fix r22010 to not crash if the current file has no company name.

[Mike Alexander]

Author: mta
Date: 2012-02-20 18:02:08 -0500 (Mon, 20 Feb 2012)
New Revision: 22058
Trac: http://svn.gnucash.org/trac/changeset/22058

Modified:
   gnucash/trunk/src/report/standard-reports/balance-sheet.scm
   gnucash/trunk/src/report/standard-reports/budget-balance-sheet.scm
   gnucash/trunk/src/report/standard-reports/budget-income-statement.scm
   gnucash/trunk/src/report/standard-reports/equity-statement.scm
   gnucash/trunk/src/report/standard-reports/income-statement.scm
   gnucash/trunk/src/report/standard-reports/trial-balance.scm
Log:
Fix r22010 to not crash if the current file has no company name.

Modified: gnucash/trunk/src/report/standard-reports/balance-sheet.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/balance-sheet.scm	2012-02-20 22:14:32 UTC (rev 22057)
+++ gnucash/trunk/src/report/standard-reports/balance-sheet.scm	2012-02-20 23:02:08 UTC (rev 22058)
@@ -158,7 +158,7 @@
     (add-option
       (gnc:make-string-option
       gnc:pagename-general optname-party-name
-      "b" opthelp-party-name (gnc:company-info gnc:*company-name*)))
+      "b" opthelp-party-name (or (gnc:company-info gnc:*company-name*) "")))
     
     ;; date at which to report balance
     (gnc:options-add-report-date!

Modified: gnucash/trunk/src/report/standard-reports/budget-balance-sheet.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/budget-balance-sheet.scm	2012-02-20 22:14:32 UTC (rev 22057)
+++ gnucash/trunk/src/report/standard-reports/budget-balance-sheet.scm	2012-02-20 23:02:08 UTC (rev 22058)
@@ -126,7 +126,7 @@
     (add-option
       (gnc:make-string-option
       gnc:pagename-general optname-party-name
-      "b" opthelp-party-name (gnc:company-info gnc:*company-name*)))
+      "b" opthelp-party-name (or (gnc:company-info gnc:*company-name*) "")))
     
     (add-option
      (gnc:make-simple-boolean-option

Modified: gnucash/trunk/src/report/standard-reports/budget-income-statement.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/budget-income-statement.scm	2012-02-20 22:14:32 UTC (rev 22057)
+++ gnucash/trunk/src/report/standard-reports/budget-income-statement.scm	2012-02-20 23:02:08 UTC (rev 22058)
@@ -147,7 +147,7 @@
     (add-option
       (gnc:make-string-option
       gnc:pagename-general optname-party-name
-      "b" opthelp-party-name (gnc:company-info gnc:*company-name*)))
+      "b" opthelp-party-name (or (gnc:company-info gnc:*company-name*) "")))
 
     (add-option
      (gnc:make-budget-option

Modified: gnucash/trunk/src/report/standard-reports/equity-statement.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/equity-statement.scm	2012-02-20 22:14:32 UTC (rev 22057)
+++ gnucash/trunk/src/report/standard-reports/equity-statement.scm	2012-02-20 23:02:08 UTC (rev 22058)
@@ -111,7 +111,7 @@
     (add-option
       (gnc:make-string-option
       (N_ "General") optname-party-name
-      "b" opthelp-party-name (gnc:company-info gnc:*company-name*)))
+      "b" opthelp-party-name (or (gnc:company-info gnc:*company-name*) "")))
     
     ;; date at which to report balance
     (gnc:options-add-date-interval!

Modified: gnucash/trunk/src/report/standard-reports/income-statement.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/income-statement.scm	2012-02-20 22:14:32 UTC (rev 22057)
+++ gnucash/trunk/src/report/standard-reports/income-statement.scm	2012-02-20 23:02:08 UTC (rev 22058)
@@ -151,7 +151,7 @@
     (add-option
       (gnc:make-string-option
       gnc:pagename-general optname-party-name
-      "b" opthelp-party-name (gnc:company-info gnc:*company-name*)))
+      "b" opthelp-party-name (or (gnc:company-info gnc:*company-name*) "")))
     
     ;; period over which to report income
     (gnc:options-add-date-interval!

Modified: gnucash/trunk/src/report/standard-reports/trial-balance.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/trial-balance.scm	2012-02-20 22:14:32 UTC (rev 22057)
+++ gnucash/trunk/src/report/standard-reports/trial-balance.scm	2012-02-20 23:02:08 UTC (rev 22058)
@@ -149,7 +149,7 @@
     (add-option
       (gnc:make-string-option
       (N_ "General") optname-party-name
-      "b" opthelp-party-name (gnc:company-info gnc:*company-name*)))
+      "b" opthelp-party-name (or (gnc:company-info gnc:*company-name*) "")))
     
     ;; the period over which to collect adjusting/closing entries and
     ;; date at which to report the balance