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

[easy-invoice] Display/Charge Type rename back to Display/Action

Browse Source 
This report had renamed "Action" to "Charge Type". For consistency,
let's rename it back, and add migration path in options.scm for
saved-options. 2 fewer strings for translation.
This commit is contained in:
Christopher Lam 2018-06-08 22:33:45 +08:00
parent d6071020e1
commit 7ef4c00579
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnucash/report/business-reports/easy-invoice.scm
View File

@ -84,7 +84,7 @@
(set-col (make-set-col col-vector)))
(set-col (opt-val "Display Columns" "Date") 0)
(set-col (opt-val "Display Columns" "Description") 1)
(set-col (opt-val "Display Columns" "Charge Type") 2)
(set-col (opt-val "Display Columns" "Action") 2)
(set-col (opt-val "Display Columns" "Quantity") 3)
(set-col (opt-val "Display Columns" "Price") 4)
(set-col (opt-val "Display Columns" "Discount") 5)
@ -101,7 +101,7 @@
(if (description-col column-vector)
(addto! heading-list (_ "Description")))
(if (action-col column-vector)
(addto! heading-list (_ "Charge Type")))
(addto! heading-list (_ "Action")))
(if (quantity-col column-vector)
(addto! heading-list (_ "Quantity")))
(if (price-col column-vector)
@ -222,8 +222,8 @@
(gnc:register-inv-option
(gnc:make-simple-boolean-option
(N_ "Display Columns") (N_ "Charge Type")
"g" (N_ "Display the charge type?") #t))
(N_ "Display Columns") (N_ "Action")
"g" (N_ "Display the action?") #t))
(gnc:register-inv-option
(gnc:make-simple-boolean-option

2
gnucash/report/business-reports/invoice.scm
View File

@ -100,7 +100,7 @@
(addif (description-col column-vector)
(_ "Description"))
(addif (action-col column-vector)
(_ "Charge Type"))
(_ "Action"))
(addif (quantity-col column-vector)
(_ "Quantity"))
(addif (price-col column-vector)

6
gnucash/report/business-reports/test/test-invoice.scm
View File

@ -193,12 +193,10 @@
(lambda (disp-col-name)
(set-option! options "Display Columns" disp-col-name setting))
(case variant
((invoice fancy-invoice)
((invoice fancy-invoice easy-invoice)
'("Date" "Description" "Action" "Quantity" "Price" "Discount"
"Taxable" "Tax Amount" "Total"))
((easy-invoice)
'("Date" "Description" "Charge Type" "Quantity"
"Price" "Discount" "Taxable" "Tax Amount" "Total"))))
(else '())))
(for-each
(lambda (disp-col-name)
(set-option! options "Display" disp-col-name setting))

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

@ -1717,6 +1717,7 @@
"Show zero balance items?" (cons #f "Show zero balance items")
"Sign Reverses?" (cons #f "Sign Reverses")
"To" (cons #f "End Date")
"Charge Type" (cons #f "Action") ;easy-invoice.scm, renamed June 2018
"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")