diff --git a/gnucash/import-export/qif-imp/qif-merge-groups.scm b/gnucash/import-export/qif-imp/qif-merge-groups.scm index b2b83cc59b4..b53c8724003 100644 --- a/gnucash/import-export/qif-imp/qif-merge-groups.scm +++ b/gnucash/import-export/qif-imp/qif-merge-groups.scm @@ -129,8 +129,8 @@ ;; The date should be close to the same.. +/- a week. (let ((date (xaccTransGetDate xtn))) (xaccQueryAddDateMatchTT query - #t (decdate64 date WeekDelta) - #t (incdate64 date WeekDelta) + #t (decdate date WeekDelta) + #t (incdate date WeekDelta) QOF-QUERY-AND)) ;; For each split in the new transaction, add a diff --git a/gnucash/report/business-reports/aging.scm b/gnucash/report/business-reports/aging.scm index 1ac703126dc..1746e9278f0 100644 --- a/gnucash/report/business-reports/aging.scm +++ b/gnucash/report/business-reports/aging.scm @@ -487,14 +487,14 @@ copying this report to a spreadsheet for use in a mail merge.") (define (make-interval-list to-date) (let ((begindate to-date)) - (set! begindate (decdate64 begindate ThirtyDayDelta)) - (set! begindate (decdate64 begindate ThirtyDayDelta)) - (set! begindate (decdate64 begindate ThirtyDayDelta)) + (set! begindate (decdate begindate ThirtyDayDelta)) + (set! begindate (decdate begindate ThirtyDayDelta)) + (set! begindate (decdate begindate ThirtyDayDelta)) (gnc:make-date-list begindate to-date ThirtyDayDelta))) ;; Have make-list create a stepped list, then add a date in the future for the "current" bucket (define (make-extended-interval-list to-date) - (define dayforcurrent (incdate64 to-date YearDelta)) ;; MAGIC CONSTANT + (define dayforcurrent (incdate to-date YearDelta)) ;; MAGIC CONSTANT (define oldintervalreversed (reverse (make-interval-list to-date))) (reverse (cons dayforcurrent oldintervalreversed))) diff --git a/gnucash/report/business-reports/job-report.scm b/gnucash/report/business-reports/job-report.scm index 590875d1a38..327e46bc57e 100644 --- a/gnucash/report/business-reports/job-report.scm +++ b/gnucash/report/business-reports/job-report.scm @@ -118,9 +118,9 @@ (define (make-interval-list to-date) (let ((begindate to-date)) - (set! begindate (decdate64 begindate ThirtyDayDelta)) - (set! begindate (decdate64 begindate ThirtyDayDelta)) - (set! begindate (decdate64 begindate ThirtyDayDelta)) + (set! begindate (decdate begindate ThirtyDayDelta)) + (set! begindate (decdate begindate ThirtyDayDelta)) + (set! begindate (decdate begindate ThirtyDayDelta)) (gnc:make-date-list begindate to-date ThirtyDayDelta))) diff --git a/gnucash/report/business-reports/owner-report.scm b/gnucash/report/business-reports/owner-report.scm index 0516f6916ec..7286ccddc27 100644 --- a/gnucash/report/business-reports/owner-report.scm +++ b/gnucash/report/business-reports/owner-report.scm @@ -204,14 +204,14 @@ (define (make-interval-list to-date) (let ((begindate to-date)) - (set! begindate (decdate64 begindate ThirtyDayDelta)) - (set! begindate (decdate64 begindate ThirtyDayDelta)) - (set! begindate (decdate64 begindate ThirtyDayDelta)) + (set! begindate (decdate begindate ThirtyDayDelta)) + (set! begindate (decdate begindate ThirtyDayDelta)) + (set! begindate (decdate begindate ThirtyDayDelta)) (gnc:make-date-list begindate to-date ThirtyDayDelta))) ;; Have make-list create a stepped list, then add a date in the future for the "current" bucket (define (make-extended-interval-list to-date) - (define dayforcurrent (incdate64 to-date YearDelta)) ;; MAGIC CONSTANT + (define dayforcurrent (incdate to-date YearDelta)) ;; MAGIC CONSTANT (define oldintervalreversed (reverse (make-interval-list to-date))) (reverse (cons dayforcurrent oldintervalreversed))) diff --git a/gnucash/report/report-system/report-collectors.scm b/gnucash/report/report-system/report-collectors.scm index 7fe4c911dd8..4e587adb0ee 100644 --- a/gnucash/report/report-system/report-collectors.scm +++ b/gnucash/report/report-system/report-collectors.scm @@ -155,7 +155,7 @@ (list min-date max-date dates))) (define (category-report-dates-accumulate dates) - (let* ((min-date (decdate64 (car (list-min-max dates <)) DayDelta)) + (let* ((min-date (decdate (car (list-min-max dates <)) DayDelta)) (max-date (cdr (list-min-max dates <))) (datepairs (reverse! (cdr (fold (lambda (next acc) (let ((prev (car acc)) diff --git a/libgnucash/app-utils/app-utils.scm b/libgnucash/app-utils/app-utils.scm index 256ca17024f..731cc09b1a9 100644 --- a/libgnucash/app-utils/app-utils.scm +++ b/libgnucash/app-utils/app-utils.scm @@ -213,8 +213,8 @@ (export moddatek) (export decdate) (export incdate) -(export decdate64) -(export incdate64) +(export decdate) +(export incdate) (export gnc:time64-le-date) (export gnc:time64-ge-date) (export gnc:make-date-interval-list) diff --git a/libgnucash/app-utils/date-utilities.scm b/libgnucash/app-utils/date-utilities.scm index 62530ded7a5..3627d292c49 100644 --- a/libgnucash/app-utils/date-utilities.scm +++ b/libgnucash/app-utils/date-utilities.scm @@ -203,7 +203,7 @@ (else #f))) ;; Modify a date -(define (moddate64 op adate delta) +(define (moddate op adate delta) (let ((newtm (gnc-localtime adate))) (begin (set-tm:sec newtm (op (tm:sec newtm) (tm:sec delta))) @@ -216,8 +216,8 @@ (gnc-mktime newtm)))) ;; Add or subtract time from a date -(define (decdate64 adate delta) (moddate64 - adate delta )) -(define (incdate64 adate delta) (moddate64 + adate delta )) +(define (decdate adate delta) (moddate - adate delta )) +(define (incdate adate delta) (moddate + adate delta )) ;; date-granularity comparison functions. @@ -235,9 +235,9 @@ ;; want that you'll have to write another function. (define (gnc:make-date-interval-list current-date end-date increment) (if (< current-date end-date) - (let ((next-date (incdate64 current-date increment))) + (let ((next-date (incdate current-date increment))) (if (< next-date end-date) - (cons (list current-date (decdate64 next-date SecDelta) '()) + (cons (list current-date (decdate next-date SecDelta) '()) (gnc:make-date-interval-list next-date end-date increment)) (cons (list current-date end-date '()) '()))) @@ -251,7 +251,7 @@ (define (gnc:make-date-list startdate enddate incr) (if (< startdate enddate) (cons startdate - (gnc:make-date-list (incdate64 startdate incr) + (gnc:make-date-list (incdate startdate incr) enddate incr)) (list enddate))) @@ -363,10 +363,10 @@ (gnc-mktime bdt))) (define (gnc:time64-previous-day t64) - (decdate64 t64 DayDelta)) + (decdate t64 DayDelta)) (define (gnc:time64-next-day t64) - (incdate64 t64 DayDelta)) + (incdate t64 DayDelta)) (define (gnc:reldate-get-symbol x) (vector-ref x 0))