Undo r18103 change - standard reports shouldn't refer to business code/objects

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18106 57a11ea4-9604-0410-9ed3-97b8803252fd

src/business/business-utils/business-utils.scm

@@ -14,16 +14,9 @@
 (define gnc:*company-email* (N_ "Company Email Address"))
 (define gnc:*company-contact* (N_ "Company Contact Person"))
 
-(define (gnc:company-info key)
+(export gnc:*business-label* gnc:*company-name* gnc:*company-addy* gnc:*company-id*
-  ;; Access company info from key-value pairs for current book
+            gnc:*company-phone* gnc:*company-fax* gnc:*company-url*
-  (kvp-frame-get-slot-path-gslist
+            gnc:*company-email* gnc:*company-contact*)
-    (gnc-book-get-slots (gnc-get-current-book))
-    (append gnc:*kvp-option-path* (list gnc:*business-label* key))))
-
-(export gnc:*business-label* gnc:*company-name*  gnc:*company-addy* 
-        gnc:*company-id*     gnc:*company-phone* gnc:*company-fax* 
-        gnc:*company-url*    gnc:*company-email* gnc:*company-contact*
-        gnc:company-info)
 
 (load-from-path "business-options.scm")
 (load-from-path "business-prefs.scm")

src/report/standard-reports/balance-sheet.scm

@@ -66,7 +66,6 @@
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (ice-9 slib))
 (use-modules (gnucash gnc-module))
-(use-modules (gnucash business-utils))
 
 (gnc:module-load "gnucash/report/report-system" 0)
 
@@ -159,7 +158,10 @@
     (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 ""))
+    ;; this should default to company name in (gnc-get-current-book)
+    ;; does anyone know the function to get the company name??
+    ;; (GnuCash is *so* well documented... sigh)
     
     ;; date at which to report balance
     (gnc:options-add-report-date!

src/report/standard-reports/budget-balance-sheet.scm

@@ -32,7 +32,6 @@
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (ice-9 slib))
 (use-modules (gnucash gnc-module))
-(use-modules (gnucash business-utils))
 
 (gnc:module-load "gnucash/report/report-system" 0)
 
@@ -127,7 +126,10 @@
     (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 ""))
+    ;; this should default to company name in (gnc-get-current-book)
+    ;; does anyone know the function to get the company name??
+    ;; (GnuCash is *so* well documented... sigh)
     
     (add-option
      (gnc:make-simple-boolean-option

src/report/standard-reports/budget-income-statement.scm

@@ -44,7 +44,6 @@
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (ice-9 slib))
 (use-modules (gnucash gnc-module))
-(use-modules (gnucash business-utils))
 
 (gnc:module-load "gnucash/report/report-system" 0)
 
@@ -134,7 +133,10 @@
     (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 ""))
+    ;; this should default to company name in (gnc-get-current-book)
+    ;; does anyone know the function to get the company name??
+    ;; (GnuCash is *so* well documented... sigh)
 
     (add-option
      (gnc:make-budget-option

src/report/standard-reports/equity-statement.scm

@@ -49,7 +49,6 @@
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (ice-9 slib))
 (use-modules (gnucash gnc-module))
-(use-modules (gnucash business-utils))
 
 (require 'printf)
 
@@ -112,7 +111,10 @@
     (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 ""))
+    ;; this should default to company name in (gnc-get-current-book)
+    ;; does anyone know the function to get the company name??
+    ;; (GnuCash is *so* well documented... sigh)
     
     ;; date at which to report balance
     (gnc:options-add-date-interval!

src/report/standard-reports/income-statement.scm

@@ -45,7 +45,6 @@
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (ice-9 slib))
 (use-modules (gnucash gnc-module))
-(use-modules (gnucash business-utils))
 
 (gnc:module-load "gnucash/report/report-system" 0)
 
@@ -145,7 +144,10 @@
     (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 ""))
+    ;; this should default to company name in (gnc-get-current-book)
+    ;; does anyone know the function to get the company name??
+    ;; (GnuCash is *so* well documented... sigh)
     
     ;; period over which to report income
     (gnc:options-add-date-interval!

src/report/standard-reports/trial-balance.scm

@@ -54,7 +54,6 @@
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (ice-9 slib))
 (use-modules (gnucash gnc-module))
-(use-modules (gnucash business-utils))
 
 (gnc:module-load "gnucash/report/report-system" 0)
 
@@ -149,7 +148,8 @@
     (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 ""))
+    ;; this should default to company name in (gnc-get-current-book)
     
     ;; the period over which to collect adjusting/closing entries and
     ;; date at which to report the balance