trdinvoice, etc.

This commit is contained in:
2026-04-10 11:27:58 +02:00
parent cacc212561
commit 456e14350a
2 changed files with 83 additions and 78 deletions

View File

@@ -546,7 +546,7 @@ Public Class frmFaktEmail
Mail = outl.CreateItem(0) Mail = outl.CreateItem(0)
Mail.Subject = txtSubject.Text 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 Try
Dim oAccount As Outlook.Account Dim oAccount As Outlook.Account
Dim accountToSent = "" Dim accountToSent = ""
@@ -554,109 +554,113 @@ Public Class frmFaktEmail
Select Case Firma_ID Select Case Firma_ID
Case 24 Case 24
accountToSent = SDL.cFakturierung.getDefaultMail("AMBAR",, True) accountToSent = SDL.cFakturierung.getDefaultMail("AMBAR",, True)
Case Else Case 19
accountToSent = "mmdabrechnung@verag.ag" 'bewusst falsch geschrieben!!!! accountToSent = "mmdabrechnung@verag.ag" 'bewusst falsch geschrieben!!!!
Case 7
accountToSent = "rechnung@atilla-spedition.com"
Case Else
accountToSent = "rechnungsversand@verag.ag"
End Select End Select
If accountToSent <> "" Then If accountToSent <> "" Then
If outl.Session.Accounts.Count > 0 Then If outl.Session.Accounts.Count > 0 Then
For Each oAccount In outl.Session.Accounts For Each oAccount In outl.Session.Accounts
If oAccount.SmtpAddress.ToLower = accountToSent.ToLower Then If oAccount.SmtpAddress.ToLower = accountToSent.ToLower Then
Mail.SendUsingAccount = oAccount Mail.SendUsingAccount = oAccount
Exit For Exit For
End If
Next
End If 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 End If
Catch ex As Exception 'Mail-Adressen eintragen
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Fehler beim Ermitteln des Mail-Accounts." & ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) '-----------------------------------------------------------------
End Try For Each r In dgvEmail.Rows
If r.cells(0).value <> "" Then Mail.To &= r.cells(0).value & ";"
End If Next
For Each r In dgvEmailCC.Rows
'Mail-Adressen eintragen If r.cells(0).value <> "" Then Mail.CC &= r.cells(0).value & ";"
'----------------------------------------------------------------- Next
For Each r In dgvEmail.Rows For Each r In dgvEmailBCC.Rows
If r.cells(0).value <> "" Then Mail.To &= r.cells(0).value & ";" If r.cells(0).value <> "" Then Mail.BCC &= r.cells(0).value & ";"
Next 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) RichTextBox.Text = RichTextBox.Text.Replace("%RgNr%", lastAktuelle_RgNr)
txtSubject.Text = txtSubject.Text.Replace("%RgNr%", lastAktuelle_RgNr) txtSubject.Text = txtSubject.Text.Replace("%RgNr%", lastAktuelle_RgNr)
Dim TextHTML = "<div style=""font-family:Calibri, Arial"">" & RichTextBox.Text.Replace(ControlChars.Lf, "<br>") & cFakturierung.getSignature(AD.LandKz, Firma_ID,,,, additionalLine,, IIf(Firma_ID = "24", True, False)) & "</div>" Dim TextHTML = "<div style=""font-family:Calibri, Arial"">" & RichTextBox.Text.Replace(ControlChars.Lf, "<br>") & cFakturierung.getSignature(AD.LandKz, Firma_ID,,,, additionalLine,, IIf(Firma_ID = "24", True, False)) & "</div>"
Mail.HTMLBody = TextHTML Mail.HTMLBody = TextHTML
Mail.Subject = txtSubject.Text Mail.Subject = txtSubject.Text
ATTACHMENTS.Clear() ATTACHMENTS.Clear()
'----------------------------------------------------------------- '-----------------------------------------------------------------
'Rechnungen anfügen 'Rechnungen anfügen
'----------------------------------------------------------------- '-----------------------------------------------------------------
For Each l In listPDFs For Each l In listPDFs
' Mail.Attachments.Add(l, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue) ' Mail.Attachments.Add(l, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
ATTACHMENTS.Add(New cFakt_MailATTach(l, "")) ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
Next Next
For Each l In SonstAnlagen For Each l In SonstAnlagen
' Mail.Attachments.Add(l, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue) ' Mail.Attachments.Add(l, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
ATTACHMENTS.Add(New cFakt_MailATTach(l, "")) ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
Next Next
addAttachments(Mail, lastAktuelle_RgNr, cbxMergeRg.Checked) addAttachments(Mail, lastAktuelle_RgNr, cbxMergeRg.Checked)
'----------------------------------------------------------------- '-----------------------------------------------------------------
'Steuerbescheid/VDB anfügen 'Steuerbescheid/VDB anfügen
'----------------------------------------------------------------- '-----------------------------------------------------------------
getAnhaenge() getAnhaenge()
'For Each l In listPDFs 'For Each l In listPDFs
' ' Mail.Attachments.Add(l, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue) ' ' Mail.Attachments.Add(l, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
' ATTACHMENTS.Add(New cFakt_MailATTach(l, "")) ' ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
'Next 'Next
'Rechnungsanhänge anfügen 'Rechnungsanhänge anfügen
'----------------------------------------------------------------- '-----------------------------------------------------------------
If SR_DT IsNot Nothing AndAlso SR_DT.Rows.Count > 0 Then If SR_DT IsNot Nothing AndAlso SR_DT.Rows.Count > 0 Then
For Each r In SR_DT.Rows For Each r 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
For Each ANH In RG_ANH For Each ANH In RG_ANH
ATTACHMENTS.Add(New cFakt_MailATTach(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(ANH.dsId), ANH.Bezeichnung)) ATTACHMENTS.Add(New cFakt_MailATTach(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(ANH.dsId), ANH.Bezeichnung))
Next
End If
Next Next
End If 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 If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
Try Try
Mail.SentOnBehalfOfName = "buchhaltung@ambarlog.com" Mail.SentOnBehalfOfName = "buchhaltung@ambarlog.com"
Catch ex2 As Exception Catch ex2 As Exception
MsgBox(ex2.Message) MsgBox(ex2.Message)
End Try End Try
End If End If
Mail.Display() Mail.Display()
'------------------------------------------------------------------------------------------ '------------------------------------------------------------------------------------------
' STB /FA SR: ABFRAGE FISKAL-VZ ' STB /FA SR: ABFRAGE FISKAL-VZ
If isFiskal Then If isFiskal Then
send_StbFAMail(AD.AdressenNr, " Rg-Nr.: " & lastAktuelle_RgNr, lastAktuelle_RgNr) send_StbFAMail(AD.AdressenNr, " Rg-Nr.: " & lastAktuelle_RgNr, lastAktuelle_RgNr)
End If End If
'------------------------------------------------------------------------------------------ '------------------------------------------------------------------------------------------
End If End If

View File

@@ -1,5 +1,6 @@
Imports System.Data.SqlClient Imports System.Data.SqlClient
Imports System.Reflection Imports System.Reflection
Imports com.sun.org.apache.xpath.internal.operations
Public Class cTrdInvoice Public Class cTrdInvoice
@@ -549,7 +550,7 @@ Class TrdInvoice_FUNCTIONS
End If End If
End If End If
Next Next
Return True Return True