From f13d21b9738e591f061dd31e291b42c20cdc68be Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Sun, 18 Nov 2018 15:38:59 +0100 Subject: [PATCH] Bug 498072 - GnuCash show taxes on invoice when individual taxes is not checked Use more descriptive option name and tool tip as proposed in the bug. --- gnucash/report/business-reports/invoice.scm | 6 +++--- libgnucash/app-utils/options.scm | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gnucash/report/business-reports/invoice.scm b/gnucash/report/business-reports/invoice.scm index 555662891f..e3f78b29bf 100644 --- a/gnucash/report/business-reports/invoice.scm +++ b/gnucash/report/business-reports/invoice.scm @@ -316,8 +316,8 @@ for styling the invoice. Please see the exported report for the CSS class names. (gnc:register-inv-option (gnc:make-simple-boolean-option - (N_ "Display") (N_ "Individual Taxes") - "o" (N_ "Display all the individual taxes?") #f)) + (N_ "Display") (N_ "Use Detailed Tax Summary") + "o" (N_ "Display all tax categories separately (one per line) instead of one single tax line.?") #f)) (gnc:register-inv-option (gnc:make-internal-option "Display" "Totals" #t)) @@ -415,7 +415,7 @@ for styling the invoice. Please see the exported report for the CSS class names. (gnc:lookup-option options section name))) (let ((show-payments (opt-val "Display" "Payments")) - (display-all-taxes (opt-val "Display" "Individual Taxes")) + (display-all-taxes (opt-val "Display" "Use Detailed Tax Summary")) (display-subtotal? (opt-val "Display" "Subtotal")) (lot (gncInvoiceGetPostedLot invoice)) (txn (gncInvoiceGetPostedTxn invoice)) diff --git a/libgnucash/app-utils/options.scm b/libgnucash/app-utils/options.scm index 0568edd473..04dbd95155 100644 --- a/libgnucash/app-utils/options.scm +++ b/libgnucash/app-utils/options.scm @@ -1723,6 +1723,7 @@ "Void Transactions?" (cons "Filter" "Void Transactions") "Void Transactions" (cons "Filter" "Void Transactions") "Account Substring" (cons "Filter" "Account Name Filter") + "Individual Taxes" (cons "#f" "Use Detailed Tax Summary") ;invoice.scm, renamed November 2018 )) (name-match (member name new-names-list)))