From bd75b08fc24da5092254eef70f76dcae7dda24bd Mon Sep 17 00:00:00 2001 From: Christopher Lam Date: Sat, 12 Dec 2020 22:35:39 +0800 Subject: [PATCH] [trep-engine] move currency options into their own section, bis Addendum to 854c11782 - option section had moved to "Currency" - need to modify tests and links --- gnucash/report/reports/standard/balsheet-pnl.scm | 4 ++-- .../reports/standard/income-gst-statement.scm | 2 +- .../reports/standard/test/test-transaction.scm | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gnucash/report/reports/standard/balsheet-pnl.scm b/gnucash/report/reports/standard/balsheet-pnl.scm index b39268fd30..7b357e2185 100644 --- a/gnucash/report/reports/standard/balsheet-pnl.scm +++ b/gnucash/report/reports/standard/balsheet-pnl.scm @@ -1181,8 +1181,8 @@ also show overall period profit & loss.")) (list (list "General" "Start Date" (cons 'absolute (car datepair))) (list "General" "End Date" (cons 'absolute (cdr datepair))) - (list "General" "Show original currency amount" show-orig?) - (list "General" "Common Currency" common-currency) + (list "Currency" "Show original currency amount" show-orig?) + (list "Currency" "Common Currency" common-currency) (list "General" "Report's currency" curr) (list "Display" "Amount" 'double) (list "Accounts" "Accounts" accts)))))) diff --git a/gnucash/report/reports/standard/income-gst-statement.scm b/gnucash/report/reports/standard/income-gst-statement.scm index 15f5abc3fa..2344224166 100644 --- a/gnucash/report/reports/standard/income-gst-statement.scm +++ b/gnucash/report/reports/standard/income-gst-statement.scm @@ -195,7 +195,7 @@ with *EUGOODS* in the account description."))) #f ;; Disable account filtering (gnc:option-make-internal! options gnc:pagename-accounts "Filter Type") (gnc:option-make-internal! options gnc:pagename-accounts "Filter By...") - (gnc:option-make-internal! options gnc:pagename-general "Show original currency amount") + (gnc:option-make-internal! options "Currency" "Show original currency amount") ;; Enforce compulsory common-currency. It's senseless to allow ;; multiple currencies in a government report. Plus, single currency diff --git a/gnucash/report/reports/standard/test/test-transaction.scm b/gnucash/report/reports/standard/test/test-transaction.scm index 0c9af3682e..b92ce4a720 100644 --- a/gnucash/report/reports/standard/test/test-transaction.scm +++ b/gnucash/report/reports/standard/test/test-transaction.scm @@ -280,8 +280,8 @@ (let ((options (default-testing-options))) (set-option! options "Sorting" "Add indenting columns" #t) (set-option! options "General" "Table for Exporting" #f) - (set-option! options "General" "Common Currency" #t) - (set-option! options "General" "Show original currency amount" #t) + (set-option! options "Currency" "Common Currency" #t) + (set-option! options "Currency" "Show original currency amount" #t) (set-option! options "General" "Add options summary" 'never) (set-option! options "Sorting" "Primary Key" 'account-name) (set-option! options "Sorting" "Primary Subtotal" #t) @@ -577,7 +577,7 @@ (set-option! options "General" "Start Date" (cons 'absolute (gnc-dmy2time64 01 01 2000))) (set-option! options "General" "End Date" (cons 'absolute (gnc-dmy2time64 31 12 2000))) (set-option! options "General" "Common Currency" #t) - (set-option! options "General" "Show original currency amount" #t) + (set-option! options "Currency" "Show original currency amount" #t) (let* ((sxml (options->sxml options "single column, with original currency headers"))) (test-equal "single amount column, with original currency headers" (list "Date" "Num" "Description" "Memo/Notes" "Account" @@ -651,7 +651,7 @@ (set! options (default-testing-options)) (set-option! options "Display" "Amount" 'double) (set-option! options "General" "Common Currency" #t) - (set-option! options "General" "Show original currency amount" #t) + (set-option! options "Currency" "Show original currency amount" #t) (set-option! options "Sorting" "Primary Key" 'date) (set-option! options "Sorting" "Primary Subtotal for Date Key" 'none) (let* ((sxml (options->sxml options "dual columns"))) @@ -733,7 +733,7 @@ (set! options (default-testing-options)) (set-option! options "Sorting" "Add indenting columns" #t) - (set-option! options "General" "Show original currency amount" #t) + (set-option! options "Currency" "Show original currency amount" #t) (set-option! options "Sorting" "Primary Key" 'account-name) (set-option! options "Sorting" "Primary Subtotal" #t) (set-option! options "Sorting" "Secondary Key" 'date) @@ -750,7 +750,7 @@ (set-option! options "Accounts" "Accounts" (gnc-account-get-descendants (gnc-account-get-root bank))) (set-option! options "Display" "Totals" #t) (set-option! options "Display" "Amount" 'double) - (set-option! options "General" "Show original currency amount" #t) + (set-option! options "Currency" "Show original currency amount" #t) (set-option! options "General" "Table for Exporting" #f) (set-option! options "Sorting" "Add indenting columns" #t) (set-option! options "Sorting" "Primary Key" 'account-name) @@ -895,7 +895,7 @@ (set-option! options "Display" "Subtotal Table" #t) (set-option! options "General" "Common Currency" #t) (set-option! options "General" "Report Currency" foreign2) - (set-option! options "General" "Show original currency amount" #t) + (set-option! options "Currency" "Show original currency amount" #t) (set-option! options "Sorting" "Primary Key" 'account-name) (set-option! options "Sorting" "Primary Subtotal" #t) (set-option! options "Sorting" "Secondary Key" 'date)