gnucash master: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Fri Aug 25 07:01:46 EDT 2017
Updated via https://github.com/Gnucash/gnucash/commit/7ee15a3d (commit)
via https://github.com/Gnucash/gnucash/commit/76e53b06 (commit)
via https://github.com/Gnucash/gnucash/commit/7c7cef5a (commit)
via https://github.com/Gnucash/gnucash/commit/bdfe184a (commit)
via https://github.com/Gnucash/gnucash/commit/4704e14b (commit)
from https://github.com/Gnucash/gnucash/commit/64f36323 (commit)
commit 7ee15a3d70ecde64139ddd72335fa65d9c6220ef
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri Aug 25 11:42:47 2017 +0200
Fully enable the new Account Substring option on the transaction report
This is done by reverting the following two commits which disabled
and hid the option on maint:
- Hide Account Substring option
(commit 197faeab3f5e24fbebfb78290b6599a549bccd35)
- Reduce to compatibility shim
(commit 19fe7d8a560467d2c6fe2b53277fa453f0677c16)
diff --git a/gnucash/report/standard-reports/transaction.scm b/gnucash/report/standard-reports/transaction.scm
index 33704f6..80fd782 100644
--- a/gnucash/report/standard-reports/transaction.scm
+++ b/gnucash/report/standard-reports/transaction.scm
@@ -33,6 +33,7 @@
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (srfi srfi-1))
+(use-modules (srfi srfi-13))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))
@@ -651,8 +652,11 @@
#f #t))
(gnc:register-trep-option
- (gnc:make-internal-option
+ (gnc:make-string-option
gnc:pagename-accounts (N_ "Account Substring")
+ "a5" (N_ "Match only above accounts whose fullname contains substring e.g. ':Travel' will \
+match Expenses:Travel:Holiday and Expenses:Business:Travel. Can be left blank, which will \
+disable the substring filter. This filter is case-sensitive.")
""))
(gnc:register-trep-option
@@ -1442,6 +1446,7 @@ Credit Card, and Income accounts.")))))
(gnc:report-starting reportname)
(let ((document (gnc:make-html-document))
(c_account_1 (opt-val gnc:pagename-accounts "Accounts"))
+ (c_account_substring (opt-val gnc:pagename-accounts "Account Substring"))
(c_account_2 (opt-val gnc:pagename-accounts "Filter By..."))
(filter-mode (opt-val gnc:pagename-accounts "Filter Type"))
(begindate (gnc:timepair-start-day-time
@@ -1464,6 +1469,11 @@ Credit Card, and Income accounts.")))))
;;(gnc:warn "accts in trep-renderer:" c_account_1)
;;(gnc:warn "Report Account names:" (get-other-account-names c_account_1))
+ (set! c_account_1
+ (filter (lambda (acc)
+ (string-contains (gnc-account-get-full-name acc) c_account_substring))
+ c_account_1))
+
(if (not (or (null? c_account_1) (and-map not c_account_1)))
(begin
(qof-query-set-book query (gnc-get-current-book))
commit 76e53b065e3e618ad55bec65086606e1916e0a11
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri Aug 25 11:40:54 2017 +0200
Hide Account Substring option
It is only there for compatibility with gnucash 2.8.
It should not be visible on 2.6.x, only exist.
diff --git a/gnucash/report/standard-reports/transaction.scm b/gnucash/report/standard-reports/transaction.scm
index af33bf9..33704f6 100644
--- a/gnucash/report/standard-reports/transaction.scm
+++ b/gnucash/report/standard-reports/transaction.scm
@@ -651,11 +651,8 @@
#f #t))
(gnc:register-trep-option
- (gnc:make-string-option
+ (gnc:make-internal-option
gnc:pagename-accounts (N_ "Account Substring")
- "a5" (N_ "Match only above accounts whose fullname contains substring e.g. ':Travel' will \
-match Expenses:Travel:Holiday and Expenses:Business:Travel. Can be left blank, which will \
-disable the substring filter. This filter is case-sensitive. Gnucash 2.8 or later.")
""))
(gnc:register-trep-option
commit 7c7cef5aedb66ab0d021478989a92db84beef065
Author: christopherlam <christopher.lck at gmail.com>
Date: Fri Aug 25 17:13:54 2017 +0800
Reduce to compatibility shim
Reduce option to retain compatibility layer for earlier 2.8
diff --git a/gnucash/report/standard-reports/transaction.scm b/gnucash/report/standard-reports/transaction.scm
index 80fd782..af33bf9 100644
--- a/gnucash/report/standard-reports/transaction.scm
+++ b/gnucash/report/standard-reports/transaction.scm
@@ -33,7 +33,6 @@
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (srfi srfi-1))
-(use-modules (srfi srfi-13))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))
@@ -656,7 +655,7 @@
gnc:pagename-accounts (N_ "Account Substring")
"a5" (N_ "Match only above accounts whose fullname contains substring e.g. ':Travel' will \
match Expenses:Travel:Holiday and Expenses:Business:Travel. Can be left blank, which will \
-disable the substring filter. This filter is case-sensitive.")
+disable the substring filter. This filter is case-sensitive. Gnucash 2.8 or later.")
""))
(gnc:register-trep-option
@@ -1446,7 +1445,6 @@ Credit Card, and Income accounts.")))))
(gnc:report-starting reportname)
(let ((document (gnc:make-html-document))
(c_account_1 (opt-val gnc:pagename-accounts "Accounts"))
- (c_account_substring (opt-val gnc:pagename-accounts "Account Substring"))
(c_account_2 (opt-val gnc:pagename-accounts "Filter By..."))
(filter-mode (opt-val gnc:pagename-accounts "Filter Type"))
(begindate (gnc:timepair-start-day-time
@@ -1469,11 +1467,6 @@ Credit Card, and Income accounts.")))))
;;(gnc:warn "accts in trep-renderer:" c_account_1)
;;(gnc:warn "Report Account names:" (get-other-account-names c_account_1))
- (set! c_account_1
- (filter (lambda (acc)
- (string-contains (gnc-account-get-full-name acc) c_account_substring))
- c_account_1))
-
(if (not (or (null? c_account_1) (and-map not c_account_1)))
(begin
(qof-query-set-book query (gnc-get-current-book))
commit bdfe184af650a1c434367d6db6018600ec35ecb5
Author: christopherlam <christopher.lck at gmail.com>
Date: Wed Aug 16 23:46:25 2017 +0800
added case sensitive filter
please squash commits for me!
diff --git a/gnucash/report/standard-reports/transaction.scm b/gnucash/report/standard-reports/transaction.scm
index eda69c7..80fd782 100644
--- a/gnucash/report/standard-reports/transaction.scm
+++ b/gnucash/report/standard-reports/transaction.scm
@@ -654,9 +654,9 @@
(gnc:register-trep-option
(gnc:make-string-option
gnc:pagename-accounts (N_ "Account Substring")
- "a5" (N_ "Match only above accounts whose fullname contains substring e.g. ':Travel:' will \
+ "a5" (N_ "Match only above accounts whose fullname contains substring e.g. ':Travel' will \
match Expenses:Travel:Holiday and Expenses:Business:Travel. Can be left blank, which will \
-disable the substring filter.")
+disable the substring filter. This filter is case-sensitive.")
""))
(gnc:register-trep-option
commit 4704e14b3ebc372482cf7bb3a6b574b0e29b5e0e
Author: christopherlam <christopher.lck at gmail.com>
Date: Wed Aug 16 23:33:03 2017 +0800
Account fullname filter for transaction.scm
This small change will introduce an account full-name filter. Only accounts whose fullname containing substring will be selected e.g. ":Travel" will match Expenses:Travel:Holiday and Expenses:Business:Travel. This can be left blank, which will mimic previous behavior. This will ease accounts selection tremendously.
diff --git a/gnucash/report/standard-reports/transaction.scm b/gnucash/report/standard-reports/transaction.scm
index 33e0a45..eda69c7 100644
--- a/gnucash/report/standard-reports/transaction.scm
+++ b/gnucash/report/standard-reports/transaction.scm
@@ -33,6 +33,7 @@
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (srfi srfi-1))
+(use-modules (srfi srfi-13))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))
@@ -651,6 +652,14 @@
#f #t))
(gnc:register-trep-option
+ (gnc:make-string-option
+ gnc:pagename-accounts (N_ "Account Substring")
+ "a5" (N_ "Match only above accounts whose fullname contains substring e.g. ':Travel:' will \
+match Expenses:Travel:Holiday and Expenses:Business:Travel. Can be left blank, which will \
+disable the substring filter.")
+ ""))
+
+ (gnc:register-trep-option
(gnc:make-account-list-option
gnc:pagename-accounts (N_ "Filter By...")
"b" (N_ "Filter on these accounts.")
@@ -1437,6 +1446,7 @@ Credit Card, and Income accounts.")))))
(gnc:report-starting reportname)
(let ((document (gnc:make-html-document))
(c_account_1 (opt-val gnc:pagename-accounts "Accounts"))
+ (c_account_substring (opt-val gnc:pagename-accounts "Account Substring"))
(c_account_2 (opt-val gnc:pagename-accounts "Filter By..."))
(filter-mode (opt-val gnc:pagename-accounts "Filter Type"))
(begindate (gnc:timepair-start-day-time
@@ -1459,6 +1469,11 @@ Credit Card, and Income accounts.")))))
;;(gnc:warn "accts in trep-renderer:" c_account_1)
;;(gnc:warn "Report Account names:" (get-other-account-names c_account_1))
+ (set! c_account_1
+ (filter (lambda (acc)
+ (string-contains (gnc-account-get-full-name acc) c_account_substring))
+ c_account_1))
+
(if (not (or (null? c_account_1) (and-map not c_account_1)))
(begin
(qof-query-set-book query (gnc-get-current-book))
Summary of changes:
gnucash/report/standard-reports/transaction.scm | 15 +++++++++++++++
1 file changed, 15 insertions(+)
More information about the gnucash-changes
mailing list