div. Änderungen

SDL/frmdynMailvorlage.vb

@@ -1,4 +1,5 @@
 Imports System.Windows.Controls
+Imports GrapeCity.ActiveReports.SectionReportModel
 Imports Microsoft.Office.Interop
 Imports VERAG_PROG_ALLGEMEIN
 
@@ -206,6 +207,7 @@ Public Class frmdynMailvorlage
             cbxAktiv.Checked = txtkonserve.txt_dynMailvorlage
             cboSprache._value = txtkonserve.txt_sprache
             rtb_Emailtext.Text = h2t.ToText(txtkonserve.txt_text)
+            rtb_txthtml.Text = txtkonserve.txt_text
             cboFirmensignatur.changeItem(txtkonserve.txt_firmaSig)
             cbxFirmaChange.changeItem(txtkonserve.txt_FIRMA)
 
@@ -297,23 +299,20 @@ Public Class frmdynMailvorlage
         ElseIf cbxSpracheSelected._value = "" Then
             If ((dgvMailvorlagen.SelectedRows(0).Cells("txt_sprache").Value Is DBNull.Value Or dgvMailvorlagen.SelectedRows(0).Cells("txt_sprache").Value Is Nothing Or dgvMailvorlagen.SelectedRows(0).Cells("txt_sprache").Value = "") Or initialSave = True) Then 'And initialSave = False ???
 
-                    If setWarning Then
-                        lblWarning.Text = "Bitte Sprache auswählen!"
-                    Else
-                        lblWarning.Text = ""
-                    End If
-
-                    Return False
+                If setWarning Then
+                    lblWarning.Text = "Bitte Sprache auswählen!"
+                Else
+                    lblWarning.Text = ""
                 End If
-
-                lblWarning.Text = ""
-                Return True
-
-
+                Return False
             End If
+            lblWarning.Text = ""
+            Return True
+
+
+        End If
 
         Return True
-
     End Function
 
     Private Function checkFields() As Boolean
@@ -351,7 +350,7 @@ Public Class frmdynMailvorlage
             If rtb_Emailtext.Text <> "" AndAlso cboSprache._value <> "" Then
 
                 Dim TextHTML = ""
-                TextHTML &= insertlinebreaks(rtb_Emailtext.Text)
+                TextHTML &= rtb_txthtml.Text
                 TextHTML &= "<br>"
                 TextHTML &= "<br>"
                 TextHTML &= "Mit freundlichen Grüßen<br>"
@@ -359,7 +358,6 @@ Public Class frmdynMailvorlage
                 TextHTML &= "<br>"
                 TextHTML &= cFakturierung.getSignature(cboSprache._value, cboFirmensignatur._value, True, True)
 
-
                 Mail.HTMLBody = "<div style=""font-family:Calibri, Arial"">" & TextHTML & "</div>"
 
                 Mail.Subject = txtBetreff.Text
@@ -377,7 +375,7 @@ Public Class frmdynMailvorlage
 
     Private Function insertlinebreaks(text As String) As String
 
-        Return text.ToString.Replace(vbLf, vbLf & "<br>")
+        Return text.ToString.Replace(vbLf, "<br>" & vbLf)
 
     End Function