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

fix

Browse Source
This commit is contained in:
d.breimaier
2025-06-20 10:08:22 +02:00
parent ec1e5b9c7b
commit c4af248cb6
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
SDL/Fakturierung/frmFaktEmail.vb
View File

@@ -517,12 +517,12 @@ Public Class frmFaktEmail
Mail = outl.CreateItem(0) Mail = outl.CreateItem(0)
Mail.Subject = txtSubject.Text Mail.Subject = txtSubject.Text
If RECHNUNG.Firma_ID = 24 OrElse RECHNUNG.Firma_ID = 19 Then If Firma_ID = 24 OrElse Firma_ID = 19 Then
Try Try
Dim oAccount As Outlook.Account Dim oAccount As Outlook.Account
Dim accountToSent = "" Dim accountToSent = ""
Select Case RECHNUNG.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 Else
@@ -653,12 +653,12 @@ Public Class frmFaktEmail
Dim Mail As Microsoft.Office.Interop.Outlook.MailItem Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
Mail = outl.CreateItem(0) Mail = outl.CreateItem(0)
If RECHNUNG.Firma_ID = 24 OrElse RECHNUNG.Firma_ID = 19 Then If Firma_ID = 24 OrElse Firma_ID = 19 Then
Try Try
Dim oAccount As Outlook.Account Dim oAccount As Outlook.Account
Dim accountToSent = "" Dim accountToSent = ""
Select Case RECHNUNG.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 Else
@@ -718,10 +718,10 @@ Public Class frmFaktEmail
RichTextBox.Text = RichTextBox.Text.Replace("%RgNr%", RechnungsNr) RichTextBox.Text = RichTextBox.Text.Replace("%RgNr%", RechnungsNr)
txtSubject.Text = txtSubject.Text.Replace("%RgNr%", RechnungsNr) & IIf(RECHNUNG.Firma_ID <> 19, abfNr, "") txtSubject.Text = txtSubject.Text.Replace("%RgNr%", RechnungsNr) & IIf(Firma_ID <> 19, abfNr, "")
Dim TextHTML = "<div style=""font-family:Calibri, Arial"">" & RichTextBox.Text.Replace(ControlChars.Lf, "<br>") & cFakturierung.getSignature(RECHNUNG.RechnungsLandKz, RECHNUNG.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(RECHNUNG.RechnungsLandKz, Firma_ID,,,, additionalLine,, IIf(Firma_ID = "24", True, False)) & "</div>"
Mail.HTMLBody = TextHTML Mail.HTMLBody = TextHTML
Mail.Subject = txtSubject.Text Mail.Subject = txtSubject.Text
@@ -761,7 +761,7 @@ Public Class frmFaktEmail
Mail.Display() Mail.Display()
If RECHNUNG.FilialenNr = 4817 And RECHNUNG.Firma_ID = 19 And RECHNUNG.DruckDatumZeit IsNot Nothing Then If Firma_ID = 19 AndAlso RECHNUNG IsNot Nothing AndAlso RECHNUNG.FilialenNr = 4817 AndAlso RECHNUNG.DruckDatumZeit IsNot Nothing Then
Dim SPEDBUCH = New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch(RECHNUNG.FilialenNr, RECHNUNG.AbfertigungsNr, RECHNUNG.UnterNr) Dim SPEDBUCH = New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch(RECHNUNG.FilialenNr, RECHNUNG.AbfertigungsNr, RECHNUNG.UnterNr)