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

[income-statement] remove dead code

Browse Source 
indent and tabbing are constant, refactor them out
This commit is contained in:
Christopher Lam 2019-09-30 15:21:32 +08:00
parent 18c79a8a6a
commit 545454e347
1 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gnucash/report/standard-reports/income-statement.scm
View File

@ -58,7 +58,6 @@
(define optname-start-date (N_ "Start Date")) (define optname-start-date (N_ "Start Date"))
(define optname-end-date (N_ "End Date")) (define optname-end-date (N_ "End Date"))
;; FIXME this could use an indent option
(define optname-accounts (N_ "Accounts")) (define optname-accounts (N_ "Accounts"))
(define opthelp-accounts (define opthelp-accounts
@ -363,12 +362,8 @@
(list (list 'str closing-str) (list (list 'str closing-str)
(list 'cased closing-cased) (list 'cased closing-cased)
(list 'regexp closing-regexp) (list 'regexp closing-regexp)
(list 'closing #t) (list 'closing #t)))
)
)
(indent 0)
(tabbing #f)
;; decompose the account list ;; decompose the account list
(split-up-accounts (gnc:decompose-accountlist accounts)) (split-up-accounts (gnc:decompose-accountlist accounts))
(revenue-accounts (assoc-ref split-up-accounts ACCT-TYPE-INCOME)) (revenue-accounts (assoc-ref split-up-accounts ACCT-TYPE-INCOME))
@ -392,7 +387,6 @@
;; Wrapper to call gnc:html-table-add-labeled-amount-line! ;; Wrapper to call gnc:html-table-add-labeled-amount-line!
;; with the proper arguments. ;; with the proper arguments.
(define (add-subtotal-line table pos-label neg-label signed-balance) (define (add-subtotal-line table pos-label neg-label signed-balance)
(define allow-same-column-totals #t)
(let* ((neg? (and signed-balance (let* ((neg? (and signed-balance
neg-label neg-label
(gnc-numeric-negative-p (gnc-numeric-negative-p
@ -400,32 +394,15 @@
(gnc:sum-collector-commodity (gnc:sum-collector-commodity
signed-balance report-commodity exchange-fn))))) signed-balance report-commodity exchange-fn)))))
(label (if neg? (or neg-label pos-label) pos-label)) (label (if neg? (or neg-label pos-label) pos-label))
(balance (if neg? (balance (if neg? (gnc:collector- signed-balance) signed-balance)))
(let ((bal (gnc:make-commodity-collector)))
(bal 'minusmerge signed-balance #f)
bal)
signed-balance))
)
(gnc:html-table-add-labeled-amount-line! (gnc:html-table-add-labeled-amount-line!
table table (* tree-depth 2) "primary-subheading" #f label 0 1 "total-label-cell"
(+ indent (* tree-depth 2)
(if (equal? tabbing 'canonically-tabbed) 1 0))
"primary-subheading"
(and (not allow-same-column-totals) balance use-rules?)
label indent 1 "total-label-cell"
(gnc:sum-collector-commodity balance report-commodity exchange-fn) (gnc:sum-collector-commodity balance report-commodity exchange-fn)
(+ indent (* tree-depth 2) (- 0 1) (1- (* tree-depth 2)) 1 "total-number-cell")))
(if (equal? tabbing 'canonically-tabbed) 1 0))
1 "total-number-cell")
)
)
;; wrapper around gnc:html-table-append-ruler! ;; wrapper around gnc:html-table-append-ruler!
(define (add-rule table) (define (add-rule table)
(gnc:html-table-append-ruler! (gnc:html-table-append-ruler! table (* 2 tree-depth)))
table
(+ (* 2 tree-depth)
(if (equal? tabbing 'canonically-tabbed) 1 0))))
(gnc:html-document-set-title! (gnc:html-document-set-title!
doc (format #f doc (format #f