merge
This commit is contained in:
@@ -102,8 +102,18 @@ Public Class cAutomailversand
|
|||||||
If AD.E_Mail IsNot Nothing AndAlso AD.E_Mail <> "" Then MailTo &= AD.E_Mail & ";"
|
If AD.E_Mail IsNot Nothing AndAlso AD.E_Mail <> "" Then MailTo &= AD.E_Mail & ";"
|
||||||
If AD.E_Mail2 IsNot Nothing AndAlso AD.E_Mail2 <> "" Then MailTo &= AD.E_Mail2 & ";"
|
If AD.E_Mail2 IsNot Nothing AndAlso AD.E_Mail2 <> "" Then MailTo &= AD.E_Mail2 & ";"
|
||||||
|
|
||||||
|
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
'TODO: nach TEST deaktivieren!
|
||||||
|
If True Then
|
||||||
|
MailTo = "d.breimaier@verag.ag"
|
||||||
|
MailtoCC = ""
|
||||||
|
MailtoBCC = ""
|
||||||
|
End If
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
If Not (MailTo = "" AndAlso MailtoCC = "" AndAlso MailtoCC = "") Then
|
If Not (MailTo = "" AndAlso MailtoCC = "" AndAlso MailtoCC = "") Then
|
||||||
|
|
||||||
Dim Mailsubject As String = ""
|
Dim Mailsubject As String = ""
|
||||||
@@ -195,7 +205,6 @@ Public Class cAutomailversand
|
|||||||
Mail = outl.CreateItem(0)
|
Mail = outl.CreateItem(0)
|
||||||
|
|
||||||
Mail.Subject = Mailsubject
|
Mail.Subject = Mailsubject
|
||||||
Mail.HTMLBody =
|
|
||||||
|
|
||||||
|
|
||||||
Dim TextHTML = ""
|
Dim TextHTML = ""
|
||||||
@@ -298,7 +307,13 @@ Public Class cAutomailversand
|
|||||||
mailcreated = True
|
mailcreated = True
|
||||||
Else
|
Else
|
||||||
|
|
||||||
If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, EMail_subject, EMail_HTML, "noreply@verag.ag", False, False, EMails_CC, EMails_BCC, ATTACHMENTS) Then
|
Dim attachList As New List(Of String)
|
||||||
|
For Each ATT As cFakt_MailATTach In ATTACHMENTS
|
||||||
|
attachList.Add(ATT.Pfad)
|
||||||
|
Next
|
||||||
|
|
||||||
|
|
||||||
|
If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, EMail_subject, EMail_HTML, "noreply@verag.ag", False, False, EMails_CC, EMails_BCC, attachList) Then
|
||||||
API.UPDTAE_OK()
|
API.UPDTAE_OK()
|
||||||
mailcreated = True
|
mailcreated = True
|
||||||
Else
|
Else
|
||||||
|
|||||||
Reference in New Issue
Block a user