Bug #584819 - Company name is not shown by default on some reports

Patch by Chris Dennis

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

src/app-utils/app-utils.scm

@@ -309,9 +309,16 @@
 (define gnc:*company-email* (N_ "Company Email Address"))
 (define gnc:*company-contact* (N_ "Company Contact Person"))
 
-(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*)
+(define (gnc:company-info key)
+  ;; Access company info from key-value pairs for current book
+  (kvp-frame-get-slot-path-gslist
+    (qof-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)
 
 (define gnc:*option-section-accounts* OPTION-SECTION-ACCOUNTS)
 (define gnc:*option-name-trading-accounts* OPTION-NAME-TRADING-ACCOUNTS)

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

@@ -65,6 +65,7 @@
 (define-module (gnucash report standard-reports balance-sheet))
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash app-utils))
 
 (gnc:module-load "gnucash/report/report-system" 0)
 
@@ -157,10 +158,7 @@
     (add-option
       (gnc:make-string-option
       gnc:pagename-general optname-party-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)
+      "b" opthelp-party-name (gnc:company-info gnc:*company-name*)))
     
     ;; date at which to report balance
     (gnc:options-add-report-date!

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

@@ -31,6 +31,7 @@
 (define-module (gnucash report standard-reports budget-balance-sheet))
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash app-utils))
 
 (gnc:module-load "gnucash/report/report-system" 0)
 
@@ -125,10 +126,7 @@
     (add-option
       (gnc:make-string-option
       gnc:pagename-general optname-party-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)
+      "b" opthelp-party-name (gnc:company-info gnc:*company-name*)))
     
     (add-option
      (gnc:make-simple-boolean-option

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

@@ -44,6 +44,7 @@
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash printf))
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash app-utils))
 
 (gnc:module-load "gnucash/report/report-system" 0)
 
@@ -146,10 +147,7 @@
     (add-option
       (gnc:make-string-option
       gnc:pagename-general optname-party-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)
+      "b" opthelp-party-name (gnc:company-info gnc:*company-name*)))
 
     (add-option
      (gnc:make-budget-option

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

@@ -48,6 +48,7 @@
 (define-module (gnucash report standard-reports equity-statement))
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash app-utils))
 
 (use-modules (gnucash printf))
 
@@ -110,10 +111,7 @@
     (add-option
       (gnc:make-string-option
       (N_ "General") optname-party-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)
+      "b" opthelp-party-name (gnc:company-info gnc:*company-name*)))
     
     ;; date at which to report balance
     (gnc:options-add-date-interval!

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

@@ -45,6 +45,7 @@
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash printf))
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash app-utils))
 
 (gnc:module-load "gnucash/report/report-system" 0)
 
@@ -150,10 +151,7 @@
     (add-option
       (gnc:make-string-option
       gnc:pagename-general optname-party-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)
+      "b" opthelp-party-name (gnc:company-info gnc:*company-name*)))
     
     ;; period over which to report income
     (gnc:options-add-date-interval!

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

@@ -54,6 +54,7 @@
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash printf))
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash app-utils))
 
 (gnc:module-load "gnucash/report/report-system" 0)
 
@@ -148,8 +149,7 @@
     (add-option
       (gnc:make-string-option
       (N_ "General") optname-party-name
-      "b" opthelp-party-name ""))
-    ;; this should default to company name in (gnc-get-current-book)
+      "b" opthelp-party-name (gnc:company-info gnc:*company-name*)))
     
     ;; the period over which to collect adjusting/closing entries and
     ;; date at which to report the balance