From ce5fe577bf1b13ad55779109d0766b5de496fd86 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Sat, 15 May 2021 10:22:02 -0700 Subject: [PATCH] Fix failure to pass accounts list to gnc:make-account-list-option The Scheme way of generating options is somehow able to obtain the account-list even when running the generator before creating the account tree. The C++ options object doesn't have that ability so one must make sure to run the account creation first in a let* statement. --- .../report/reports/standard/test/test-equity-statement.scm | 4 ++-- gnucash/report/reports/standard/test/test-portfolios.scm | 4 ++-- gnucash/report/reports/standard/test/test-register.scm | 4 ++-- gnucash/report/reports/standard/test/test-trial-balance.scm | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gnucash/report/reports/standard/test/test-equity-statement.scm b/gnucash/report/reports/standard/test/test-equity-statement.scm index 90aff7ef3b..835af33938 100644 --- a/gnucash/report/reports/standard/test/test-equity-statement.scm +++ b/gnucash/report/reports/standard/test/test-equity-statement.scm @@ -51,8 +51,8 @@ (gnc:options->sxml uuid options "test-equity-statement" test-title)) (define (test-equity-statement) - (let* ((options (gnc:make-report-options uuid)) - (account-alist (create-test-data)) + (let* ((account-alist (create-test-data)) + (options (gnc:make-report-options uuid)) (gbp-bank (assoc-ref account-alist "GBP Bank")) (usd-bank (assoc-ref account-alist "Bank")) (expense (assoc-ref account-alist "Expenses")) diff --git a/gnucash/report/reports/standard/test/test-portfolios.scm b/gnucash/report/reports/standard/test/test-portfolios.scm index 298d072e0b..e89329a5fc 100644 --- a/gnucash/report/reports/standard/test/test-portfolios.scm +++ b/gnucash/report/reports/standard/test/test-portfolios.scm @@ -97,8 +97,8 @@ (define (advanced-tests) (test-group-with-cleanup "advanced-portfolio-tests" - (let ((account-alist (create-stock-test-data)) - (options (gnc:make-report-options advanced-uuid))) + (let* ((account-alist (create-stock-test-data)) + (options (gnc:make-report-options advanced-uuid))) (let ((sxml (options->sxml advanced-uuid options "basic average"))) (test-equal "advanced: average basis" '("AAPL" "AAPL" "NASDAQ" "42.00" "$6.0000" "$484.88" "$252.00" "$800.00" diff --git a/gnucash/report/reports/standard/test/test-register.scm b/gnucash/report/reports/standard/test/test-register.scm index 12d6d1d77b..fdbda3ea4b 100644 --- a/gnucash/report/reports/standard/test/test-register.scm +++ b/gnucash/report/reports/standard/test/test-register.scm @@ -51,8 +51,8 @@ (gnc:options->sxml uuid options "test-register" test-title)) (define (test-register) - (let* ((options (gnc:make-report-options uuid)) - (account-alist (create-test-data)) + (let* ((account-alist (create-test-data)) + (options (gnc:make-report-options uuid)) (bank (cdr (assoc "Bank" account-alist)))) (gnc-commodity-set-user-symbol diff --git a/gnucash/report/reports/standard/test/test-trial-balance.scm b/gnucash/report/reports/standard/test/test-trial-balance.scm index a6c0a21517..dd1ed98f5b 100644 --- a/gnucash/report/reports/standard/test/test-trial-balance.scm +++ b/gnucash/report/reports/standard/test/test-trial-balance.scm @@ -51,8 +51,8 @@ (gnc:options->sxml uuid options "test-trial-balance" test-title)) (define (test-trial-balance) - (let* ((options (gnc:make-report-options uuid)) - (account-alist (create-test-data)) + (let* ((account-alist (create-test-data)) + (options (gnc:make-report-options uuid)) (gbp-bank (assoc-ref account-alist "GBP Bank")) (usd-bank (assoc-ref account-alist "Bank")) (expense (assoc-ref account-alist "Expenses"))