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

Merge Jean Laroche's 'add_reconcile_after_ofx_import_master' into master.

Browse Source 
https://github.com/Gnucash/gnucash/pull/700
pull/709/head
John Ralls 6 years ago
parent de9ee8dede 2d0d7c40f8
commit 9822f2f486
5 changed files with 103 additions and 25 deletions
Show Stats Download Patch File Download Diff File

3
gnucash/gnome/window-reconcile.c
Unescape View File

@ -57,6 +57,7 @@
#include "gnc-window.h"
#include "reconcile-view.h"
#include "window-reconcile.h"
#include "gnc-session.h"
#ifdef MAC_INTEGRATION
#include <gtkmacintegration/gtkosxapplication.h>
#endif
@ -1734,6 +1735,8 @@ recnWindowWithBalance (GtkWidget *parent, Account *account, gnc_numeric new_endi
gnc_register_gui_component (WINDOW_RECONCILE_CM_CLASS,
refresh_handler, close_handler,
recnData);
// This window should close if we close the session.
gnc_gui_component_set_session (recnData->component_id, gnc_get_current_session());
recn_set_watches (recnData);

2
gnucash/import-export/ofx/CMakeLists.txt
Unescape View File

@ -21,7 +21,7 @@ if (WITH_OFX)
add_library(gncmod-ofx ${ofx_SOURCES} ${ofx_noinst_HEADERS})
target_link_libraries(gncmod-ofx gnc-generic-import gnc-engine gnc-app-utils gnc-core-utils
gnc-gnome-utils gnc-module ${LIBOFX_LDFLAGS})
gnc-gnome-utils gnc-gnome gnc-module ${LIBOFX_LDFLAGS})
target_compile_definitions(gncmod-ofx PRIVATE -DG_LOG_DOMAIN=\"gnc.import.ofx\")

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

@ -50,6 +50,7 @@
#include "gnc-ui.h"
#include "dialog-account.h"
#include "dialog-utils.h"
#include "window-reconcile.h"
#define GNC_PREFS_GROUP "dialogs.import.ofx"
#define GNC_PREF_AUTO_COMMODITY "auto-create-commodity"
@ -66,7 +67,13 @@ static QofLogModule log_module = GNC_MOD_IMPORT;
GNCImportMainMatcher *gnc_ofx_importer_gui = NULL;
static gboolean auto_create_commodity = FALSE;
static Account *ofx_parent_account = NULL;
static gint num_trans_processed = 0;
// Structure we use to gather information about statement balance/account etc.
typedef struct _ofx_info
{
gint num_trans_processed;
GSList* statement;
GtkWindow* parent;
} ofx_info ;
GList *ofx_created_commodites = NULL;
@ -111,7 +118,10 @@ set_associated_income_account(Account* investment_account,
xaccAccountCommitEdit(investment_account);
}
int ofx_proc_security_cb(const struct OfxSecurityData data, void * security_user_data);
int ofx_proc_statement_cb(struct OfxStatementData data,
void *statement_user_data);
int ofx_proc_security_cb(const struct OfxSecurityData data,
void *security_user_data);
int ofx_proc_transaction_cb (struct OfxTransactionData data, void *user_data);
int ofx_proc_account_cb(struct OfxAccountData data, void * account_user_data);
static double ofx_get_investment_amount(const struct OfxTransactionData* data);
@ -409,7 +419,8 @@ int ofx_proc_transaction_cb(struct OfxTransactionData data, void *user_data)
Transaction *transaction;
Split *split;
gchar *notes, *tmp;
GtkWindow *parent = GTK_WINDOW (user_data);
ofx_info* info = (ofx_info*) user_data;
GtkWindow *parent = GTK_WINDOW (info->parent);
g_assert(gnc_ofx_importer_gui);
@ -890,16 +901,20 @@ int ofx_proc_transaction_cb(struct OfxTransactionData data, void *user_data)
xaccTransDestroy(transaction);
xaccTransCommitEdit(transaction);
}
num_trans_processed += 1;
info->num_trans_processed += 1;
return 0;
}//end ofx_proc_transaction()
/*
int ofx_proc_statement_cb(struct OfxStatementData data, void * statement_user_data)
int ofx_proc_statement_cb (struct OfxStatementData data, void * statement_user_data)
{
return 0;
ofx_info* info = (ofx_info*) statement_user_data;
struct OfxStatementData* statement = g_new (struct OfxStatementData, 1);
*statement = data;
info->statement = g_slist_append (info->statement, statement);
return 0;
}//end ofx_proc_statement()
*/
int ofx_proc_account_cb(struct OfxAccountData data, void * account_user_data)
{
@ -910,6 +925,8 @@ int ofx_proc_account_cb(struct OfxAccountData data, void * account_user_data)
/* In order to trigger a book options display on the creation of a new book,
* we need to detect when we are dealing with a new book. */
gboolean new_book = gnc_is_new_book();
ofx_info* info = (ofx_info*) account_user_data;
Account* account = NULL;
const gchar * account_type_name = _("Unknown OFX account");
@ -985,10 +1002,10 @@ int ofx_proc_account_cb(struct OfxAccountData data, void * account_user_data)
"%s \"%s\"",
account_type_name,
data.account_name);
gnc_import_select_account(gnc_gen_trans_list_widget(gnc_ofx_importer_gui),
data.account_id, 1,
account_description, default_commodity,
default_type, NULL, NULL);
account = gnc_import_select_account (gnc_gen_trans_list_widget(gnc_ofx_importer_gui),
data.account_id, 1,
account_description, default_commodity,
default_type, NULL, NULL);
g_free(account_description);
}
else
@ -1034,6 +1051,9 @@ void gnc_file_ofx_import (GtkWindow *parent)
LibofxContextPtr libofx_context = libofx_get_new_context();
GList *filters = NULL;
GtkFileFilter* filter = gtk_file_filter_new ();
GSList *iter = NULL;
// Create the structure we're using to gather reconciliation information.
ofx_info info = {0, NULL, parent};
ofx_PARSER_msg = false;
ofx_DEBUG_msg = false;
@ -1077,12 +1097,11 @@ void gnc_file_ofx_import (GtkWindow *parent)
auto_create_commodity =
gnc_prefs_get_bool (GNC_PREFS_GROUP_IMPORT, GNC_PREF_AUTO_COMMODITY);
/* Initialize libofx */
/*ofx_set_statement_cb(libofx_context, ofx_proc_statement_cb, 0);*/
ofx_set_account_cb(libofx_context, ofx_proc_account_cb, 0);
ofx_set_transaction_cb(libofx_context, ofx_proc_transaction_cb, parent);
ofx_set_security_cb(libofx_context, ofx_proc_security_cb, 0);
/* Initialize libofx and set the callbacks*/
ofx_set_statement_cb (libofx_context, ofx_proc_statement_cb, &info);
ofx_set_account_cb (libofx_context, ofx_proc_account_cb, &info);
ofx_set_transaction_cb (libofx_context, ofx_proc_transaction_cb, &info);
ofx_set_security_cb (libofx_context, ofx_proc_security_cb, &info);
/*ofx_set_status_cb(libofx_context, ofx_proc_status_cb, 0);*/
#ifdef G_OS_WIN32
@ -1092,21 +1111,43 @@ void gnc_file_ofx_import (GtkWindow *parent)
#endif
DEBUG("Opening selected file");
num_trans_processed = 0;
libofx_proc_file(libofx_context, selected_filename, AUTODETECT);
// Now would be a good time to see whether the view has anything in it!
// See whether the view has anything in it and warn the user if not.
if(gnc_gen_trans_list_empty(gnc_ofx_importer_gui))
{
gnc_gen_trans_list_delete (gnc_ofx_importer_gui);
if(num_trans_processed)
gnc_info_dialog(parent,_("OFX file imported, %d transactions processed, no transactions to match"),num_trans_processed);
if(info.num_trans_processed)
gnc_info_dialog (parent, _("OFX file imported, %d transactions processed, no transactions to match"), info.num_trans_processed);
}
else
{
gnc_gen_trans_list_show_all(gnc_ofx_importer_gui);
}
g_free(selected_filename);
// Open a reconcile window for each balance statement found.
for (iter=info.statement; iter; iter=iter->next)
{
struct OfxStatementData* statement = (struct OfxStatementData*) iter->data;
Account* account = gnc_import_select_account (gnc_gen_trans_list_widget(gnc_ofx_importer_gui),
statement->account_id,
0, NULL, NULL, ACCT_TYPE_NONE,
NULL, NULL);
if (account)
{
if (statement->ledger_balance_valid)
{
gnc_numeric value =
double_to_gnc_numeric (statement->ledger_balance,
xaccAccountGetCommoditySCU (account),
GNC_HOW_RND_ROUND_HALF_UP);
recnWindowWithBalance (GTK_WIDGET (parent),
account,
value,
statement->ledger_balance_date);
}
}
}
g_free (selected_filename);
g_slist_free_full (info.statement,g_free);
}
if (ofx_created_commodites)

