[Gnucash-changes] gnucash

[Joshua Sled]

Update of /home/cvs/cvsroot/gnucash
In directory cvs.gnucash.org:/tmp/cvs-serv25814

Modified Files:
      Tag: gnucash-1-8-branch
	ChangeLog 
Log Message:
2004-03-13  Joshua Sled  <jsled at asynchronous.org>

	* src/gnome/dialog-scheduledxaction.c (gnc_sxed_check_consistent):
	Bug#133709 fix: when we have a problem parsing a credit/debit
	cell, indicate to the user what occurred.

Update of /home/cvs/cvsroot/gnucash/src/gnome
In directory cvs.gnucash.org:/tmp/cvs-serv25814/src/gnome

Modified Files:
      Tag: gnucash-1-8-branch
	dialog-scheduledxaction.c 
Log Message:
2004-03-13  Joshua Sled  <jsled at asynchronous.org>

	* src/gnome/dialog-scheduledxaction.c (gnc_sxed_check_consistent):
	Bug#133709 fix: when we have a problem parsing a credit/debit
	cell, indicate to the user what occurred.


==================================================
Differences for ChangeLog (revision 1.1461.2.310 -> 1.1461.2.311)
==================================================
--- /home/cvs/cvsroot/gnucash/ChangeLog	2004/03/10 21:06:54	1.1461.2.310
+++ /home/cvs/cvsroot/gnucash/ChangeLog	2004/03/14 00:28:21	1.1461.2.311
@@ -1,3 +1,9 @@
+2004-03-13  Joshua Sled  <jsled at asynchronous.org>
+
+	* src/gnome/dialog-scheduledxaction.c (gnc_sxed_check_consistent):
+	Bug#133709 fix: when we have a problem parsing a credit/debit
+	cell, indicate to the user what occurred.
+
 2004-03-10  Christian Stimming  <stimming at tuhh.de>
 
 	* po/de.po: Updated German translation
@@ -43,7 +49,7 @@
 
 	* src/gnome/dialog-sxsincelast.c (create_each_transaction_helper):
 	Better handling of various error cases in
-        transaction-creation. Bug#120311; Bug#130330.
+        transaction-creation. Bug#102311; Bug#130330.
 
 2004-03-08  Christian Stimming  <stimming at tuhh.de>
 

==================================================
Differences for dialog-scheduledxaction.c (revision 1.70.2.5 -> 1.70.2.6)
==================================================
--- /home/cvs/cvsroot/gnucash/src/gnome/dialog-scheduledxaction.c	2004/03/09 04:19:26	1.70.2.5
+++ /home/cvs/cvsroot/gnucash/src/gnome/dialog-scheduledxaction.c	2004/03/14 00:28:21	1.70.2.6
@@ -743,9 +743,20 @@
                                      && (str = kvp_value_get_string(v))
                                      && strlen( str ) != 0 ) {
                                         if ( parse_vars_from_formula( str, vars, &tmp ) < 0 ) {
-                                                PERR( "Couldn't parse credit formula for "
-                                                      "\"%s\" on second pass",
-                                                      xaccSchedXactionGetName( sxed->sx ) );
+                                                GString *errStr;
+
+                                                errStr = g_string_sized_new( 32 );
+                                                g_string_sprintf( errStr,
+                                                                  _( "Couldn't parse credit formula for "
+                                                                     "split \"%s\"." ),
+                                                                  xaccSplitGetMemo( s ) );
+
+                                                PERR( errStr->str );
+                                                                  
+                                                gnc_error_dialog_parented( GTK_WINDOW(sxed->dialog),
+                                                                           errStr->str );
+                                                g_string_free( errStr, TRUE );
+
                                                 return FALSE;
                                         }
                                         tcds->creditSum =
@@ -761,9 +772,19 @@
                                      && (str = kvp_value_get_string(v))
                                      && strlen(str) != 0 ) {
                                         if ( parse_vars_from_formula( str, vars, &tmp ) < 0 ) {
-                                                PERR( "Couldn't parse debit formula for "
-                                                      "\"%s\" on second pass",
-                                                      xaccSchedXactionGetName( sxed->sx ) );
+                                                GString *errStr;
+
+                                                errStr = g_string_sized_new( 32 );
+                                                g_string_sprintf( errStr,
+                                                                  _( "Couldn't parse debit formula for "
+                                                                     "split \"%s\"." ),
+                                                                  xaccSplitGetMemo( s ) );
+                                                gnc_error_dialog_parented( GTK_WINDOW(sxed->dialog),
+                                                                           errStr->str );
+
+                                                PERR( errStr->str );
+                                                g_string_free( errStr, TRUE );
+
                                                 return FALSE;
                                         }
                                         tcds->debitSum = gnc_numeric_add( tcds->debitSum, tmp, 100,