[Gnucash-changes] r14066 - gnucash/trunk - Bug#341609: filter template transactions from general journal report query.

[Joshua Sled]

Author: jsled
Date: 2006-05-14 19:24:06 -0400 (Sun, 14 May 2006)
New Revision: 14066
Trac: http://svn.gnucash.org/trac/changeset/14066

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/engine/gw-engine-spec.scm
   gnucash/trunk/src/report/standard-reports/general-journal.scm
Log:
Bug#341609: filter template transactions from general journal report query.


Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-05-14 23:22:30 UTC (rev 14065)
+++ gnucash/trunk/ChangeLog	2006-05-14 23:24:06 UTC (rev 14066)
@@ -1,3 +1,11 @@
+2006-05-14  Joshua Sled  <jsled at asynchronous.org>
+
+	* src/engine/gw-engine-spec.scm: expose gnc:book-get-template-group
+
+	* src/report/standard-reports/general-journal.scm
+	(general-journal-options-generator): Filter template
+	transactions out of query; Bug#341609.
+
 2006-05-14  Derek Atkins  <derek at ihtfp.com>
 
 	* src/lib/libqof/qof/qofquery.h:

Modified: gnucash/trunk/src/engine/gw-engine-spec.scm
===================================================================
--- gnucash/trunk/src/engine/gw-engine-spec.scm	2006-05-14 23:22:30 UTC (rev 14065)
+++ gnucash/trunk/src/engine/gw-engine-spec.scm	2006-05-14 23:24:06 UTC (rev 14066)
@@ -34,7 +34,8 @@
     "#include <gnc-lot.h>\n"
     "#include <gnc-session-scm.h>\n"
     "#include <gnc-hooks-scm.h>\n"
-    "#include <engine-helpers.h>\n")))
+    "#include <engine-helpers.h>\n"
+    "#include <SX-book.h>\n")))
 
 (gw:wrapset-add-cs-initializers!
  ws
@@ -1476,6 +1477,14 @@
 
 (gw:wrap-function
  ws
+ 'gnc:book-get-template-group
+ '<gnc:AccountGroup*>
+ "gnc_book_get_template_group"
+ '((<gnc:Book*> book))
+ "Get the book's template account group.")
+
+(gw:wrap-function
+ ws
  'gnc:book-get-commodity-table
  '<gnc:commodity-table*>
  "gnc_commodity_table_get_table"

Modified: gnucash/trunk/src/report/standard-reports/general-journal.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/general-journal.scm	2006-05-14 23:22:30 UTC (rev 14065)
+++ gnucash/trunk/src/report/standard-reports/general-journal.scm	2006-05-14 23:24:06 UTC (rev 14066)
@@ -67,6 +67,13 @@
 			      (list gnc:query-default-sort)
 			      '())
     (gnc:query-set-sort-increasing query #t #t #t)
+
+    (gnc:query-add-account-match
+     query
+     (gnc:group-get-subaccounts (gnc:book-get-template-group (gnc:get-current-book)))
+     'guid-match-none
+     'query-and)
+
     ;; set the "__reg" options required by the Register Report...
     (for-each
      (lambda (l)