TP->T64: gnucash/report/business-reports/owner-report.scm

gnucash/report/business-reports/owner-report.scm

@@ -204,14 +204,14 @@
 
 (define (make-interval-list to-date)
   (let ((begindate to-date))
-    (set! begindate (decdate begindate ThirtyDayDelta))
-    (set! begindate (decdate begindate ThirtyDayDelta))
-    (set! begindate (decdate begindate ThirtyDayDelta))
+    (set! begindate (decdate64 begindate ThirtyDayDelta))
+    (set! begindate (decdate64 begindate ThirtyDayDelta))
+    (set! begindate (decdate64 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 (incdate to-date YearDelta)) ;; MAGIC CONSTANT 
+    (define dayforcurrent (incdate64 to-date YearDelta)) ;; MAGIC CONSTANT 
     (define oldintervalreversed (reverse (make-interval-list to-date)))          
     (reverse (cons dayforcurrent oldintervalreversed))) 
 
@@ -222,7 +222,7 @@
     (table (gnc:make-html-table)))
 
      (define (in-interval this-date current-bucket)
-      (gnc:timepair-lt this-date current-bucket))
+      (< this-date current-bucket))
 
      (define (find-bucket current-bucket bucket-intervals date)
       (begin
@@ -247,7 +247,7 @@
        (let* ((bal (gnc-lot-get-balance lot))
           (invoice (gncInvoiceGetInvoiceFromLot lot))
               (date (if (eq? date-type 'postdate)
-               (gncInvoiceGetDatePosted invoice) 
+               (gncInvoiceGetDatePostedTT invoice) 
                (gncInvoiceGetDateDue invoice)))
               )
          
@@ -283,12 +283,12 @@
 (define (make-row column-vector date due-date num type-str memo monetary credit debit sale tax)
   (let ((row-contents '()))
     (if (date-col column-vector)
-        (addto! row-contents (gnc-print-date date)))
+        (addto! row-contents (qof-print-date date)))
     (if (date-due-col column-vector)
         (addto! row-contents 
          (if (and due-date
-              (not (equal? due-date (cons 0 0))))
-             (gnc-print-date due-date)
+              (not (zero? due-date)))
+             (qof-print-date due-date)
              "")))
     (if (num-col column-vector)
         (addto! row-contents num))
@@ -342,7 +342,7 @@
 (define (add-txn-row table txn acc column-vector odd-row? printed?
              reverse? start-date total)
   (let* ((type (xaccTransGetTxnType txn))
-     (date (gnc-transaction-get-date-posted txn))
+     (date (xaccTransGetDate txn))
      (due-date #f)
      (value (xaccTransGetAccountValue txn acc))
      (sale (gnc-numeric-zero))
@@ -369,7 +369,7 @@
    (if reverse?
     (set! value (gnc-numeric-neg value)))
 
-   (if (gnc:timepair-le start-date date)
+   (if (<= start-date date)
     (begin
       
       ; Adds 'balance' row if needed
@@ -670,7 +670,7 @@
      guid QOF-QUERY-OR)
 
     (xaccQueryAddSingleAccountMatch q account QOF-QUERY-AND)
-    (xaccQueryAddDateMatchTS q #f end-date #t end-date QOF-QUERY-AND)
+    (xaccQueryAddDateMatchTT q #f end-date #t end-date QOF-QUERY-AND)
     (qof-query-set-book q (gnc-get-current-book))
     q))
 
@@ -698,7 +698,7 @@
    table
    (list
     (string-append label ":&nbsp;")
-    (string-expand (gnc-print-date date) #\space "&nbsp;"))))
+    (string-expand (qof-print-date date) #\space "&nbsp;"))))
 
 (define (make-date-table)
   (let ((table (gnc:make-html-table)))
@@ -731,7 +731,7 @@
     (gnc:html-table-append-row! table (list
                        (strftime
                     date-format
-                    (gnc-localtime (car (gnc:get-today))))))
+                    (gnc-localtime (gnc:get-today)))))
     table))
 
 (define (make-break! document)
@@ -750,10 +750,10 @@
      (orders '())
      (query (qof-query-create-for-splits))
      (account (opt-val owner-page acct-string))
-     (start-date (gnc:timepair-start-day-time 
+     (start-date (gnc:time64-start-day-time 
       (gnc:date-option-absolute-time
        (opt-val gnc:pagename-general optname-from-date))))
-     (end-date (gnc:timepair-end-day-time 
+     (end-date (gnc:time64-end-day-time 
                (gnc:date-option-absolute-time
                (opt-val gnc:pagename-general optname-to-date))))
      (book (gnc-account-get-book account))
@@ -816,9 +816,9 @@
           (string-append
            (_ "Date Range")
            ": "
-           (gnc-print-date start-date)
+           (qof-print-date start-date)
            " - "
-           (gnc-print-date end-date))))
+           (qof-print-date end-date))))
 
         (make-break! document)