Bug #672161 - New CSV account and transaction importer

Final patch by Robert Fewell

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22291 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Geert Janssens 2012-08-07 17:25:12 +00:00
parent c5e2adcb7a
commit 7358bcc62d
2 changed files with 4 additions and 25 deletions

View File

@ -184,33 +184,9 @@ on_matcher_ok_clicked (GtkButton *button,
info->user_data);
}
}
else
{
/* transaction skipped -> destroy
* Otherwise temporary transactions remains visible if account is open
* (see gnc_import_process_trans_item() case GNCImport_CLEAR) */
/*FIXME xaccTransDestroy(gnc_import_TransInfo_get_trans(trans_info));
xaccTransCommitEdit(gnc_import_TransInfo_get_trans(trans_info)); */
}
}
while (gtk_tree_model_iter_next (model, &iter));
/* DEBUG ("Deleting") */
/* DRH: Is this necessary. Isn't the call to trans_list_delete at
the end of this routine going to destroy the entire list store
anyway? */
/*FIXME for (item = refs_list; item; item = g_slist_next(item))
{
ref = item->data;
path = gtk_tree_row_reference_get_path(ref);
if (gtk_tree_model_get_iter(model, &iter, path))
gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
gtk_tree_path_free(path);
gtk_tree_row_reference_free(ref);
}
g_slist_free(refs_list); */
gnc_gen_trans_list_delete (info);
/* DEBUG ("End") */
}

View File

@ -1030,7 +1030,10 @@ gnc_split_register_get_vnotes_entry (VirtualLocation virt_loc,
split = gnc_split_register_get_split (reg, virt_loc.vcell_loc);
trans = xaccSplitGetParent (split);
return xaccTransGetVoidReason(trans);
if(trans == NULL)
return g_strdup('\0');
else
return xaccTransGetVoidReason(trans);
}
static char *