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

addresses change request from jralls

Browse Source
This commit is contained in:
Stefan Bayer 2021-11-22 18:35:38 +01:00 committed by John Ralls
parent ab609eda9b
commit a85520de7b
3 changed files with 25 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnucash/import-export/aqb/dialog-ab-trans.c
View File

@ -406,16 +406,6 @@ gnc_ab_trans_dialog_new(GtkWidget *parent, GNC_AB_ACCOUNT_SPEC *ab_acc,
#if (AQBANKING_VERSION_INT >= 60400)
case SEPA_INTERNAL_TRANSFER:
gtk_label_set_text(GTK_LABEL (heading_label),
/* Translators: Strings from this file are
needed only in countries that have one of
aqbanking's Online Banking techniques
available. This is 'OFX DirectConnect'
(U.S. and others), 'HBCI' (Germany),
or 'YellowNet' (Switzerland). If none of
these techniques are available in your
country, you may safely ignore strings
from the import-export/hbci
subdirectory. */
_("Enter a SEPA Internal Transfer"));
gtk_label_set_text(GTK_LABEL(recp_account_heading),
_("Recipient IBAN (International Account Number)"));
@ -438,7 +428,7 @@ gnc_ab_trans_dialog_new(GtkWidget *parent, GNC_AB_ACCOUNT_SPEC *ab_acc,
gtk_widget_set_can_focus(del_templ_button, FALSE);
gtk_label_set_text(GTK_LABEL(template_label),
_("Target Accounts"));
gtk_expander_set_expanded(template_expander,TRUE);
gtk_expander_set_expanded(template_expander, TRUE);
break;
#endif

7
gnucash/import-export/aqb/gnc-ab-transfer.c
View File

@ -171,20 +171,19 @@ gnc_ab_maketrans(GtkWidget *parent, Account *gnc_acc,
/* Let the user enter the values */
result = gnc_ab_trans_dialog_run_until_ok(td);
templates = gnc_ab_trans_dialog_get_templ(td, &changed);
#if (AQBANKING_VERSION_INT >= 60400)
if (trans_type != SEPA_INTERNAL_TRANSFER && changed)
#else
if (changed)
if (changed)
#endif
{
/* Save the templates */
/* Save the templates */
save_templates(parent, gnc_acc, templates,
(result == GNC_RESPONSE_NOW));
}
g_list_free(templates);
g_list_free(templates);
templates = NULL;
if (result != GNC_RESPONSE_NOW && result != GNC_RESPONSE_LATER)

48
gnucash/import-export/aqb/gnc-ab-utils.c
View File

@ -1341,41 +1341,35 @@ GList*
gnc_ab_trans_templ_list_new_from_ref_accounts(GNC_AB_ACCOUNT_SPEC *ab_acc)
{
GList *retval = NULL;
AB_REFERENCE_ACCOUNT *ra = NULL;
AB_REFERENCE_ACCOUNT *ra;
AB_REFERENCE_ACCOUNT_LIST *ral;
int16_t numAccounts;
int16_t counter;
GWEN_BUFFER *accNameForTemplate;
const char *accName;
const char *iban;
gnc_numeric zero=gnc_numeric_zero();
GWEN_BUFFER *accNameForTemplate = GWEN_Buffer_new(0,120,0,0);
gnc_numeric zero = gnc_numeric_zero();
/* get the target account list */
/* get the target account list */
ral = AB_AccountSpec_GetRefAccountList(ab_acc);
numAccounts = AB_ReferenceAccount_List_GetCount(ral);
ra = AB_ReferenceAccount_List_First(ral);
accNameForTemplate = GWEN_Buffer_new(0,120,0,0);
/* fill the template list with the target accounts */
while (ra)
{
GncABTransTempl *new_templ;
GWEN_Buffer_Reset(accNameForTemplate);
iban = AB_ReferenceAccount_GetIban(ra);
accName = AB_ReferenceAccount_GetAccountName(ra);
if (accName) {
GWEN_Buffer_AppendString(accNameForTemplate, accName);
GWEN_Buffer_AppendString(accNameForTemplate, ": ");
}
GWEN_Buffer_AppendString(accNameForTemplate, iban);
new_templ = gnc_ab_trans_templ_new();
gnc_ab_trans_templ_set_name(new_templ,GWEN_Buffer_GetStart(accNameForTemplate));
gnc_ab_trans_templ_set_recp_name(new_templ,AB_ReferenceAccount_GetOwnerName(ra));
gnc_ab_trans_templ_set_recp_account(new_templ,AB_ReferenceAccount_GetIban(ra));
gnc_ab_trans_templ_set_recp_bankcode(new_templ,AB_ReferenceAccount_GetBic(ra));
gnc_ab_trans_templ_set_amount(new_templ,zero);
retval = g_list_prepend (retval, new_templ);
ra = AB_ReferenceAccount_List_Next(ra);
GncABTransTempl *new_templ = gnc_ab_trans_templ_new();
const char *iban = AB_ReferenceAccount_GetIban(ra);
const char *accName = AB_ReferenceAccount_GetAccountName(ra);
GWEN_Buffer_Reset(accNameForTemplate);
if (accName)
{
GWEN_Buffer_AppendString(accNameForTemplate, accName);
GWEN_Buffer_AppendString(accNameForTemplate, ": ");
}
GWEN_Buffer_AppendString(accNameForTemplate, iban);
gnc_ab_trans_templ_set_name(new_templ, GWEN_Buffer_GetStart(accNameForTemplate));
gnc_ab_trans_templ_set_recp_name(new_templ, AB_ReferenceAccount_GetOwnerName(ra));
gnc_ab_trans_templ_set_recp_account(new_templ, AB_ReferenceAccount_GetIban(ra));
gnc_ab_trans_templ_set_recp_bankcode(new_templ, AB_ReferenceAccount_GetBic(ra));
gnc_ab_trans_templ_set_amount(new_templ, zero);
retval = g_list_prepend (retval, new_templ);
ra = AB_ReferenceAccount_List_Next(ra);
}
retval = g_list_reverse (retval);