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

Merge branch 'maint'

Browse Source 
* Bug 733283 - [PATCH] Loss of fractions when importing OFX investment transactions
* Bug 733506 - (ForwadDisableQIF) The forward button is not active even though a file is selected
This commit is contained in:
Geert Janssens 2014-09-16 23:40:09 +02:00
commit 9bc5d1a20c
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/import-export/ofx/gnc-ofx-import.c
View File

@ -672,8 +672,8 @@ int ofx_proc_transaction_cb(struct OfxTransactionData data, void * transaction_u
xaccTransAppendSplit(transaction, split);
xaccAccountInsertSplit(investment_account, split);
gnc_amount = gnc_ofx_numeric_from_double (ofx_get_investment_amount(&data),
investment_commodity);
gnc_amount = gnc_ofx_numeric_from_double_txn (ofx_get_investment_amount(&data),
transaction);
gnc_units = gnc_ofx_numeric_from_double (data.units, investment_commodity);
xaccSplitSetAmount(split, gnc_units);
xaccSplitSetValue(split, gnc_amount);

14
src/import-export/qif-imp/assistant-qif-import.c
View File

@ -1543,12 +1543,22 @@ gnc_ui_qif_import_load_file_complete (GtkAssistant *assistant,
void
gnc_ui_qif_import_load_file_prepare (GtkAssistant *assistant, gpointer user_data)
{
QIFImportWindow * wind = user_data;
const gchar * path_to_load;
gboolean page_status = FALSE;
gint num = gtk_assistant_get_current_page (assistant);
GtkWidget *page = gtk_assistant_get_nth_page (assistant, num);
/* Disable the Assistant Forward Button */
gtk_assistant_set_page_complete (assistant, page, FALSE);
/* Get the file name. */
path_to_load = gtk_entry_get_text(GTK_ENTRY(wind->filename_entry));
/* Calculate status for the Assistant Forward Button */
if (strlen(path_to_load) != 0)
{
page_status = gnc_ui_qif_import_load_file_complete(assistant, user_data);
}
gtk_assistant_set_page_complete (assistant, page, page_status);
}