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

Update invoice reports to use the new entry value getters.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21987 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Geert Janssens 2012-02-10 15:32:47 +00:00
parent 2197c038fd
commit daca5e3e88
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/report/business-reports/easy-invoice.scm
View File

@ -139,11 +139,11 @@
value value
(gnc-numeric-neg value))) (gnc-numeric-neg value)))
(define (update-account-hash hash values credit-note?) (define (update-account-hash hash values)
(for-each (for-each
(lambda (item) (lambda (item)
(let* ((acct (car item)) (let* ((acct (car item))
(val (inv-or-cn-value(cdr item) credit-note?)) (val (cdr item))
(ref (hash-ref hash acct))) (ref (hash-ref hash acct)))
(hash-set! hash acct (if ref (gnc-numeric-add-fixed ref val) val)))) (hash-set! hash acct (if ref (gnc-numeric-add-fixed ref val) val))))
@ -524,8 +524,8 @@
cust-doc? credit-note?))) cust-doc? credit-note?)))
(if display-all-taxes (if display-all-taxes
(let ((tax-list (gncEntryGetIntTaxValues current cust-doc?))) (let ((tax-list (gncEntryGetDocTaxValues current cust-doc? credit-note?)))
(update-account-hash acct-hash tax-list credit-note?)) (update-account-hash acct-hash tax-list))
(tax-collector 'add (tax-collector 'add
(gnc:gnc-monetary-commodity (cdr entry-values)) (gnc:gnc-monetary-commodity (cdr entry-values))
(gnc:gnc-monetary-amount (cdr entry-values)))) (gnc:gnc-monetary-amount (cdr entry-values))))

17
src/report/business-reports/invoice.scm
View File

@ -133,11 +133,11 @@
value value
(gnc-numeric-neg value))) (gnc-numeric-neg value)))
(define (update-account-hash hash values credit-note?) (define (update-account-hash hash values)
(for-each (for-each
(lambda (item) (lambda (item)
(let* ((acct (car item)) (let* ((acct (car item))
(val (inv-or-cn-value(cdr item) credit-note?)) (val (cdr item))
(ref (hash-ref hash acct))) (ref (hash-ref hash acct)))
(hash-set! hash acct (if ref (gnc-numeric-add-fixed ref val) val)))) (hash-set! hash acct (if ref (gnc-numeric-add-fixed ref val) val))))
@ -165,10 +165,10 @@
(let* ((row-contents '()) (let* ((row-contents '())
(entry-value (gnc:make-gnc-monetary (entry-value (gnc:make-gnc-monetary
currency currency
(inv-or-cn-value (gncEntryGetIntValue entry #t cust-doc?) credit-note?))) (gncEntryGetDocValue entry #t cust-doc? credit-note?)))
(entry-tax-value (gnc:make-gnc-monetary (entry-tax-value (gnc:make-gnc-monetary
currency currency
(inv-or-cn-value (gncEntryGetIntTaxValue entry #t cust-doc?) credit-note?)))) (gncEntryGetDocTaxValue entry #t cust-doc? credit-note?))))
(if (date-col column-vector) (if (date-col column-vector)
(addto! row-contents (addto! row-contents
@ -328,7 +328,7 @@
(gnc:register-inv-option (gnc:register-inv-option
(gnc:make-simple-boolean-option (gnc:make-simple-boolean-option
(N_ "Display") (N_ "Payments") (N_ "Display") (N_ "Payments")
"tc" (N_ "Display the payments applied to this cust-doc?") #f)) "tc" (N_ "Display the payments applied to this invoice?") #f))
(gnc:register-inv-option (gnc:register-inv-option
(gnc:make-text-option (gnc:make-text-option
@ -469,7 +469,8 @@
(lambda (split) (lambda (split)
(if (not (equal? (xaccSplitGetParent split) txn)) (if (not (equal? (xaccSplitGetParent split) txn))
(add-payment-row table used-columns (add-payment-row table used-columns
split total-collector reverse-payments?))) split total-collector
reverse-payments?)))
splits))) splits)))
(add-subtotal-row table used-columns total-collector (add-subtotal-row table used-columns total-collector
@ -491,8 +492,8 @@
cust-doc? credit-note?))) cust-doc? credit-note?)))
(if display-all-taxes (if display-all-taxes
(let ((tax-list (gncEntryGetIntTaxValues current cust-doc?))) (let ((tax-list (gncEntryGetDocTaxValues current cust-doc? credit-note?)))
(update-account-hash acct-hash tax-list credit-note?)) (update-account-hash acct-hash tax-list))
(tax-collector 'add (tax-collector 'add
(gnc:gnc-monetary-commodity (cdr entry-values)) (gnc:gnc-monetary-commodity (cdr entry-values))
(gnc:gnc-monetary-amount (cdr entry-values)))) (gnc:gnc-monetary-amount (cdr entry-values))))