Bug#341609: filter template transactions from general journal report query.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14066 57a11ea4-9604-0410-9ed3-97b8803252fd

ChangeLog

@@ -1,3 +1,11 @@
+2006-05-14  Joshua Sled  <jsled@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@ihtfp.com>
 
 	* src/lib/libqof/qof/qofquery.h:

src/engine/gw-engine-spec.scm

@@ -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
@@ -1474,6 +1475,14 @@ argument between 0 and 100 (inclusive).")
  '((<gnc:Book*> book))
  "Get the book's account group.")
 
+(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

src/report/standard-reports/general-journal.scm

@@ -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)