29
libgnucash/engine/Account.cpp
Unescape View File

@ -4391,6 +4391,35 @@ gboolean xaccAccountIsAssetLiabType(GNCAccountType t)
}
}
GNCAccountType
xaccAccountTypeGetFundamental (GNCAccountType t)
{
switch (t)
{
case ACCT_TYPE_BANK:
case ACCT_TYPE_STOCK:
case ACCT_TYPE_MUTUAL:
case ACCT_TYPE_CURRENCY:
case ACCT_TYPE_CASH:
case ACCT_TYPE_ASSET:
case ACCT_TYPE_RECEIVABLE:
return ACCT_TYPE_ASSET;
case ACCT_TYPE_CREDIT:
case ACCT_TYPE_LIABILITY:
case ACCT_TYPE_PAYABLE:
return ACCT_TYPE_LIABILITY;
case ACCT_TYPE_INCOME:
return ACCT_TYPE_INCOME;
case ACCT_TYPE_EXPENSE:
return ACCT_TYPE_EXPENSE;
case ACCT_TYPE_EQUITY:
return ACCT_TYPE_EQUITY;
case ACCT_TYPE_TRADING:
default:
return ACCT_TYPE_NONE;
}
}
gboolean xaccAccountIsAPARType(GNCAccountType t)
{
switch (t)

5
libgnucash/engine/Account.h
Unescape View File

@ -975,6 +975,11 @@ guint32 xaccAccountTypesValid(void);
* Asset or Liability type, but not a business account type
* (meaning not an Accounts Payable/Accounts Receivable). */
gboolean xaccAccountIsAssetLiabType(GNCAccountType t);
/** Convenience function to return the fundamental type
* asset/liability/income/expense/equity given an account type. */
GNCAccountType xaccAccountTypeGetFundamental (GNCAccountType t);
/** Convenience function to check if the account is a valid
* business account type

Write Preview
Loading…
Cancel
Save