Merge branch 'maint'

2025-02-25 18:55:30 -06:00 · 2016-10-03 19:55:07 +02:00
parent 921b5a9f3f cd8182fc6f
commit 87ed53b347
7 changed files with 27 additions and 53 deletions
--- a/accounts/de_DE/acctchrt_wohnungsw.gnucash-xea
+++ b/accounts/de_DE/acctchrt_wohnungsw.gnucash-xea
@@ -64,6 +64,7 @@
      <slot:value type="string">true</slot:value>
    </slot>
  </act:slots>
+  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
  <act:name>00 Grundstücke mit Wohnbauten</act:name>
--- a/configure.ac
+++ b/configure.ac
@@ -645,7 +645,6 @@ fi

 LIBXML2_REQUIRED=2.5.10
 PKG_CHECK_MODULES(LIBXML2, libxml-2.0 >= $LIBXML2_REQUIRED)
-AS_SCRUB_INCLUDE(LIBXML2_CFLAGS)
 AC_SUBST(LIBXML2_CFLAGS)
 AC_SUBST(LIBXML2_LIBS)

@@ -662,7 +661,6 @@ LIBS="$oLIBS"
 ### LIBXSLT

 PKG_CHECK_MODULES(LIBXSLT, libxslt)
-AS_SCRUB_INCLUDE(LIBXLT_CFLAGS)
 AC_SUBST(LIBXSLT_CFLAGS)
 AC_SUBST(LIBXSLT_LIBS)

@@ -1142,7 +1140,6 @@ then
    AQBANKING_LIBS="${AQBANKING_LIBS} -lktoblzcheck"
  fi

-  AS_SCRUB_INCLUDE(AQBANKING_CFLAGS)
  AC_SUBST(AQBANKING_LIBS)
  AC_SUBST(AQBANKING_CFLAGS)
  _COMPONENTS="$_COMPONENTS aqbanking"
@@ -1362,23 +1359,19 @@ then
  CFLAGS="$__cflags"

  PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.24.0)
-  AS_SCRUB_INCLUDE(GTK_CFLAGS)
  AC_SUBST(GTK_CFLAGS)
  AC_SUBST(GTK_LIBS)

  PKG_CHECK_MODULES(GNOMECANVAS, libgnomecanvas-2.0)
-  AS_SCRUB_INCLUDE(GNOMECANVAS_CFLAGS)
  AC_SUBST(GNOMECANVAS_CFLAGS)
  AC_SUBST(GNOMECANVAS_LIBS)

  PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0)
-  AS_SCRUB_INCLUDE(GDK_PIXBUF_CFLAGS)
  AC_SUBST(GDK_PIXBUF_CFLAGS)
  AC_SUBST(GDK_PIXBUF_LIBS)

   # checks for goffice
  PKG_CHECK_MODULES(GOFFICE, libgoffice-0.8 >= 0.7.0 libgoffice-0.8 < 0.9.0, [goffice=1], [AC_MSG_ERROR([Cannot find libgoffice >= 0.7.0 and < 0.9.0])])
-  AS_SCRUB_INCLUDE(GOFFICE_CFLAGS)
  AC_SUBST(GOFFICE_CFLAGS)
  AC_SUBST(GOFFICE_LIBS)

--- a/macros/as-scrub-include.m4
+++ b/macros/as-scrub-include.m4
@@ -1,32 +0,0 @@
-dnl as-scrub-include.m4 0.0.1
-dnl autostars m4 macro for scrubbing CFLAGS of system include dirs
-dnl because gcc 3.x complains about including system including dirs
-dnl
-dnl thomas@apestaart.org
-dnl
-dnl This macro uses output of cpp -v and expects it to contain text that 
-dnl looks a little bit like this:
-dnl #include <...> search starts here:
-dnl  /usr/local/include
-dnl  /usr/lib/gcc-lib/i386-redhat-linux/3.2/include
-dnl  /usr/include
-dnl End of search list.
-
-dnl AS_SCRUB_INCLUDE(VAR)
-dnl example
-dnl AS_SCRUB_INCLUDE(CFLAGS)
-dnl will remove all system include dirs from the given CFLAGS
-
-AC_DEFUN([AS_SCRUB_INCLUDE],
-[
-  GIVEN_CFLAGS=$[$1]
-  INCLUDE_DIRS=`echo | cpp -v 2>&1`
-
-  dnl remove everything from this output between the "starts here" and "End of"
-  dnl line
-  INCLUDE_DIRS=`echo $INCLUDE_DIRS | sed -e 's/.*<...> search starts here://' | sed -e 's/End of search list.*//'`
-  for dir in $INCLUDE_DIRS; do
-    GIVEN_CFLAGS=`echo $GIVEN_CFLAGS | sed -e "s;-I$dir ;;" | sed -e "s;-I$dir$;;"`
-  done
-  [$1]=$GIVEN_CFLAGS
-])
--- a/src/cmake_modules/GncFindPkgConfig.cmake
+++ b/src/cmake_modules/GncFindPkgConfig.cmake
@@ -1,4 +1,4 @@
-if(${CMAKE_VERSION} VERSION_GREATER 3.1)
+if((${CMAKE_VERSION} VERSION_GREATER 3.1) AND (${CMAKE_VERSION} VERSION_LESS 3.5))

 function (pkg_get_variable result pkg variable)
  _pkgconfig_invoke("${pkg}" "prefix" "result" "" "--variable=${variable}")
