gnucash maint: Multiple changes pushed
Christopher Lam
clam at code.gnucash.org
Thu Jul 22 20:24:43 EDT 2021
Updated via https://github.com/Gnucash/gnucash/commit/f1e35daa (commit)
via https://github.com/Gnucash/gnucash/commit/251db8c3 (commit)
via https://github.com/Gnucash/gnucash/commit/2606ddf9 (commit)
from https://github.com/Gnucash/gnucash/commit/2fccf30c (commit)
commit f1e35daab3142b42208e8803c1eaad539726364a
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Fri Jul 23 06:10:48 2021 +0800
Rename option name from "Extra notes" to "Extra Notes"
diff --git a/gnucash/report/reports/standard/receipt.scm b/gnucash/report/reports/standard/receipt.scm
index 560dd50bc..bdfef6b62 100644
--- a/gnucash/report/reports/standard/receipt.scm
+++ b/gnucash/report/reports/standard/receipt.scm
@@ -61,7 +61,7 @@
(define optname-subtotal (N_ "Sub-total"))
(define optname-amount-due (N_ "Amount Due"))
(define optname-payment-recd (N_ "Payment received text"))
-(define optname-extra-notes (N_ "Extra notes"))
+(define optname-extra-notes (N_ "Extra Notes"))
(define optname-date-format (N_ "Today date format"))
(define (options-generator)
diff --git a/gnucash/report/reports/standard/taxinvoice.scm b/gnucash/report/reports/standard/taxinvoice.scm
index 09f0bd24b..7a6b3333b 100644
--- a/gnucash/report/reports/standard/taxinvoice.scm
+++ b/gnucash/report/reports/standard/taxinvoice.scm
@@ -110,7 +110,7 @@
(define optname-subtotal (N_ "Sub-total"))
(define optname-amount-due (N_ "Amount Due"))
(define optname-payment-recd (N_ "Payment received text"))
-(define optname-extra-notes (N_ "Extra notes"))
+(define optname-extra-notes (N_ "Extra Notes"))
(define (options-generator)
;; Options
diff --git a/libgnucash/app-utils/options.scm b/libgnucash/app-utils/options.scm
index df25d5a9f..7c7ddc613 100644
--- a/libgnucash/app-utils/options.scm
+++ b/libgnucash/app-utils/options.scm
@@ -1836,6 +1836,7 @@ the option '~a'."))
("Invoice number" #f "Invoice Number")
;; receipt.scm and taxinvoice.scm, renamed July 2021
("Report title" #f "Report Title")
+ ("Extra notes" #f "Extra Notes")
;; income-gst-statement.scm
("default format" #f "Default Format")
("Report format" #f "Report Format")
commit 251db8c37bd6efc21a84e016fba5e399f2f4beac
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Thu Jul 22 23:10:07 2021 +0800
Rename option name from "Report title" to "Report Title"
diff --git a/gnucash/report/reports/standard/receipt.scm b/gnucash/report/reports/standard/receipt.scm
index f7efe54a9..560dd50bc 100644
--- a/gnucash/report/reports/standard/receipt.scm
+++ b/gnucash/report/reports/standard/receipt.scm
@@ -40,7 +40,7 @@
(define displaypage (N_ "Display"))
(define generalpage gnc:pagename-general)
; option names
-(define optname-report-title (N_ "Report title"))
+(define optname-report-title (N_ "Report Title"))
(define optname-template-file (N_ "Template file"))
(define optname-css-file (N_ "CSS stylesheet file"))
(define optname-heading-font (N_ "Heading font"))
diff --git a/gnucash/report/reports/standard/taxinvoice.scm b/gnucash/report/reports/standard/taxinvoice.scm
index 7992d871e..09f0bd24b 100644
--- a/gnucash/report/reports/standard/taxinvoice.scm
+++ b/gnucash/report/reports/standard/taxinvoice.scm
@@ -91,7 +91,7 @@
(define optname-border-color-th (N_ "table-header-border-color"))
(define optname-border-color-td (N_ "table-cell-border-color"))
(define optname-extra-css (N_ "Embedded CSS"))
-(define optname-report-title (N_ "Report title"))
+(define optname-report-title (N_ "Report Title"))
(define optname-template-file (N_ "Template file"))
(define optname-css-file (N_ "CSS stylesheet file"))
(define optname-heading-font (N_ "Heading font"))
diff --git a/libgnucash/app-utils/options.scm b/libgnucash/app-utils/options.scm
index e56c27f7e..df25d5a9f 100644
--- a/libgnucash/app-utils/options.scm
+++ b/libgnucash/app-utils/options.scm
@@ -1834,6 +1834,8 @@ the option '~a'."))
("Individual Taxes" #f "Use Detailed Tax Summary")
;; receipt.scm, renamed July 2021
("Invoice number" #f "Invoice Number")
+ ;; receipt.scm and taxinvoice.scm, renamed July 2021
+ ("Report title" #f "Report Title")
;; income-gst-statement.scm
("default format" #f "Default Format")
("Report format" #f "Report Format")
commit 2606ddf905f4fbf31ceca3a5bac4d6276fee9537
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Wed Jul 21 22:38:09 2021 +0800
Rename option name from "Invoice number" to "Invoice Number"
This ensures it matches all other invoice reports.
diff --git a/gnucash/report/reports/standard/receipt.scm b/gnucash/report/reports/standard/receipt.scm
index 194c9a782..f7efe54a9 100644
--- a/gnucash/report/reports/standard/receipt.scm
+++ b/gnucash/report/reports/standard/receipt.scm
@@ -41,7 +41,6 @@
(define generalpage gnc:pagename-general)
; option names
(define optname-report-title (N_ "Report title"))
-(define optname-invoice-number (N_ "Invoice number"))
(define optname-template-file (N_ "Template file"))
(define optname-css-file (N_ "CSS stylesheet file"))
(define optname-heading-font (N_ "Heading font"))
@@ -73,7 +72,7 @@
(add-option
(gnc:make-invoice-option ; defined in gnucash/scm/business-options.scm
- generalpage optname-invoice-number
+ generalpage gnc:optname-invoice-number
"a" "" (lambda () '()) #f))
;; Display options
@@ -164,7 +163,7 @@
; Get all the options
(let* ((document (gnc:make-html-document))
- (opt-invoice (opt-value generalpage optname-invoice-number))
+ (opt-invoice (opt-value generalpage gnc:optname-invoice-number))
(opt-template-file (find-template
(opt-value displaypage optname-template-file)))
(opt-css-file (find-stylesheet
diff --git a/libgnucash/app-utils/options.scm b/libgnucash/app-utils/options.scm
index 0b64b1f81..e56c27f7e 100644
--- a/libgnucash/app-utils/options.scm
+++ b/libgnucash/app-utils/options.scm
@@ -1832,6 +1832,8 @@ the option '~a'."))
("Links" #f "Transaction Links")
;; invoice.scm, renamed November 2018
("Individual Taxes" #f "Use Detailed Tax Summary")
+ ;; receipt.scm, renamed July 2021
+ ("Invoice number" #f "Invoice Number")
;; income-gst-statement.scm
("default format" #f "Default Format")
("Report format" #f "Report Format")
Summary of changes:
gnucash/report/reports/standard/receipt.scm | 9 ++++-----
gnucash/report/reports/standard/taxinvoice.scm | 4 ++--
libgnucash/app-utils/options.scm | 5 +++++
3 files changed, 11 insertions(+), 7 deletions(-)
More information about the gnucash-changes
mailing list