TP->T64: gnucash/report/standard-reports/test/test-cash-flow.scm

gnucash/report/standard-reports/test/test-cash-flow.scm

@@ -18,11 +18,10 @@
 	      (list "Wallet"))
 	(list "Expenses" (list (cons 'type ACCT-TYPE-EXPENSE)))))
 
-(define (NDayDelta tp n)
+(define (NDayDelta t64 n)
   (let* ((day-secs (* 60 60 24 n)) ; n days in seconds is n times 60 sec/min * 60 min/h * 24 h/day
-         (new-secs (- (car tp) day-secs))
-         (new-tp (cons new-secs 0)))
-    new-tp))
+         (new-secs (- t64 day-secs)))
+    new-secs))
 
 (define (test-one-tx-in-cash-flow)
   (let* ((env (create-test-env))
@@ -31,15 +30,15 @@
 	 (wallet-account (cdr (assoc "Wallet" account-alist)))
 	 (expense-account (cdr (assoc "Expenses" account-alist)))
 	 (today (gnc-localtime (current-time)))
-         (to-date-tp (gnc-dmy2timespec-end (tm:mday today) (+ 1 (tm:mon today)) (+ 1900 (tm:year today))))
-         (from-date-tp (NDayDelta to-date-tp 1))
+         (to-date-t64 (gnc-dmy2time64-end (tm:mday today) (+ 1 (tm:mon today)) (+ 1900 (tm:year today))))
+         (from-date-t64 (NDayDelta to-date-t64 1))
 	 (exchange-fn (lambda (currency amount date) amount))
 	 (report-currency (gnc-default-report-currency))
 	 )
-    (env-create-transaction env to-date-tp bank-account expense-account 100/1)
+    (env-create-transaction env to-date-t64 bank-account expense-account 100/1)
     (let ((result (cash-flow-calc-money-in-out (list (cons 'accounts (list bank-account))
-						     (cons 'to-date-tp to-date-tp)
-						     (cons 'from-date-tp from-date-tp)
+						     (cons 'to-date-t64 to-date-t64)
+						     (cons 'from-date-t64 from-date-t64)
 						     (cons 'report-currency report-currency)
 						     (cons 'include-trading-accounts #f)
 						     (cons 'to-report-currency exchange-fn)))))
@@ -75,15 +74,15 @@
 	 (wallet-account (cdr (assoc "Wallet" account-alist)))
 	 (expense-account (cdr (assoc "Expenses" account-alist)))
 	 (today (gnc-localtime (current-time)))
-         (to-date-tp (gnc-dmy2timespec-end (tm:mday today) (+ 1 (tm:mon today)) (+ 1900 (tm:year today))))
-         (from-date-tp (NDayDelta to-date-tp 1))
+         (to-date-t64 (gnc-dmy2time64-end (tm:mday today) (+ 1 (tm:mon today)) (+ 1900 (tm:year today))))
+         (from-date-t64 (NDayDelta to-date-t64 1))
 	 (exchange-fn (lambda (currency amount date) amount))
 	 (report-currency (gnc-default-report-currency))
 	 )
-    (env-create-transaction env to-date-tp bank-account wallet-account 100/1)
+    (env-create-transaction env to-date-t64 bank-account wallet-account 100/1)
     (let ((result (cash-flow-calc-money-in-out (list (cons 'accounts (list wallet-account bank-account))
-						     (cons 'to-date-tp to-date-tp)
-						     (cons 'from-date-tp from-date-tp)
+						     (cons 'to-date-t64 to-date-t64)
+						     (cons 'from-date-t64 from-date-t64)
 						     (cons 'report-currency report-currency)
 						     (cons 'include-trading-accounts #f)
 						     (cons 'to-report-currency exchange-fn)))))
@@ -109,16 +108,16 @@
 	 (wallet-account (cdr (assoc "Wallet" account-alist)))
 	 (expense-account (cdr (assoc "Expenses" account-alist)))
 	 (today (gnc-localtime (current-time)))
-         (to-date-tp (gnc-dmy2timespec-end (tm:mday today) (+ 1 (tm:mon today)) (+ 1900 (tm:year today))))
-         (from-date-tp (NDayDelta to-date-tp 1))
+         (to-date-t64 (gnc-dmy2time64-end (tm:mday today) (+ 1 (tm:mon today)) (+ 1900 (tm:year today))))
+         (from-date-t64 (NDayDelta to-date-t64 1))
 	 (exchange-fn (lambda (currency amount date) amount))
 	 (report-currency (gnc-default-report-currency))
 	 )
-    (env-create-transaction env to-date-tp bank-account expense-account 100/1)
-    (env-create-transaction env to-date-tp expense-account bank-account 50/1)
+    (env-create-transaction env to-date-t64 bank-account expense-account 100/1)
+    (env-create-transaction env to-date-t64 expense-account bank-account 50/1)
     (let ((result (cash-flow-calc-money-in-out (list (cons 'accounts (list wallet-account bank-account))
-						     (cons 'to-date-tp to-date-tp)
-						     (cons 'from-date-tp from-date-tp)
+						     (cons 'to-date-t64 to-date-t64)
+						     (cons 'from-date-t64 from-date-t64)
 						     (cons 'report-currency report-currency)
 						     (cons 'include-trading-accounts #f)
 						     (cons 'to-report-currency exchange-fn)))))