IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Let taxinvoice optionally show the net instead of the given price

Browse Source 
This is needed if there is a mix of entries with tax included and
excluded
This commit is contained in:
Christoph Rohland 2017-03-08 15:08:54 +01:00 committed by Geert Janssens
parent 6bba55128f
commit 9d57447fe1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/report/business-reports/taxinvoice.eguile.scm
View File

@ -326,8 +326,7 @@
(inv-total (gnc:make-commodity-collector))) (inv-total (gnc:make-commodity-collector)))
(for entry in entries do (for entry in entries do
(let ((qty (gncEntryGetDocQuantity entry credit-note?)) (let ((qty (gncEntryGetDocQuantity entry credit-note?))
;;(each (gncEntryGetInvPrice entry)) (each (gncEntryGetPrice entry cust-doc? opt-netprice))
(each (if cust-doc? (gncEntryGetInvPrice entry)(gncEntryGetBillPrice entry)))
(action (gncEntryGetAction entry)) (action (gncEntryGetAction entry))
(rval (gncEntryGetDocValue entry #t cust-doc? credit-note?)) (rval (gncEntryGetDocValue entry #t cust-doc? credit-note?))
(rdiscval (gncEntryGetDocDiscountValue entry #t cust-doc? credit-note?)) (rdiscval (gncEntryGetDocDiscountValue entry #t cust-doc? credit-note?))

3
src/report/business-reports/taxinvoice.scm
View File

@ -102,6 +102,7 @@
(define optname-jobnumber-text (N_ "Job Number text")) (define optname-jobnumber-text (N_ "Job Number text"))
(define optname-jobname-show (N_ "Show Job name")) (define optname-jobname-show (N_ "Show Job name"))
(define optname-jobnumber-show (N_ "Show Job number")) (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-invnum-next-to-title (N_ "Invoice number next to title"))
(define optname-border-collapse (N_ "table-border-collapse")) (define optname-border-collapse (N_ "table-border-collapse"))
(define optname-border-color-th (N_ "table-header-border-color")) (define optname-border-color-th (N_ "table-header-border-color"))
@ -170,6 +171,7 @@
(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-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-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-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 ;; Display options
(add-option (gnc:make-string-option displaypage optname-template-file "a" (add-option (gnc:make-string-option displaypage optname-template-file "a"
@ -282,6 +284,7 @@
(opt-invnum-next-to-title (opt-value elementspage optname-invnum-next-to-title)) (opt-invnum-next-to-title (opt-value elementspage optname-invnum-next-to-title))
(opt-jobname-show (opt-value elementspage optname-jobname-show)) (opt-jobname-show (opt-value elementspage optname-jobname-show))
(opt-jobnumber-show (opt-value elementspage optname-jobnumber-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-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-collapse (if (opt-value displaypage optname-border-collapse) "border-collapse:collapse;"))
(opt-css-border-color-th (opt-value displaypage optname-border-color-th)) (opt-css-border-color-th (opt-value displaypage optname-border-color-th))