IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Generalize importing function so that this function can fully replace gnc_file_mt940_import and the whole mt940 module.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14719 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2006-08-23 19:29:00 +00:00
parent 4fe55315d6
commit 1286a411ac
3 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/import-export/hbci/gnc-dtaus-import.c
View File

@ -78,6 +78,7 @@ struct import_data
AB_BANKING *ab;
AB_ACCOUNT *hbci_account;
GList *job_list;
gboolean execute_transactions;
};
@ -141,8 +142,9 @@ AB_ImExporterAccountInfo_TransactionsForEach(AB_IMEXPORTER_ACCOUNTINFO *iea,
* Entry point
\********************************************************************/
void gnc_file_dtaus_import (const gchar *aqbanking_importername,
const gchar *aqbanking_profilename)
void gnc_file_aqbanking_import (const gchar *aqbanking_importername,
const gchar *aqbanking_profilename,
gboolean execute_transactions)
{
char *selected_filename;
char *default_dir;
@ -269,6 +271,7 @@ void gnc_file_dtaus_import (const gchar *aqbanking_importername,
data.importer_generic = importer_generic_gui;
data.ab = ab;
data.job_list = NULL;
data.execute_transactions = execute_transactions;
/* Iterate through all accounts */
AB_ImExporterContext_AccountInfoForEach(ctx, accountinfolist_cb, &data);
@ -277,19 +280,23 @@ void gnc_file_dtaus_import (const gchar *aqbanking_importername,
/* that's it */
g_free(selected_filename);
/* and run the gnucash importer. */
result = gnc_gen_trans_list_run (importer_generic_gui);
if (execute_transactions) {
/* and run the gnucash importer. */
result = gnc_gen_trans_list_run (importer_generic_gui);
if (result)
/* NEW: Copied from gnc-hbci-transfer.c: */
/* Execute these jobs now. This function already delete()s the
job. */
/* no parent so far: GNCInteractor_reparent (interactor, parent); */
successful = gnc_hbci_multijob_execute (parent, ab, data.job_list, interactor);
/* else */
/* Delete all jobs from queue in any case. */
g_list_foreach (data.job_list, delpending_cb, ab);
if (result)
/* Execute these jobs now. This function already delete()s the
job. */
/* no parent so far; otherwise add this: GNCInteractor_reparent (interactor, parent); */
successful = gnc_hbci_multijob_execute (parent, ab, data.job_list, interactor);
/* else */
/* Delete all jobs from queue in any case. */
g_list_foreach (data.job_list, delpending_cb, ab);
}
else {
successful = TRUE;
}
/* We clean up here. */
AB_ImExporterContext_free(ctx);
@ -323,11 +330,17 @@ accountinfolist_cb(AB_IMEXPORTER_ACCOUNTINFO *accinfo, void *user_data) {
if (gnc_acc) {
/* Store chosen gnucash account in callback data */
data->gnc_acc = gnc_acc;
/* Retrieve the aqbanking account that belongs to this gnucash
account */
data->hbci_account = gnc_hbci_get_hbci_acc (data->ab, gnc_acc);
if (data->hbci_account == NULL) {
gnc_error_dialog (NULL, _("No HBCI account found for this gnucash account. These transactions will not be executed by HBCI."));
if (data->execute_transactions) {
/* Retrieve the aqbanking account that belongs to this gnucash
account */
data->hbci_account = gnc_hbci_get_hbci_acc (data->ab, gnc_acc);
if (data->hbci_account == NULL) {
gnc_error_dialog (NULL, _("No HBCI account found for this gnucash account. These transactions will not be executed by HBCI."));
}
}
else {
data->hbci_account = NULL;
}
/* Iterate through all transactions. */

9
src/import-export/hbci/gnc-dtaus-import.h
View File

@ -40,7 +40,12 @@
* but for all others: "default", or more precisely: Look into
* $datadir/aqbanking/imexporters and look into the "name" field of
* the foo.conf files.
*
* @param execute_transactions If TRUE, import the transactions and
* additionally send them as online jobs over aqbanking/HBCI. If
* FALSE, simply import the transactions and that's it.
*/
void gnc_file_dtaus_import (const gchar *aqbanking_importername,
const gchar *aqbanking_profilename);
void gnc_file_aqbanking_import (const gchar *aqbanking_importername,
const gchar *aqbanking_profilename,
gboolean execute_transactions);
#endif

2
src/import-export/hbci/gnc-plugin-hbci.c
View File

@ -523,7 +523,7 @@ static void
gnc_plugin_hbci_cmd_dtaus_import (GtkAction *action,
GncMainWindowActionData *data)
{
gnc_file_dtaus_import ("dtaus", "default");
gnc_file_aqbanking_import ("dtaus", "default", TRUE);
}
/************************************************************
* Plugin Bootstrapping *