gnucash master: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Tue Aug 4 15:35:26 EDT 2015
Updated via https://github.com/Gnucash/gnucash/commit/9240c1b4 (commit)
via https://github.com/Gnucash/gnucash/commit/8fd10360 (commit)
from https://github.com/Gnucash/gnucash/commit/aa6b538e (commit)
commit 9240c1b4aa73ae3cd83b448b0878232384ebbf5a
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Aug 4 21:32:13 2015 +0200
Partially revert 'Drop some unused parameters from business reports'
Instead have gnc:company-info and gnc:fancy-date-info use the book
parameter again (which got lost in the kvp refactoring).
This preserves some code for potentially being able to have two
books open at once.
diff --git a/src/app-utils/app-utils.scm b/src/app-utils/app-utils.scm
index 5ba5428..4920cdb 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 4ad4f9b..24495af 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 fcd1136..bb7c50f 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 "<br>")))
(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 d241692..fc9e60e 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 "<tr><td align='left'>")
(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 "<table width='100%'><tr>")
(add-html! document "<td align='left'>")
@@ -739,7 +740,7 @@
(add-html! document "<td align='right'>")
(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 "<td align='right' valign='top'>")
(gnc:html-document-add-object!
document
- (make-myname-table))
+ (make-myname-table book))
(add-html! document "</td>")))
(add-html! document "</tr></table>")
)
diff --git a/src/report/business-reports/fancy-invoice.scm b/src/report/business-reports/fancy-invoice.scm
index 667cff3..8cba63c 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 365ed12..5a6d9b8 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 f909330..3edb7dd 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 748ec01..dbb298f 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 829da36..3b70108 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 7978898..ad04190 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 85b554e..6cf0fce 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 d40bc16..739d9fc 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 266324f..da67b06 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 aa5052c..322316b 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 8c1b2b3..44bdc43 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 7c40395..0d24a1e 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 ff707e0..e81c972 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
commit 8fd103602bacb301fcd9cc408f664f2281a2e6b4
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Aug 4 16:37:51 2015 +0200
Minor debug message fixup
diff --git a/src/gnome-utils/dialog-transfer.c b/src/gnome-utils/dialog-transfer.c
index bd1cda6..1f4006d 100644
--- a/src/gnome-utils/dialog-transfer.c
+++ b/src/gnome-utils/dialog-transfer.c
@@ -1442,7 +1442,7 @@ gnc_xfer_dialog_response_cb (GtkDialog *dialog, gint response, gpointer data)
if (!gnc_amount_edit_evaluate (GNC_AMOUNT_EDIT (xferData->amount_edit)))
{
gnc_parse_error_dialog (xferData, _("You must enter a valid amount."));
- LEAVE("no account");
+ LEAVE("no amount");
return;
}
Summary of changes:
src/app-utils/app-utils.scm | 12 ++++----
src/gnome-utils/dialog-transfer.c | 2 +-
src/report/business-reports/balsheet-eg.scm | 3 +-
src/report/business-reports/customer-summary.scm | 15 ++++++----
src/report/business-reports/easy-invoice.scm | 15 +++++-----
src/report/business-reports/fancy-invoice.scm | 32 ++++++++++++----------
src/report/business-reports/invoice.scm | 11 ++++----
src/report/business-reports/job-report.scm | 11 ++++----
src/report/business-reports/owner-report.scm | 11 ++++----
src/report/business-reports/receipt.eguile.scm | 16 +++++------
src/report/business-reports/taxinvoice.eguile.scm | 19 +++++++------
src/report/locale-specific/us/taxtxf-de_DE.scm | 3 +-
src/report/standard-reports/balance-sheet.scm | 3 +-
.../standard-reports/budget-balance-sheet.scm | 3 +-
.../standard-reports/budget-income-statement.scm | 3 +-
src/report/standard-reports/equity-statement.scm | 3 +-
src/report/standard-reports/income-statement.scm | 3 +-
src/report/standard-reports/trial-balance.scm | 3 +-
18 files changed, 93 insertions(+), 75 deletions(-)
More information about the gnucash-changes
mailing list