r19132 - gnucash/trunk/src - Bug #357696 - Billable items appear in more than one invoice

[Geert Janssens]

Author: gjanssens
Date: 2010-05-07 06:32:07 -0400 (Fri, 07 May 2010)
New Revision: 19132
Trac: http://svn.gnucash.org/trac/changeset/19132

Modified:
   gnucash/trunk/src/business/business-ledger/gncEntryLedger.c
   gnucash/trunk/src/libqof/qof/qofquerycore.c
Log:
Bug #357696 - Billable items appear in more than one invoice

Modified: gnucash/trunk/src/business/business-ledger/gncEntryLedger.c
===================================================================
--- gnucash/trunk/src/business/business-ledger/gncEntryLedger.c	2010-05-07 07:41:36 UTC (rev 19131)
+++ gnucash/trunk/src/business/business-ledger/gncEntryLedger.c	2010-05-07 10:32:07 UTC (rev 19132)
@@ -426,7 +426,7 @@
      *          ( Entry->Billable == TRUE AND
      *            Entry->Bill->Is-Posted? == TRUE AND
      *            ( Entry->BillTo == Invoice->parent OR
-     *              Entry->Bill->BillTo == Invoice->parent ) )
+     *              ( Entry->BillTo == NULL AND Entry->Bill->BillTo == Invoice->parent ) ) )
      *           OR
      *           ( Entry->Order->real-parent == Invoice->parent ) )
      * #endif

Modified: gnucash/trunk/src/libqof/qof/qofquerycore.c
===================================================================
--- gnucash/trunk/src/libqof/qof/qofquerycore.c	2010-05-07 07:41:36 UTC (rev 19131)
+++ gnucash/trunk/src/libqof/qof/qofquerycore.c	2010-05-07 10:32:07 UTC (rev 19132)
@@ -730,7 +730,9 @@
     query_guid_t pdata;
     GList *node;
 
-    if (NULL == guid_list) return NULL;
+    /* An empty list of guids is only valid when testing for a null GUID value */
+    if (!guid_list)
+        g_return_val_if_fail (options == QOF_GUID_MATCH_NULL, NULL);
 
     pdata = g_new0 (query_guid_def, 1);
     pdata->pd.how = QOF_COMPARE_EQUAL;