@@ -247,12 +247,10 @@ endmacro()

 else()

+include(FindPkgConfig)
+
 macro(gnc_pkg_check_modules _prefix _module0)
-  if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND)
-    _pkgconfig_parse_options   (_pkg_modules _pkg_is_required _pkg_is_silent "${_module0}" ${ARGN})
-    _pkg_check_modules_internal("${_pkg_is_required}" "${_pkg_is_silent}" "${_prefix}" ${_pkg_modules})
-    _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
-  endif()
+   PKG_CHECK_MODULES(${_prefix} ${_module0} ${ARGN})
 endmacro()

 endif()
--- a/src/plugins/bi_import/dialog-bi-import.c
+++ b/src/plugins/bi_import/dialog-bi-import.c
@@ -714,9 +714,11 @@ gnc_bi_import_create_bis (GtkListStore * store, QofBook * book,
        {
            qof_scan_date (date_opened, &day, &month, &year); // FIXME: Must check for the return value of qof_scan_date!
            gncEntrySetDate(entry, gnc_dmy2timespec (day, month, year));
+            gncEntrySetDateEntered(entry, gnc_dmy2timespec (day, month, year));
        }
        else
        {
+            gncEntrySetDate(entry, today);
            gncEntrySetDateEntered(entry, today);
        }
        // Remove escaped quotes
--- a/src/report/report-system/html-document.scm
+++ b/src/report/report-system/html-document.scm
@@ -159,7 +159,7 @@
                ;;./share/gnucash/scm/gnucash/report/balsheet-eg.eguile.scm:<html>

                ;; Validate against HTML4 Transitional:
-                (push "<!DOCTYPE!DOCTYPE html PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN\" \n\"http://www.w3.org/TR/html4/loose.dtd\">")
+                (push "<!DOCTYPE html PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN\" \n\"http://www.w3.org/TR/html4/loose.dtd\">")
                (push "<head>\n")
                (push "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" />\n")
 				(if css? 
--- a/src/report/report-system/test/test-report-utilities.scm
+++ b/src/report/report-system/test/test-report-utilities.scm
@@ -18,19 +18,31 @@

 (define (test-account-get-trans-type-splits-interval)
  (let ((env (create-test-env))
-	(end-date (gnc:date->timepair (localtime (current-time)))))
+	(end-date-tp (gnc:date->timepair (localtime (current-time)))))
    (let* ((accounts (env-create-account-structure-alist env (list "Assets"
 								   (list (cons 'type ACCT-TYPE-ASSET))
 								   (list "Bank Account")
 								   (list "Wallet"))))
 	   (bank-account (cdr (assoc "Bank Account" accounts)))
-	   (wallet (cdr (assoc "Wallet" accounts))))
+	   (wallet (cdr (assoc "Wallet" accounts)))
+	   (start-date-tp (decdate end-date-tp (NDayDelta 10)))
+	   (q-start-date-tp (decdate end-date-tp (NDayDelta 5)))
+	   (q-start-date (gnc:timepair->date q-start-date-tp))
+	   (q-end-date (gnc:timepair->date end-date-tp)))

-      (env-create-daily-transactions env (decdate end-date (NDayDelta 10)) end-date bank-account wallet)
+      (env-create-daily-transactions env start-date-tp end-date-tp bank-account wallet)
+
+      ; Ensure the query interval is as inclusive as possible to deal with timezone differences
+      (set-tm:hour q-end-date 23)
+      (set-tm:min  q-end-date 59)
+      (set-tm:sec  q-end-date 59)
+      (set-tm:hour q-start-date 00)
+      (set-tm:min  q-start-date 00)
+      (set-tm:sec  q-start-date 01)

      (let ((splits (gnc:account-get-trans-type-splits-interval (list bank-account wallet)
 							      ACCT-TYPE-ASSET
-							      (decdate end-date (NDayDelta 5))
-							      end-date)))
-	;; 8 is the right number (4 days, two splits per tx)
-	(and (equal? 8 (length splits)))))))
+							      (gnc:date->timepair q-start-date)
+							      (gnc:date->timepair q-end-date))))
+	;; 10 is the right number (5 days, two splits per tx)
+	(and (equal? 10 (length splits)))))))