gnucash master: Multiple changes pushed

[Mike Alexander]

Updated	 via  https://github.com/Gnucash/gnucash/commit/1134d64a (commit)
	 via  https://github.com/Gnucash/gnucash/commit/5db0cb98 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/f4d2cc28 (commit)
	from  https://github.com/Gnucash/gnucash/commit/7015cf9e (commit)



commit 1134d64a35813c8993ae1257f09154577a675a80
Merge: f4d2cc2 5db0cb9
Author: Mike Alexander <mta at umich.edu>
Date:   Thu Aug 14 17:18:51 2014 -0400

    Merge branch 'maint'


commit 5db0cb98d42df0d348aba6c5b3ae301d62b0b5b7
Author: Mike Alexander <mta at umich.edu>
Date:   Thu Aug 14 16:29:59 2014 -0400

    Bug 722140: Add option to control inclusion of trading accounts in cash flow report.

diff --git a/src/report/standard-reports/cash-flow.scm b/src/report/standard-reports/cash-flow.scm
index 2e7c500..764d270 100644
--- a/src/report/standard-reports/cash-flow.scm
+++ b/src/report/standard-reports/cash-flow.scm
@@ -51,6 +51,7 @@
 (define optname-price-source (N_ "Price Source"))
 (define optname-show-rates (N_ "Show Exchange Rates"))
 (define optname-show-full-names (N_ "Show Full Account Names"))
+(define optname-include-trading-accounts (N_ "Include Trading Accounts in report"))
 
 ;; options generator
 (define (cash-flow-options-generator)
@@ -93,6 +94,13 @@
               ACCT-TYPE-STOCK ACCT-TYPE-MUTUAL)
         (gnc-account-get-descendants-sorted (gnc-get-current-root-account))))
      #f)
+     
+     ;; Trading accounts?
+     (gnc:register-option
+      options
+      (gnc:make-simple-boolean-option
+       gnc:pagename-accounts optname-include-trading-accounts
+       "b" (N_ "Include transfers to and from Trading Accounts in the report.")  #f))
     
     ;; Set the general page as default option tab
     (gnc:options-set-default-section options gnc:pagename-general)      
@@ -119,6 +127,8 @@
                                      optname-show-subaccounts))
          (accounts (get-option gnc:pagename-accounts
                                optname-accounts))
+         (include-trading-accounts (get-option gnc:pagename-accounts
+                               optname-include-trading-accounts))
          (row-num 0)
 	 (work-done 0)
 	 (work-to-do 0)
@@ -261,6 +271,7 @@
                             (for-each
                               (lambda (s)
                                 (let* ((s-account (xaccSplitGetAccount s))
+                                       (s-account-type (xaccAccountGetType s-account)) 
                                        (s-amount (xaccSplitGetAmount s))
                                        (s-value (xaccSplitGetValue s))
                                        (s-commodity (xaccAccountGetCommodity s-account)))
@@ -275,6 +286,7 @@
                                   ;(gnc:debug (xaccAccountGetName s-account))
                                   (if (and	 ;; make sure we don't have
 				       (not (null? s-account)) ;;  any dangling splits
+				       (or include-trading-accounts (not (eq? s-account-type ACCT-TYPE-TRADING)))
 				       (not (account-in-list? s-account accounts)))
 				      (if (not (split-in-list? s seen-split-list))
 					  (begin  

commit f4d2cc2863627ff37520a317d0788f2704831c06
Author: Mike Alexander <mta at umich.edu>
Date:   Thu Aug 14 15:50:19 2014 -0400

    Remove an AC_MSG_CHECKING/AC_MSG_RESULT that is redundant and confusing.

diff --git a/configure.ac b/configure.ac
index f46d80d..3c8eaca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,9 +132,7 @@ AM_CONDITIONAL([CLANG], [test "x$ac_cv_CLANG" = "xyes"])
 ###--------------------------------------------------------
 ### Begin C++ dependencies
 ###--------------------------------------------------------
-AC_MSG_CHECKING(Boost >= 1.48.0)
 AX_BOOST_BASE([1.48.0], [ac_cv_BOOST=yes], [ac_cv_BOOST=no])
-AC_MSG_RESULT($ac_cv_BOOST)
 if test x$ac_cv_BOOST != xyes; then
     AC_MSG_ERROR([Boost 1.48.0 or later was not found and is required to build GnuCash])
 fi



Summary of changes:
 configure.ac                              |  2 --
 src/report/standard-reports/cash-flow.scm | 12 ++++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)