[Gnucash-changes] Fix handling of debit notes.
Christian Stimming
cstim at cvs.gnucash.org
Mon May 23 17:02:26 EDT 2005
Log Message:
-----------
Fix handling of debit notes.
2005-05-23 Christian Stimming <stimming at tuhh.de>
* src/import-export/hbci/dialog-hbcitrans.c: Fix handling of debit
notes -- they were broken at all times since the aqbanking
transition, oops.
Tags:
----
gnucash-1-8-branch
Modified Files:
--------------
gnucash/po:
de.po
gnucash:
ChangeLog
gnucash/src/import-export/hbci:
dialog-hbcitrans.c
gnc-hbci-transfer.c
Revision Data
-------------
Index: de.po
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/po/de.po,v
retrieving revision 1.147.2.57
retrieving revision 1.147.2.58
diff -Lpo/de.po -Lpo/de.po -u -r1.147.2.57 -r1.147.2.58
--- po/de.po
+++ po/de.po
@@ -10,8 +10,8 @@
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-23 22:16+0200\n"
-"PO-Revision-Date: 2005-05-23 22:18+0200\n"
+"POT-Creation-Date: 2005-05-23 23:06+0200\n"
+"PO-Revision-Date: 2005-05-23 23:11+0200\n"
"Last-Translator: Christian Stimming <stimming at tuhh.de>\n"
"Language-Team: German <de at li.org>\n"
"MIME-Version: 1.0\n"
@@ -7597,8 +7597,8 @@
msgstr "BLZ des Auftraggebers"
#: src/import-export/hbci/dialog-hbcitrans.c:370
-#: src/import-export/hbci/dialog-hbcitrans.c:819
-#: src/import-export/hbci/dialog-hbcitrans.c:828
+#: src/import-export/hbci/dialog-hbcitrans.c:823
+#: src/import-export/hbci/dialog-hbcitrans.c:832
msgid "(unknown)"
msgstr "(unbekannt)"
@@ -7620,7 +7620,7 @@
"Dies ergibt keinen zulässigen Zahlungsauftrag. Wollen Sie den Auftrag\n"
"erneut eingeben?"
-#: src/import-export/hbci/dialog-hbcitrans.c:516
+#: src/import-export/hbci/dialog-hbcitrans.c:515
msgid ""
"You did not enter any transaction purpose. A purpose is \n"
"required for an online transfer.\n"
@@ -7633,7 +7633,7 @@
"\n"
"Wollen Sie den Auftrag erneut eingeben?"
-#: src/import-export/hbci/dialog-hbcitrans.c:649
+#: src/import-export/hbci/dialog-hbcitrans.c:648
#, c-format
msgid ""
"The internal check of the destination account number '%s' \n"
@@ -7646,7 +7646,7 @@
"einen Fehler enthält. Wollen Sie den Auftrag trotzdem mit dieser\n"
"Kontonummer abschicken?"
-#: src/import-export/hbci/dialog-hbcitrans.c:730
+#: src/import-export/hbci/dialog-hbcitrans.c:734
msgid ""
"The job was sent to the bank successfully, but the \n"
"bank is refusing to execute the job. Please check \n"
@@ -7664,15 +7664,15 @@
"\n"
"Wollen Sie den Auftrag erneut eingeben?"
-#: src/import-export/hbci/dialog-hbcitrans.c:860
+#: src/import-export/hbci/dialog-hbcitrans.c:864
msgid "Enter name for new template:"
msgstr "Bitte geben Sie einen Namen für die neue Überweisungsvorlage ein:"
-#: src/import-export/hbci/dialog-hbcitrans.c:982
+#: src/import-export/hbci/dialog-hbcitrans.c:986
msgid "Do you really want to sort the list of templates?"
msgstr "Wollen Sie die Liste der Vorlagen wirklich sortieren?"
-#: src/import-export/hbci/dialog-hbcitrans.c:1018
+#: src/import-export/hbci/dialog-hbcitrans.c:1022
#, c-format
msgid "Do you really want to delete the template '%s'?"
msgstr "Wollen Sie die Vorlage »%s« wirklich löschen?"
@@ -7728,7 +7728,29 @@
msgid "The HBCI import returned no transactions for the selected time period."
msgstr "Es liegen keine Buchungen für die gewählte Zeitspanne vor."
-#: src/import-export/hbci/gnc-hbci-transfer.c:178
+#: src/import-export/hbci/gnc-hbci-transfer.c:121
+msgid ""
+"The backend found an error during the preparation \n"
+"of the job. It is not possible to execute this job. \n"
+"\n"
+"Most probable the bank does not support your chosen \n"
+"job or your HBCI account does not have the permission \n"
+"to execute this job. More error messages might be \n"
+"visible on your console log.\n"
+"\n"
+"Do you want to enter the job again?"
+msgstr ""
+"Das AqBanking-Modul hat einen Fehler während der Vorbereitung des\n"
+"Auftrags gefunden. Es ist nicht möglich, den Auftrag auszuführen.\n"
+"\n"
+"Wahrscheinlich wird dieser HBCI Geschäftsvorfall von Ihrer Bank leider\n"
+"nicht unterstützt oder ist für Ihren HBCI-Zugang nicht\n"
+"freigeschaltet. Weitere Fehlermeldungen könnten auf dem Console-Log\n"
+"sichtbar sein.\n"
+"\n"
+"Wollen Sie den Auftrag erneut eingeben?"
+
+#: src/import-export/hbci/gnc-hbci-transfer.c:200
msgid ""
"You have changed the list of online transfer templates,\n"
"but you cancelled the transfer dialog.\n"
@@ -7738,11 +7760,11 @@
"den Überweisungsdialog abgebrochen. Möchten Sie die Liste der\n"
"Überweisungsvorlagen trotzdem speichern?"
-#: src/import-export/hbci/gnc-hbci-transfer.c:209
+#: src/import-export/hbci/gnc-hbci-transfer.c:231
msgid "Online HBCI Direct Debit Note"
msgstr "Online-Auftrag Einzellastschrift"
-#: src/import-export/hbci/gnc-hbci-transfer.c:212
+#: src/import-export/hbci/gnc-hbci-transfer.c:234
msgid "Online HBCI Transaction"
msgstr "Online-Auftrag Einzelüberweisung"
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1461.2.413
retrieving revision 1.1461.2.414
diff -LChangeLog -LChangeLog -u -r1.1461.2.413 -r1.1461.2.414
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,9 @@
2005-05-23 Christian Stimming <stimming at tuhh.de>
+ * src/import-export/hbci/dialog-hbcitrans.c: Fix handling of debit
+ notes -- they were broken at all times since the aqbanking
+ transition, oops.
+
* src/import-export/hbci/dialog-hbcitrans.c: Add sanity checks and
ask user when there are no purpose lines.
Index: gnc-hbci-transfer.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/hbci/gnc-hbci-transfer.c,v
retrieving revision 1.7.2.10
retrieving revision 1.7.2.11
diff -Lsrc/import-export/hbci/gnc-hbci-transfer.c -Lsrc/import-export/hbci/gnc-hbci-transfer.c -u -r1.7.2.10 -r1.7.2.11
--- src/import-export/hbci/gnc-hbci-transfer.c
+++ src/import-export/hbci/gnc-hbci-transfer.c
@@ -77,7 +77,7 @@
( gnc_hbci_get_book_template_list
( xaccAccountGetBook(gnc_acc)));
int result;
- gboolean successful;
+ gboolean successful = FALSE;
HBCITransDialog *td;
/* Now open the HBCI_trans_dialog, which also calls
@@ -110,6 +110,28 @@
AB_JOB *job =
gnc_hbci_trans_dialog_enqueue(td, api,
(AB_ACCOUNT *)h_acc, trans_type);
+
+ /* Check whether we really got a job */
+ if (!job) {
+ /* Oops, no job, probably not supported by bank. */
+ if (gnc_verify_dialog_parented
+ (parent,
+ FALSE,
+ "%s",
+ _("The backend found an error during the preparation \n"
+ "of the job. It is not possible to execute this job. \n"
+ "\n"
+ "Most probable the bank does not support your chosen \n"
+ "job or your HBCI account does not have the permission \n"
+ "to execute this job. More error messages might be \n"
+ "visible on your console log.\n"
+ "\n"
+ "Do you want to enter the job again?")))
+ continue;
+ else
+ /* job is NULL anyway, so it doesn't have to be cleaned up */
+ break;
+ }
/* HBCI Transaction has been created and enqueued, so now open
* the gnucash transaction dialog and fill in all values. */
Index: dialog-hbcitrans.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/hbci/dialog-hbcitrans.c,v
retrieving revision 1.9.2.23
retrieving revision 1.9.2.24
diff -Lsrc/import-export/hbci/dialog-hbcitrans.c -Lsrc/import-export/hbci/dialog-hbcitrans.c -u -r1.9.2.23 -r1.9.2.24
--- src/import-export/hbci/dialog-hbcitrans.c
+++ src/import-export/hbci/dialog-hbcitrans.c
@@ -506,7 +506,6 @@
{
char *purpose = gnc_hbci_getpurpose (td->hbci_trans);
- printf ("%d: %s\n", strlen(purpose), purpose);
if (strlen(purpose) == 0) {
gtk_widget_show_all (td->dialog);
values_ok = !gnc_verify_dialog_parented
@@ -694,10 +693,15 @@
printf("gnc_hbci_trans_dialog_enqueue: Oops, job not available. Aborting.\n");
return NULL;
}
- AB_JobSingleTransfer_SetTransaction(job, td->hbci_trans);
- /* Make really sure there is no other job in the queue */
-/* HBCI_Outbox_removeByStatus (outbox, HBCI_JOB_STATUS_NONE); */
+ switch (trans_type) {
+ case SINGLE_DEBITNOTE:
+ AB_JobSingleDebitNote_SetTransaction(job, td->hbci_trans);
+ break;
+ default:
+ case SINGLE_TRANSFER:
+ AB_JobSingleTransfer_SetTransaction(job, td->hbci_trans);
+ };
/* Add job to queue */
AB_Banking_EnqueueJob(api, job);
More information about the gnucash-changes
mailing list