diff --git a/src/scm/date-utilities.scm b/src/scm/date-utilities.scm index b569950730..25526b6512 100644 --- a/src/scm/date-utilities.scm +++ b/src/scm/date-utilities.scm @@ -257,8 +257,8 @@ (define (gnc:timepair-end-day-time tp) (let ((bdt (localtime (gnc:timepair->secs tp)))) - (set-tm:sec bdtime 59) - (set-tm:min bdtime 59) - (set-tm:hour bdtime 23) + (set-tm:sec bdt 59) + (set-tm:min bdt 59) + (set-tm:hour bdt 23) (let ((newtime (car (mktime bdt)))) (cons newtime 0)))) diff --git a/src/scm/report/average-balance.scm b/src/scm/report/average-balance.scm index 8e57ef3e61..b0e728d415 100644 --- a/src/scm/report/average-balance.scm +++ b/src/scm/report/average-balance.scm @@ -323,7 +323,7 @@ (let ((acctcurrency "USD") (acctname "") (begindate (gov-fun "From")) - (enddate (gov-fun "To")) + (enddate (gnc:timepair-end-day-time (gov-fun "To"))) (stepsize (eval (gov-fun "Step Size"))) (plotstr (eval (gov-fun "Plot Type"))) (accounts (gov-fun "Account")) diff --git a/src/scm/report/balance-and-pnl.scm b/src/scm/report/balance-and-pnl.scm index daec9a0ced..b04eacff53 100644 --- a/src/scm/report/balance-and-pnl.scm +++ b/src/scm/report/balance-and-pnl.scm @@ -112,8 +112,9 @@ (let* ((from-option (gnc:lookup-option options "Report Options" "From")) (from-value (if from-option (gnc:option-value from-option) #f)) - (to-value (gnc:option-value - (gnc:lookup-option options "Report Options" "To")))) + (to-value (gnc:timepair-end-day-time + (gnc:option-value + (gnc:lookup-option options "Report Options" "To"))))) (define (handle-level-1-account account options) (let ((type (gnc:account-type->symbol (gnc:account-get-type account)))) diff --git a/src/scm/report/transaction-report.scm b/src/scm/report/transaction-report.scm index c254bfca51..9efb41eda2 100644 --- a/src/scm/report/transaction-report.scm +++ b/src/scm/report/transaction-report.scm @@ -579,7 +579,6 @@ gnc:*transaction-report-options*) - (define (gnc:trep-renderer options) (let* ((begindate (gnc:lookup-option options "Report Options" "From")) (enddate (gnc:lookup-option options "Report Options" "To")) @@ -602,7 +601,8 @@ (accounts (gnc:option-value tr-report-account-op)) (date-filter-pred (split-report-make-date-filter-predicate (car (gnc:option-value begindate)) - (car (gnc:option-value enddate)))) + (car (gnc:timepair-end-day-time + (gnc:option-value enddate))))) (s1 (split-report-get-sort-spec-entry (gnc:option-value tr-report-primary-key-op) (eq? (gnc:option-value tr-report-primary-order-op) 'ascend)