r22059 - gnucash/branches/2.4/src/plugins/bi_import - Revert "Fix skipping of alternate rows when there is a customer id mis-match."
Mike Evans
mikee at code.gnucash.org
Tue Feb 21 10:36:50 EST 2012
Author: mikee
Date: 2012-02-21 10:36:49 -0500 (Tue, 21 Feb 2012)
New Revision: 22059
Trac: http://svn.gnucash.org/trac/changeset/22059
Modified:
gnucash/branches/2.4/src/plugins/bi_import/bi_import.c
Log:
Revert "Fix skipping of alternate rows when there is a customer id mis-match."
Doesn't fully work. Will redo.
This reverts commit 63c4689a36aa042564d7c29b40ee970533e3d81f.
Modified: gnucash/branches/2.4/src/plugins/bi_import/bi_import.c
===================================================================
--- gnucash/branches/2.4/src/plugins/bi_import/bi_import.c 2012-02-20 23:02:08 UTC (rev 22058)
+++ gnucash/branches/2.4/src/plugins/bi_import/bi_import.c 2012-02-21 15:36:49 UTC (rev 22059)
@@ -237,7 +237,6 @@
gchar *id, *date_opened, *date_posted, *owner_id, *date, *quantity, *price;
GString *prev_id, *prev_date_opened, *prev_date_posted, *prev_owner_id, *prev_date; // needed to fix multi line invoices
guint dummy;
- gint row = 1;
// allow the call to this function with only GtkListeStore* specified
if (!fixed)
@@ -277,8 +276,8 @@
gtk_list_store_remove (store, &iter);
row_deleted = TRUE;
g_string_append_printf (info,
- _("ROW %d DELETED, PRICE_NOT_SET: id=%s\n"),
- row, id);
+ _("ROW DELETED, PRICE_NOT_SET: id=%s\n"),
+ id);
}
else if (strlen (quantity) == 0)
{
@@ -286,8 +285,8 @@
// no fix possible -> delete row
gtk_list_store_remove (store, &iter);
row_deleted = TRUE;
- g_string_append_printf (info, _("ROW %d DELETED, QTY_NOT_SET: id=%s\n"),
- row, id);
+ g_string_append_printf (info, _("ROW DELETED, QTY_NOT_SET: id=%s\n"),
+ id);
}
else
{
@@ -300,7 +299,7 @@
gtk_list_store_remove (store, &iter);
row_deleted = TRUE;
g_string_append_printf (info,
- _("ROW %d DELETED, ID_NOT_SET\n"),row);
+ _("ROW DELETED, ID_NOT_SET\n"));
}
else
{
@@ -395,8 +394,8 @@
gtk_list_store_remove (store, &iter);
row_deleted = TRUE;
g_string_append_printf (info,
- _("ROW %d DELETED, VENDOR_NOT_SET: id=%s\n"),
- row, id);
+ _("ROW DELETED, VENDOR_NOT_SET: id=%s\n"),
+ id);
}
else
{
@@ -418,8 +417,8 @@
gtk_list_store_remove (store, &iter);
row_deleted = TRUE;
g_string_append_printf (info,
- _("ROW %d DELETED, CUSTOMER_DOES_NOT_EXIST: id=%s\n"),
- row, id);
+ _("ROW DELETED, VENDOR_DOES_NOT_EXIST: id=%s\n"),
+ id);
}
// owner_id is valid
@@ -444,11 +443,7 @@
}
else if (row_fixed)
(*fixed)++;
-
- if (!row_deleted)
valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter);
-
- row++;
}
// deallocate strings
More information about the gnucash-changes
mailing list