gnucash master: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Tue Aug 4 09:32:47 EDT 2015
Updated via https://github.com/Gnucash/gnucash/commit/42710c7e (commit)
via https://github.com/Gnucash/gnucash/commit/c031d5cc (commit)
via https://github.com/Gnucash/gnucash/commit/678cc189 (commit)
via https://github.com/Gnucash/gnucash/commit/c64f58f5 (commit)
via https://github.com/Gnucash/gnucash/commit/21069b5e (commit)
from https://github.com/Gnucash/gnucash/commit/dd60ce69 (commit)
commit 42710c7e6c69ae99b0a8d3713ae79db43f37f7d4
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Aug 4 15:31:40 2015 +0200
Drop some unused parameters from business reports
They are no longer used since the introduction of gnc:company-info
diff --git a/src/report/business-reports/easy-invoice.scm b/src/report/business-reports/easy-invoice.scm
index e2ee9c2..d241692 100644
--- a/src/report/business-reports/easy-invoice.scm
+++ b/src/report/business-reports/easy-invoice.scm
@@ -625,7 +625,7 @@
'attribute (list "valign" "top"))
table))
-(define (make-myname-table book)
+(define (make-myname-table)
(let* ((table (gnc:make-html-table))
(name (gnc:company-info gnc:*company-name*))
(addy (gnc:company-info gnc:*company-addy*)))
@@ -753,7 +753,7 @@
(make-break! document)
; add the client and company name table
- (let ((book (gncInvoiceGetBook invoice)))
+ (begin
(set! table (make-entry-table invoice
(gnc:report-options report-obj)
add-order cust-doc? credit-note?))
@@ -769,7 +769,7 @@
(add-html! document "<td align='right' valign='top'>")
(gnc:html-document-add-object!
document
- (make-myname-table book))
+ (make-myname-table))
(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 cd5bf31..667cff3 100644
--- a/src/report/business-reports/fancy-invoice.scm
+++ b/src/report/business-reports/fancy-invoice.scm
@@ -675,7 +675,7 @@
'attribute (list "valign" "top"))
table))
-(define (make-myname-table book date-format title)
+(define (make-myname-table title)
(let* ((table (gnc:make-html-table))
(name (gnc:company-info gnc:*company-name*))
;; (contact (gnc:company-info gnc:*company-contact*))
@@ -796,8 +796,7 @@
(if (not (null? invoice))
- (let ((book (gncInvoiceGetBook invoice))
- (date-object #f)
+ (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)))
@@ -828,8 +827,7 @@
"50%" "60%")))
(gnc:html-document-add-object!
- document (make-myname-table
- book date-format title)) ;; Note: date-format is not used for this report
+ document (make-myname-table title))
(make-break! document)
(make-break! document)
diff --git a/src/report/business-reports/invoice.scm b/src/report/business-reports/invoice.scm
index 094e82a..365ed12 100644
--- a/src/report/business-reports/invoice.scm
+++ b/src/report/business-reports/invoice.scm
@@ -602,7 +602,7 @@
'attribute (list "valign" "top"))
table))
-(define (make-myname-table book date-format)
+(define (make-myname-table date-format)
(let* ((table (gnc:make-html-table))
(name (gnc:company-info gnc:*company-name*))
(addy (gnc:company-info gnc:*company-addy*)))
@@ -691,8 +691,7 @@
(gncInvoiceGetID invoice)))
(if (not (null? invoice))
- (let* ((book (gncInvoiceGetBook invoice))
- (date-format (gnc:fancy-date-info gnc:*fancy-date-format*)))
+ (let* ((date-format (gnc:fancy-date-info gnc:*fancy-date-format*)))
(set! table (make-entry-table invoice
(gnc:report-options report-obj)
add-order cust-doc? credit-note?))
@@ -705,7 +704,7 @@
(gnc:html-document-add-object!
document
- (make-myname-table book date-format))
+ (make-myname-table 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 dfb8e40..f909330 100644
--- a/src/report/business-reports/job-report.scm
+++ b/src/report/business-reports/job-report.scm
@@ -506,7 +506,7 @@
'attribute (list "valign" "top"))
table))
-(define (make-myname-table book date-format)
+(define (make-myname-table date-format)
(let* ((table (gnc:make-html-table))
(name (gnc:company-info gnc:*company-name*))
(addy (gnc:company-info gnc:*company-addy*)))
@@ -552,7 +552,6 @@
(end-date (gnc:timepair-end-day-time
(gnc:date-option-absolute-time
(opt-val gnc:pagename-general (N_ "To")))))
- (book (gnc-get-current-book)) ;XXX Grab this from elsewhere
(date-format (gnc:fancy-date-info gnc:*fancy-date-format*))
(type (opt-val "__reg" "owner-type"))
(type-str "")
@@ -607,7 +606,7 @@
(gnc:html-document-add-object!
document
- (make-myname-table book date-format))
+ (make-myname-table 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 6278a8f..748ec01 100644
--- a/src/report/business-reports/owner-report.scm
+++ b/src/report/business-reports/owner-report.scm
@@ -711,7 +711,7 @@
'attribute (list "valign" "top"))
table))
-(define (make-myname-table book date-format)
+(define (make-myname-table date-format)
(let* ((table (gnc:make-html-table))
(name (gnc:company-info gnc:*company-name*))
(addy (gnc:company-info gnc:*company-addy*)))
@@ -756,7 +756,6 @@
(end-date (gnc:timepair-end-day-time
(gnc:date-option-absolute-time
(opt-val gnc:pagename-general optname-to-date))))
- (book (gnc-get-current-book)) ;XXX Grab this from elsewhere
(date-format (gnc:fancy-date-info gnc:*fancy-date-format*))
(type (opt-val "__reg" "owner-type"))
(owner-descr (owner-string type))
@@ -803,7 +802,7 @@
(gnc:html-document-add-object!
document
- (make-myname-table book date-format))
+ (make-myname-table date-format))
(gnc:html-document-add-object!
document
diff --git a/src/report/business-reports/taxinvoice.eguile.scm b/src/report/business-reports/taxinvoice.eguile.scm
index 2a9d14b..7978898 100644
--- a/src/report/business-reports/taxinvoice.eguile.scm
+++ b/src/report/business-reports/taxinvoice.eguile.scm
@@ -35,7 +35,6 @@
(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))
commit c031d5cc6d9a659ad6d77fa4fd95280589bc1ca3
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Aug 4 15:23:02 2015 +0200
Drop 'Today Date Format' option from business reports
Use 'Fancy Date Format' option instead for a more
consistent date display on the reports and to reduce
the number of semi-overlapping options
diff --git a/src/report/business-reports/easy-invoice.scm b/src/report/business-reports/easy-invoice.scm
index 93ca5ad..e2ee9c2 100644
--- a/src/report/business-reports/easy-invoice.scm
+++ b/src/report/business-reports/easy-invoice.scm
@@ -356,12 +356,6 @@
"v" (N_ "Extra notes to put on the invoice (simple HTML is accepted).")
(_ "Thank you for your patronage!")))
- (gnc:register-inv-option
- (gnc:make-string-option
- (N_ "Text") (N_ "Today Date Format")
- "x" (N_ "The format for the date->string conversion for today's date.")
- (gnc-default-strftime-date-format)))
-
(gnc:options-set-default-section gnc:*report-options* "General")
gnc:*report-options*)
@@ -795,8 +789,6 @@
(string-append "<font color='red'>"
(_ "INVOICE NOT POSTED")
"</font>"))))
- ;(add-html! document (strftime (opt-val "Text" "Today Date Format")
- ; (localtime (car (gnc:get-today))))))
(make-break! document)
diff --git a/src/report/business-reports/fancy-invoice.scm b/src/report/business-reports/fancy-invoice.scm
index d9dfdd1..cd5bf31 100644
--- a/src/report/business-reports/fancy-invoice.scm
+++ b/src/report/business-reports/fancy-invoice.scm
@@ -372,13 +372,6 @@
"ub2" (N_ "The phrase used to introduce the company contact.")
(_ "Direct all inquiries to")))
-; not used
-; (gnc:register-inv-option
-; (gnc:make-string-option
-; (N_ "Display") (N_ "Today Date Format")
-; "v" (N_ "The format for the date->string conversion for today's date.")
-; (gnc-default-strftime-date-format)))
-
(gnc:options-set-default-section gnc:*report-options* "General")
gnc:*report-options*)
@@ -736,14 +729,6 @@
""))
#\newline "<br>" )
(if url (string-append (_ "Web:") " " url) "")))
-
-;; oli-custom - I didn't want today's date on the invoice.
-;; The invoice already has a date.
-;; Today's date can be in the email, fax or letter accompanying the invoice.
-;; (gnc:html-table-append-row! table (list
-;; (strftime
-;; date-format
-;; (localtime (car (gnc:get-today))))))
table))
(define (make-break! document)
@@ -844,8 +829,7 @@
(gnc:html-document-add-object!
document (make-myname-table
- book ;;(opt-val "Display" "Today Date Format")))
- "" title))
+ book date-format title)) ;; Note: date-format is not used for this report
(make-break! document)
(make-break! document)
diff --git a/src/report/business-reports/invoice.scm b/src/report/business-reports/invoice.scm
index 1020e27..094e82a 100644
--- a/src/report/business-reports/invoice.scm
+++ b/src/report/business-reports/invoice.scm
@@ -331,12 +331,6 @@
"u" (N_ "Extra notes to put on the invoice.")
(_ "Thank you for your patronage!")))
- (gnc:register-inv-option
- (gnc:make-string-option
- (N_ "Display") (N_ "Today Date Format")
- "v" (N_ "The format for the date->string conversion for today's date.")
- (gnc-default-strftime-date-format)))
-
(gnc:options-set-default-section gnc:*report-options* "General")
gnc:*report-options*)
@@ -711,7 +705,7 @@
(gnc:html-document-add-object!
document
- (make-myname-table book (opt-val "Display" "Today 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 61328af..dfb8e40 100644
--- a/src/report/business-reports/job-report.scm
+++ b/src/report/business-reports/job-report.scm
@@ -406,13 +406,7 @@
(gnc:register-inv-option
(gnc:make-simple-boolean-option
(N_ "Display Columns") amount-header
- "hb" (N_ "Display the transaction amount?") #t))
-
- (gnc:register-inv-option
- (gnc:make-string-option
- gnc:pagename-general (N_ "Today Date Format")
- "p" (N_ "The format for the date->string conversion for today's date.")
- (gnc-default-strftime-date-format)))
+ "hb" (N_ "Display the transaction amount?") #t))
(gnc:options-set-default-section gnc:*report-options* "General")
@@ -559,6 +553,7 @@
(gnc:date-option-absolute-time
(opt-val gnc:pagename-general (N_ "To")))))
(book (gnc-get-current-book)) ;XXX Grab this from elsewhere
+ (date-format (gnc:fancy-date-info gnc:*fancy-date-format*))
(type (opt-val "__reg" "owner-type"))
(type-str "")
(report-title-str ""))
@@ -612,7 +607,7 @@
(gnc:html-document-add-object!
document
- (make-myname-table book (opt-val gnc:pagename-general (N_ "Today 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 eeb81e7..6278a8f 100644
--- a/src/report/business-reports/owner-report.scm
+++ b/src/report/business-reports/owner-report.scm
@@ -608,12 +608,6 @@
(gnc:make-simple-boolean-option
(N_ "Display Columns") amount-header
"hb" (N_ "Display the transaction amount?") #t))
-
- (gnc:register-inv-option
- (gnc:make-string-option
- gnc:pagename-general (N_ "Today Date Format")
- "p" (N_ "The format for the date->string conversion for today's date.")
- (gnc-default-strftime-date-format)))
(gnc:register-inv-option
(gnc:make-multichoice-option
@@ -763,6 +757,7 @@
(gnc:date-option-absolute-time
(opt-val gnc:pagename-general optname-to-date))))
(book (gnc-get-current-book)) ;XXX Grab this from elsewhere
+ (date-format (gnc:fancy-date-info 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))
@@ -808,7 +803,7 @@
(gnc:html-document-add-object!
document
- (make-myname-table book (opt-val gnc:pagename-general (N_ "Today Date Format"))))
+ (make-myname-table book date-format))
(gnc:html-document-add-object!
document
commit 678cc189a30e67f673007bd87be7b06ee279c35b
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Aug 4 15:00:57 2015 +0200
Bug 645786 - Fancy invoice report still doesn't use fancy date format preference
Use fancy date consistently for all invoice reports
diff --git a/src/report/business-reports/easy-invoice.scm b/src/report/business-reports/easy-invoice.scm
index eacbd0f..93ca5ad 100644
--- a/src/report/business-reports/easy-invoice.scm
+++ b/src/report/business-reports/easy-invoice.scm
@@ -611,12 +611,14 @@
'attribute (list "valign" "top"))
table))
-(define (make-date-row! table label date)
+(define (make-date-row! table label date date-format)
(gnc:html-table-append-row!
table
(list
(string-append label ": ")
- (string-expand (gnc-print-date date) #\space " "))))
+ (string-expand (strftime date-format
+ (localtime (car date)))
+ #\space " "))))
(define (make-date-table)
(let ((table (gnc:make-html-table)))
@@ -731,7 +733,7 @@
(add-html! document "<tr><td align='left'>")
(if (not (null? invoice))
- (begin
+ (let* ((date-format (gnc:fancy-date-info gnc:*fancy-date-format*)))
; invoice number and ID String table
(add-html! document "<table width='100%'><tr>")
(add-html! document "<td align='left'>")
@@ -779,26 +781,16 @@
)
; add the date
- (let ((post-date (gncInvoiceGetDatePosted invoice))
+ (let ((date-table #f)
+ (post-date (gncInvoiceGetDatePosted invoice))
(due-date (gncInvoiceGetDateDue invoice)))
(if (not (equal? post-date (cons 0 0)))
(begin
- (add-html! document "<table border=0><tr>")
- (add-html! document "<td>")
- (add-html! document (string-append (_ "Date") ": "))
- (add-html! document "</td>")
- (add-html! document "<td>")
- (add-html! document (gnc-print-date post-date))
- (add-html! document "</td>")
+ (set! date-table (make-date-table))
+ (make-date-row! date-table (_ "Date") post-date date-format)
(if (opt-val "Display" "Due Date")
- (begin
- (add-html! document "<tr><td>")
- (add-html! document (string-append (_ "Due") ": "))
- (add-html! document "</td>")
- (add-html! document "<td>")
- (add-html! document (gnc-print-date due-date))
- (add-html! document "</td>")))
- (add-html! document "</tr></table>"))
+ (make-date-row! date-table (_ "Due") due-date date-format))
+ (gnc:html-document-add-object! document date-table))
(add-html! document
(string-append "<font color='red'>"
(_ "INVOICE NOT POSTED")
diff --git a/src/report/business-reports/fancy-invoice.scm b/src/report/business-reports/fancy-invoice.scm
index db726a9..d9dfdd1 100644
--- a/src/report/business-reports/fancy-invoice.scm
+++ b/src/report/business-reports/fancy-invoice.scm
@@ -661,18 +661,14 @@
'attribute (list "valign" "top"))
table))
-(define (make-date-row! table label date)
+(define (make-date-row! table label date date-format)
(gnc:html-table-append-row!
table
(list
(string-append label ": ")
- ;; oli-custom - modified to display a custom format
- ;; for the invoice date/due date fields
- ;; I could have taken the format from the report options, but... ;)
- (string-expand (strftime (gnc-default-strftime-date-format)
+ (string-expand (strftime date-format
(localtime (car date)))
- #\space " ")
- ;;(string-expand (gnc-print-date date) #\space " ")
+ #\space " ")
)))
(define (make-date-table)
@@ -815,7 +811,9 @@
(if (not (null? invoice))
- (let* ((date-object #f)
+ (let ((book (gncInvoiceGetBook invoice))
+ (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)))
(set! table (make-entry-table invoice
@@ -877,8 +875,8 @@
;; options. This string sucks for i18n, but I don't
;; have a better solution right now without breaking
;; other people's invoices.
- (make-date-row! date-table (sprintf #f (_ "%s Date") title) post-date)
- (make-date-row! date-table (_ "Due Date") due-date)
+ (make-date-row! date-table (sprintf #f (_ "%s Date") title) post-date date-format)
+ (make-date-row! date-table (_ "Due Date") due-date date-format)
date-table)
(gnc:make-html-text
;; oli-custom - FIXME: I have a feeling I broke a
diff --git a/src/report/business-reports/invoice.scm b/src/report/business-reports/invoice.scm
index d9add63..1020e27 100644
--- a/src/report/business-reports/invoice.scm
+++ b/src/report/business-reports/invoice.scm
@@ -587,12 +587,15 @@
'attribute (list "valign" "top"))
table))
-(define (make-date-row! table label date)
+(define (make-date-row! table label date date-format)
(gnc:html-table-append-row!
table
(list
(string-append label ": ")
- (string-expand (gnc-print-date date) #\space " "))))
+ (string-expand (strftime date-format
+ (localtime (car date)))
+ #\space " ")
+ )))
(define (make-date-table)
(let ((table (gnc:make-html-table)))
@@ -665,7 +668,7 @@
(if (not (null? invoice))
(begin
- (set! owner (gncInvoiceGetOwner invoice))
+ (set! owner (gncInvoiceGetOwner invoice))
(let ((type (gncInvoiceGetType invoice)))
(cond
((eqv? type GNC-INVOICE-CUST-INVOICE)
@@ -694,7 +697,8 @@
(gncInvoiceGetID invoice)))
(if (not (null? invoice))
- (let ((book (gncInvoiceGetBook invoice)))
+ (let* ((book (gncInvoiceGetBook invoice))
+ (date-format (gnc:fancy-date-info gnc:*fancy-date-format*)))
(set! table (make-entry-table invoice
(gnc:report-options report-obj)
add-order cust-doc? credit-note?))
@@ -716,8 +720,8 @@
(if (not (equal? post-date (cons 0 0)))
(begin
(set! date-table (make-date-table))
- (make-date-row! date-table (string-append title " " (_ "Date")) post-date)
- (make-date-row! date-table (_ "Due Date") due-date)
+ (make-date-row! date-table (string-append title " " (_ "Date")) post-date date-format)
+ (make-date-row! date-table (_ "Due Date") due-date date-format)
(gnc:html-document-add-object! document date-table))
(gnc:html-document-add-object!
document
diff --git a/src/report/business-reports/taxinvoice.eguile.scm b/src/report/business-reports/taxinvoice.eguile.scm
index 75a5f81..2a9d14b 100644
--- a/src/report/business-reports/taxinvoice.eguile.scm
+++ b/src/report/business-reports/taxinvoice.eguile.scm
@@ -47,6 +47,7 @@
(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*))
@@ -249,11 +250,13 @@
<?scm ) (begin ?>
<tr>
<td align="right"><?scm:d (nbsp (_ "Invoice Date")) ?>: </td>
- <td align="right"><?scm:d (gnc-print-date postdate) ?></td>
+ <td align="right"><?scm:d (nbsp (strftime dateformat
+ (localtime (car postdate)))) ?></td>
</tr>
<tr>
<td align="right"><?scm:d (nbsp (_ "Due Date")) ?>: </td>
- <td align="right"><?scm:d (gnc-print-date duedate) ?></td>
+ <td align="right"><?scm:d (nbsp (strftime dateformat
+ (localtime (car duedate)))) ?></td>
</tr> <?scm )) ?>
<?scm (if (not (string=? billingid "")) (begin ?>
<tr>
commit c64f58f54f0a0441cc72d1f6ac5f6e7b9872101e
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Aug 4 15:00:19 2015 +0200
Introduce new function to query fancy date format
diff --git a/src/app-utils/app-utils.scm b/src/app-utils/app-utils.scm
index 840aed5..5ba5428 100644
--- a/src/app-utils/app-utils.scm
+++ b/src/app-utils/app-utils.scm
@@ -149,7 +149,9 @@
(define (gnc:option-get-value category key)
;;Access an option directly
(qof-book-get-option (gnc-get-current-book)
- (list category key)))
+ (if (list? key)
+ (append (list category) key)
+ (list category key))))
(export gnc:option-get-value)
;; config-var.scm
(export gnc:make-config-var)
@@ -320,15 +322,22 @@
(define gnc:*company-url* (N_ "Company Website URL"))
(define gnc:*company-email* (N_ "Company Email Address"))
(define gnc:*company-contact* (N_ "Company Contact Person"))
+(define gnc:*fancy-date-label* (N_ "Fancy Date Format"))
+(define gnc:*fancy-date-format* (N_ "custom"))
(define (gnc:company-info key)
;; Access company info from key-value pairs for current book
(gnc:option-get-value gnc:*business-label* key))
+(define (gnc:fancy-date-info 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)))
+
(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)
+ gnc:*fancy-date-label* gnc:*fancy-date-format*
+ gnc:company-info gnc:fancy-date-info)
(define gnc:*option-section-accounts* OPTION-SECTION-ACCOUNTS)
(define gnc:*option-name-trading-accounts* OPTION-NAME-TRADING-ACCOUNTS)
diff --git a/src/app-utils/business-prefs.scm b/src/app-utils/business-prefs.scm
index d37b4dc..257438e 100644
--- a/src/app-utils/business-prefs.scm
+++ b/src/app-utils/business-prefs.scm
@@ -121,7 +121,7 @@
(reg-option
(gnc:make-dateformat-option
- gnc:*business-label* (N_ "Fancy Date Format")
+ gnc:*business-label* gnc:*fancy-date-label*
"g" (N_ "The default date format used for fancy printed dates.")
#f))
commit 21069b5e9a03471155a449c80877f2faa7171abc
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Aug 4 14:48:48 2015 +0200
Fix missing parameter in fancy date option definition
diff --git a/src/app-utils/options.scm b/src/app-utils/options.scm
index 6132fbe..01ab29c 100644
--- a/src/app-utils/options.scm
+++ b/src/app-utils/options.scm
@@ -1284,7 +1284,8 @@
b (symbol->string (cadr value)) (append p '("month")))
(qof-book-set-option
b (if (caddr value) 1 0) (append p '("years")))
- (qof-book-set-option (cadddr value) (append p '("custom"))))
+ (qof-book-set-option
+ b (cadddr value) (append p '("custom"))))
(lambda (f p)
(let ((fmt (qof-book-get-option f (append p '("fmt"))))
(month (qof-book-get-option f (append p '("month"))))
Summary of changes:
src/app-utils/app-utils.scm | 13 +++++--
src/app-utils/business-prefs.scm | 2 +-
src/app-utils/options.scm | 3 +-
src/report/business-reports/easy-invoice.scm | 44 ++++++++---------------
src/report/business-reports/fancy-invoice.scm | 38 +++++---------------
src/report/business-reports/invoice.scm | 25 ++++++-------
src/report/business-reports/job-report.scm | 14 +++-----
src/report/business-reports/owner-report.scm | 12 ++-----
src/report/business-reports/taxinvoice.eguile.scm | 8 +++--
9 files changed, 60 insertions(+), 99 deletions(-)
More information about the gnucash-changes
mailing list