edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Formulare, cAutomailversand, etc.

Browse Source
This commit is contained in:
d.breimaier
2025-09-22 17:59:44 +02:00
parent 1a7d4f44eb
commit b2b127c99f
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
SDL/Fakturierung/cAutomailversand.vb
View File

@@ -1,4 +1,5 @@
Imports com.sun.tools.doclets.internal.toolkit.util Imports System.IO
Imports com.sun.tools.doclets.internal.toolkit.util
Imports Microsoft.Office.Interop Imports Microsoft.Office.Interop
Imports VERAG_PROG_ALLGEMEIN Imports VERAG_PROG_ALLGEMEIN
@@ -149,7 +150,7 @@ Public Class cAutomailversand
Next Next
Catch ex As System.Exception Catch ex As System.Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL,,,,,, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "d.breimaier@verag.ag", "mmdabrechnung@verag.ag"))
End Try End Try
End Sub End Sub
@@ -257,7 +258,7 @@ Public Class cAutomailversand
ATTACHMENTS.Clear() ATTACHMENTS.Clear()
'Rechnungsanhänge anfügen 'Rechnungsanhänge anfügen
Dim zielPfadZusammenfassung = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Belegsanhänge", ".pdf",, False, "Zusammenfassung") Dim zielPfadZusammenfassung = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Attachment", ".pdf",, False, "Zusammenfassung")
For Each l In listPDFs For Each l In listPDFs
@@ -267,6 +268,9 @@ Public Class cAutomailversand
Next Next
'----------------------------------------------------------------- '-----------------------------------------------------------------
If SR_DT IsNot Nothing AndAlso SR_DT.Rows.Count > 0 Then If SR_DT IsNot Nothing AndAlso SR_DT.Rows.Count > 0 Then
Dim myList As New List(Of String)
For Each r As DataRow 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")) Dim RG_ANH = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.LOAD_ANHAENGE_LIST(r("RK_ID"))
If RG_ANH IsNot Nothing Then If RG_ANH IsNot Nothing Then
@@ -275,13 +279,11 @@ Public Class cAutomailversand
If FilialenNr = 4817 Then 'diese immer zusammenfassen! If FilialenNr = 4817 Then 'diese immer zusammenfassen!
Dim myList As List(Of String)
For Each ANH In RG_ANH For Each ANH In RG_ANH
Dim path = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(ANH.dsId) Dim path = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(ANH.dsId)
If Not path.ToString.Contains("Sammelrechnung") Then If Not (path.ToString.Contains("Sammelrechnung") OrElse path.ToString.Contains("Maut") OrElse path.ToString.Contains("POS")) Then
myList.Add(ANH.Bezeichnung) myList.Add(path)
Else Else
ATTACHMENTS.Add(New cFakt_MailATTach(path, ANH.Bezeichnung)) ATTACHMENTS.Add(New cFakt_MailATTach(path, ANH.Bezeichnung))
End If End If
@@ -289,7 +291,8 @@ Public Class cAutomailversand
Next Next
If FormularManagerNEU.MergePdfFiles(myList, zielPfadZusammenfassung) Then If FormularManagerNEU.MergePdfFiles(myList, zielPfadZusammenfassung) Then
ATTACHMENTS.Add(New cFakt_MailATTach(zielPfadZusammenfassung, "")) Dim fileInfo As New FileInfo(zielPfadZusammenfassung)
ATTACHMENTS.Add(New cFakt_MailATTach(zielPfadZusammenfassung, fileInfo.Name))
End If End If
Else Else
@@ -381,7 +384,7 @@ Public Class cAutomailversand
Next Next
If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, EMail_subject, EMail_HTML, "mmdabrechnung@verag.ag", False, False, EMails_CC, EMails_BCC, attachList,, "mmdabrechnung@verag.ag") Then If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, EMail_subject, EMail_HTML, "mmdabrechnung@verag.ag", False, False, EMails_CC, EMails_BCC, attachList,, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "d.breimaier@verag.ag", "mmdabrechnung@verag.ag")) Then
API.UPDTAE_OK() API.UPDTAE_OK()
mailcreated = True mailcreated = True
Else Else

2
SDL/Formulare/KDFormulare/frmFormulare.vb
View File

@@ -6701,7 +6701,7 @@ Public Class FormularManagerNEU
End If End If
Finally Finally
If document IsNot Nothing AndAlso document.PageNumber > 0 Then If document IsNot Nothing Then
document.Close() document.Close()
End If End If
End Try End Try