gnucash master: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Sat Oct 10 13:20:58 EDT 2015
Updated via https://github.com/Gnucash/gnucash/commit/b1fa6dc9 (commit)
via https://github.com/Gnucash/gnucash/commit/66902d24 (commit)
from https://github.com/Gnucash/gnucash/commit/0eb92f37 (commit)
commit b1fa6dc969d52b50183e9769cdf5db922e81b846
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Oct 10 15:03:02 2015 +0200
Transaction report - reduce magic constant use
- The option page names 'Display' and 'Sorting' were defined already
- Option 'Detail Level' is used in several places, best use one variable for it
diff --git a/src/report/standard-reports/transaction.scm b/src/report/standard-reports/transaction.scm
index 838c168..94f94b0 100644
--- a/src/report/standard-reports/transaction.scm
+++ b/src/report/standard-reports/transaction.scm
@@ -46,6 +46,7 @@
;; Define the strings here to avoid typos and make changes easier.
(define reportname (N_ "Transaction Report"))
+(define optname-detail-level (N_ "Detail Level"))
(define pagename-sorting (N_ "Sorting"))
(define optname-prime-sortkey (N_ "Primary Key"))
(define optname-prime-subtotal (N_ "Primary Subtotal"))
@@ -377,48 +378,48 @@
(gnc:option-value
(gnc:lookup-option options section name)))
(let ((column-list (make-vector columns-used-size #f))
- (is-single? (eq? (opt-val (N_ "Display") (N_ "Detail level")) 'single)))
- (if (opt-val (N_ "Display") (N_ "Date"))
+ (is-single? (eq? (opt-val gnc:pagename-display optname-detail-level) 'single)))
+ (if (opt-val gnc:pagename-display (N_ "Date"))
(vector-set! column-list 0 #t))
- (if (opt-val (N_ "Display") (N_ "Reconciled Date"))
+ (if (opt-val gnc:pagename-display (N_ "Reconciled Date"))
(vector-set! column-list 1 #t))
- (if (if (gnc:lookup-option options (N_ "Display") (N_ "Num"))
- (opt-val (N_ "Display") (N_ "Num"))
- (opt-val (N_ "Display") (N_ "Num/Action")))
+ (if (if (gnc:lookup-option options gnc:pagename-display (N_ "Num"))
+ (opt-val gnc:pagename-display (N_ "Num"))
+ (opt-val gnc:pagename-display (N_ "Num/Action")))
(vector-set! column-list 2 #t))
- (if (opt-val (N_ "Display") (N_ "Description"))
+ (if (opt-val gnc:pagename-display (N_ "Description"))
(vector-set! column-list 3 #t))
- (if (opt-val (N_ "Display") (N_ "Account Name"))
+ (if (opt-val gnc:pagename-display (N_ "Account Name"))
(vector-set! column-list 4 #t))
- (if (and is-single? (opt-val (N_ "Display") (N_ "Other Account Name")))
+ (if (and is-single? (opt-val gnc:pagename-display (N_ "Other Account Name")))
(vector-set! column-list 5 #t))
- (if (opt-val (N_ "Display") (N_ "Shares"))
+ (if (opt-val gnc:pagename-display (N_ "Shares"))
(vector-set! column-list 6 #t))
- (if (opt-val (N_ "Display") (N_ "Price"))
+ (if (opt-val gnc:pagename-display (N_ "Price"))
(vector-set! column-list 7 #t))
- (let ((amount-setting (opt-val (N_ "Display") (N_ "Amount"))))
+ (let ((amount-setting (opt-val gnc:pagename-display (N_ "Amount"))))
(if (eq? amount-setting 'single)
(vector-set! column-list 8 #t))
(if (eq? amount-setting 'double)
(begin (vector-set! column-list 9 #t)
(vector-set! column-list 10 #t))))
- (if (opt-val (N_ "Display") (N_ "Running Balance"))
+ (if (opt-val gnc:pagename-display (N_ "Running Balance"))
(vector-set! column-list 11 #t))
- (if (opt-val (N_ "Display") (N_ "Use Full Account Name"))
+ (if (opt-val gnc:pagename-display (N_ "Use Full Account Name"))
(vector-set! column-list 12 #t))
- (if (opt-val (N_ "Display") (N_ "Memo"))
+ (if (opt-val gnc:pagename-display (N_ "Memo"))
(vector-set! column-list 13 #t))
- (if (opt-val (N_ "Display") (N_ "Account Code"))
+ (if (opt-val gnc:pagename-display (N_ "Account Code"))
(vector-set! column-list 14 #t))
- (if (and is-single? (opt-val (N_ "Display") (N_ "Other Account Code")))
+ (if (and is-single? (opt-val gnc:pagename-display (N_ "Other Account Code")))
(vector-set! column-list 15 #t))
- (if (and is-single? (opt-val (N_ "Display") (N_ "Use Full Other Account Name")))
+ (if (and is-single? (opt-val gnc:pagename-display (N_ "Use Full Other Account Name")))
(vector-set! column-list 16 #t))
- (if (opt-val (N_ "Sorting") (N_ "Show Account Code"))
+ (if (opt-val pagename-sorting (N_ "Show Account Code"))
(vector-set! column-list 17 #t))
- (if (opt-val (N_ "Sorting") (N_ "Show Full Account Name"))
+ (if (opt-val pagename-sorting (N_ "Show Full Account Name"))
(vector-set! column-list 18 #t))
- (if (opt-val (N_ "Display") (N_ "Notes"))
+ (if (opt-val gnc:pagename-display (N_ "Notes"))
(vector-set! column-list 19 #t))
column-list))
@@ -969,7 +970,7 @@
(gnc:register-trep-option
(gnc:make-multichoice-callback-option
- gnc:pagename-display (N_ "Detail level")
+ gnc:pagename-display optname-detail-level
"h" (N_ "Amount of detail to display per transaction.")
'single
(list (vector 'multi-line
@@ -1074,14 +1075,14 @@ Credit Card, and Income accounts.")))))
(define (get-account-types-to-reverse options)
(cdr (assq (gnc:option-value
(gnc:lookup-option options
- (N_ "Display")
+ gnc:pagename-display
(N_ "Sign Reverses")))
account-types-to-reverse-assoc-list)))
(define (transaction-report-multi-rows-p options)
(eq? (gnc:option-value
- (gnc:lookup-option options gnc:pagename-display (N_ "Detail level")))
+ (gnc:lookup-option options gnc:pagename-display optname-detail-level))
'multi-line))
(define (transaction-report-export-p options)
commit 66902d24569e41b56b65e1b429e078df584537b8
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Oct 10 14:41:06 2015 +0200
Bug 608098 - Option is hard to find: Change Transaction Report to show account names in multirow txn
diff --git a/src/report/standard-reports/transaction.scm b/src/report/standard-reports/transaction.scm
index f010b8b..838c168 100644
--- a/src/report/standard-reports/transaction.scm
+++ b/src/report/standard-reports/transaction.scm
@@ -376,7 +376,8 @@
(define (opt-val section name)
(gnc:option-value
(gnc:lookup-option options section name)))
- (let ((column-list (make-vector columns-used-size #f)))
+ (let ((column-list (make-vector columns-used-size #f))
+ (is-single? (eq? (opt-val (N_ "Display") (N_ "Detail level")) 'single)))
(if (opt-val (N_ "Display") (N_ "Date"))
(vector-set! column-list 0 #t))
(if (opt-val (N_ "Display") (N_ "Reconciled Date"))
@@ -389,7 +390,7 @@
(vector-set! column-list 3 #t))
(if (opt-val (N_ "Display") (N_ "Account Name"))
(vector-set! column-list 4 #t))
- (if (opt-val (N_ "Display") (N_ "Other Account Name"))
+ (if (and is-single? (opt-val (N_ "Display") (N_ "Other Account Name")))
(vector-set! column-list 5 #t))
(if (opt-val (N_ "Display") (N_ "Shares"))
(vector-set! column-list 6 #t))
@@ -409,9 +410,9 @@
(vector-set! column-list 13 #t))
(if (opt-val (N_ "Display") (N_ "Account Code"))
(vector-set! column-list 14 #t))
- (if (opt-val (N_ "Display") (N_ "Other Account Code"))
+ (if (and is-single? (opt-val (N_ "Display") (N_ "Other Account Code")))
(vector-set! column-list 15 #t))
- (if (opt-val (N_ "Display") (N_ "Use Full Other Account Name"))
+ (if (and is-single? (opt-val (N_ "Display") (N_ "Use Full Other Account Name")))
(vector-set! column-list 16 #t))
(if (opt-val (N_ "Sorting") (N_ "Show Account Code"))
(vector-set! column-list 17 #t))
@@ -613,18 +614,6 @@
(gnc:register-trep-option
- (gnc:make-multichoice-option
- gnc:pagename-general (N_ "Style")
- "d" (N_ "Report style.")
- 'single
- (list (vector 'multi-line
- (N_ "Multi-Line")
- (N_ "Display N lines."))
- (vector 'single
- (N_ "Single")
- (N_ "Display 1 line.")))))
-
- (gnc:register-trep-option
(gnc:make-complex-boolean-option
gnc:pagename-general optname-common-currency
"e" (N_ "Convert all transactions into a common currency.") #f
@@ -949,7 +938,7 @@
(list (N_ "Account Name") "e" (N_ "Display the account name?") #f)
(list (N_ "Use Full Account Name") "f" (N_ "Display the full account name?") #t)
(list (N_ "Account Code") "g" (N_ "Display the account code?") #f)
- (list (N_ "Other Account Name") "h" (N_ "Display the other account name?\
+ (list (N_ "Other Account Name") "h1" (N_ "Display the other account name?\
(if this is a split transaction, this parameter is guessed).") #f)
(list (N_ "Use Full Other Account Name") "i" (N_ "Display the full account name?") #t)
(list (N_ "Other Account Code") "j" (N_ "Display the other account code?") #f)
@@ -979,6 +968,31 @@
x))))
(gnc:register-trep-option
+ (gnc:make-multichoice-callback-option
+ gnc:pagename-display (N_ "Detail level")
+ "h" (N_ "Amount of detail to display per transaction.")
+ 'single
+ (list (vector 'multi-line
+ (N_ "Multi-Line")
+ (N_ "Display all splits in a transaction on a separate line."))
+ (vector 'single
+ (N_ "Single")
+ (N_ "Display one line per transaction, merging multiple splits where required.")))
+ #f
+ (lambda (x)
+ (let ((is-single? (eq? x 'single)))
+ (gnc-option-db-set-option-selectable-by-name
+ gnc:*transaction-report-options*
+ gnc:pagename-display (N_ "Other Account Name") is-single?)
+ (gnc-option-db-set-option-selectable-by-name
+ gnc:*transaction-report-options*
+ gnc:pagename-display (N_ "Use Full Other Account Name") is-single?)
+ (gnc-option-db-set-option-selectable-by-name
+ gnc:*transaction-report-options*
+ gnc:pagename-display (N_ "Other Account Code") is-single?)))))
+
+
+ (gnc:register-trep-option
(gnc:make-multichoice-option
gnc:pagename-display (N_ "Amount")
"m" (N_ "Display the amount?")
@@ -1067,7 +1081,7 @@ Credit Card, and Income accounts.")))))
(define (transaction-report-multi-rows-p options)
(eq? (gnc:option-value
- (gnc:lookup-option options gnc:pagename-general (N_ "Style")))
+ (gnc:lookup-option options gnc:pagename-display (N_ "Detail level")))
'multi-line))
(define (transaction-report-export-p options)
Summary of changes:
src/report/standard-reports/transaction.scm | 87 +++++++++++++++++------------
1 file changed, 51 insertions(+), 36 deletions(-)
More information about the gnucash-changes
mailing list