autmailversand
This commit is contained in:
@@ -575,11 +575,53 @@ Public Class cAutomailversand
|
||||
|
||||
Select Case ZOLL
|
||||
Case "DE"
|
||||
If SPEDBUCH.DokumentId_Steuerbeleg IsNot Nothing Then ATTACHMENTS.Add(New cFakt_MailATTach(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(SPEDBUCH.DokumentId_Steuerbeleg), "Steuerbescheid.pdf"))
|
||||
If SPEDBUCH.DokumentId_VBD IsNot Nothing Then ATTACHMENTS.Add(New cFakt_MailATTach(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(SPEDBUCH.DokumentId_VBD), "Abgabenbescheid.pdf"))
|
||||
If SPEDBUCH.DokumentId_Steuerbeleg IsNot Nothing Then
|
||||
Dim path = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(SPEDBUCH.DokumentId_Steuerbeleg)
|
||||
pdfAnhang_merge = PDFS_zusammenfassen(path, RECHNUNG.FilialenNr, RECHNUNG.Firma_ID, False)
|
||||
If pdfAnhang_merge Then
|
||||
zsmf_ER.Add(path)
|
||||
Else
|
||||
ATTACHMENTS.Add(New cFakt_MailATTach(path, "Steuerbescheid.pdf"))
|
||||
End If
|
||||
|
||||
End If
|
||||
If SPEDBUCH.DokumentId_VBD IsNot Nothing Then
|
||||
Dim path = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(SPEDBUCH.DokumentId_VBD)
|
||||
pdfAnhang_merge = PDFS_zusammenfassen(path, RECHNUNG.FilialenNr, RECHNUNG.Firma_ID, False)
|
||||
If pdfAnhang_merge Then
|
||||
zsmf_ER.Add(path)
|
||||
Else
|
||||
ATTACHMENTS.Add(New cFakt_MailATTach(path, "Abgabenbescheid.pdf"))
|
||||
End If
|
||||
|
||||
|
||||
|
||||
End If
|
||||
Case "AT"
|
||||
If SPEDBUCH.DokumentId_Steuerbeleg IsNot Nothing Then ATTACHMENTS.Add(New cFakt_MailATTach(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(SPEDBUCH.DokumentId_Steuerbeleg), "Verzollungsnachweis.pdf"))
|
||||
If SPEDBUCH.DokumentId_Mitteilung IsNot Nothing Then ATTACHMENTS.Add(New cFakt_MailATTach(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(SPEDBUCH.DokumentId_Mitteilung), "Versandschein.pdf"))
|
||||
If SPEDBUCH.DokumentId_Steuerbeleg IsNot Nothing Then
|
||||
|
||||
Dim path = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(SPEDBUCH.DokumentId_Steuerbeleg)
|
||||
pdfAnhang_merge = PDFS_zusammenfassen(path, RECHNUNG.FilialenNr, RECHNUNG.Firma_ID, False)
|
||||
If pdfAnhang_merge Then
|
||||
zsmf_ER.Add(path)
|
||||
Else
|
||||
ATTACHMENTS.Add(New cFakt_MailATTach(path, "Verzollungsnachweis.pdf"))
|
||||
End If
|
||||
|
||||
End If
|
||||
If SPEDBUCH.DokumentId_Mitteilung IsNot Nothing Then
|
||||
|
||||
|
||||
Dim path = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(SPEDBUCH.DokumentId_Mitteilung)
|
||||
pdfAnhang_merge = PDFS_zusammenfassen(path, RECHNUNG.FilialenNr, RECHNUNG.Firma_ID, False)
|
||||
If pdfAnhang_merge Then
|
||||
zsmf_ER.Add(path)
|
||||
Else
|
||||
ATTACHMENTS.Add(New cFakt_MailATTach(path, "Versandschein.pdf"))
|
||||
End If
|
||||
|
||||
|
||||
End If
|
||||
|
||||
End Select
|
||||
|
||||
@@ -588,12 +630,19 @@ Public Class cAutomailversand
|
||||
|
||||
|
||||
If zsmf_ER.Any() Then
|
||||
If zsmf_ER.Count = 1 Then
|
||||
Dim fileInfo As New FileInfo(zsmf_ER(0))
|
||||
ATTACHMENTS.Add(New cFakt_MailATTach(zsmf_ER(0), fileInfo.Name))
|
||||
|
||||
Else
|
||||
If FormularManagerNEU.MergePdfFiles(zsmf_ER, zielPfadZusammenfassung) Then
|
||||
Dim fileInfo As New FileInfo(zielPfadZusammenfassung)
|
||||
ATTACHMENTS.Add(New cFakt_MailATTach(zielPfadZusammenfassung, fileInfo.Name))
|
||||
End If
|
||||
End If
|
||||
|
||||
End If
|
||||
|
||||
If mergeAllPDFS Then 'also Beleg + Anhänge in Beleg
|
||||
Dim Anhangsbezeichnung = If(RECHNUNG.BelegartenKz = "AR", "Invoice_", "Credit_Note_")
|
||||
Dim zielPfadZusammenfassung2 = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(Anhangsbezeichnung & "Attachment.pdf", ".pdf",, False, "Zusammenfassung")
|
||||
@@ -621,6 +670,10 @@ Public Class cAutomailversand
|
||||
'ATTACHMENTS.Clear()
|
||||
Dim zsmf_SR As New List(Of String)
|
||||
|
||||
For Each l In listPDFs
|
||||
zsmf_SR.Add(l)
|
||||
Next
|
||||
|
||||
For Each r As DataRow In SR_DT.Rows
|
||||
Dim RG_ANH = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.LOAD_ANHAENGE_LIST(r("RK_ID"))
|
||||
If RG_ANH IsNot Nothing Then
|
||||
@@ -653,17 +706,27 @@ Public Class cAutomailversand
|
||||
|
||||
Next
|
||||
|
||||
If zsmf_SR.Any() Then
|
||||
If FormularManagerNEU.MergePdfFiles(zsmf_SR, zielPfadZusammenfassung) Then
|
||||
Dim fileInfo As New FileInfo(zielPfadZusammenfassung)
|
||||
ATTACHMENTS.Add(New cFakt_MailATTach(zielPfadZusammenfassung, fileInfo.Name))
|
||||
End If
|
||||
End If
|
||||
|
||||
End If
|
||||
|
||||
|
||||
Next
|
||||
|
||||
If zsmf_SR.Any() Then
|
||||
If zsmf_SR.Count = 1 Then
|
||||
|
||||
Dim fileInfo As New FileInfo(zsmf_SR(0))
|
||||
ATTACHMENTS.Add(New cFakt_MailATTach(zsmf_SR(0), fileInfo.Name))
|
||||
|
||||
Else
|
||||
|
||||
If FormularManagerNEU.MergePdfFiles(zsmf_SR, zielPfadZusammenfassung) Then
|
||||
Dim fileInfo As New FileInfo(zielPfadZusammenfassung)
|
||||
ATTACHMENTS.Add(New cFakt_MailATTach(zielPfadZusammenfassung, fileInfo.Name))
|
||||
End If
|
||||
End If
|
||||
|
||||
End If
|
||||
|
||||
'nicht bei SR!
|
||||
|
||||
|
||||
@@ -535,7 +535,7 @@ Public Class frmFaktEmail
|
||||
Mail = outl.CreateItem(0)
|
||||
Mail.Subject = txtSubject.Text
|
||||
|
||||
If Firma_ID = 24 OrElse Firma_ID = 19 OrElse Firma_ID = 1 OrElse Firma_ID = 7 Then
|
||||
If Firma_ID = 24 OrElse Firma_ID = 19 OrElse Firma_ID = 1 OrElse Firma_ID = 7 OrElse Firma_ID = 26 Then
|
||||
Try
|
||||
Dim oAccount As Outlook.Account
|
||||
Dim accountToSent = ""
|
||||
@@ -677,7 +677,7 @@ Public Class frmFaktEmail
|
||||
Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
|
||||
Mail = outl.CreateItem(0)
|
||||
|
||||
If Firma_ID = 24 OrElse Firma_ID = 19 OrElse Firma_ID = 1 OrElse Firma_ID = 7 Then
|
||||
If Firma_ID = 24 OrElse Firma_ID = 19 OrElse Firma_ID = 1 OrElse Firma_ID = 7 OrElse Firma_ID = 26 Then
|
||||
Try
|
||||
Dim oAccount As Outlook.Account
|
||||
Dim accountToSent = ""
|
||||
|
||||
Reference in New Issue
Block a user