diff --git a/gnucash/report/standard-reports/budget-barchart.scm b/gnucash/report/standard-reports/budget-barchart.scm index 33cadc97d7..105da0a92e 100644 --- a/gnucash/report/standard-reports/budget-barchart.scm +++ b/gnucash/report/standard-reports/budget-barchart.scm @@ -141,11 +141,9 @@ ;; ;; Create bar and and values ;; -(define (gnc:chart-create-budget-actual budget acct running-sum chart-type width height from-tp to-tp) +(define (gnc:chart-create-budget-actual budget acct running-sum chart-type width height report-start-time report-end-time) (let* ( (chart #f) - (report-start-time (car from-tp)) - (report-end-time (car to-tp)) ) (if (eqv? chart-type 'bars) @@ -183,7 +181,6 @@ (bgt-sum 0) (act-sum 0) (date (gnc-budget-get-period-start-date budget period)) - (period-start-time (car date)) (bgt-vals '()) (act-vals '()) (date-iso-string-list '()) @@ -206,7 +203,7 @@ (gnc-budget-get-account-period-actual-value budget acct period)))) ) ) - (if (<= report-start-time period-start-time) + (if (<= report-start-time date) ;; within reporting period, update the display lists (begin (if (not running-sum) @@ -221,14 +218,13 @@ ) (set! bgt-vals (append bgt-vals (list bgt-sum))) (set! act-vals (append act-vals (list act-sum))) - (set! date-iso-string-list (append date-iso-string-list (list (gnc-print-date date)))) + (set! date-iso-string-list (append date-iso-string-list (list (qof-print-date date)))) ) ) ;; prepare data for next loop repetition (set! period (+ period 1)) (set! date (gnc-budget-get-period-start-date budget period)) - (set! period-start-time (car date)) - (if (< report-end-time period-start-time) + (if (< report-end-time date) (set! period num-periods) ;; reporting period has ended, break the loop ) ) @@ -319,10 +315,10 @@ (report-title (get-option gnc:pagename-general gnc:optname-reportname)) (document (gnc:make-html-document)) - (from-date-tp (gnc:timepair-start-day-time + (from-date-t64 (gnc:time64-start-day-time (gnc:date-option-absolute-time (get-option gnc:pagename-general optname-from-date)))) - (to-date-tp (gnc:timepair-end-day-time + (to-date-t64 (gnc:time64-end-day-time (gnc:date-option-absolute-time (get-option gnc:pagename-general optname-to-date)))) ) @@ -357,7 +353,7 @@ ) (gnc:html-document-add-object! document - (gnc:chart-create-budget-actual budget acct running-sum chart-type width height from-date-tp to-date-tp) + (gnc:chart-create-budget-actual budget acct running-sum chart-type width height from-date-t64 to-date-t64) ) ) )