From 43cbe65282eacc736df1e350a11b0072f614688d Mon Sep 17 00:00:00 2001
From: Christopher Lam <christopher.lck@gmail.com>
Date: Mon, 11 Dec 2017 05:50:00 +0800
Subject: [PATCH] REFACTOR:Move Void-status filter to filter tab

Also upgrade lookup-value Void Transactions now in Filter tab
---
 gnucash/report/standard-reports/transaction.scm | 17 +++++++++--------
 libgnucash/app-utils/options.scm                |  3 ++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/gnucash/report/standard-reports/transaction.scm b/gnucash/report/standard-reports/transaction.scm
index 51a4076746..44eb8f3794 100644
--- a/gnucash/report/standard-reports/transaction.scm
+++ b/gnucash/report/standard-reports/transaction.scm
@@ -58,7 +58,6 @@
 (define optname-accounts (N_ "Accounts"))
 (define optname-filterby (N_ "Filter By..."))
 (define optname-filtertype (N_ "Filter Type"))
-(define optname-void-transactions (N_ "Void Transactions"))
 
 ;;Display
 (define optname-detail-level (N_ "Detail Level"))
@@ -92,6 +91,7 @@
 (define optname-transaction-matcher (N_ "Transaction Matcher"))
 (define optname-transaction-matcher-regex (N_ "Transaction Matcher uses regular expressions for extended matching"))
 (define optname-reconcile-status (N_ "Reconcile Status"))
+(define optname-void-transactions (N_ "Void Transactions"))
 
 ;;Styles
 (define def:grand-total-style "grand-total")
@@ -437,6 +437,13 @@ tags within description, notes or memo. ")
     #f
     (keylist->vectorlist reconcile-status-list)))
 
+  (gnc:register-trep-option
+   (gnc:make-multichoice-option
+    pagename-filter optname-void-transactions
+    "k" (N_ "How to handle void transactions.")
+    'non-void-only
+    (keylist->vectorlist show-void-list)))
+
   ;; Accounts options
 
   ;; account to do report on
@@ -474,12 +481,6 @@ tags within description, notes or memo. ")
        (not (eq? x 'none))))))
   ;;
 
-  (gnc:register-trep-option
-   (gnc:make-multichoice-option
-    gnc:pagename-accounts optname-void-transactions
-    "d" (N_ "How to handle void transactions.")
-    'non-void-only
-    (keylist->vectorlist show-void-list)))
 
   ;; Sorting options
 
@@ -1417,7 +1418,7 @@ tags within description, notes or memo. ")
          (secondary-key (opt-val pagename-sorting optname-sec-sortkey))
          (secondary-order (opt-val pagename-sorting optname-sec-sortorder))
          (secondary-date-subtotal (opt-val pagename-sorting optname-sec-date-subtotal))
-         (void-status (opt-val gnc:pagename-accounts optname-void-transactions))
+         (void-status (opt-val pagename-filter optname-void-transactions))
          (splits '())
          (custom-sort? (or (and (member primary-key DATE-SORTING-TYPES)   ; this will remain
                                 (not (eq? primary-date-subtotal 'none)))  ; until qof-query
diff --git a/libgnucash/app-utils/options.scm b/libgnucash/app-utils/options.scm
index 3bb5e9653f..6083a14d82 100644
--- a/libgnucash/app-utils/options.scm
+++ b/libgnucash/app-utils/options.scm
@@ -1708,7 +1708,8 @@
                                         "To" (cons #f "End Date")
                                         "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 #f "Void Transactions")
+                                        "Void Transactions?" (cons "Filter" "Void Transactions")
+                                        "Void Transactions" (cons "Filter" "Void Transactions")
                                         "Account Substring" (cons "Filter" "Account Matcher")
                                         ))
                        (name-match (member name new-names-list)))