Merge branch 'maint'

This commit is contained in:
Geert Janssens 2017-03-16 21:39:06 +01:00
commit 79df9b5c26
3 changed files with 23 additions and 2 deletions

View File

@ -1090,6 +1090,23 @@ gnc_ab_import_context(AB_IMEXPORTER_CONTEXT *context,
AB_ImExporterContext_AccountInfoForEach(context, bal_accountinfo_cb,
data);
/* Check bank-messages */
{
AB_MESSAGE * bankmsg = AB_ImExporterContext_GetFirstMessage(context);
while (bankmsg)
{
const char* subject = AB_Message_GetSubject(bankmsg);
const char* text = AB_Message_GetText(bankmsg);
gnc_info_dialog(data->parent, "%s\n%s %s\n%s",
_("The bank has sent a message in its response."),
_("Subject:"),
subject,
text);
bankmsg = AB_ImExporterContext_GetNextMessage(context); // The interator is incremented within aqbanking
}
}
return data;
}

View File

@ -243,6 +243,10 @@
legend: {
show: true,
placement: \"outsideGrid\", },
highlighter: {
show: false },
cursor: {
showTooltip: false },
};\n")
(if title

View File

@ -755,8 +755,8 @@
(if report
(begin
(set! html (gnc:report-render-html report #t))
(set! html (gnc:substring-replace-from-to html "jquery.min.js" "" 2 -1))
(set! html (gnc:substring-replace-from-to html "jquery.jqplot.js" "" 2 -1))
(set! html (gnc:substring-replace-from-to html (gnc:html-js-include "jqplot/jquery.min.js") "" 2 -1))
(set! html (gnc:substring-replace-from-to html (gnc:html-js-include "jqplot/jquery.jqplot.js") "" 2 -1))
))))
(gnc-unset-busy-cursor '())
html))