IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source
This commit is contained in:
Geert Janssens 2016-10-10 13:55:35 +02:00
commit 3877c03ee7
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/report/report-system/test/test-report-utilities.scm
View File

@ -20,10 +20,13 @@
(define (test-account-get-trans-type-splits-interval) (define (test-account-get-trans-type-splits-interval)
(let* ((env (create-test-env)) (let* ((env (create-test-env))
(ts-now (localtime (current-time))) (ts-now (localtime (current-time)))
(end-date-tp (gnc-dmy2timespec-neutral (tm:mday ts-now) (tm:mon ts-now) (tm:year ts-now))) (test-day (tm:mday ts-now))
(test-month (+ 1 (tm:mon ts-now)))
(test-year (+ 1900 (tm:year ts-now)))
(end-date-tp (gnc-dmy2timespec-neutral test-day test-month test-year))
(start-date-tp (NDayDelta end-date-tp 10)) (start-date-tp (NDayDelta end-date-tp 10))
(q-end-date-tp (gnc-dmy2timespec-end (tm:mday ts-now) (tm:mon ts-now) (tm:year ts-now))) (q-end-date-tp (gnc-dmy2timespec-end test-day test-month test-year))
(q-start-date-tp (gnc-dmy2timespec (tm:mday ts-now) (tm:mon ts-now) (tm:year ts-now))) (q-start-date-tp (gnc-dmy2timespec test-day test-month test-year))
(q-start-date-tp (NDayDelta q-start-date-tp 5))) (q-start-date-tp (NDayDelta q-start-date-tp 5)))
(let* ((accounts (env-create-account-structure-alist env (list "Assets" (let* ((accounts (env-create-account-structure-alist env (list "Assets"

6
src/report/standard-reports/test/test-cash-flow.scm
View File

@ -31,7 +31,7 @@
(wallet-account (cdr (assoc "Wallet" account-alist))) (wallet-account (cdr (assoc "Wallet" account-alist)))
(expense-account (cdr (assoc "Expenses" account-alist))) (expense-account (cdr (assoc "Expenses" account-alist)))
(today (localtime (current-time))) (today (localtime (current-time)))
(to-date-tp (gnc-dmy2timespec-end (tm:mday today) (tm:mon today) (tm:year today))) (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)) (from-date-tp (NDayDelta to-date-tp 1))
(exchange-fn (lambda (currency amount date) amount)) (exchange-fn (lambda (currency amount date) amount))
(report-currency (gnc-default-report-currency)) (report-currency (gnc-default-report-currency))
@ -67,7 +67,7 @@
(wallet-account (cdr (assoc "Wallet" account-alist))) (wallet-account (cdr (assoc "Wallet" account-alist)))
(expense-account (cdr (assoc "Expenses" account-alist))) (expense-account (cdr (assoc "Expenses" account-alist)))
(today (localtime (current-time))) (today (localtime (current-time)))
(to-date-tp (gnc-dmy2timespec-end (tm:mday today) (tm:mon today) (tm:year today))) (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)) (from-date-tp (NDayDelta to-date-tp 1))
(exchange-fn (lambda (currency amount date) amount)) (exchange-fn (lambda (currency amount date) amount))
(report-currency (gnc-default-report-currency)) (report-currency (gnc-default-report-currency))
@ -99,7 +99,7 @@
(wallet-account (cdr (assoc "Wallet" account-alist))) (wallet-account (cdr (assoc "Wallet" account-alist)))
(expense-account (cdr (assoc "Expenses" account-alist))) (expense-account (cdr (assoc "Expenses" account-alist)))
(today (localtime (current-time))) (today (localtime (current-time)))
(to-date-tp (gnc-dmy2timespec-end (tm:mday today) (tm:mon today) (tm:year today))) (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)) (from-date-tp (NDayDelta to-date-tp 1))
(exchange-fn (lambda (currency amount date) amount)) (exchange-fn (lambda (currency amount date) amount))
(report-currency (gnc-default-report-currency)) (report-currency (gnc-default-report-currency))