From 6509023d7f1c514dbfa58e110183687e7a365a97 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 30 Jul 2025 16:42:57 +0200 Subject: [PATCH] =?UTF-8?q?Mailtextvariable=20f=C3=BCr=20RMC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SDL/Fakturierung/frmFaktEmail.vb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/SDL/Fakturierung/frmFaktEmail.vb b/SDL/Fakturierung/frmFaktEmail.vb index 321d19a3..14a01089 100644 --- a/SDL/Fakturierung/frmFaktEmail.vb +++ b/SDL/Fakturierung/frmFaktEmail.vb @@ -384,6 +384,15 @@ Public Class frmFaktEmail If Not SR Then + If RECHNUNG.VermittlerKundenNr = 150000 Then + replaceKZ("nichtRMC", TextHTML) + TextHTML = TextHTML.ToString.Replace("%RMC:", "") : TextHTML = TextHTML.ToString.Replace("RMC%", "") + Else + replaceKZ("RMC", TextHTML) + TextHTML = TextHTML.ToString.Replace("%nichtRMC:", "") : TextHTML = TextHTML.ToString.Replace("nichtRMC%", "") + End If + + If RECHNUNG.FilialenNr = 4817 And Firma_ID = 19 AndAlso RECHNUNG.ErfassungsNr IsNot Nothing Then Dim SPEDBUCH = New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch(RECHNUNG.FilialenNr, RECHNUNG.AbfertigungsNr, RECHNUNG.UnterNr) If SPEDBUCH.hasEntry AndAlso (SPEDBUCH.Abfertigungsart = 114 Or SPEDBUCH.Abfertigungsart = 115 Or SPEDBUCH.Abfertigungsart = 10) Then @@ -406,6 +415,10 @@ Public Class frmFaktEmail TextHTML = TextHTML.ToString.Replace("%", "") End If + + + + If mailText <> "" Then TextHTML &= mailText & vbNewLine 'TextHTML &= "


" & cFakturierung.getSignature(RechnungsLandKz, Firma_ID) @@ -1315,6 +1328,7 @@ Public Class frmFaktEmail If TextHTML = "" Then Exit Sub Dim index_start As Integer = TextHTML.ToString.IndexOf("%" & KZ & ":") + If index_start < 0 Then Exit Sub Dim txtKZ = TextHTML.ToString.Substring(index_start) Dim index_end As Integer = txtKZ.ToString.IndexOf("%", 1)