gnucash master: Multiple changes pushed
Christian Stimming
cstim at code.gnucash.org
Thu Mar 6 16:40:46 EST 2014
Updated via https://github.com/Gnucash/gnucash/commit/f04d8cfa (commit)
via https://github.com/Gnucash/gnucash/commit/f63e6468 (commit)
from https://github.com/Gnucash/gnucash/commit/511a5562 (commit)
commit f04d8cfa97c1e5e5e327dccf6a7ad26fc1fce200
Author: Christian Stimming <christian at cstimming.de>
Date: Thu Mar 6 22:39:53 2014 +0100
Aqbanking: SEPA transfer improvements - fix origin labels and add possibility to edit sender's name.
diff --git a/src/import-export/aqb/dialog-ab-trans.c b/src/import-export/aqb/dialog-ab-trans.c
index 6bdd305..c034fe8 100644
--- a/src/import-export/aqb/dialog-ab-trans.c
+++ b/src/import-export/aqb/dialog-ab-trans.c
@@ -128,6 +128,9 @@ struct _GncABTransDialog
/* Recipient's bank name (may be filled in automatically sometime later) */
GtkWidget *recp_bankname_label;
+ /* Originator's name (might have to be edited by the user) */
+ GtkWidget *orig_name_entry;
+
/* The template choosing GtkTreeView/GtkListStore */
GtkTreeView *template_gtktreeview;
GtkListStore *template_list_store;
@@ -200,6 +203,8 @@ gnc_ab_trans_dialog_fill_values(GncABTransDialog *td)
trans, gtk_entry_get_text(GTK_ENTRY(td->recp_bankcode_entry)));
AB_Transaction_SetRemoteIban(
trans, gtk_entry_get_text(GTK_ENTRY(td->recp_account_entry)));
+ AB_Transaction_SetLocalName(
+ trans, gtk_entry_get_text(GTK_ENTRY(td->orig_name_entry)));
}
else
{
@@ -263,7 +268,6 @@ gnc_ab_trans_dialog_new(GtkWidget *parent, AB_ACCOUNT *ab_acc,
GtkWidget *recp_bankcode_heading;
GtkWidget *amount_hbox;
GtkWidget *orig_name_heading;
- GtkWidget *orig_name_label;
GtkWidget *orig_account_heading;
GtkWidget *orig_account_label;
G_GNUC_UNUSED GtkWidget *orig_bankname_heading;
@@ -317,7 +321,7 @@ gnc_ab_trans_dialog_new(GtkWidget *parent, AB_ACCOUNT *ab_acc,
td->purpose_cont3_entry = GTK_WIDGET(gtk_builder_get_object (builder, "purpose_cont3_entry"));
td->exec_button = GTK_WIDGET(gtk_builder_get_object(builder, "exec_now_button"));
orig_name_heading = GTK_WIDGET(gtk_builder_get_object (builder, "orig_name_heading"));
- orig_name_label = GTK_WIDGET(gtk_builder_get_object (builder, "orig_name_label"));
+ td->orig_name_entry = GTK_WIDGET(gtk_builder_get_object (builder, "orig_name_label"));
orig_account_heading = GTK_WIDGET(gtk_builder_get_object (builder, "orig_account_heading"));
orig_account_label = GTK_WIDGET(gtk_builder_get_object (builder, "orig_account_label"));
orig_bankname_heading = GTK_WIDGET(gtk_builder_get_object (builder, "orig_bankname_heading"));
@@ -345,11 +349,9 @@ gnc_ab_trans_dialog_new(GtkWidget *parent, AB_ACCOUNT *ab_acc,
{
case SINGLE_TRANSFER:
case SINGLE_INTERNAL_TRANSFER:
- case SEPA_TRANSFER:
/* all labels are already set */
break;
- case SINGLE_DEBITNOTE:
- case SEPA_DEBITNOTE:
+ case SEPA_TRANSFER:
gtk_label_set_text(GTK_LABEL (heading_label),
/* Translators: Strings from this file are
* needed only in countries that have one of
@@ -361,6 +363,20 @@ gnc_ab_trans_dialog_new(GtkWidget *parent, AB_ACCOUNT *ab_acc,
* country, you may safely ignore strings
* from the import-export/hbci
* subdirectory. */
+ _("Enter a SEPA Online Transfer"));
+ gtk_label_set_text(GTK_LABEL(recp_account_heading),
+ _("Recipient IBAN (International Account Number)"));
+ gtk_label_set_text(GTK_LABEL(recp_bankcode_heading),
+ _("Recipient BIC (Bank Code)"));
+
+ gtk_label_set_text(GTK_LABEL(orig_account_heading),
+ _("Originator IBAN (International Account Number)"));
+ gtk_label_set_text(GTK_LABEL(orig_bankcode_heading),
+ _("Originator BIC (Bank Code)"));
+ break;
+
+ case SINGLE_DEBITNOTE:
+ gtk_label_set_text(GTK_LABEL (heading_label),
_("Enter an Online Direct Debit Note"));
gtk_label_set_text(GTK_LABEL(recp_name_heading),
@@ -378,31 +394,32 @@ gnc_ab_trans_dialog_new(GtkWidget *parent, AB_ACCOUNT *ab_acc,
_("Credited Account Bank Code"));
break;
- default:
- g_critical("gnc_ab_trans_dialog_new: Oops, unknown GncABTransType %d",
- trans_type);
- break;
- }
-
- /* Additionally change the labels for the European (SEPA) transactions */
- switch (trans_type)
- {
- case SEPA_TRANSFER:
- gtk_label_set_text(GTK_LABEL(recp_account_heading),
- _("Recipient IBAN (International Account Number)"));
- gtk_label_set_text(GTK_LABEL(recp_bankcode_heading),
- _("Recipient BIC (Bank Code)"));
- break;
case SEPA_DEBITNOTE:
+ gtk_label_set_text(GTK_LABEL (heading_label),
+ _("Enter a SEPA Online Direct Debit Note"));
+
+ gtk_label_set_text(GTK_LABEL(recp_name_heading),
+ _("Debited Account Owner"));
gtk_label_set_text(GTK_LABEL(recp_account_heading),
_("Debited IBAN (International Account Number)"));
gtk_label_set_text(GTK_LABEL(recp_bankcode_heading),
_("Debited BIC (Bank Code)"));
+
+ gtk_label_set_text(GTK_LABEL(orig_name_heading),
+ _("Credited Account Owner"));
+ gtk_label_set_text(GTK_LABEL(orig_account_heading),
+ _("Credited IBAN (International Account Number)"));
+ gtk_label_set_text(GTK_LABEL(orig_bankcode_heading),
+ _("Credited BIC (Bank Code)"));
break;
+
default:
- // do nothing
+ g_critical("gnc_ab_trans_dialog_new: Oops, unknown GncABTransType %d",
+ trans_type);
break;
}
+
+ /* Additionally change the labels for the European (SEPA) transactions */
if (gnc_ab_trans_isSEPA(trans_type))
{
// Also, SEPA might have much longer IBAN (up to 34 chars) and BIC (11)
@@ -410,10 +427,22 @@ gnc_ab_trans_dialog_new(GtkWidget *parent, AB_ACCOUNT *ab_acc,
gtk_entry_set_max_length(GTK_ENTRY(td->recp_account_entry), 34);
}
- gtk_label_set_text(GTK_LABEL(orig_name_label), ab_ownername);
- gtk_label_set_text(GTK_LABEL(orig_account_label), ab_accountnumber);
+ gtk_entry_set_text(GTK_ENTRY(td->orig_name_entry), ab_ownername);
gtk_label_set_text(GTK_LABEL(orig_bankname_label), ab_bankname);
- gtk_label_set_text (GTK_LABEL (orig_bankcode_label), ab_bankcode);
+ if (gnc_ab_trans_isSEPA(trans_type))
+ {
+ gtk_widget_set_sensitive(GTK_WIDGET(td->orig_name_entry), TRUE);
+ ab_accountnumber = AB_Account_GetIBAN(ab_acc);
+ ab_bankcode = AB_Account_GetBIC(ab_acc);
+ gtk_label_set_text(GTK_LABEL(orig_account_label), ab_accountnumber);
+ gtk_label_set_text (GTK_LABEL (orig_bankcode_label), ab_bankcode);
+ }
+ else
+ {
+ gtk_widget_set_sensitive(GTK_WIDGET(td->orig_name_entry), FALSE);
+ gtk_label_set_text(GTK_LABEL(orig_account_label), ab_accountnumber);
+ gtk_label_set_text (GTK_LABEL (orig_bankcode_label), ab_bankcode);
+ }
/* Fill list for choosing a transaction template */
td->template_list_store = gtk_list_store_new(TEMPLATE_NUM_COLUMNS,
diff --git a/src/import-export/aqb/dialog-ab.glade b/src/import-export/aqb/dialog-ab.glade
index ee7342d..d2bb114 100644
--- a/src/import-export/aqb/dialog-ab.glade
+++ b/src/import-export/aqb/dialog-ab.glade
@@ -1206,11 +1206,14 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="orig_name_label">
+ <object class="GtkEntry" id="orig_name_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">something</property>
+ <property name="can_focus">True</property>
+ <property name="max_length">54</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
</object>
<packing>
<property name="top_attach">16</property>
commit f63e6468cc027a9643eee25809ed73c1f9794085
Author: Christian Stimming <christian at cstimming.de>
Date: Thu Mar 6 22:35:28 2014 +0100
Win32 build: Update aqbanking version numbers
diff --git a/packaging/win32/defaults.sh b/packaging/win32/defaults.sh
index 39de60d..4e77870 100644
--- a/packaging/win32/defaults.sh
+++ b/packaging/win32/defaults.sh
@@ -343,16 +343,16 @@ set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
#set_default LIBOFX_PATCH `pwd`/libofx-x.x.x.patch
## online banking: gwenhywfar+aqbanking
-GWENHYWFAR_VERSION="4.9.0beta"
-set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=72&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
+GWENHYWFAR_VERSION="4.11.0beta"
+set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=74&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
KTOBLZCHECK_VERSION="1.44"
set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
-AQBANKING_VERSION="5.3.0beta"
-set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=105&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+AQBANKING_VERSION="5.4.1beta"
+set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=113&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
set_default SQLITE3_URL "http://sqlite.org/sqlite-amalgamation-3.6.1.tar.gz"
Summary of changes:
packaging/win32/defaults.sh | 8 ++--
src/import-export/aqb/dialog-ab-trans.c | 77 +++++++++++++++++++++++----------
src/import-export/aqb/dialog-ab.glade | 11 +++--
3 files changed, 64 insertions(+), 32 deletions(-)
More information about the gnucash-changes
mailing list