IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2024-12-02 13:39:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

[income-gst-statement] rename options

Browse Source 
Further commit to fix 3466ce78b

Discussion as follows
https://code.gnucash.org/logs/2018/12/27.html#T12:31:58
https://code.gnucash.org/logs/2018/12/28.html#T19:12:18
This commit is contained in:
Christopher Lam 2018-12-28 17:10:15 +08:00 committed by Frank H. Ellenberger
parent 5d7ca8b556
commit 0d4575da6c
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,8 +105,8 @@ for taxes paid on expenses, and type LIABILITY for taxes collected on sales.")
(gnc:make-simple-boolean-option
gnc:pagename-display (car l) (cadr l) (caddr l) (cadddr l))))
(list
(list (N_ "Individual income columns") "p" (N_ "Display individual income columns rather than their sum") #f)
(list (N_ "Individual expense columns") "q" (N_ "Display individual expense columns rather than their sum") #f)
(list (N_ "Individual sales columns") "p" (N_ "Display individual sales columns rather than their sum") #f)
(list (N_ "Individual purchases columns") "q" (N_ "Display individual purchases columns rather than their sum") #f)
(list (N_ "Individual tax columns") "r" (N_ "Display individual tax columns rather than their sum") #f)
(list (N_ "Gross Balance") "s" (N_ "Display the gross balance (gross sales - gross purchases)") #f)
(list (N_ "Net Balance") "t" (N_ "Display the net balance (sales without tax - purchases without tax)") #f)
@ -198,7 +198,7 @@ for taxes paid on expenses, and type LIABILITY for taxes collected on sales.")
;; each column will be a vector
;; (vector heading ;; string
;; calculator-function ;; (calculator-function split) to obtain amount
;; reverse-column? ;; #t for income, #f for expense
;; reverse-column? ;; #t for sales, #f for purchases
;; subtotal? ;; #t - all columns need subtotals
;; start-dual-column? ;; unused in GST report
;; friendly-heading-fn ;; unused in GST report
@ -207,7 +207,7 @@ for taxes paid on expenses, and type LIABILITY for taxes collected on sales.")
gross-sales
#t #t #f
(lambda (a) "")))
(if (opt-val gnc:pagename-display (N_ "Individual income columns"))
(if (opt-val gnc:pagename-display (N_ "Individual sales columns"))
(map (lambda (acc) (vector (xaccAccountGetName acc)
(account-adder-neg acc)
#t #t #f
@ -232,7 +232,7 @@ for taxes paid on expenses, and type LIABILITY for taxes collected on sales.")
gross-purchases
#f #t #f
(lambda (a) "")))
(if (opt-val gnc:pagename-display (N_ "Individual expense columns"))
(if (opt-val gnc:pagename-display (N_ "Individual purchases columns"))
(map (lambda (acc) (vector (xaccAccountGetName acc)
(account-adder acc)
#f #t #f

8
gnucash/report/standard-reports/test/test-income-gst.scm
View File

@ -200,10 +200,10 @@
(sxml->table-row-col sxml 1 #f 9)))
(set-option! options "Display" "Individual tax columns" #t)
(set-option! options "Display" "Individual expense columns" #t)
(set-option! options "Display" "Individual income columns" #t)
(set-option! options "Display" "Remittance amount" #t)
(set-option! options "Display" "Net Income" #t)
(set-option! options "Display" "Individual purchases columns" #t)
(set-option! options "Display" "Individual sales columns" #t)
(set-option! options "Display" "Gross Balance" #t)
(set-option! options "Display" "Net Balance" #t)
(set-option! options "Display" "Tax payable" #t)
(let ((sxml (options->sxml options "display options enabled")))
(test-equal "all display columns enabled"

9
libgnucash/app-utils/options.scm
View File

@ -1718,12 +1718,19 @@
"Sign Reverses?" (cons #f "Sign Reverses")
"To" (cons #f "End Date")
"Charge Type" (cons #f "Action") ;easy-invoice.scm, renamed June 2018
;; the following 4 options in income-gst-statement.scm renamed Dec 2018
"Individual income columns" (cons #f "Individual sales columns")
"Individual expense columns" (cons #f "Individual purchases columns")
"Remittance amount" (cons #f "Gross Balance")
"Net Income" (cons #f "Net Balance")
;; transaction.scm:
"Use Full Account Name?" (cons #f "Use Full Account Name")
"Use Full Other Account Name?" (cons #f "Use Full Other Account Name")
"Void Transactions?" (cons "Filter" "Void Transactions")
"Void Transactions" (cons "Filter" "Void Transactions")
"Account Substring" (cons "Filter" "Account Name Filter")
"Individual Taxes" (cons "#f" "Use Detailed Tax Summary") ;invoice.scm, renamed November 2018
;; invoice.scm, renamed November 2018
"Individual Taxes" (cons "#f" "Use Detailed Tax Summary")
))
(name-match (member name new-names-list)))