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] RHS Pre-Payment and UNPAID get link-id highlights

Browse Source 
They are related to the LHS invoice or payment.
This commit is contained in:
Christopher Lam 2020-01-26 11:44:55 +08:00
parent 074aed940e
commit e65db8df4a
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,10 +116,11 @@
(rhs-class link-data-rhs-class))
(define-record-type :link-desc-amount
(make-link-desc-amount desc amount)
(make-link-desc-amount desc amount rhs-class)
link-desc-amount?
(desc link-desc-amount-desc)
(amount link-desc-amount-amount))
(amount link-desc-amount-amount)
(rhs-class link-desc-amount-rhs-class))
(define-record-type :link-blank
(make-link-blank)
@ -403,11 +404,25 @@
((link-desc-amount? link-data)
(let ((cols (num-cols column-vector 'rhs-span)))
(append
(addif (< 0 cols) (gnc:make-html-table-cell/size
1 cols (link-desc-amount-desc link-data)))
(addif (or (debit-col column-vector) (credit-col column-vector))
(gnc:make-html-table-cell/size/markup
1 2 "number-cell" (link-desc-amount-amount link-data))))))
(map
(lambda (str)
(let ((cell (gnc:make-html-table-cell/size 1 cols str))
(rhs-class (link-desc-amount-rhs-class link-data)))
(when rhs-class
(gnc:html-table-cell-set-style!
cell "td" 'attribute (list "link-id" rhs-class)))
cell))
(addif (< 0 cols) (link-desc-amount-desc link-data)))
(map
(lambda (str)
(let ((cell (gnc:make-html-table-cell/size/markup 1 2 "number-cell" str))
(rhs-class (link-desc-amount-rhs-class link-data)))
(when rhs-class
(gnc:html-table-cell-set-style!
cell "number-cell" 'attribute (list "link-id" rhs-class)))
cell))
(addif (or (debit-col column-vector) (credit-col column-vector))
(link-desc-amount-amount link-data))))))
((link-blank? link-data)
(make-list (num-cols column-vector 'rhs-cols) #f))
@ -578,7 +593,8 @@
(cons (make-link-desc-amount
(_ "UNPAID")
(gnc:make-gnc-monetary
currency (AP-negate (gnc-lot-get-balance lot))))
currency (AP-negate (gnc-lot-get-balance lot)))
(gncInvoiceReturnGUID invoice))
result))))
;; This is the regular payment split. Find Transfer acct
@ -703,7 +719,8 @@
'()
(list (make-link-desc-amount
(_ "Pre-Payment")
(gnc:make-gnc-monetary currency overpayment))))))
(gnc:make-gnc-monetary currency overpayment)
(gncTransGetGUID txn))))))
(define payments-list
(map