From fd5916794f9352873bfc716489abacbba943606e Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 9 Aug 2024 09:51:54 +0200 Subject: [PATCH] Textkonserve, Mahnlauf und Mailvorlage. --- SDL/buchhaltung/frmBU_Mahnlauf.vb | 4 +- SDL/frmdynMailvorlage.Designer.vb | 109 +++++++++++------- SDL/frmdynMailvorlage.vb | 5 +- VERAG_PROG_ALLGEMEIN/Classes/cTextkonserve.vb | 3 +- 4 files changed, 73 insertions(+), 48 deletions(-) diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb index d48ef696..60897c5a 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb @@ -512,8 +512,8 @@ Public Class frmBU_Mahnlauf End Select Mail_HTMLBody = "
" & Mail_HTMLBody & "
" Mail_To = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(AD.AdressenNr, "Mahnung an") - Mail_cc = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(AD.AdressenNr, "Mahnung an") - Mail_bcc = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(AD.AdressenNr, "Mahnung an") + Mail_CC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(AD.AdressenNr, "Mahnung an") + Mail_BCC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(AD.AdressenNr, "Mahnung an") ' isnull(( SELECT TOP 1 [kkd_Email] FROM [FMZOLL\SQLFMZOLL].[VERAG].[dbo].[tblKundenKontakt] where kkd_kkaId=10 and kkd_KundenNr=i_personenkonto ) ,'') Email, 'isnull(( SELECT TOP 1 [kkd_Email] FROM [FMZOLL\SQLFMZOLL].[VERAG].[dbo].[tblKundenKontakt] where kkd_kkaId=10 and kkd_KundenNr=i_personenkonto ) ,'') Email, diff --git a/SDL/frmdynMailvorlage.Designer.vb b/SDL/frmdynMailvorlage.Designer.vb index 597f05cc..911867a5 100644 --- a/SDL/frmdynMailvorlage.Designer.vb +++ b/SDL/frmdynMailvorlage.Designer.vb @@ -24,6 +24,8 @@ Partial Class frmdynMailvorlagen Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Me.mainPanel = New System.Windows.Forms.Panel() + Me.Label11 = New System.Windows.Forms.Label() + Me.rtb_txthtml = New System.Windows.Forms.RichTextBox() Me.cbxSendungsvermerk = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label10 = New System.Windows.Forms.Label() Me.txtSendungsvermerk = New System.Windows.Forms.TextBox() @@ -36,7 +38,6 @@ Partial Class frmdynMailvorlagen Me.Label7 = New System.Windows.Forms.Label() Me.txtBezeichnung = New System.Windows.Forms.TextBox() Me.Label6 = New System.Windows.Forms.Label() - Me.TextBox1 = New System.Windows.Forms.TextBox() Me.txtBetreff = New System.Windows.Forms.TextBox() Me.Label5 = New System.Windows.Forms.Label() Me.cboSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox() @@ -59,8 +60,9 @@ Partial Class frmdynMailvorlagen Me.Label3 = New System.Windows.Forms.Label() Me.cbxFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.dgvMailvorlagen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.Label11 = New System.Windows.Forms.Label() - Me.rtb_txthtml = New System.Windows.Forms.RichTextBox() + Me.txtfixeEmail = New System.Windows.Forms.TextBox() + Me.Label12 = New System.Windows.Forms.Label() + Me.TextBox1 = New System.Windows.Forms.TextBox() Me.mainPanel.SuspendLayout() Me.pnlTop.SuspendLayout() CType(Me.dgvMailvorlagen, System.ComponentModel.ISupportInitialize).BeginInit() @@ -71,6 +73,9 @@ Partial Class frmdynMailvorlagen Me.mainPanel.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.mainPanel.Controls.Add(Me.TextBox1) + Me.mainPanel.Controls.Add(Me.txtfixeEmail) + Me.mainPanel.Controls.Add(Me.Label12) Me.mainPanel.Controls.Add(Me.Label11) Me.mainPanel.Controls.Add(Me.rtb_txthtml) Me.mainPanel.Controls.Add(Me.cbxSendungsvermerk) @@ -85,7 +90,6 @@ Partial Class frmdynMailvorlagen Me.mainPanel.Controls.Add(Me.Label7) Me.mainPanel.Controls.Add(Me.txtBezeichnung) Me.mainPanel.Controls.Add(Me.Label6) - Me.mainPanel.Controls.Add(Me.TextBox1) Me.mainPanel.Controls.Add(Me.txtBetreff) Me.mainPanel.Controls.Add(Me.Label5) Me.mainPanel.Controls.Add(Me.cboSprache) @@ -101,6 +105,26 @@ Partial Class frmdynMailvorlagen Me.mainPanel.Size = New System.Drawing.Size(1283, 457) Me.mainPanel.TabIndex = 101 ' + 'Label11 + ' + Me.Label11.AutoSize = True + Me.Label11.Location = New System.Drawing.Point(638, 71) + Me.Label11.Name = "Label11" + Me.Label11.Size = New System.Drawing.Size(89, 13) + Me.Label11.TabIndex = 41 + Me.Label11.Text = "Email-Text-HTML" + ' + 'rtb_txthtml + ' + Me.rtb_txthtml.AcceptsTab = True + Me.rtb_txthtml.BackColor = System.Drawing.SystemColors.Window + Me.rtb_txthtml.Location = New System.Drawing.Point(641, 87) + Me.rtb_txthtml.Name = "rtb_txthtml" + Me.rtb_txthtml.ReadOnly = True + Me.rtb_txthtml.Size = New System.Drawing.Size(625, 307) + Me.rtb_txthtml.TabIndex = 40 + Me.rtb_txthtml.Text = "" + ' 'cbxSendungsvermerk ' Me.cbxSendungsvermerk._allowedValuesFreiText = Nothing @@ -156,12 +180,13 @@ Partial Class frmdynMailvorlagen ' Me.TextBox2.BackColor = System.Drawing.SystemColors.Control Me.TextBox2.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.TextBox2.Location = New System.Drawing.Point(22, 400) + Me.TextBox2.Location = New System.Drawing.Point(10, 414) Me.TextBox2.Multiline = True Me.TextBox2.Name = "TextBox2" - Me.TextBox2.Size = New System.Drawing.Size(256, 45) + Me.TextBox2.Size = New System.Drawing.Size(576, 31) Me.TextBox2.TabIndex = 34 - Me.TextBox2.Text = "* Email-Text-Variablen: " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "%VAR-GRENZE%" + Me.TextBox2.Text = "%VAR-GRENZE%, %LKW%, %LKWKennzeichen%, %Empfaenger%, %voraus-Eintreffen%, %Filial" & + "enNr%, %AbfertigungsNr%, %Absender%, %Gewicht%, %ImEx%, %Zollstelle%" ' 'btn ' @@ -222,28 +247,17 @@ Partial Class frmdynMailvorlagen Me.Label6.TabIndex = 28 Me.Label6.Text = "Bezeichnung" ' - 'TextBox1 - ' - Me.TextBox1.BackColor = System.Drawing.SystemColors.Control - Me.TextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.TextBox1.Location = New System.Drawing.Point(823, 3) - Me.TextBox1.Multiline = True - Me.TextBox1.Name = "TextBox1" - Me.TextBox1.Size = New System.Drawing.Size(110, 61) - Me.TextBox1.TabIndex = 27 - Me.TextBox1.Text = "* Betreff-Variablen: " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "%LKW%" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "%LKWKennzeichen%" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "%Empfaenger%" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) - ' 'txtBetreff ' - Me.txtBetreff.Location = New System.Drawing.Point(465, 20) + Me.txtBetreff.Location = New System.Drawing.Point(421, 21) Me.txtBetreff.Name = "txtBetreff" - Me.txtBetreff.Size = New System.Drawing.Size(290, 20) + Me.txtBetreff.Size = New System.Drawing.Size(460, 20) Me.txtBetreff.TabIndex = 26 ' 'Label5 ' Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(462, 3) + Me.Label5.Location = New System.Drawing.Point(418, 4) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(42, 13) Me.Label5.TabIndex = 25 @@ -274,9 +288,9 @@ Partial Class frmdynMailvorlagen ' Me.rtb_Emailtext.AcceptsTab = True Me.rtb_Emailtext.BackColor = System.Drawing.SystemColors.Window - Me.rtb_Emailtext.Location = New System.Drawing.Point(10, 72) + Me.rtb_Emailtext.Location = New System.Drawing.Point(10, 87) Me.rtb_Emailtext.Name = "rtb_Emailtext" - Me.rtb_Emailtext.Size = New System.Drawing.Size(625, 322) + Me.rtb_Emailtext.Size = New System.Drawing.Size(625, 307) Me.rtb_Emailtext.TabIndex = 22 Me.rtb_Emailtext.Text = "" ' @@ -323,7 +337,7 @@ Partial Class frmdynMailvorlagen 'Label1 ' Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(19, 56) + Me.Label1.Location = New System.Drawing.Point(19, 71) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(60, 13) Me.Label1.TabIndex = 1 @@ -483,27 +497,34 @@ Partial Class frmdynMailvorlagen Me.dgvMailvorlagen.Size = New System.Drawing.Size(1283, 365) Me.dgvMailvorlagen.TabIndex = 104 ' - 'Label11 + 'txtfixeEmail ' - Me.Label11.AutoSize = True - Me.Label11.Location = New System.Drawing.Point(647, 56) - Me.Label11.Name = "Label11" - Me.Label11.Size = New System.Drawing.Size(89, 13) - Me.Label11.TabIndex = 41 - Me.Label11.Text = "Email-Text-HTML" + Me.txtfixeEmail.Location = New System.Drawing.Point(136, 61) + Me.txtfixeEmail.Name = "txtfixeEmail" + Me.txtfixeEmail.Size = New System.Drawing.Size(324, 20) + Me.txtfixeEmail.TabIndex = 43 ' - 'rtb_txthtml + 'Label12 ' - Me.rtb_txthtml.AcceptsTab = True - Me.rtb_txthtml.BackColor = System.Drawing.SystemColors.Window - Me.rtb_txthtml.Location = New System.Drawing.Point(641, 72) - Me.rtb_txthtml.Name = "rtb_txthtml" - Me.rtb_txthtml.ReadOnly = True - Me.rtb_txthtml.Size = New System.Drawing.Size(625, 322) - Me.rtb_txthtml.TabIndex = 40 - Me.rtb_txthtml.Text = "" + Me.Label12.AutoSize = True + Me.Label12.Location = New System.Drawing.Point(133, 45) + Me.Label12.Name = "Label12" + Me.Label12.Size = New System.Drawing.Size(194, 13) + Me.Label12.TabIndex = 42 + Me.Label12.Text = "fixer Empfänger (mehrere mit ; getrennt):" ' - 'frmdynMailvorlage + 'TextBox1 + ' + Me.TextBox1.BackColor = System.Drawing.SystemColors.Control + Me.TextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.TextBox1.Location = New System.Drawing.Point(10, 395) + Me.TextBox1.Multiline = True + Me.TextBox1.Name = "TextBox1" + Me.TextBox1.Size = New System.Drawing.Size(109, 18) + Me.TextBox1.TabIndex = 44 + Me.TextBox1.Text = "* Text-Variablen:" + ' + 'frmdynMailvorlagen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font @@ -513,7 +534,7 @@ Partial Class frmdynMailvorlagen Me.Controls.Add(Me.btnDelete) Me.Controls.Add(Me.pnlTop) Me.Controls.Add(Me.dgvMailvorlagen) - Me.Name = "frmdynMailvorlage" + Me.Name = "frmdynMailvorlagen" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "frmdynMailvorlage" Me.mainPanel.ResumeLayout(False) @@ -542,7 +563,6 @@ Partial Class frmdynMailvorlagen Friend WithEvents Label2 As Label Friend WithEvents rtb_Emailtext As RichTextBox Friend WithEvents Label5 As Label - Friend WithEvents TextBox1 As TextBox Friend WithEvents txtBetreff As TextBox Friend WithEvents txtBezeichnung As TextBox Friend WithEvents Label6 As Label @@ -562,4 +582,7 @@ Partial Class frmdynMailvorlagen Friend WithEvents cbSendungsvermerk As CheckBox Friend WithEvents Label11 As Label Friend WithEvents rtb_txthtml As RichTextBox + Friend WithEvents txtfixeEmail As TextBox + Friend WithEvents Label12 As Label + Friend WithEvents TextBox1 As TextBox End Class diff --git a/SDL/frmdynMailvorlage.vb b/SDL/frmdynMailvorlage.vb index 15e80ae7..38f6cb1e 100644 --- a/SDL/frmdynMailvorlage.vb +++ b/SDL/frmdynMailvorlage.vb @@ -210,10 +210,10 @@ Public Class frmdynMailvorlagen rtb_txthtml.Text = txtkonserve.txt_text cboFirmensignatur.changeItem(txtkonserve.txt_firmaSig) cbxFirmaChange.changeItem(txtkonserve.txt_FIRMA) - cbSendungsvermerk.Checked = txtkonserve.txt_sendungsvermerk cbxSendungsvermerk.changeItem(txtkonserve.txt_sendungsvermerkId) txtSendungsvermerk.Text = txtkonserve.txt_sendungsvermerkText + txtfixeEmail.Text = txtkonserve.txt_fixerEmpfaengerEmail Catch ex As Exception @@ -240,7 +240,7 @@ Public Class frmdynMailvorlagen txtKS.txt_firmaSig = cboFirmensignatur._value txtKS.txt_letzteAenderung = DateTime.Now txtKS.txt_letzteAenderungUser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME - + txtKS.txt_fixerEmpfaengerEmail = txtfixeEmail.Text txtKS.txt_sendungsvermerk = cbSendungsvermerk.Checked If cbSendungsvermerk.Checked AndAlso cbxSendungsvermerk._value = "" Then MsgBox("SendungsvermerksID hinterlegen!") : Exit Sub @@ -346,6 +346,7 @@ Public Class frmdynMailvorlagen Dim Mail As Microsoft.Office.Interop.Outlook.MailItem Mail = outl.CreateItem(0) + If txtfixeEmail.Text <> "" Then Mail.To = txtfixeEmail.Text If rtb_Emailtext.Text <> "" AndAlso cboSprache._value <> "" Then diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cTextkonserve.vb b/VERAG_PROG_ALLGEMEIN/Classes/cTextkonserve.vb index a761c7d2..ad4d1168 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cTextkonserve.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cTextkonserve.vb @@ -70,10 +70,10 @@ Public Class cTextkonserve Property txt_dynMailvorlage As Boolean Property txt_letzteAenderungUser As String Property txt_letzteAenderung As DateTime - Property txt_sendungsvermerk As Boolean Property txt_sendungsvermerkId As Integer Property txt_sendungsvermerkText As String + Property txt_fixerEmpfaengerEmail As String @@ -118,6 +118,7 @@ Public Class cTextkonserve list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("txt_sendungsvermerk", txt_sendungsvermerk)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("txt_sendungsvermerkId", txt_sendungsvermerkId)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("txt_sendungsvermerkText", txt_sendungsvermerkText)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("txt_fixerEmpfaengerEmail", txt_fixerEmpfaengerEmail)) Return list End Function