r18106 - gnucash/trunk/src - Undo r18103 change - standard reports shouldn't refer to business code/objects
Phil Longstaff
plongstaff at code.gnucash.org
Fri Jun 5 19:58:07 EDT 2009
Author: plongstaff
Date: 2009-06-05 19:58:07 -0400 (Fri, 05 Jun 2009)
New Revision: 18106
Trac: http://svn.gnucash.org/trac/changeset/18106
Modified:
gnucash/trunk/src/business/business-utils/business-utils.scm
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:
Undo r18103 change - standard reports shouldn't refer to business code/objects
Modified: gnucash/trunk/src/business/business-utils/business-utils.scm
===================================================================
--- gnucash/trunk/src/business/business-utils/business-utils.scm 2009-06-05 23:55:22 UTC (rev 18105)
+++ gnucash/trunk/src/business/business-utils/business-utils.scm 2009-06-05 23:58:07 UTC (rev 18106)
@@ -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)
- ;; Access company info from key-value pairs for current book
- (kvp-frame-get-slot-path-gslist
- (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*)
-(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")
Modified: gnucash/trunk/src/report/standard-reports/balance-sheet.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/balance-sheet.scm 2009-06-05 23:55:22 UTC (rev 18105)
+++ gnucash/trunk/src/report/standard-reports/balance-sheet.scm 2009-06-05 23:58:07 UTC (rev 18106)
@@ -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!
Modified: gnucash/trunk/src/report/standard-reports/budget-balance-sheet.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/budget-balance-sheet.scm 2009-06-05 23:55:22 UTC (rev 18105)
+++ gnucash/trunk/src/report/standard-reports/budget-balance-sheet.scm 2009-06-05 23:58:07 UTC (rev 18106)
@@ -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
Modified: gnucash/trunk/src/report/standard-reports/budget-income-statement.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/budget-income-statement.scm 2009-06-05 23:55:22 UTC (rev 18105)
+++ gnucash/trunk/src/report/standard-reports/budget-income-statement.scm 2009-06-05 23:58:07 UTC (rev 18106)
@@ -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
Modified: gnucash/trunk/src/report/standard-reports/equity-statement.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/equity-statement.scm 2009-06-05 23:55:22 UTC (rev 18105)
+++ gnucash/trunk/src/report/standard-reports/equity-statement.scm 2009-06-05 23:58:07 UTC (rev 18106)
@@ -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!
Modified: gnucash/trunk/src/report/standard-reports/income-statement.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/income-statement.scm 2009-06-05 23:55:22 UTC (rev 18105)
+++ gnucash/trunk/src/report/standard-reports/income-statement.scm 2009-06-05 23:58:07 UTC (rev 18106)
@@ -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!
Modified: gnucash/trunk/src/report/standard-reports/trial-balance.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/trial-balance.scm 2009-06-05 23:55:22 UTC (rev 18105)
+++ gnucash/trunk/src/report/standard-reports/trial-balance.scm 2009-06-05 23:58:07 UTC (rev 18106)
@@ -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
More information about the gnucash-changes
mailing list