diff --git a/src/report/standard-reports/transaction.scm b/src/report/standard-reports/transaction.scm index b852eb6e16..b58c665da3 100644 --- a/src/report/standard-reports/transaction.scm +++ b/src/report/standard-reports/transaction.scm @@ -232,33 +232,35 @@ (define (used-date columns-used) (vector-ref columns-used 0)) -(define (used-num columns-used) +(define (used-reconciled-date columns-used) (vector-ref columns-used 1)) -(define (used-description columns-used) +(define (used-num columns-used) (vector-ref columns-used 2)) -(define (used-account columns-used) +(define (used-description columns-used) (vector-ref columns-used 3)) +(define (used-account columns-used) + (vector-ref columns-used 4)) (define (used-other-account columns-used) - (vector-ref columns-used 4)) -(define (used-shares columns-used) (vector-ref columns-used 5)) -(define (used-price columns-used) +(define (used-shares columns-used) (vector-ref columns-used 6)) -(define (used-amount-single columns-used) +(define (used-price columns-used) (vector-ref columns-used 7)) -(define (used-amount-double-positive columns-used) +(define (used-amount-single columns-used) (vector-ref columns-used 8)) -(define (used-amount-double-negative columns-used) +(define (used-amount-double-positive columns-used) (vector-ref columns-used 9)) +(define (used-amount-double-negative columns-used) + (vector-ref columns-used 10)) (define (used-running-balance columns-used) - (vector-ref columns-used 10)) -(define (used-account-full-name columns-used) (vector-ref columns-used 11)) - -(define (used-memo columns-used) +(define (used-account-full-name columns-used) (vector-ref columns-used 12)) -(define columns-used-size 13) +(define (used-memo columns-used) + (vector-ref columns-used 13)) + +(define columns-used-size 14) (define (num-columns-required columns-used) (do ((i 0 (+ i 1)) @@ -273,36 +275,40 @@ (let ((column-list (make-vector columns-used-size #f))) (if (opt-val (N_ "Display") (N_ "Date")) (vector-set! column-list 0 #t)) - (if (opt-val (N_ "Display") (N_ "Num")) + (if (opt-val (N_ "Display") (N_ "Reconciled Date")) (vector-set! column-list 1 #t)) - (if (opt-val (N_ "Display") (N_ "Description")) + (if (opt-val (N_ "Display") (N_ "Num")) (vector-set! column-list 2 #t)) - (if (opt-val (N_ "Display") (N_ "Account")) + (if (opt-val (N_ "Display") (N_ "Description")) (vector-set! column-list 3 #t)) - (if (opt-val (N_ "Display") (N_ "Other Account")) + (if (opt-val (N_ "Display") (N_ "Account")) (vector-set! column-list 4 #t)) - (if (opt-val (N_ "Display") (N_ "Shares")) + (if (opt-val (N_ "Display") (N_ "Other Account")) (vector-set! column-list 5 #t)) - (if (opt-val (N_ "Display") (N_ "Price")) + (if (opt-val (N_ "Display") (N_ "Shares")) (vector-set! column-list 6 #t)) + (if (opt-val (N_ "Display") (N_ "Price")) + (vector-set! column-list 7 #t)) (let ((amount-setting (opt-val (N_ "Display") (N_ "Amount")))) (if (eq? amount-setting 'single) - (vector-set! column-list 7 #t)) + (vector-set! column-list 8 #t)) (if (eq? amount-setting 'double) - (begin (vector-set! column-list 8 #t) - (vector-set! column-list 9 #t)))) + (begin (vector-set! column-list 9 #t) + (vector-set! column-list 10 #t)))) (if (opt-val (N_ "Display") (N_ "Running Balance")) - (vector-set! column-list 10 #t)) - (if (opt-val (N_ "Display") (N_ "Use Full Account Name?")) (vector-set! column-list 11 #t)) - (if (opt-val (N_ "Display") (N_ "Memo")) + (if (opt-val (N_ "Display") (N_ "Use Full Account Name?")) (vector-set! column-list 12 #t)) + (if (opt-val (N_ "Display") (N_ "Memo")) + (vector-set! column-list 13 #t)) column-list)) (define (make-heading-list column-vector) (let ((heading-list '())) (if (used-date column-vector) (addto! heading-list (_ "Date"))) + (if (used-reconciled-date column-vector) + (addto! heading-list (_ "Reconciled Date"))) (if (used-num column-vector) (addto! heading-list (_ "Num"))) (if (used-description column-vector) @@ -353,6 +359,12 @@ (if transaction-row? (gnc:print-date (gnc:transaction-get-date-posted parent)) " "))) + (if (used-reconciled-date column-vector) + (addto! row-contents + (let ((date (gnc:split-get-reconciled-date split))) + (if (equal? date (cons 0 0)) + " " + (gnc:print-date date))))) (if (used-num column-vector) (addto! row-contents (if transaction-row? @@ -542,6 +554,9 @@ (vector 'exact-time (N_ "Exact Time") (N_ "Sort by exact time")) + (vector 'reconciled-date + (N_ "Reconciled Date") + (N_ "Sort by the Reconciled Date")) (vector 'register-order (N_ "Register Order") (N_ "Sort as with the register")) @@ -668,6 +683,7 @@ ;; help-string, default-value (list (list (N_ "Date") "a" (N_ "Display the date?") #t) + (list (N_ "Reconciled Date") "a2" (N_ "Display the reconciled date?") #f) (list (N_ "Num") "b" (N_ "Display the check number?") #t) (list (N_ "Description") "c" (N_ "Display the description?") #t) (list (N_ "Memo") "d" (N_ "Display the memo?") #t) @@ -978,6 +994,8 @@ Credit Card, and Income accounts"))))) (cons 'date (vector (list gnc:split-trans gnc:trans-date-posted) #f #f #f)) + (cons 'reconciled-date (vector + (list gnc:split-date-reconciled) #f #f #f)) (cons 'register-order (vector (list gnc:query-default-sort)