gnucash master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/6252fcf1 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/2c268ba0 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/cc1b68a3 (commit)
	from  https://github.com/Gnucash/gnucash/commit/6e3fafed (commit)



commit 6252fcf1aea440e13b2ad44caede7b4a7a2fc752
Merge: 6e3fafe 2c268ba
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Jul 15 15:18:59 2016 +0000

    Merge branch 'maint'


commit 2c268ba09cf1874de9ef2d430d9243e63f83b4f7
Author: Rob Gowin <robgowin at gmail.com>
Date:   Thu Jul 14 20:44:09 2016 -0500

    Allow HTMLHELP_DIR to be specified on cmake command line

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24752ad..bbd1fa8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,6 +81,7 @@ SET(GNC_DBD_DIR ${CMAKE_PREFIX_PATH}/lib/dbd CACHE PATH "specify location of lib
 SET(PKGLIBDIR ${CMAKE_INSTALL_PREFIX}/lib/gnucash)
 SET(TEST_MYSQL_URL "" CACHE STRING "MySQL database URL for testing")
 SET(TEST_PGSQL_URL "" CACHE STRING "PgSQL database URL for testing")
+SET(HTMLHELP_DIR ${CMAKE_PREFIX_PATH}/hh CACHE PATH "Specify location of Win32 HTMLHELP library")
 
 IF(GNC_BUILD_AS_INSTALL)
   SET(DATADIR_BUILD    ${CMAKE_BINARY_DIR}/${DATADIRNAME})
@@ -205,10 +206,8 @@ FIND_PATH (REGEX_INCLUDE_PATH NAMES regex.h
 		  PATHS /usr/include /opt/gnome/include)
 FIND_LIBRARY (REGEX_LIBRARY NAMES regex)
 IF (WIN32)
-  FIND_PATH (HTMLHELP_INCLUDE_PATH NAMES htmlhelp.h
-             PATHS /usr/include
-             HINTS ${CMAKE_PREFIX_PATH}/hh/include)
-  FIND_LIBRARY (HTMLHELP_LIBRARY htmlhelp HINTS ${CMAKE_PREFIX_PATH}/hh/lib)
+  FIND_PATH (HTMLHELP_INCLUDE_PATH NAMES htmlhelp.h HINTS ${HTMLHELP_DIR}/include)
+  FIND_LIBRARY (HTMLHELP_LIBRARY htmlhelp HINTS ${HTMLHELP_DIR}/lib)
 ENDIF (WIN32)
 
 # ############################################################

commit cc1b68a3296fc1e3eaba814d80dc6bcec41cbc48
Author: Mike Evans <mikee at saxicola.co.uk>
Date:   Tue Jul 12 15:08:09 2016 +0100

    Bug 756416 - CSV data with Posted information will always have last invoice not posted.
    
    When importing the last line of the CSV the gtk_tree_model_get() never happens
    and the following compare uses the previous value of new_id, which is now = id,
    so the last invoice is never posted.
    
    Set new_id = Null before gtk_tree_model_get() to ensure processing the last line.

diff --git a/src/plugins/bi_import/dialog-bi-import.c b/src/plugins/bi_import/dialog-bi-import.c
index c872f30..f266ffc 100644
--- a/src/plugins/bi_import/dialog-bi-import.c
+++ b/src/plugins/bi_import/dialog-bi-import.c
@@ -760,10 +760,10 @@ gnc_bi_import_create_bis (GtkListStore * store, QofBook * book,
             gncInvoiceAddEntry (invoice, entry);
         }
         valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter);
-
         // handle auto posting of invoices
 
-
+        new_id = NULL;
+       
         if (valid)
             gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, ID, &new_id, -1);
         if (g_strcmp0 (id, new_id) != 0)
@@ -790,6 +790,7 @@ gnc_bi_import_create_bis (GtkListStore * store, QofBook * book,
                                          memo_posted,
                                          text2bool (accumulatesplits),
                                          auto_pay);
+                DEBUG("Invoice %s posted",id);
             }
 
         }



Summary of changes:
 CMakeLists.txt                           | 7 +++----
 src/plugins/bi_import/dialog-bi-import.c | 5 +++--
 2 files changed, 6 insertions(+), 6 deletions(-)