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

[trep-engine] move currency options into their own section, bis

Browse Source 
Addendum to 854c11782 - option section had moved to "Currency" - need
to modify tests and links
This commit is contained in:
Christopher Lam 2020-12-12 22:35:39 +08:00
parent 6927c12292
commit bd75b08fc2
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gnucash/report/reports/standard/balsheet-pnl.scm
View File

@ -1181,8 +1181,8 @@ also show overall period profit & loss."))
(list (list
(list "General" "Start Date" (cons 'absolute (car datepair))) (list "General" "Start Date" (cons 'absolute (car datepair)))
(list "General" "End Date" (cons 'absolute (cdr datepair))) (list "General" "End Date" (cons 'absolute (cdr datepair)))
(list "General" "Show original currency amount" show-orig?) (list "Currency" "Show original currency amount" show-orig?)
(list "General" "Common Currency" common-currency) (list "Currency" "Common Currency" common-currency)
(list "General" "Report's currency" curr) (list "General" "Report's currency" curr)
(list "Display" "Amount" 'double) (list "Display" "Amount" 'double)
(list "Accounts" "Accounts" accts)))))) (list "Accounts" "Accounts" accts))))))

2
gnucash/report/reports/standard/income-gst-statement.scm
View File

@ -195,7 +195,7 @@ with *EUGOODS* in the account description."))) #f
;; Disable account filtering ;; Disable account filtering
(gnc:option-make-internal! options gnc:pagename-accounts "Filter Type") (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-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 ;; Enforce compulsory common-currency. It's senseless to allow
;; multiple currencies in a government report. Plus, single currency ;; multiple currencies in a government report. Plus, single currency

14
gnucash/report/reports/standard/test/test-transaction.scm
View File

@ -280,8 +280,8 @@
(let ((options (default-testing-options))) (let ((options (default-testing-options)))
(set-option! options "Sorting" "Add indenting columns" #t) (set-option! options "Sorting" "Add indenting columns" #t)
(set-option! options "General" "Table for Exporting" #f) (set-option! options "General" "Table for Exporting" #f)
(set-option! options "General" "Common Currency" #t) (set-option! options "Currency" "Common Currency" #t)
(set-option! options "General" "Show original currency amount" #t) (set-option! options "Currency" "Show original currency amount" #t)
(set-option! options "General" "Add options summary" 'never) (set-option! options "General" "Add options summary" 'never)
(set-option! options "Sorting" "Primary Key" 'account-name) (set-option! options "Sorting" "Primary Key" 'account-name)
(set-option! options "Sorting" "Primary Subtotal" #t) (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" "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" "End Date" (cons 'absolute (gnc-dmy2time64 31 12 2000)))
(set-option! options "General" "Common Currency" #t) (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"))) (let* ((sxml (options->sxml options "single column, with original currency headers")))
(test-equal "single amount column, with original currency headers" (test-equal "single amount column, with original currency headers"
(list "Date" "Num" "Description" "Memo/Notes" "Account" (list "Date" "Num" "Description" "Memo/Notes" "Account"
@ -651,7 +651,7 @@
(set! options (default-testing-options)) (set! options (default-testing-options))
(set-option! options "Display" "Amount" 'double) (set-option! options "Display" "Amount" 'double)
(set-option! options "General" "Common Currency" #t) (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 Key" 'date)
(set-option! options "Sorting" "Primary Subtotal for Date Key" 'none) (set-option! options "Sorting" "Primary Subtotal for Date Key" 'none)
(let* ((sxml (options->sxml options "dual columns"))) (let* ((sxml (options->sxml options "dual columns")))
@ -733,7 +733,7 @@
(set! options (default-testing-options)) (set! options (default-testing-options))
(set-option! options "Sorting" "Add indenting columns" #t) (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 Key" 'account-name)
(set-option! options "Sorting" "Primary Subtotal" #t) (set-option! options "Sorting" "Primary Subtotal" #t)
(set-option! options "Sorting" "Secondary Key" 'date) (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 "Accounts" "Accounts" (gnc-account-get-descendants (gnc-account-get-root bank)))
(set-option! options "Display" "Totals" #t) (set-option! options "Display" "Totals" #t)
(set-option! options "Display" "Amount" 'double) (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 "General" "Table for Exporting" #f)
(set-option! options "Sorting" "Add indenting columns" #t) (set-option! options "Sorting" "Add indenting columns" #t)
(set-option! options "Sorting" "Primary Key" 'account-name) (set-option! options "Sorting" "Primary Key" 'account-name)
@ -895,7 +895,7 @@
(set-option! options "Display" "Subtotal Table" #t) (set-option! options "Display" "Subtotal Table" #t)
(set-option! options "General" "Common Currency" #t) (set-option! options "General" "Common Currency" #t)
(set-option! options "General" "Report Currency" foreign2) (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 Key" 'account-name)
(set-option! options "Sorting" "Primary Subtotal" #t) (set-option! options "Sorting" "Primary Subtotal" #t)
(set-option! options "Sorting" "Secondary Key" 'date) (set-option! options "Sorting" "Secondary Key" 'date)