diff --git a/SDL/Fakturierung/frmFaktEmail.vb b/SDL/Fakturierung/frmFaktEmail.vb
index 88d2f187..4b393959 100644
--- a/SDL/Fakturierung/frmFaktEmail.vb
+++ b/SDL/Fakturierung/frmFaktEmail.vb
@@ -546,7 +546,7 @@ Public Class frmFaktEmail
Mail = outl.CreateItem(0)
Mail.Subject = txtSubject.Text
- If Firma_ID = 24 OrElse Firma_ID = 19 Then
+ If Firma_ID = 24 OrElse Firma_ID = 19 OrElse Firma_ID = 1 OrElse Firma_ID = 7 Then
Try
Dim oAccount As Outlook.Account
Dim accountToSent = ""
@@ -554,109 +554,113 @@ Public Class frmFaktEmail
Select Case Firma_ID
Case 24
accountToSent = SDL.cFakturierung.getDefaultMail("AMBAR",, True)
- Case Else
+ Case 19
accountToSent = "mmdabrechnung@verag.ag" 'bewusst falsch geschrieben!!!!
+ Case 7
+ accountToSent = "rechnung@atilla-spedition.com"
+ Case Else
+ accountToSent = "rechnungsversand@verag.ag"
End Select
If accountToSent <> "" Then
- If outl.Session.Accounts.Count > 0 Then
- For Each oAccount In outl.Session.Accounts
- If oAccount.SmtpAddress.ToLower = accountToSent.ToLower Then
- Mail.SendUsingAccount = oAccount
- Exit For
+ If outl.Session.Accounts.Count > 0 Then
+ For Each oAccount In outl.Session.Accounts
+ If oAccount.SmtpAddress.ToLower = accountToSent.ToLower Then
+ Mail.SendUsingAccount = oAccount
+ Exit For
+ End If
+ Next
End If
- Next
- End If
+ End If
+
+ Catch ex As Exception
+ VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Fehler beim Ermitteln des Mail-Accounts." & ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+ End Try
+
End If
- Catch ex As Exception
- VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Fehler beim Ermitteln des Mail-Accounts." & ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
- End Try
-
- End If
-
- 'Mail-Adressen eintragen
- '-----------------------------------------------------------------
- For Each r In dgvEmail.Rows
- If r.cells(0).value <> "" Then Mail.To &= r.cells(0).value & ";"
- Next
- For Each r In dgvEmailCC.Rows
- If r.cells(0).value <> "" Then Mail.CC &= r.cells(0).value & ";"
- Next
- For Each r In dgvEmailBCC.Rows
- If r.cells(0).value <> "" Then Mail.BCC &= r.cells(0).value & ";"
- Next
+ 'Mail-Adressen eintragen
+ '-----------------------------------------------------------------
+ For Each r In dgvEmail.Rows
+ If r.cells(0).value <> "" Then Mail.To &= r.cells(0).value & ";"
+ Next
+ For Each r In dgvEmailCC.Rows
+ If r.cells(0).value <> "" Then Mail.CC &= r.cells(0).value & ";"
+ Next
+ For Each r In dgvEmailBCC.Rows
+ If r.cells(0).value <> "" Then Mail.BCC &= r.cells(0).value & ";"
+ Next
- RichTextBox.Text = RichTextBox.Text.Replace("%RgNr%", lastAktuelle_RgNr)
- txtSubject.Text = txtSubject.Text.Replace("%RgNr%", lastAktuelle_RgNr)
+ RichTextBox.Text = RichTextBox.Text.Replace("%RgNr%", lastAktuelle_RgNr)
+ txtSubject.Text = txtSubject.Text.Replace("%RgNr%", lastAktuelle_RgNr)
- Dim TextHTML = "" & RichTextBox.Text.Replace(ControlChars.Lf, "
") & cFakturierung.getSignature(AD.LandKz, Firma_ID,,,, additionalLine,, IIf(Firma_ID = "24", True, False)) & "
"
+ Dim TextHTML = "" & RichTextBox.Text.Replace(ControlChars.Lf, "
") & cFakturierung.getSignature(AD.LandKz, Firma_ID,,,, additionalLine,, IIf(Firma_ID = "24", True, False)) & "
"
- Mail.HTMLBody = TextHTML
- Mail.Subject = txtSubject.Text
+ Mail.HTMLBody = TextHTML
+ Mail.Subject = txtSubject.Text
- ATTACHMENTS.Clear()
- '-----------------------------------------------------------------
- 'Rechnungen anfügen
- '-----------------------------------------------------------------
- For Each l In listPDFs
- ' Mail.Attachments.Add(l, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
+ ATTACHMENTS.Clear()
+ '-----------------------------------------------------------------
+ 'Rechnungen anfügen
+ '-----------------------------------------------------------------
+ For Each l In listPDFs
+ ' Mail.Attachments.Add(l, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
- ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
+ ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
- Next
- For Each l In SonstAnlagen
- ' Mail.Attachments.Add(l, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
+ Next
+ For Each l In SonstAnlagen
+ ' Mail.Attachments.Add(l, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
- ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
+ ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
- Next
- addAttachments(Mail, lastAktuelle_RgNr, cbxMergeRg.Checked)
+ Next
+ addAttachments(Mail, lastAktuelle_RgNr, cbxMergeRg.Checked)
- '-----------------------------------------------------------------
- 'Steuerbescheid/VDB anfügen
- '-----------------------------------------------------------------
- getAnhaenge()
- 'For Each l In listPDFs
- ' ' Mail.Attachments.Add(l, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
- ' ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
- 'Next
+ '-----------------------------------------------------------------
+ 'Steuerbescheid/VDB anfügen
+ '-----------------------------------------------------------------
+ getAnhaenge()
+ 'For Each l In listPDFs
+ ' ' Mail.Attachments.Add(l, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
+ ' ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
+ 'Next
- 'Rechnungsanhänge anfügen
- '-----------------------------------------------------------------
- If SR_DT IsNot Nothing AndAlso SR_DT.Rows.Count > 0 Then
- For Each r In SR_DT.Rows
- Dim RG_ANH = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.LOAD_ANHAENGE_LIST(r("RK_ID"))
- If RG_ANH IsNot Nothing Then
- For Each ANH In RG_ANH
- ATTACHMENTS.Add(New cFakt_MailATTach(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(ANH.dsId), ANH.Bezeichnung))
+ 'Rechnungsanhänge anfügen
+ '-----------------------------------------------------------------
+ If SR_DT IsNot Nothing AndAlso SR_DT.Rows.Count > 0 Then
+ For Each r In SR_DT.Rows
+ Dim RG_ANH = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.LOAD_ANHAENGE_LIST(r("RK_ID"))
+ If RG_ANH IsNot Nothing Then
+ For Each ANH In RG_ANH
+ ATTACHMENTS.Add(New cFakt_MailATTach(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(ANH.dsId), ANH.Bezeichnung))
+ Next
+ End If
Next
End If
- Next
- End If
- '-----------------------------------------------------------------
+ '-----------------------------------------------------------------
- addAttachments(Mail, lastAktuelle_RgNr, cbxMergePDF.Checked)
+ addAttachments(Mail, lastAktuelle_RgNr, cbxMergePDF.Checked)
- If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
- Try
- Mail.SentOnBehalfOfName = "buchhaltung@ambarlog.com"
- Catch ex2 As Exception
- MsgBox(ex2.Message)
- End Try
- End If
+ If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
+ Try
+ Mail.SentOnBehalfOfName = "buchhaltung@ambarlog.com"
+ Catch ex2 As Exception
+ MsgBox(ex2.Message)
+ End Try
+ End If
- Mail.Display()
- '------------------------------------------------------------------------------------------
- ' STB /FA SR: ABFRAGE FISKAL-VZ
- If isFiskal Then
- send_StbFAMail(AD.AdressenNr, " Rg-Nr.: " & lastAktuelle_RgNr, lastAktuelle_RgNr)
- End If
+ Mail.Display()
+ '------------------------------------------------------------------------------------------
+ ' STB /FA SR: ABFRAGE FISKAL-VZ
+ If isFiskal Then
+ send_StbFAMail(AD.AdressenNr, " Rg-Nr.: " & lastAktuelle_RgNr, lastAktuelle_RgNr)
+ End If
'------------------------------------------------------------------------------------------
End If
diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cTrdInvoice.vb b/VERAG_PROG_ALLGEMEIN/Classes/cTrdInvoice.vb
index f76383b3..5365e6fc 100644
--- a/VERAG_PROG_ALLGEMEIN/Classes/cTrdInvoice.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cTrdInvoice.vb
@@ -1,5 +1,6 @@
Imports System.Data.SqlClient
Imports System.Reflection
+Imports com.sun.org.apache.xpath.internal.operations
Public Class cTrdInvoice
@@ -549,7 +550,7 @@ Class TrdInvoice_FUNCTIONS
End If
- End If
+ End If
Next
Return True