RMC Einarbeitung von EasyTrip, Sammelrechnung, Creditsafe, etc.
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
Imports Microsoft.Office.Interop
|
||||
Imports com.sun.tools.doclets.internal.toolkit.util
|
||||
Imports Microsoft.Office.Interop
|
||||
Imports VERAG_PROG_ALLGEMEIN
|
||||
|
||||
Public Class cAutomailversand
|
||||
@@ -256,6 +257,9 @@ Public Class cAutomailversand
|
||||
ATTACHMENTS.Clear()
|
||||
'Rechnungsanhänge anfügen
|
||||
|
||||
Dim zielPfadZusammenfassung = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Belegsanhänge", ".pdf",, False, "Zusammenfassung")
|
||||
|
||||
|
||||
For Each l In listPDFs
|
||||
|
||||
ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
|
||||
@@ -263,12 +267,39 @@ Public Class cAutomailversand
|
||||
Next
|
||||
'-----------------------------------------------------------------
|
||||
If SR_DT IsNot Nothing AndAlso SR_DT.Rows.Count > 0 Then
|
||||
For Each r In SR_DT.Rows
|
||||
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
|
||||
For Each ANH In RG_ANH
|
||||
ATTACHMENTS.Add(New cFakt_MailATTach(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(ANH.dsId), ANH.Bezeichnung))
|
||||
Next
|
||||
|
||||
Dim FilialenNr = IIf(Not IsDBNull(r.Item("FilialenNr")) AndAlso IsNumeric(r.Item("FilialenNr")), CInt(r.Item("FilialenNr")), 0)
|
||||
|
||||
If FilialenNr = 4817 Then 'diese immer zusammenfassen!
|
||||
|
||||
Dim myList As List(Of String)
|
||||
|
||||
For Each ANH In RG_ANH
|
||||
|
||||
Dim path = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(ANH.dsId)
|
||||
If Not path.ToString.Contains("Sammelrechnung") Then
|
||||
myList.Add(ANH.Bezeichnung)
|
||||
Else
|
||||
ATTACHMENTS.Add(New cFakt_MailATTach(path, ANH.Bezeichnung))
|
||||
End If
|
||||
|
||||
Next
|
||||
|
||||
If FormularManagerNEU.MergePdfFiles(myList, zielPfadZusammenfassung) Then
|
||||
ATTACHMENTS.Add(New cFakt_MailATTach(zielPfadZusammenfassung, ""))
|
||||
End If
|
||||
|
||||
Else
|
||||
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
|
||||
|
||||
|
||||
|
||||
End If
|
||||
Next
|
||||
End If
|
||||
|
||||
Reference in New Issue
Block a user