From de360cabb33395c2dd668b08b7b8c12dd6e33b80 Mon Sep 17 00:00:00 2001 From: hcrohland Date: Thu, 2 Mar 2017 20:53:40 +0100 Subject: [PATCH] Revert the taxinvoice.scm changes Since they touch strings and user behavior they cannot go into maint. The pull request now only includes the backend change. By that you can easily tweak the invoice reports to show the net price. --- src/report/business-reports/taxinvoice.eguile.scm | 2 +- src/report/business-reports/taxinvoice.scm | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/report/business-reports/taxinvoice.eguile.scm b/src/report/business-reports/taxinvoice.eguile.scm index e5fa8eadb4..74aa6843d6 100644 --- a/src/report/business-reports/taxinvoice.eguile.scm +++ b/src/report/business-reports/taxinvoice.eguile.scm @@ -311,7 +311,7 @@ (inv-total (gnc:make-commodity-collector))) (for entry in entries do (let ((qty (gncEntryGetDocQuantity entry credit-note?)) - (each (gncEntryGetPrice entry #t opt-netprice)) + (each (gncEntryGetInvPrice entry)) (action (gncEntryGetAction entry)) (rval (gncEntryGetDocValue entry #t #t credit-note?)) (rdiscval (gncEntryGetDocDiscountValue entry #t #t credit-note?)) diff --git a/src/report/business-reports/taxinvoice.scm b/src/report/business-reports/taxinvoice.scm index 59e6cb74f4..16a925ef7b 100644 --- a/src/report/business-reports/taxinvoice.scm +++ b/src/report/business-reports/taxinvoice.scm @@ -108,7 +108,6 @@ (define optname-jobnumber-text (N_ "Job Number text")) (define optname-jobname-show (N_ "Show Job name")) (define optname-jobnumber-show (N_ "Show Job number")) -(define optname-netprice (N_ "Show net price")) (define optname-invnum-next-to-title (N_ "Invoice number next to title")) (define optname-border-collapse (N_ "table-border-collapse")) (define optname-border-color-th (N_ "table-header-border-color")) @@ -177,7 +176,6 @@ (add-option (gnc:make-simple-boolean-option elementspage optname-invnum-next-to-title "h" (N_ "Invoice Number next to title?") #f)) (add-option (gnc:make-simple-boolean-option elementspage optname-jobname-show "i" (N_ "Display Job name?") #t)) (add-option (gnc:make-simple-boolean-option elementspage optname-jobnumber-show "j" (N_ "Invoice Job number?") #f)) -(add-option (gnc:make-simple-boolean-option elementspage optname-netprice "k" (N_ "Show net price?") #f)) ;; Display options (add-option (gnc:make-string-option displaypage optname-template-file "a" @@ -290,7 +288,6 @@ (opt-invnum-next-to-title (opt-value elementspage optname-invnum-next-to-title)) (opt-jobname-show (opt-value elementspage optname-jobname-show)) (opt-jobnumber-show (opt-value elementspage optname-jobnumber-show)) - (opt-netprice (opt-value elementspage optname-netprice)) (opt-report-currency (opt-value gnc:pagename-general optname-report-currency)) (opt-css-border-collapse (if (opt-value displaypage optname-border-collapse) "border-collapse:collapse;")) (opt-css-border-color-th (opt-value displaypage optname-border-color-th))