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

[transaction] convert nested if/then/else -> cond

Browse Source 
This nested if/then/else snippet is more suited to (cond) syntax.
This commit is contained in:
Christopher Lam
2018-12-05 15:37:07 +08:00
committed by John Ralls
parent 0850e004e2
commit f697eb2f01
1 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
gnucash/report/standard-reports/transaction.scm
View File

@@ -1389,38 +1389,42 @@ be excluded from periodic reporting.")
(reverse result)
(let* ((mon (retrieve-commodity (car columns) commodity))
(this-column (and mon (gnc:gnc-monetary-amount mon))))
(if (car merge-list)
;; We're merging. If a subtotal exists, send to next loop iteration.
(loop #t
this-column
(cond
;; We're merging. If a subtotal exists, send to next loop iteration.
((car merge-list)
(loop #t
this-column
(cdr columns)
(cdr merge-list)
result))
;; We're completing merge. Display debit-credit in correct column.
(merging?
(let* ((sum (and (or last-column this-column)
(- (or last-column 0) (or this-column 0))))
(sum-table-cell (and sum (gnc:make-html-table-cell/markup
"total-number-cell"
(gnc:make-gnc-monetary
commodity (abs sum)))))
(debit-col (and sum (positive? sum) sum-table-cell))
(credit-col (and sum (not (positive? sum)) sum-table-cell)))
(loop #f
#f
(cdr columns)
(cdr merge-list)
result)
(begin
(if merging?
;; We're completing merge. Display debit-credit in correct column.
(let* ((sum (and (or last-column this-column)
(- (or last-column 0) (or this-column 0))))
(sum-table-cell (and sum (gnc:make-html-table-cell/markup
"total-number-cell"
(gnc:make-gnc-monetary
commodity (abs sum)))))
(debit-col (and sum (positive? sum) sum-table-cell))
(credit-col (and sum (not (positive? sum)) sum-table-cell)))
(loop #f
#f
(cdr columns)
(cdr merge-list)
(cons* (or credit-col "")
(or debit-col "")
result)))
;; Default; not merging nor completed merge. Just add amount to result.
(loop #f
#f
(cdr columns)
(cdr merge-list)
(cons (gnc:make-html-table-cell/markup "total-number-cell" mon)
result)))))))))
(cons* (or credit-col "")
(or debit-col "")
result))))
;; Not merging nor completed merge. Just add amount to result.
(else
(loop #f
#f
(cdr columns)
(cdr merge-list)
(cons (gnc:make-html-table-cell/markup "total-number-cell" mon)
result))))))))
;; take the first column of each commodity, add onto the subtotal grid
(set! grid (grid-add grid row col