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

[new-owner-report] fix: invoice->payments renders full amount

Browse Source 
For payments spanning multiple invoices, previously it would render
partial payment amount. But this info duplicates the invoice
details.

By rendering the full payment amount, it will ease tracking with other
invoices paid with same payment.

If the payment transaction originates from a different currency, the
invoice->payments table will render it in the originating currency.
This commit is contained in:
Christopher Lam 2019-11-12 15:01:46 +08:00
parent a63ba72624
commit 0b8bfe6683
1 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
gnucash/report/business-reports/new-owner-report.scm
View File

@ -305,36 +305,42 @@
currency total #f #f #f #f (list (make-list link-cols #f)))) currency total #f #f #f #f (list (make-list link-cols #f))))
(define (make-invoice->payments-table invoice invoice-splits currency txn) (define (make-invoice->payments-table invoice invoice-splits currency txn)
(append (let lp ((invoice-splits invoice-splits) (result '()))
(map (cond
(lambda (pmt-split) ((null? invoice-splits)
(list (reverse
(qof-print-date (if (gncInvoiceIsPaid invoice)
(xaccTransGetDate result
(xaccSplitGetParent pmt-split))) (cons (list (gnc:make-html-table-cell/size 1 2 (_ "Outstanding"))
(let ((text (gnc-get-num-action (make-cell
(xaccSplitGetParent pmt-split) (gnc:make-gnc-monetary
pmt-split))) currency (gnc-lot-get-balance
(if (string-null? text) (gncInvoiceGetPostedLot invoice)))))
(_ "Payment") result))))
text)) (else
(let* ((lot-split (car invoice-splits))
(lot-txn (xaccSplitGetParent lot-split))
(tfr-splits (xaccTransGetPaymentAcctSplitList lot-txn)))
(let lp1 ((tfr-splits tfr-splits) (result result))
(cond
((equal? lot-txn txn) (lp (cdr invoice-splits) result))
((null? tfr-splits) (lp (cdr invoice-splits) result))
(else
(let* ((tfr-split (car tfr-splits))
(tfr-acct (xaccSplitGetAccount tfr-split))
(tfr-curr (xaccAccountGetCommodity tfr-acct))
(tfr-amt (xaccSplitGetAmount tfr-split)))
(lp1 (cdr tfr-splits)
(cons (list
(qof-print-date (xaccTransGetDate lot-txn))
(let ((num (gnc-get-num-action lot-txn lot-split)))
(if (string-null? num) (_ "Payment") num))
(make-cell (make-cell
(gnc:make-html-text (gnc:make-html-text
(gnc:html-markup-anchor (gnc:html-markup-anchor
(gnc:split-anchor-text pmt-split) (gnc:split-anchor-text tfr-split)
(gnc:make-gnc-monetary (gnc:make-gnc-monetary tfr-curr tfr-amt)))))
currency (- (xaccSplitGetAmount pmt-split)))))))) result)))))))))))
(filter (lambda (s) (not (equal? (xaccSplitGetParent s) txn)))
invoice-splits))
(if (gncInvoiceIsPaid invoice)
'()
(list
(list (gnc:make-html-table-cell/size 1 2 (_ "Outstanding"))
(make-cell
(gnc:make-gnc-monetary
currency
(gnc-lot-get-balance
(gncInvoiceGetPostedLot invoice)))))))))
(define (make-payment->invoices-list invoice payment-splits) (define (make-payment->invoices-list invoice payment-splits)
(list (list