gnucash maint: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Tue Sep 16 17:41:44 EDT 2014
Updated via https://github.com/Gnucash/gnucash/commit/afdce5e1 (commit)
via https://github.com/Gnucash/gnucash/commit/9d5e7037 (commit)
from https://github.com/Gnucash/gnucash/commit/5d180470 (commit)
commit afdce5e182d0e7864743bcc6b4b0f8dc020c413e
Author: David Maline <firemanworld at gmail.com>
Date: Tue Sep 16 21:32:49 2014 +0200
Bug 733506 - (ForwadDisableQIF) The forward button is not active even though a file is selected
diff --git a/src/import-export/qif-imp/assistant-qif-import.c b/src/import-export/qif-imp/assistant-qif-import.c
index 4e57a59..983e7ca 100644
--- a/src/import-export/qif-imp/assistant-qif-import.c
+++ b/src/import-export/qif-imp/assistant-qif-import.c
@@ -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);
}
commit 9d5e7037ed83248520afdf5131312aa7205d45e9
Author: Jethro Beekman <gnome-bugzilla at jbeekman.nl>
Date: Tue Sep 16 21:28:54 2014 +0200
Bug 733283 - [PATCH] Loss of fractions when importing OFX investment transactions
diff --git a/src/import-export/ofx/gnc-ofx-import.c b/src/import-export/ofx/gnc-ofx-import.c
index 19b5f64..98b5491 100644
--- a/src/import-export/ofx/gnc-ofx-import.c
+++ b/src/import-export/ofx/gnc-ofx-import.c
@@ -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);
Summary of changes:
src/import-export/ofx/gnc-ofx-import.c | 4 ++--
src/import-export/qif-imp/assistant-qif-import.c | 14 ++++++++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
More information about the gnucash-changes
mailing list