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

REFACTOR: Use time64 instead of timepair

Browse Source
This commit is contained in:
Christopher Lam 2017-12-11 23:48:13 +08:00
parent 1be88ad175
commit 521c16241d
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,14 +214,14 @@ options specified in the Options panels."))
(define (sortkey-get-info sortkey info) (define (sortkey-get-info sortkey info)
(cdr (assq info (cdr (assq sortkey sortkey-list))))) (cdr (assq info (cdr (assq sortkey sortkey-list)))))
(define (timepair-year tp) (gnc:timepair-get-year tp)) (define (time64-year t64) (gnc:date-get-year (gnc-localtime t64)))
(define (timepair-quarter tp) (+ (* 10 (timepair-year tp)) (gnc:timepair-get-quarter tp))) (define (time64-quarter t64) (+ (* 10 (gnc:date-get-year (gnc-localtime t64))) (gnc:date-get-quarter (gnc-localtime t64))))
(define (timepair-month tp) (+ (* 100 (timepair-year tp)) (gnc:timepair-get-month tp))) (define (time64-month t64) (+ (* 100 (gnc:date-get-year (gnc-localtime t64))) (gnc:date-get-month (gnc-localtime t64))))
(define (timepair-week tp) (+ (* 100 (timepair-year tp)) (gnc:timepair-get-week tp))) (define (time64-week t64) (gnc:date-get-week (gnc-localtime t64)))
(define (split-week a) (timepair-week (gnc-transaction-get-date-posted (xaccSplitGetParent a)))) (define (split-week a) (time64-week (xaccTransGetDate (xaccSplitGetParent a))))
(define (split-month a) (timepair-month (gnc-transaction-get-date-posted (xaccSplitGetParent a)))) (define (split-month a) (time64-month (xaccTransGetDate (xaccSplitGetParent a))))
(define (split-quarter a) (timepair-quarter (gnc-transaction-get-date-posted (xaccSplitGetParent a)))) (define (split-quarter a) (time64-quarter (xaccTransGetDate (xaccSplitGetParent a))))
(define (split-year a) (timepair-year (gnc-transaction-get-date-posted (xaccSplitGetParent a)))) (define (split-year a) (time64-year (xaccTransGetDate (xaccSplitGetParent a))))
(define date-subtotal-list (define date-subtotal-list
;; List for date option. ;; List for date option.
@ -999,8 +999,8 @@ Credit Card, and Income accounts."))))))
((month) gnc:date-get-month-year-string) ((month) gnc:date-get-month-year-string)
((quarter) gnc:date-get-quarter-year-string) ((quarter) gnc:date-get-quarter-year-string)
((year) gnc:date-get-year-string)) ((year) gnc:date-get-year-string))
(gnc:timepair->date (gnc-localtime
(gnc-transaction-get-date-posted (xaccTransGetDate
(xaccSplitGetParent split))))) (xaccSplitGetParent split)))))
(define (render-account renderer-key split anchor?) (define (render-account renderer-key split anchor?)
@ -1055,17 +1055,17 @@ Credit Card, and Income accounts."))))))
(if transaction-row? (if transaction-row?
(gnc:make-html-table-cell/markup (gnc:make-html-table-cell/markup
"date-cell" "date-cell"
(gnc-print-date (gnc-transaction-get-date-posted trans))) (qof-print-date (xaccTransGetDate trans)))
""))) "")))
(if (column-uses? 'reconciled-date used-columns) (if (column-uses? 'reconciled-date used-columns)
(addto! row-contents (addto! row-contents
(gnc:make-html-table-cell/markup (gnc:make-html-table-cell/markup
"date-cell" "date-cell"
(let ((date (gnc-split-get-date-reconciled split))) (let ((date (xaccSplitGetDateReconciled split)))
(if (equal? date (cons 0 0)) (if (zero? date)
"" ""
(gnc-print-date date)))))) (qof-print-date date))))))
(if (column-uses? 'num used-columns) (if (column-uses? 'num used-columns)
(addto! row-contents (addto! row-contents