[Gnucash-changes] r13885 - gnucash/trunk/src - Take care of any pending changes to a Transaction before voiding it.

[Chris Shoemaker]

Author: chris
Date: 2006-04-29 22:38:11 -0400 (Sat, 29 Apr 2006)
New Revision: 13885
Trac: http://svn.gnucash.org/trac/changeset/13885

Modified:
   gnucash/trunk/src/gnome/gnc-plugin-page-register.c
   gnucash/trunk/src/register/ledger-core/split-register.c
Log:
   Take care of any pending changes to a Transaction before voiding it.


Modified: gnucash/trunk/src/gnome/gnc-plugin-page-register.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-page-register.c	2006-04-30 01:27:24 UTC (rev 13884)
+++ gnucash/trunk/src/gnome/gnc-plugin-page-register.c	2006-04-30 02:38:11 UTC (rev 13885)
@@ -1979,6 +1979,9 @@
     return;
   }
 
+  if (!gnc_plugin_page_register_finish_pending(GNC_PLUGIN_PAGE(page)))
+      return;
+
   xml = gnc_glade_xml_new("register.glade", "Void Transaction");
   dialog = glade_xml_get_widget(xml, "Void Transaction");
   entry = glade_xml_get_widget(xml, "reason");

Modified: gnucash/trunk/src/register/ledger-core/split-register.c
===================================================================
--- gnucash/trunk/src/register/ledger-core/split-register.c	2006-04-30 01:27:24 UTC (rev 13884)
+++ gnucash/trunk/src/register/ledger-core/split-register.c	2006-04-30 02:38:11 UTC (rev 13885)
@@ -930,7 +930,10 @@
     info->pending_trans_guid = *guid_null();
     pending_trans = NULL;
   }
-
+  if (xaccTransIsOpen(trans)) {
+      PERR("We should not be voiding an open transaction.");
+      xaccTransCommitEdit(trans);
+  }
   gnc_resume_gui_refresh ();
 }