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

MWST-Liste, Email, mdmfunctions

Browse Source
This commit is contained in:
d.breimaier
2025-05-27 16:21:59 +02:00
parent 20b62840cd
commit 05fed2d357
3 changed files with 105 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
SDL/Fakturierung/frmFaktEmail.vb
View File

@@ -307,7 +307,7 @@ Public Class frmFaktEmail
TextHTML &= "" & vbNewLine & vbNewLine & vbNewLine & "Mit freundlichen Grüßen" & vbNewLine & vbNewLine & ""
Case Else
txtSubject.Text = If(BelegartenNr = 71, "Credit No. ", "Invoice No. ") & txtRgNr
TextHTML = "Dear Sir or Madam," & vbNewLine & vbNewLine & "attached we send you the invoice mentioned above."
TextHTML = "Dear Sir or Madam," & vbNewLine & vbNewLine & "attached we send you the " & If(BelegartenNr = 71, "credit note", "invoice") & " mentioned above."
TextHTML &= TextHTMLADD
TextHTML &= "" & vbNewLine & vbNewLine & vbNewLine & "Best regards" & vbNewLine & vbNewLine & ""
End Select
@@ -546,7 +546,7 @@ Public Class frmFaktEmail
Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
Mail = outl.CreateItem(0)
If Firma_ID = 24 Then
If Firma_ID = 24 OrElse Firma_ID = 19 Then
Try
Dim oAccount As Outlook.Account
Dim accountToSent = SDL.cFakturierung.getDefaultMail("AMBAR",, True)
@@ -603,7 +603,7 @@ Public Class frmFaktEmail
RichTextBox.Text = RichTextBox.Text.Replace("%RgNr%", RechnungsNr)
txtSubject.Text = txtSubject.Text.Replace("%RgNr%", RechnungsNr) & abfNr
txtSubject.Text = txtSubject.Text.Replace("%RgNr%", RechnungsNr) & IIf(RECHNUNG.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>"