diff --git a/src/app-utils/app-utils.scm b/src/app-utils/app-utils.scm index 5ba54285c2..4920cdbac4 100644 --- a/src/app-utils/app-utils.scm +++ b/src/app-utils/app-utils.scm @@ -146,9 +146,9 @@ (export gnc:send-options) (export gnc:save-options) -(define (gnc:option-get-value category key) +(define (gnc:option-get-value book category key) ;;Access an option directly - (qof-book-get-option (gnc-get-current-book) + (qof-book-get-option book (if (list? key) (append (list category) key) (list category key)))) @@ -325,13 +325,13 @@ (define gnc:*fancy-date-label* (N_ "Fancy Date Format")) (define gnc:*fancy-date-format* (N_ "custom")) -(define (gnc:company-info key) +(define (gnc:company-info book key) ;; Access company info from key-value pairs for current book - (gnc:option-get-value gnc:*business-label* key)) + (gnc:option-get-value book gnc:*business-label* key)) -(define (gnc:fancy-date-info key) +(define (gnc:fancy-date-info book key) ;; Access fancy date info from key-value pairs for current book - (gnc:option-get-value gnc:*business-label* (list gnc:*fancy-date-label* key))) + (gnc:option-get-value book gnc:*business-label* (list gnc:*fancy-date-label* key))) (export gnc:*business-label* gnc:*company-name* gnc:*company-addy* gnc:*company-id* gnc:*company-phone* gnc:*company-fax* diff --git a/src/report/business-reports/balsheet-eg.scm b/src/report/business-reports/balsheet-eg.scm index 4ad4f9bfd0..24495af25f 100644 --- a/src/report/business-reports/balsheet-eg.scm +++ b/src/report/business-reports/balsheet-eg.scm @@ -434,7 +434,8 @@ ; to avoid duplicates. (xlist '()) - (coyname (or (gnc:company-info gnc:*company-name*) "")) + ;; XXX I haven't found a way to get the book for which the report was opened here + (coyname (or (gnc:company-info (gnc-get-current-book) gnc:*company-name*) "")) (css? (gnc-html-engine-supports-css)) diff --git a/src/report/business-reports/customer-summary.scm b/src/report/business-reports/customer-summary.scm index fcd1136bae..bb7c50f6fd 100644 --- a/src/report/business-reports/customer-summary.scm +++ b/src/report/business-reports/customer-summary.scm @@ -611,11 +611,11 @@ 'attribute (list "valign" "top")) table)) -(define (make-myname-table book) +(define (make-myname-table book date-format) (let* ((table (gnc:make-html-table)) (table-outer (gnc:make-html-table)) - (name (gnc:company-info gnc:*company-name*)) - (addy (gnc:company-info gnc:*company-addy*))) + (name (gnc:company-info book gnc:*company-name*)) + (addy (gnc:company-info book gnc:*company-addy*))) (gnc:html-table-set-style! table "table" @@ -631,7 +631,9 @@ (if addy addy "") #\newline "
"))) (gnc:html-table-append-row! table (list - (gnc-print-date (gnc:get-today)))) + (strftime + date-format + (localtime (car (gnc:get-today)))))) (gnc:html-table-set-style! table-outer "table" @@ -701,7 +703,8 @@ (expense-accounts (opt-val pagename-expenseaccounts optname-expenseaccounts)) (income-accounts (opt-val pagename-incomeaccounts optname-incomeaccounts)) (all-accounts (append income-accounts expense-accounts)) - (book (gnc-get-current-book)) ;XXX Grab this from elsewhere + (book (gnc-account-get-book (car all-accounts))) + (date-format (gnc:fancy-date-info book gnc:*fancy-date-format*)) (type (opt-val "__reg" "owner-type")) (reverse? (opt-val "__reg" "reverse?")) (ownerlist (gncBusinessGetOwnerList @@ -818,7 +821,7 @@ (if show-own-address? (gnc:html-document-add-object! document - (make-myname-table book))) + (make-myname-table book date-format))) ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/src/report/business-reports/easy-invoice.scm b/src/report/business-reports/easy-invoice.scm index d241692fdd..fc9e60eb10 100644 --- a/src/report/business-reports/easy-invoice.scm +++ b/src/report/business-reports/easy-invoice.scm @@ -625,10 +625,10 @@ 'attribute (list "valign" "top")) table)) -(define (make-myname-table) +(define (make-myname-table book) (let* ((table (gnc:make-html-table)) - (name (gnc:company-info gnc:*company-name*)) - (addy (gnc:company-info gnc:*company-addy*))) + (name (gnc:company-info book gnc:*company-name*)) + (addy (gnc:company-info book gnc:*company-addy*))) (gnc:html-table-set-style! table "table" @@ -727,7 +727,8 @@ (add-html! document "") (if (not (null? invoice)) - (let* ((date-format (gnc:fancy-date-info gnc:*fancy-date-format*))) + (let* ((book (gncInvoiceGetBook invoice)) + (date-format (gnc:fancy-date-info book gnc:*fancy-date-format*))) ; invoice number and ID String table (add-html! document "") (add-html! document ""))) (add-html! document "
") @@ -739,7 +740,7 @@ (add-html! document "") (if (opt-val "Display" "My Company ID") - (let* ((taxid (gnc:company-info gnc:*company-id*))) + (let* ((taxid (gnc:company-info book gnc:*company-id*))) (if (and taxid (> (string-length taxid) 0)) (begin (add-html! document taxid) @@ -753,7 +754,7 @@ (make-break! document) ; add the client and company name table - (begin + (let ((book (gncInvoiceGetBook invoice))) (set! table (make-entry-table invoice (gnc:report-options report-obj) add-order cust-doc? credit-note?)) @@ -769,7 +770,7 @@ (add-html! document "") (gnc:html-document-add-object! document - (make-myname-table)) + (make-myname-table book)) (add-html! document "
") ) diff --git a/src/report/business-reports/fancy-invoice.scm b/src/report/business-reports/fancy-invoice.scm index 667cff3545..8cba63c378 100644 --- a/src/report/business-reports/fancy-invoice.scm +++ b/src/report/business-reports/fancy-invoice.scm @@ -675,15 +675,15 @@ 'attribute (list "valign" "top")) table)) -(define (make-myname-table title) +(define (make-myname-table book title) (let* ((table (gnc:make-html-table)) - (name (gnc:company-info gnc:*company-name*)) -;; (contact (gnc:company-info gnc:*company-contact*)) - (addy (gnc:company-info gnc:*company-addy*)) - (id (gnc:company-info gnc:*company-id*)) - (phone (gnc:company-info gnc:*company-phone*)) - (fax (gnc:company-info gnc:*company-fax*)) - (url (gnc:company-info gnc:*company-url*)) + (name (gnc:company-info book gnc:*company-name*)) +;; (contact (gnc:company-info book gnc:*company-contact*)) + (addy (gnc:company-info book gnc:*company-addy*)) + (id (gnc:company-info book gnc:*company-id*)) + (phone (gnc:company-info book gnc:*company-phone*)) + (fax (gnc:company-info book gnc:*company-fax*)) + (url (gnc:company-info book gnc:*company-url*)) (invoice-cell (gnc:make-html-table-cell)) (name-cell (gnc:make-html-table-cell)) @@ -796,10 +796,11 @@ (if (not (null? invoice)) - (let ((date-object #f) - (date-format (gnc:fancy-date-info gnc:*fancy-date-format*)) - (helper-table (gnc:make-html-table)) - (title (title-string default-title custom-title))) + (let* ((book (gncInvoiceGetBook invoice)) + (date-object #f) + (date-format (gnc:fancy-date-info book gnc:*fancy-date-format*)) + (helper-table (gnc:make-html-table)) + (title (title-string default-title custom-title))) (set! table (make-entry-table invoice (gnc:report-options report-obj) add-order cust-doc? credit-note?)) @@ -827,7 +828,8 @@ "50%" "60%"))) (gnc:html-document-add-object! - document (make-myname-table title)) + document (make-myname-table + book title)) (make-break! document) (make-break! document) @@ -927,7 +929,7 @@ (make-break! document) (if (opt-val "Display" "Payable to") - (let* ((name (gnc:company-info gnc:*company-name*)) + (let* ((name (gnc:company-info book gnc:*company-name*)) (name-str (opt-val "Display" "Payable to string"))) (if (and name (> (string-length name) 0)) (gnc:html-document-add-object! @@ -939,7 +941,7 @@ (make-break! document) (if (opt-val "Display" "Company contact") - (let* ((contact (gnc:company-info gnc:*company-contact*)) + (let* ((contact (gnc:company-info book gnc:*company-contact*)) (contact-str (opt-val "Display" "Company contact string"))) (if (and contact (> (string-length contact) 0)) (gnc:html-document-add-object! diff --git a/src/report/business-reports/invoice.scm b/src/report/business-reports/invoice.scm index 365ed124f0..5a6d9b8a20 100644 --- a/src/report/business-reports/invoice.scm +++ b/src/report/business-reports/invoice.scm @@ -602,10 +602,10 @@ 'attribute (list "valign" "top")) table)) -(define (make-myname-table date-format) +(define (make-myname-table book date-format) (let* ((table (gnc:make-html-table)) - (name (gnc:company-info gnc:*company-name*)) - (addy (gnc:company-info gnc:*company-addy*))) + (name (gnc:company-info book gnc:*company-name*)) + (addy (gnc:company-info book gnc:*company-addy*))) (gnc:html-table-set-style! table "table" @@ -691,7 +691,8 @@ (gncInvoiceGetID invoice))) (if (not (null? invoice)) - (let* ((date-format (gnc:fancy-date-info gnc:*fancy-date-format*))) + (let* ((book (gncInvoiceGetBook invoice)) + (date-format (gnc:fancy-date-info book gnc:*fancy-date-format*))) (set! table (make-entry-table invoice (gnc:report-options report-obj) add-order cust-doc? credit-note?)) @@ -704,7 +705,7 @@ (gnc:html-document-add-object! document - (make-myname-table date-format)) + (make-myname-table book date-format)) (let ((date-table #f) (post-date (gncInvoiceGetDatePosted invoice)) diff --git a/src/report/business-reports/job-report.scm b/src/report/business-reports/job-report.scm index f90933063a..3edb7dd80f 100644 --- a/src/report/business-reports/job-report.scm +++ b/src/report/business-reports/job-report.scm @@ -506,10 +506,10 @@ 'attribute (list "valign" "top")) table)) -(define (make-myname-table date-format) +(define (make-myname-table book date-format) (let* ((table (gnc:make-html-table)) - (name (gnc:company-info gnc:*company-name*)) - (addy (gnc:company-info gnc:*company-addy*))) + (name (gnc:company-info book gnc:*company-name*)) + (addy (gnc:company-info book gnc:*company-addy*))) (gnc:html-table-set-style! table "table" @@ -552,7 +552,8 @@ (end-date (gnc:timepair-end-day-time (gnc:date-option-absolute-time (opt-val gnc:pagename-general (N_ "To"))))) - (date-format (gnc:fancy-date-info gnc:*fancy-date-format*)) + (book (gnc-account-get-book account)) + (date-format (gnc:fancy-date-info book gnc:*fancy-date-format*)) (type (opt-val "__reg" "owner-type")) (type-str "") (report-title-str "")) @@ -606,7 +607,7 @@ (gnc:html-document-add-object! document - (make-myname-table date-format)) + (make-myname-table book date-format)) (gnc:html-document-add-object! document diff --git a/src/report/business-reports/owner-report.scm b/src/report/business-reports/owner-report.scm index 748ec01c5b..dbb298f674 100644 --- a/src/report/business-reports/owner-report.scm +++ b/src/report/business-reports/owner-report.scm @@ -711,10 +711,10 @@ 'attribute (list "valign" "top")) table)) -(define (make-myname-table date-format) +(define (make-myname-table book date-format) (let* ((table (gnc:make-html-table)) - (name (gnc:company-info gnc:*company-name*)) - (addy (gnc:company-info gnc:*company-addy*))) + (name (gnc:company-info book gnc:*company-name*)) + (addy (gnc:company-info book gnc:*company-addy*))) (gnc:html-table-set-style! table "table" @@ -756,7 +756,8 @@ (end-date (gnc:timepair-end-day-time (gnc:date-option-absolute-time (opt-val gnc:pagename-general optname-to-date)))) - (date-format (gnc:fancy-date-info gnc:*fancy-date-format*)) + (book (gnc-account-get-book account)) + (date-format (gnc:fancy-date-info book gnc:*fancy-date-format*)) (type (opt-val "__reg" "owner-type")) (owner-descr (owner-string type)) (date-type (opt-val gnc:pagename-general optname-date-driver)) @@ -802,7 +803,7 @@ (gnc:html-document-add-object! document - (make-myname-table date-format)) + (make-myname-table book date-format)) (gnc:html-document-add-object! document diff --git a/src/report/business-reports/receipt.eguile.scm b/src/report/business-reports/receipt.eguile.scm index 829da36e90..3b70108d58 100644 --- a/src/report/business-reports/receipt.eguile.scm +++ b/src/report/business-reports/receipt.eguile.scm @@ -41,14 +41,14 @@ (currency (gncInvoiceGetCurrency opt-invoice)) (entries (gncInvoiceGetEntries opt-invoice)) (splits '()) - (coyname (gnc:company-info gnc:*company-name*)) - (coycontact (gnc:company-info gnc:*company-contact*)) - (coyaddr (gnc:company-info gnc:*company-addy*)) - (coyid (gnc:company-info gnc:*company-id*)) - (coyphone (gnc:company-info gnc:*company-phone*)) - (coyfax (gnc:company-info gnc:*company-fax*)) - (coyurl (gnc:company-info gnc:*company-url*)) - (coyemail (gnc:company-info gnc:*company-email*)) + (coyname (gnc:company-info book gnc:*company-name*)) + (coycontact (gnc:company-info book gnc:*company-contact*)) + (coyaddr (gnc:company-info book gnc:*company-addy*)) + (coyid (gnc:company-info book gnc:*company-id*)) + (coyphone (gnc:company-info book gnc:*company-phone*)) + (coyfax (gnc:company-info book gnc:*company-fax*)) + (coyurl (gnc:company-info book gnc:*company-url*)) + (coyemail (gnc:company-info book gnc:*company-email*)) (owneraddr (gnc:owner-get-name-and-address-dep owner)) (billcontact (gncAddressGetName (gnc:owner-get-address owner))) ; flags and counters diff --git a/src/report/business-reports/taxinvoice.eguile.scm b/src/report/business-reports/taxinvoice.eguile.scm index 797889880a..ad04190827 100644 --- a/src/report/business-reports/taxinvoice.eguile.scm +++ b/src/report/business-reports/taxinvoice.eguile.scm @@ -35,6 +35,7 @@ (let* (; invoice and company details (invoiceid (gncInvoiceGetID opt-invoice)) (credit-note? (gncInvoiceGetIsCreditNote opt-invoice)) + (book (gncInvoiceGetBook opt-invoice)) (postdate (gncInvoiceGetDatePosted opt-invoice)) (duedate (gncInvoiceGetDateDue opt-invoice)) (billingid (gncInvoiceGetBillingID opt-invoice)) @@ -46,15 +47,15 @@ (currency (gncInvoiceGetCurrency opt-invoice)) (entries (gncInvoiceGetEntries opt-invoice)) (splits '());' - (dateformat (gnc:fancy-date-info gnc:*fancy-date-format*)) - (coyname (gnc:company-info gnc:*company-name*)) - (coycontact (gnc:company-info gnc:*company-contact*)) - (coyaddr (gnc:company-info gnc:*company-addy*)) - (coyid (gnc:company-info gnc:*company-id*)) - (coyphone (gnc:company-info gnc:*company-phone*)) - (coyfax (gnc:company-info gnc:*company-fax*)) - (coyurl (gnc:company-info gnc:*company-url*)) - (coyemail (gnc:company-info gnc:*company-email*)) + (dateformat (gnc:fancy-date-info book gnc:*fancy-date-format*)) + (coyname (gnc:company-info book gnc:*company-name*)) + (coycontact (gnc:company-info book gnc:*company-contact*)) + (coyaddr (gnc:company-info book gnc:*company-addy*)) + (coyid (gnc:company-info book gnc:*company-id*)) + (coyphone (gnc:company-info book gnc:*company-phone*)) + (coyfax (gnc:company-info book gnc:*company-fax*)) + (coyurl (gnc:company-info book gnc:*company-url*)) + (coyemail (gnc:company-info book gnc:*company-email*)) (owneraddr (gnc:owner-get-address-dep owner)) (ownername (gnc:owner-get-name-dep owner)) (jobnumber (gncJobGetID (gncOwnerGetJob (gncInvoiceGetOwner opt-invoice)))) diff --git a/src/report/locale-specific/us/taxtxf-de_DE.scm b/src/report/locale-specific/us/taxtxf-de_DE.scm index 85b554e612..6cf0fce0d3 100644 --- a/src/report/locale-specific/us/taxtxf-de_DE.scm +++ b/src/report/locale-specific/us/taxtxf-de_DE.scm @@ -488,6 +488,7 @@ (validate (reverse (gnc-account-get-children-sorted (gnc-get-current-root-account)))))) + (book (gnc:account-get-book (car selected-accounts))) (generations (if (pair? selected-accounts) (apply max (map (lambda (x) (num-generations x 1)) selected-accounts)) @@ -753,7 +754,7 @@ (car (timespecCanonicalDayTime (cons (current-time) 0)))))) (tax-nr (or - (gnc:option-get-value gnc:*tax-label* gnc:*tax-nr-label*) + (gnc:option-get-value book gnc:*tax-label* gnc:*tax-nr-label*) "")) ) diff --git a/src/report/standard-reports/balance-sheet.scm b/src/report/standard-reports/balance-sheet.scm index d40bc161bc..739d9fc2c7 100644 --- a/src/report/standard-reports/balance-sheet.scm +++ b/src/report/standard-reports/balance-sheet.scm @@ -147,6 +147,7 @@ ;; options generator (define (balance-sheet-options-generator) (let* ((options (gnc:new-options)) + (book (gnc-get-current-book)) ; XXX Find a way to get the book that opened the report (add-option (lambda (new-option) (gnc:register-option options new-option)))) @@ -158,7 +159,7 @@ (add-option (gnc:make-string-option gnc:pagename-general optname-party-name - "b" opthelp-party-name (or (gnc:company-info gnc:*company-name*) ""))) + "b" opthelp-party-name (or (gnc:company-info book gnc:*company-name*) ""))) ;; date at which to report balance (gnc:options-add-report-date! diff --git a/src/report/standard-reports/budget-balance-sheet.scm b/src/report/standard-reports/budget-balance-sheet.scm index 266324fb47..da67b067be 100644 --- a/src/report/standard-reports/budget-balance-sheet.scm +++ b/src/report/standard-reports/budget-balance-sheet.scm @@ -115,6 +115,7 @@ ;; options generator (define (budget-balance-sheet-options-generator) (let* ((options (gnc:new-options)) + (book (gnc-get-current-book)) ; XXX Find a way to get the book that opened the report (add-option (lambda (new-option) (gnc:register-option options new-option)))) @@ -126,7 +127,7 @@ (add-option (gnc:make-string-option gnc:pagename-general optname-party-name - "b" opthelp-party-name (or (gnc:company-info gnc:*company-name*) ""))) + "b" opthelp-party-name (or (gnc:company-info book gnc:*company-name*) ""))) (add-option (gnc:make-simple-boolean-option diff --git a/src/report/standard-reports/budget-income-statement.scm b/src/report/standard-reports/budget-income-statement.scm index aa5052cb73..322316b6f1 100644 --- a/src/report/standard-reports/budget-income-statement.scm +++ b/src/report/standard-reports/budget-income-statement.scm @@ -136,6 +136,7 @@ ;; options generator (define (budget-income-statement-options-generator-internal reportname) (let* ((options (gnc:new-options)) + (book (gnc-get-current-book)) ; XXX Find a way to get the book that opened the report (add-option (lambda (new-option) (gnc:register-option options new-option)))) @@ -147,7 +148,7 @@ (add-option (gnc:make-string-option gnc:pagename-general optname-party-name - "b" opthelp-party-name (or (gnc:company-info gnc:*company-name*) ""))) + "b" opthelp-party-name (or (gnc:company-info book gnc:*company-name*) ""))) (add-option (gnc:make-budget-option diff --git a/src/report/standard-reports/equity-statement.scm b/src/report/standard-reports/equity-statement.scm index 8c1b2b36a9..44bdc43e98 100644 --- a/src/report/standard-reports/equity-statement.scm +++ b/src/report/standard-reports/equity-statement.scm @@ -100,6 +100,7 @@ ;; options generator (define (equity-statement-options-generator) (let* ((options (gnc:new-options)) + (book (gnc-get-current-book)) ; XXX Find a way to get the book that opened the report (add-option (lambda (new-option) (gnc:register-option options new-option)))) @@ -111,7 +112,7 @@ (add-option (gnc:make-string-option (N_ "General") optname-party-name - "b" opthelp-party-name (or (gnc:company-info gnc:*company-name*) ""))) + "b" opthelp-party-name (or (gnc:company-info book gnc:*company-name*) ""))) ;; date at which to report balance (gnc:options-add-date-interval! diff --git a/src/report/standard-reports/income-statement.scm b/src/report/standard-reports/income-statement.scm index 7c40395ae4..0d24a1ea8c 100644 --- a/src/report/standard-reports/income-statement.scm +++ b/src/report/standard-reports/income-statement.scm @@ -140,6 +140,7 @@ ;; options generator (define (income-statement-options-generator-internal reportname) (let* ((options (gnc:new-options)) + (book (gnc-get-current-book)) ; XXX Find a way to get the book that opened the report (add-option (lambda (new-option) (gnc:register-option options new-option)))) @@ -151,7 +152,7 @@ (add-option (gnc:make-string-option gnc:pagename-general optname-party-name - "b" opthelp-party-name (or (gnc:company-info gnc:*company-name*) ""))) + "b" opthelp-party-name (or (gnc:company-info book gnc:*company-name*) ""))) ;; period over which to report income (gnc:options-add-date-interval! diff --git a/src/report/standard-reports/trial-balance.scm b/src/report/standard-reports/trial-balance.scm index ff707e0a6b..e81c9726fe 100644 --- a/src/report/standard-reports/trial-balance.scm +++ b/src/report/standard-reports/trial-balance.scm @@ -138,6 +138,7 @@ ;; options generator (define (trial-balance-options-generator) (let* ((options (gnc:new-options)) + (book (gnc-get-current-book)) ; XXX Find a way to get the book that opened the report (add-option (lambda (new-option) (gnc:register-option options new-option)))) @@ -149,7 +150,7 @@ (add-option (gnc:make-string-option (N_ "General") optname-party-name - "b" opthelp-party-name (or (gnc:company-info gnc:*company-name*) ""))) + "b" opthelp-party-name (or (gnc:company-info book gnc:*company-name*) ""))) ;; the period over which to collect adjusting/closing entries and ;; date at which to report the balance