aherman
/
gnucash
mirror of https://github.com/Gnucash/gnucash
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge Jean Laroche's '105334_ofx_multiple_accounts' into maint.

Browse Source
pull/1139/head
John Ralls 5 years ago
parent 93289006e3 34bd7b49b2
commit 1170d7b0d4
1 changed files with 105 additions and 42 deletions
Show Stats Download Patch File Download Diff File

147
gnucash/import-export/ofx/gnc-ofx-import.c
Unescape View File

@ -76,8 +76,12 @@ typedef struct _ofx_info
struct OfxStatementData* statement; // Statement, if any
gboolean run_reconcile; // If TRUE the reconcile window is opened after matching.
GSList* file_list; // List of OFX files to import
GList* trans_list; // We store the processed ofx transactions here
gint response; // Response sent by the match gui
} ofx_info ;
static void runMatcher(ofx_info* info, char * selected_filename, gboolean go_to_next_file);
/*
int ofx_proc_status_cb(struct OfxStatusData data)
{
@ -899,8 +903,9 @@ int ofx_proc_transaction_cb(struct OfxTransactionData data, void *user_data)
/* Send transaction to importer GUI. */
if (xaccTransCountSplits(transaction) > 0)
{
DEBUG("%d splits sent to the importer gui", xaccTransCountSplits(transaction));
gnc_gen_trans_list_add_trans (info->gnc_ofx_importer_gui, transaction);
DEBUG("%d splits sent to the importer gui",
xaccTransCountSplits(transaction));
info->trans_list = g_list_prepend (info->trans_list, transaction);
}
else
{
@ -1088,7 +1093,7 @@ gnc_ofx_process_next_file (GtkDialog *dialog, gpointer user_data)
info->statement = NULL;
// Done with the previous OFX file, process the next one if any.
info->file_list = g_slist_delete_link(info->file_list, info->file_list);
info->file_list = g_slist_delete_link (info->file_list, info->file_list);
if (info->file_list)
gnc_file_ofx_import_process_file (info);
else
@ -1098,14 +1103,36 @@ gnc_ofx_process_next_file (GtkDialog *dialog, gpointer user_data)
}
}
static void
gnc_ofx_on_match_click (GtkDialog *dialog, gint response_id, gpointer user_data)
{
// Record the response of the user. If cancel we won't go to the next file, etc.
ofx_info* info = (ofx_info*)user_data;
info->response = response_id;
}
// This callback is called when the user is done matching transactions.
static void
gnc_ofx_match_done (GtkDialog *dialog, gint response_id, gpointer user_data)
gnc_ofx_match_done (GtkDialog *dialog, gpointer user_data)
{
ofx_info* info = (ofx_info*) user_data;
if (response_id == GTK_RESPONSE_OK && info->run_reconcile && info->statement)
/* The the user did not click OK, don't process the rest of the
* transaction, don't go to the next of xfile.
*/
if (info->response != GTK_RESPONSE_OK) return;
if (info->trans_list)
{
/* Re-run the match dialog if there are transactions
* remaining in our list (happens if several accounts exist
* in the same ofx).
*/
info->gnc_ofx_importer_gui = gnc_gen_trans_list_new (GTK_WIDGET (info->parent), NULL, FALSE, 42, FALSE);
runMatcher (info, NULL, true);
return;
}
if (info->run_reconcile && info->statement)
{
// Open a reconcile window.
Account* account = gnc_import_select_account (gnc_gen_trans_list_widget(info->gnc_ofx_importer_gui),
@ -1121,17 +1148,12 @@ gnc_ofx_match_done (GtkDialog *dialog, gint response_id, gpointer user_data)
info->statement->ledger_balance_date);
// Connect to destroy, at which point we'll process the next OFX file..
g_signal_connect (G_OBJECT(gnc_ui_reconcile_window_get_window (rec_window)), "destroy",
G_CALLBACK(gnc_ofx_process_next_file), info);
g_signal_connect (G_OBJECT (gnc_ui_reconcile_window_get_window (rec_window)), "destroy",
G_CALLBACK (gnc_ofx_process_next_file), info);
return;
}
}
else if (response_id == GTK_RESPONSE_HELP)
return;
else
{
gtk_widget_hide (GTK_WIDGET(dialog));
gnc_ofx_process_next_file (dialog, info);
}
gnc_ofx_process_next_file (NULL, info);
}
// This callback is triggered when the user checks or unchecks the reconcile after match
@ -1142,6 +1164,71 @@ reconcile_when_close_toggled_cb (GtkToggleButton *togglebutton, ofx_info* info)
info->run_reconcile = gtk_toggle_button_get_active (togglebutton);
}
static void
runMatcher(ofx_info* info, char * selected_filename, gboolean go_to_next_file)
{
GtkWindow *parent = info->parent;
GList* trans_list_remain = NULL;
Account* first_account = NULL;
/* If we have multiple accounts in the ofx file, we need to
* process transactions one account at a time, in case there are
* transfers between accounts.
*/
info->num_trans_processed = 0;
for(GList* node = info->trans_list; node; node=node->next)
{
Transaction* trans = node->data;
Split* split = xaccTransGetSplit (trans, 0);
if (first_account == NULL) first_account = xaccSplitGetAccount (split);
if (xaccSplitGetAccount (split) == first_account)
{
gnc_gen_trans_list_add_trans (info->gnc_ofx_importer_gui, trans);
info->num_trans_processed ++;
}
else trans_list_remain = g_list_prepend (trans_list_remain, trans);
}
g_list_free (info->trans_list);
info->trans_list = g_list_reverse (trans_list_remain);
g_list_free (trans_list_remain);
// See whether the view has anything in it and warn the user if not.
if (gnc_gen_trans_list_empty (info->gnc_ofx_importer_gui))
{
gnc_gen_trans_list_delete (info->gnc_ofx_importer_gui);
if (info->num_trans_processed)
{
gchar* acct_name = gnc_get_account_name_for_register (first_account);
gnc_info_dialog (parent, _("OFX file '%s', imported transactions for account '%s'\n%d transactions processed, no transactions to match"),
selected_filename, acct_name, info->num_trans_processed);
g_free (acct_name);
gnc_ofx_match_done (NULL,info);
return;
}
}
else
{
/* Show the match dialog and connect to the "destroy" signal so we can trigger a reconcile when
the user clicks OK when done matching transactions if required. Connecting to response isn't enough
because only when the matcher is destroyed do imported transactions get recorded */
g_signal_connect (G_OBJECT (gnc_gen_trans_list_widget (info->gnc_ofx_importer_gui)), "destroy",
G_CALLBACK (gnc_ofx_match_done), info);
// Connect to response so we know if the user pressed "cancel".
g_signal_connect (G_OBJECT (gnc_gen_trans_list_widget (info->gnc_ofx_importer_gui)), "response",
G_CALLBACK (gnc_ofx_on_match_click), info);
gnc_gen_trans_list_show_all (info->gnc_ofx_importer_gui);
// Show or hide the check box for reconciling after match, depending on whether a statement was received.
gnc_gen_trans_list_show_reconcile_after_close_button (info->gnc_ofx_importer_gui, info->statement != NULL, info->run_reconcile);
// Finally connect to the reconcile after match check box so we can be notified if the user wants/does not want to reconcile.
g_signal_connect (G_OBJECT (gnc_gen_trans_list_get_reconcile_after_close_button (info->gnc_ofx_importer_gui)), "toggled",
G_CALLBACK (reconcile_when_close_toggled_cb), info);
}
}
// Aux function to process the OFX file in info->file_list
static void
gnc_file_ofx_import_process_file (ofx_info* info)
@ -1182,33 +1269,7 @@ gnc_file_ofx_import_process_file (ofx_info* info)
// Free the libofx context before recursing to process the next file
libofx_free_context(libofx_context);
// See whether the view has anything in it and warn the user if not.
if(gnc_gen_trans_list_empty (info->gnc_ofx_importer_gui))
{
gnc_gen_trans_list_delete (info->gnc_ofx_importer_gui);
if(info->num_trans_processed)
gnc_info_dialog (parent, _("OFX file '%s' imported, %d transactions processed, no transactions to match"),
selected_filename, info->num_trans_processed);
// Process the next OFX file if any.
gnc_ofx_process_next_file (NULL, info);
}
else
{
/* Show the match dialog and connect to the "response" signal so we can trigger a reconcile when
the user clicks OK when done matching transactions if required. */
g_signal_connect (G_OBJECT(gnc_gen_trans_list_widget (info->gnc_ofx_importer_gui)), "response",
G_CALLBACK (gnc_ofx_match_done), info);
gnc_gen_trans_list_show_all (info->gnc_ofx_importer_gui);
// Show or hide the check box for reconciling after match, depending on whether a statement was received.
gnc_gen_trans_list_show_reconcile_after_close_button (info->gnc_ofx_importer_gui, info->statement != NULL, info->run_reconcile);
// Finally connect to the reconcile after match check box so we can be notified if the user wants/does not want to reconcile.
g_signal_connect (G_OBJECT(gnc_gen_trans_list_get_reconcile_after_close_button (info->gnc_ofx_importer_gui)), "toggled",
G_CALLBACK(reconcile_when_close_toggled_cb), info);
}
runMatcher(info, selected_filename,true);
g_free(selected_filename);
}
@ -1272,6 +1333,8 @@ void gnc_file_ofx_import (GtkWindow *parent)
info->parent = parent;
info->run_reconcile = FALSE;
info->file_list = selected_filenames;
info->trans_list = NULL;
info->response = 0;
// Call the aux import function.
gnc_file_ofx_import_process_file (info);
}

Write Preview
Loading…
Cancel
Save