diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj
index 27d8c757..44b26424 100644
--- a/SDL/SDL.vbproj
+++ b/SDL/SDL.vbproj
@@ -634,18 +634,18 @@
UserControl
-
- usrCntlImportverzollung.vb
-
-
- UserControl
-
usrCntlZollbeschau.vb
UserControl
+
+ frmdynMailvorlage.vb
+
+
+ Form
+
frmEssensbestellungen.vb
@@ -3143,12 +3143,12 @@
usrcntlVollmacht_GB_IE.vb
-
- usrCntlImportverzollung.vb
-
usrCntlZollbeschau.vb
+
+ frmdynMailvorlage.vb
+
frmEssensbestellungen.vb
diff --git a/SDL/frmdynMailvorlage.Designer.vb b/SDL/frmdynMailvorlage.Designer.vb
new file mode 100644
index 00000000..3196366a
--- /dev/null
+++ b/SDL/frmdynMailvorlage.Designer.vb
@@ -0,0 +1,470 @@
+ _
+Partial Class frmdynMailvorlage
+ Inherits System.Windows.Forms.Form
+
+ 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+ _
+ Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+ Try
+ If disposing AndAlso components IsNot Nothing Then
+ components.Dispose()
+ End If
+ Finally
+ MyBase.Dispose(disposing)
+ End Try
+ End Sub
+
+ 'Wird vom Windows Form-Designer benötigt.
+ Private components As System.ComponentModel.IContainer
+
+ 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+ 'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
+ 'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+ _
+ Private Sub InitializeComponent()
+ Me.mainPanel = New System.Windows.Forms.Panel()
+ Me.btn = New System.Windows.Forms.Button()
+ Me.lblWordcount = New System.Windows.Forms.Label()
+ Me.cboFirmensignatur = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+ 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()
+ Me.Label2 = New System.Windows.Forms.Label()
+ Me.rtb_Emailtext = New System.Windows.Forms.RichTextBox()
+ Me.cbxFirmaChange = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+ Me.Label = New System.Windows.Forms.Label()
+ Me.btnSave = New System.Windows.Forms.Button()
+ Me.cbxAktiv = New System.Windows.Forms.CheckBox()
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.btnAdd = New System.Windows.Forms.Button()
+ Me.btnDelete = New System.Windows.Forms.Button()
+ Me.pnlTop = New System.Windows.Forms.Panel()
+ Me.cbxSpracheSelected = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+ Me.Label8 = New System.Windows.Forms.Label()
+ Me.txtSuche = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+ Me.Label18 = New System.Windows.Forms.Label()
+ Me.lblWarning = New System.Windows.Forms.Label()
+ Me.Label4 = New System.Windows.Forms.Label()
+ Me.Label3 = New System.Windows.Forms.Label()
+ Me.cbxFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+ Me.dgvMailvorlagen = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
+ Me.TextBox2 = New System.Windows.Forms.TextBox()
+ Me.mainPanel.SuspendLayout()
+ Me.pnlTop.SuspendLayout()
+ CType(Me.dgvMailvorlagen, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.SuspendLayout()
+ '
+ 'mainPanel
+ '
+ 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.TextBox2)
+ Me.mainPanel.Controls.Add(Me.btn)
+ Me.mainPanel.Controls.Add(Me.lblWordcount)
+ Me.mainPanel.Controls.Add(Me.cboFirmensignatur)
+ 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)
+ Me.mainPanel.Controls.Add(Me.Label2)
+ Me.mainPanel.Controls.Add(Me.rtb_Emailtext)
+ Me.mainPanel.Controls.Add(Me.cbxFirmaChange)
+ Me.mainPanel.Controls.Add(Me.Label)
+ Me.mainPanel.Controls.Add(Me.btnSave)
+ Me.mainPanel.Controls.Add(Me.cbxAktiv)
+ Me.mainPanel.Controls.Add(Me.Label1)
+ Me.mainPanel.Location = New System.Drawing.Point(0, 425)
+ Me.mainPanel.Name = "mainPanel"
+ Me.mainPanel.Size = New System.Drawing.Size(1283, 449)
+ Me.mainPanel.TabIndex = 101
+ '
+ 'btn
+ '
+ Me.btn.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.btn.BackgroundImage = Global.SDL.My.Resources.Resources.email_big
+ Me.btn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+ Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btn.Location = New System.Drawing.Point(1100, 405)
+ Me.btn.Margin = New System.Windows.Forms.Padding(5)
+ Me.btn.Name = "btn"
+ Me.btn.Padding = New System.Windows.Forms.Padding(5)
+ Me.btn.Size = New System.Drawing.Size(50, 40)
+ Me.btn.TabIndex = 33
+ Me.btn.UseVisualStyleBackColor = True
+ '
+ 'lblWordcount
+ '
+ Me.lblWordcount.AutoSize = True
+ Me.lblWordcount.Location = New System.Drawing.Point(1199, 398)
+ Me.lblWordcount.Name = "lblWordcount"
+ Me.lblWordcount.Size = New System.Drawing.Size(0, 13)
+ Me.lblWordcount.TabIndex = 32
+ '
+ 'cboFirmensignatur
+ '
+ Me.cboFirmensignatur._allowedValuesFreiText = Nothing
+ Me.cboFirmensignatur._allowFreiText = False
+ Me.cboFirmensignatur._value = ""
+ Me.cboFirmensignatur.DropDownWidth = 120
+ Me.cboFirmensignatur.FormattingEnabled = True
+ Me.cboFirmensignatur.Location = New System.Drawing.Point(985, 21)
+ Me.cboFirmensignatur.Name = "cboFirmensignatur"
+ Me.cboFirmensignatur.Size = New System.Drawing.Size(100, 21)
+ Me.cboFirmensignatur.TabIndex = 31
+ '
+ 'Label7
+ '
+ Me.Label7.AutoSize = True
+ Me.Label7.Location = New System.Drawing.Point(982, 5)
+ Me.Label7.Name = "Label7"
+ Me.Label7.Size = New System.Drawing.Size(103, 13)
+ Me.Label7.TabIndex = 30
+ Me.Label7.Text = "Email-Firmensignatur"
+ '
+ 'txtBezeichnung
+ '
+ Me.txtBezeichnung.Location = New System.Drawing.Point(139, 20)
+ Me.txtBezeichnung.Name = "txtBezeichnung"
+ Me.txtBezeichnung.Size = New System.Drawing.Size(250, 20)
+ Me.txtBezeichnung.TabIndex = 29
+ '
+ 'Label6
+ '
+ Me.Label6.AutoSize = True
+ Me.Label6.Location = New System.Drawing.Point(133, 3)
+ Me.Label6.Name = "Label6"
+ Me.Label6.Size = New System.Drawing.Size(69, 13)
+ 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.Name = "txtBetreff"
+ Me.txtBetreff.Size = New System.Drawing.Size(290, 20)
+ Me.txtBetreff.TabIndex = 26
+ '
+ 'Label5
+ '
+ Me.Label5.AutoSize = True
+ Me.Label5.Location = New System.Drawing.Point(462, 3)
+ Me.Label5.Name = "Label5"
+ Me.Label5.Size = New System.Drawing.Size(42, 13)
+ Me.Label5.TabIndex = 25
+ Me.Label5.Text = "Betreff*"
+ '
+ 'cboSprache
+ '
+ Me.cboSprache._allowedValuesFreiText = Nothing
+ Me.cboSprache._allowFreiText = False
+ Me.cboSprache._value = ""
+ Me.cboSprache.DropDownWidth = 120
+ Me.cboSprache.FormattingEnabled = True
+ Me.cboSprache.Location = New System.Drawing.Point(22, 21)
+ Me.cboSprache.Name = "cboSprache"
+ Me.cboSprache.Size = New System.Drawing.Size(64, 21)
+ Me.cboSprache.TabIndex = 24
+ '
+ 'Label2
+ '
+ Me.Label2.AutoSize = True
+ Me.Label2.Location = New System.Drawing.Point(19, 5)
+ Me.Label2.Name = "Label2"
+ Me.Label2.Size = New System.Drawing.Size(47, 13)
+ Me.Label2.TabIndex = 23
+ Me.Label2.Text = "Sprache"
+ '
+ 'rtb_Emailtext
+ '
+ Me.rtb_Emailtext.Location = New System.Drawing.Point(15, 72)
+ Me.rtb_Emailtext.Name = "rtb_Emailtext"
+ Me.rtb_Emailtext.Size = New System.Drawing.Size(1245, 322)
+ Me.rtb_Emailtext.TabIndex = 22
+ Me.rtb_Emailtext.Text = ""
+ '
+ 'cbxFirmaChange
+ '
+ Me.cbxFirmaChange._allowedValuesFreiText = Nothing
+ Me.cbxFirmaChange._allowFreiText = False
+ Me.cbxFirmaChange._value = ""
+ Me.cbxFirmaChange.DropDownWidth = 120
+ Me.cbxFirmaChange.FormattingEnabled = True
+ Me.cbxFirmaChange.Location = New System.Drawing.Point(1155, 19)
+ Me.cbxFirmaChange.Name = "cbxFirmaChange"
+ Me.cbxFirmaChange.Size = New System.Drawing.Size(100, 21)
+ Me.cbxFirmaChange.TabIndex = 21
+ '
+ 'Label
+ '
+ Me.Label.AutoSize = True
+ Me.Label.Location = New System.Drawing.Point(1152, 3)
+ Me.Label.Name = "Label"
+ Me.Label.Size = New System.Drawing.Size(78, 13)
+ Me.Label.TabIndex = 20
+ Me.Label.Text = "gültig für Firma:"
+ '
+ 'btnSave
+ '
+ Me.btnSave.Location = New System.Drawing.Point(1185, 414)
+ Me.btnSave.Name = "btnSave"
+ Me.btnSave.Size = New System.Drawing.Size(75, 23)
+ Me.btnSave.TabIndex = 10
+ Me.btnSave.Text = "Speichern"
+ Me.btnSave.UseVisualStyleBackColor = True
+ '
+ 'cbxAktiv
+ '
+ Me.cbxAktiv.AutoSize = True
+ Me.cbxAktiv.Location = New System.Drawing.Point(1083, 52)
+ Me.cbxAktiv.Name = "cbxAktiv"
+ Me.cbxAktiv.Size = New System.Drawing.Size(172, 17)
+ Me.cbxAktiv.TabIndex = 3
+ Me.cbxAktiv.Text = "als dyn Mailvorlage verwenden"
+ Me.cbxAktiv.UseVisualStyleBackColor = True
+ '
+ 'Label1
+ '
+ Me.Label1.AutoSize = True
+ Me.Label1.Location = New System.Drawing.Point(19, 56)
+ Me.Label1.Name = "Label1"
+ Me.Label1.Size = New System.Drawing.Size(115, 13)
+ Me.Label1.TabIndex = 1
+ Me.Label1.Text = "Email-Text (als HTML)*"
+ '
+ 'btnAdd
+ '
+ Me.btnAdd.BackgroundImage = Global.SDL.My.Resources.Resources.plus
+ Me.btnAdd.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+ Me.btnAdd.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btnAdd.Location = New System.Drawing.Point(1236, 399)
+ Me.btnAdd.Name = "btnAdd"
+ Me.btnAdd.Size = New System.Drawing.Size(24, 20)
+ Me.btnAdd.TabIndex = 103
+ Me.btnAdd.UseVisualStyleBackColor = True
+ '
+ 'btnDelete
+ '
+ Me.btnDelete.BackgroundImage = Global.SDL.My.Resources.Resources.del
+ Me.btnDelete.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+ Me.btnDelete.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btnDelete.Location = New System.Drawing.Point(1259, 399)
+ Me.btnDelete.Name = "btnDelete"
+ Me.btnDelete.Size = New System.Drawing.Size(24, 20)
+ Me.btnDelete.TabIndex = 102
+ Me.btnDelete.UseVisualStyleBackColor = True
+ '
+ 'pnlTop
+ '
+ Me.pnlTop.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+ Me.pnlTop.Controls.Add(Me.cbxSpracheSelected)
+ Me.pnlTop.Controls.Add(Me.Label8)
+ Me.pnlTop.Controls.Add(Me.txtSuche)
+ Me.pnlTop.Controls.Add(Me.Label18)
+ Me.pnlTop.Controls.Add(Me.lblWarning)
+ Me.pnlTop.Controls.Add(Me.Label4)
+ Me.pnlTop.Controls.Add(Me.Label3)
+ Me.pnlTop.Controls.Add(Me.cbxFirma)
+ Me.pnlTop.Dock = System.Windows.Forms.DockStyle.Top
+ Me.pnlTop.Location = New System.Drawing.Point(0, 0)
+ Me.pnlTop.Name = "pnlTop"
+ Me.pnlTop.Size = New System.Drawing.Size(1295, 48)
+ Me.pnlTop.TabIndex = 100
+ '
+ 'cbxSpracheSelected
+ '
+ Me.cbxSpracheSelected._allowedValuesFreiText = Nothing
+ Me.cbxSpracheSelected._allowFreiText = False
+ Me.cbxSpracheSelected._value = ""
+ Me.cbxSpracheSelected.DropDownWidth = 120
+ Me.cbxSpracheSelected.FormattingEnabled = True
+ Me.cbxSpracheSelected.Location = New System.Drawing.Point(1055, 19)
+ Me.cbxSpracheSelected.Name = "cbxSpracheSelected"
+ Me.cbxSpracheSelected.Size = New System.Drawing.Size(64, 21)
+ Me.cbxSpracheSelected.TabIndex = 35
+ '
+ 'Label8
+ '
+ Me.Label8.AutoSize = True
+ Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label8.ForeColor = System.Drawing.Color.White
+ Me.Label8.Location = New System.Drawing.Point(1052, 3)
+ Me.Label8.Name = "Label8"
+ Me.Label8.Size = New System.Drawing.Size(54, 13)
+ Me.Label8.TabIndex = 34
+ Me.Label8.Text = "Sprache"
+ '
+ 'txtSuche
+ '
+ Me.txtSuche._DateTimeOnly = False
+ Me.txtSuche._numbersOnly = False
+ Me.txtSuche._numbersOnlyKommastellen = ""
+ Me.txtSuche._numbersOnlyTrennzeichen = True
+ Me.txtSuche._Prozent = False
+ Me.txtSuche._ShortDateNew = False
+ Me.txtSuche._ShortDateOnly = False
+ Me.txtSuche._TimeOnly = False
+ Me.txtSuche._TimeOnly_Seconds = False
+ Me.txtSuche._value = Nothing
+ Me.txtSuche._Waehrung = False
+ Me.txtSuche._WaehrungZeichen = False
+ Me.txtSuche.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.txtSuche.ForeColor = System.Drawing.Color.Black
+ Me.txtSuche.Location = New System.Drawing.Point(702, 19)
+ Me.txtSuche.MaxLineLength = -1
+ Me.txtSuche.MaxLines_Warning = ""
+ Me.txtSuche.MaxLines_Warning_Label = Nothing
+ Me.txtSuche.Name = "txtSuche"
+ Me.txtSuche.Size = New System.Drawing.Size(314, 20)
+ Me.txtSuche.TabIndex = 34
+ '
+ 'Label18
+ '
+ Me.Label18.AutoSize = True
+ Me.Label18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label18.ForeColor = System.Drawing.Color.White
+ Me.Label18.Location = New System.Drawing.Point(699, 4)
+ Me.Label18.Name = "Label18"
+ Me.Label18.Size = New System.Drawing.Size(43, 13)
+ Me.Label18.TabIndex = 33
+ Me.Label18.Text = "Suche"
+ '
+ 'lblWarning
+ '
+ Me.lblWarning.AutoSize = True
+ Me.lblWarning.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.lblWarning.ForeColor = System.Drawing.Color.Red
+ Me.lblWarning.Location = New System.Drawing.Point(166, 13)
+ Me.lblWarning.Name = "lblWarning"
+ Me.lblWarning.Size = New System.Drawing.Size(0, 13)
+ Me.lblWarning.TabIndex = 14
+ '
+ 'Label4
+ '
+ Me.Label4.AutoSize = True
+ Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 16.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label4.ForeColor = System.Drawing.Color.White
+ Me.Label4.Location = New System.Drawing.Point(10, 13)
+ Me.Label4.Name = "Label4"
+ Me.Label4.Size = New System.Drawing.Size(147, 26)
+ Me.Label4.TabIndex = 0
+ Me.Label4.Text = "Mailvorlagen"
+ '
+ 'Label3
+ '
+ Me.Label3.AutoSize = True
+ Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label3.ForeColor = System.Drawing.Color.White
+ Me.Label3.Location = New System.Drawing.Point(1152, 3)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(37, 13)
+ Me.Label3.TabIndex = 5
+ Me.Label3.Text = "Firma"
+ '
+ 'cbxFirma
+ '
+ Me.cbxFirma._allowedValuesFreiText = Nothing
+ Me.cbxFirma._allowFreiText = False
+ Me.cbxFirma._value = ""
+ Me.cbxFirma.DropDownWidth = 150
+ Me.cbxFirma.Enabled = False
+ Me.cbxFirma.FormattingEnabled = True
+ Me.cbxFirma.Location = New System.Drawing.Point(1155, 19)
+ Me.cbxFirma.Name = "cbxFirma"
+ Me.cbxFirma.Size = New System.Drawing.Size(128, 21)
+ Me.cbxFirma.TabIndex = 13
+ '
+ 'dgvMailvorlagen
+ '
+ Me.dgvMailvorlagen.AKTUALISIERUNGS_INTERVALL = -1
+ Me.dgvMailvorlagen.AllowUserToAddRows = False
+ Me.dgvMailvorlagen.AllowUserToDeleteRows = False
+ Me.dgvMailvorlagen.BackgroundColor = System.Drawing.Color.White
+ Me.dgvMailvorlagen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+ Me.dgvMailvorlagen.Location = New System.Drawing.Point(0, 54)
+ Me.dgvMailvorlagen.Name = "dgvMailvorlagen"
+ Me.dgvMailvorlagen.Size = New System.Drawing.Size(1283, 365)
+ Me.dgvMailvorlagen.TabIndex = 104
+ '
+ 'TextBox2
+ '
+ 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.Multiline = True
+ Me.TextBox2.Name = "TextBox2"
+ Me.TextBox2.Size = New System.Drawing.Size(256, 45)
+ Me.TextBox2.TabIndex = 34
+ Me.TextBox2.Text = "* Email-Text-Variablen: " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "%VAR-GRENZE%"
+ '
+ 'frmdynMailvorlage
+ '
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.ClientSize = New System.Drawing.Size(1295, 886)
+ Me.Controls.Add(Me.mainPanel)
+ Me.Controls.Add(Me.btnAdd)
+ Me.Controls.Add(Me.btnDelete)
+ Me.Controls.Add(Me.pnlTop)
+ Me.Controls.Add(Me.dgvMailvorlagen)
+ Me.Name = "frmdynMailvorlage"
+ Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+ Me.Text = "frmdynMailvorlage"
+ Me.mainPanel.ResumeLayout(False)
+ Me.mainPanel.PerformLayout()
+ Me.pnlTop.ResumeLayout(False)
+ Me.pnlTop.PerformLayout()
+ CType(Me.dgvMailvorlagen, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.ResumeLayout(False)
+
+ End Sub
+ Friend WithEvents mainPanel As Panel
+ Friend WithEvents cbxFirmaChange As VERAG_PROG_ALLGEMEIN.MyComboBox
+ Friend WithEvents Label As Label
+ Friend WithEvents btnSave As Button
+ Friend WithEvents cbxAktiv As CheckBox
+ Friend WithEvents Label1 As Label
+ Friend WithEvents btnAdd As Button
+ Friend WithEvents btnDelete As Button
+ Friend WithEvents pnlTop As Panel
+ Friend WithEvents lblWarning As Label
+ Friend WithEvents Label4 As Label
+ Friend WithEvents Label3 As Label
+ Friend WithEvents cbxFirma As VERAG_PROG_ALLGEMEIN.MyComboBox
+ Friend WithEvents dgvMailvorlagen As VERAG_PROG_ALLGEMEIN.MyDatagridview
+ Friend WithEvents cboSprache As VERAG_PROG_ALLGEMEIN.MyComboBox
+ 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
+ Friend WithEvents txtSuche As VERAG_PROG_ALLGEMEIN.MyTextBox
+ Friend WithEvents Label18 As Label
+ Friend WithEvents cboFirmensignatur As VERAG_PROG_ALLGEMEIN.MyComboBox
+ Friend WithEvents Label7 As Label
+ Friend WithEvents lblWordcount As Label
+ Friend WithEvents btn As Button
+ Friend WithEvents cbxSpracheSelected As VERAG_PROG_ALLGEMEIN.MyComboBox
+ Friend WithEvents Label8 As Label
+ Friend WithEvents TextBox2 As TextBox
+End Class
diff --git a/SDL/frmdynMailvorlage.resx b/SDL/frmdynMailvorlage.resx
new file mode 100644
index 00000000..1af7de15
--- /dev/null
+++ b/SDL/frmdynMailvorlage.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/SDL/frmdynMailvorlage.vb b/SDL/frmdynMailvorlage.vb
new file mode 100644
index 00000000..f6163477
--- /dev/null
+++ b/SDL/frmdynMailvorlage.vb
@@ -0,0 +1,336 @@
+Imports Microsoft.Office.Interop
+Imports VERAG_PROG_ALLGEMEIN
+
+Public Class frmdynMailvorlage
+
+ Dim txtkonserve As New cTextkonserve
+ Dim editall As Boolean = False
+
+
+ Sub New(permission As Boolean)
+ InitializeComponent()
+ editall = permission
+ End Sub
+
+ Private Sub Mailvorlage_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+
+ cboSprache.Items.Clear()
+ cboSprache.fillWithSQL("SELECT distinct([txt_sprache]) FROM [tblTextkonserve] where txt_sprache is not null ", False, "FMZOLL", True)
+
+ cbxSpracheSelected.Items.AddRange(cboSprache.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray())
+ cbxSpracheSelected.changeItem("DE")
+
+
+ Dim listofFirmen = cFirmen.LOAD_LIST
+
+ cboFirmensignatur.Items.Clear()
+ For Each firma In listofFirmen
+ cboFirmensignatur.Items.Add(New MyListItem(firma.Firma_Bez, firma.Firma_ID))
+ Next
+
+ cbxFirma.Items.Clear()
+ cbxFirmaChange.Items.Clear()
+ cbxFirma.fillWithSQL("SELECT distinct([Firmengruppe]) FROM [tblFirma] where Firmengruppe is not null ", False, "FMZOLL", True)
+ cbxFirmaChange.Items.AddRange(cbxFirma.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray())
+
+ cbxFirma.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
+
+ cbxFirma.Enabled = editall
+
+ initDGVMailvorlagen(cbxFirma._value,, cbxSpracheSelected._value)
+
+ End Sub
+
+
+ Private Sub initDGVMailvorlagen(Optional firma As String = "", Optional searchparam As String = "", Optional sprache As String = "")
+
+ lblWarning.Text = ""
+
+ Dim SQLString As String = "SELECT * FROM [tblTextkonserve] WHERE txt_kategorie = 'FRM_MNGR_MailText'"
+ Dim SQLWHere = ""
+ If firma <> "" Then
+ SQLWHere &= " AND txt_FIRMA = '" & firma & "'"
+ End If
+
+ If searchparam <> "" Then
+ SQLWHere &= " AND (txt_Bezeichnung like '%" & searchparam & "%' OR txt_Betreff like '%" & searchparam & "%')"
+ End If
+
+ If sprache <> "" Then
+ SQLWHere &= " AND (txt_Sprache = '" & sprache & "')"
+ End If
+
+
+ dgvMailvorlagen.SET_SQL(SQLString & SQLWHere, "FMZOLL", ,)
+ dgvMailvorlagen.LOAD()
+
+
+ If dgvMailvorlagen.Columns.Count < 1 Then Exit Sub
+
+ With dgvMailvorlagen
+ If .RowCount = 0 Then Me.Cursor = Cursors.Default : Exit Sub
+ .MultiSelect = False
+ .RowHeadersVisible = False
+ .ReadOnly = True
+ .SelectionMode = DataGridViewSelectionMode.FullRowSelect
+ .Columns("txt_Id").Visible = False
+ .Columns("txt_kategorie").Visible = False
+ .Columns("txt_bezeichnung").HeaderText = "Bezeichnung"
+ .Columns("txt_bezeichnung").Width = 200
+ .Columns("txt_text").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+ .Columns("txt_betreff").HeaderText = "Betreff"
+ .Columns("txt_betreff").Width = 150
+ .Columns("txt_sprache").HeaderText = "Sprache"
+ .Columns("txt_sprache").Width = 40
+ .Columns("txt_dynMailvorlage").HeaderText = "Mailvorlage"
+ .Columns("txt_firmaSig").Visible = False
+ .Columns("txt_FIRMA").HeaderText = "Firma"
+ .Columns("txt_FIRMA").Width = 150
+ End With
+
+
+ For Each row As DataGridViewRow In dgvMailvorlagen.Rows
+
+
+ If row.Cells("txt_firmaSig").Value IsNot DBNull.Value AndAlso IsNumeric(row.Cells("txt_firmaSig").Value) Then
+ If CInt(row.Cells("txt_firmaSig").Value) > 0 Then
+
+ Dim tmpFirma = New VERAG_PROG_ALLGEMEIN.cFirmen(row.Cells("txt_firmaSig").Value)
+ 'row.Cells("txt_firmaSig").Value = tmpFirma.Firma_Bez.ToString
+ End If
+ End If
+
+ Next
+
+
+
+ End Sub
+
+ Private Sub btnAdd_Click(sender As Object, e As EventArgs) Handles btnAdd.Click
+
+ If checkIfFirmaIsFilled(True) = False Then Exit Sub
+
+ Dim input = InputBox("Bitte geben Sie die Bezeichnung der neuen Mailvorlage ein:", "Mailvorlage anlegen")
+ If input <> "" Then
+ If checkNameIsValid(input) Then
+ Dim txtkonserve As New cTextkonserve()
+ txtkonserve.txt_bezeichnung = input
+ txtkonserve.txt_kategorie = "FRM_MNGR_MailText"
+ txtkonserve.txt_dynMailvorlage = True
+ txtkonserve.txt_sprache = cbxSpracheSelected._value
+ txtkonserve.txt_text = " "
+ txtkonserve.txt_betreff = " "
+ txtkonserve.txt_FIRMA = cbxFirma.Text
+ txtkonserve.txt_firmaSig = 1
+
+ If txtkonserve.SAVE() Then
+ initDGVMailvorlagen(cbxFirma._value)
+ End If
+
+ Else
+ MsgBox("Es existiert bereits ein Mailvorlage " & input & " für die Firma " & cbxFirma._value & "in der Sprache " & cbxSpracheSelected._value)
+ End If
+
+ Else
+ MsgBox("Keine Bezeichnung angegeben!")
+ End If
+ End Sub
+
+ Private Sub btnDelete_Click(sender As Object, e As EventArgs) Handles btnDelete.Click
+ If dgvMailvorlagen.SelectedRows.Count > 0 Then
+
+ Dim txtKonserve As New cTextkonserve(dgvMailvorlagen.SelectedRows(0).Cells("txt_id").Value)
+
+ If vbYes = MsgBox("Möchten Sie diesen Mailvorlage " & txtKonserve.txt_bezeichnung & " (" & txtKonserve.txt_sprache & ")" & " in " & txtKonserve.txt_FIRMA & " wirklich löschen?", vbYesNo) Then
+ 'txtKonserve.deleteWarenort(txtKonserve.txt_Id) ' delete funktion implementierten
+ initDGVMailvorlagen(cbxFirma._value)
+ End If
+
+ End If
+
+ End Sub
+
+ Private Function checkNameIsValid(name As String) As Boolean
+
+ If dgvMailvorlagen.Rows.Count = 0 Then Return True
+ If checkIfFirmaIsFilled(False) = False Then Return False
+
+
+ For Each row As DataGridViewRow In dgvMailvorlagen.Rows
+ If Not IsDBNull(row.Cells("txt_bezeichnung").Value) AndAlso Not IsDBNull(row.Cells("txt_FIRMA").Value) Then
+ If row.Cells("txt_bezeichnung").Value.ToLower = name.ToLower AndAlso row.Cells("txt_FIRMA").Value = cbxFirma._value Then
+ Return False
+ End If
+ End If
+
+ Next
+
+ Return True
+
+ End Function
+
+
+ Private Sub dgvMailvorlagen_SelectionChanged(sender As Object, e As EventArgs) Handles dgvMailvorlagen.SelectionChanged
+ Try
+
+
+ If dgvMailvorlagen.SelectedRows.Count < 1 Then
+ mainPanel.Enabled = False
+ Exit Sub
+
+ Else
+ mainPanel.Enabled = True
+
+ End If
+
+ txtkonserve = New cTextkonserve(dgvMailvorlagen.SelectedRows(0).Cells("txt_id").Value)
+
+ rtb_Emailtext.Text = txtkonserve.txt_text
+ txtBezeichnung.Text = txtkonserve.txt_bezeichnung
+ txtBetreff.Text = txtkonserve.txt_betreff
+ cbxAktiv.Checked = txtkonserve.txt_dynMailvorlage
+ cboSprache._value = txtkonserve.txt_sprache
+ rtb_Emailtext.Text = txtkonserve.txt_text
+ cboFirmensignatur.changeItem(txtkonserve.txt_firmaSig)
+ cbxFirmaChange.changeItem(txtkonserve.txt_FIRMA)
+
+
+ Catch ex As Exception
+ VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+ End Try
+
+
+ End Sub
+
+ Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click
+ Try
+ checkIfFirmaIsFilled(False)
+
+ Dim txtKS As New cTextkonserve(dgvMailvorlagen.SelectedRows(0).Cells("txt_id").Value)
+
+ If checkFields() = False Then Exit Sub
+
+ txtKS.txt_bezeichnung = txtBezeichnung.Text
+ txtKS.txt_betreff = txtBetreff.Text
+ txtKS.txt_dynMailvorlage = cbxAktiv.Checked
+ txtKS.txt_sprache = cboSprache._value
+ txtKS.txt_text = rtb_Emailtext.Text
+ txtKS.txt_FIRMA = cbxFirmaChange._value
+ txtKS.txt_firmaSig = cboFirmensignatur._value
+
+ txtKS.SAVE()
+
+ dgvMailvorlagen.GetOrder()
+ initDGVMailvorlagen(cbxFirma._value)
+ dgvMailvorlagen.SetOrder()
+ Catch ex As Exception
+ VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+ End Try
+
+ End Sub
+
+ Private Sub cbxFirma_SelectedValueChanged(sender As Object, e As EventArgs) Handles cbxFirma.SelectedValueChanged, cbxSpracheSelected.SelectedValueChanged
+ Try
+
+ dgvMailvorlagen.GetOrder()
+ initDGVMailvorlagen(cbxFirma._value, txtSuche.Text, cbxSpracheSelected._value)
+ dgvMailvorlagen.SetOrder()
+
+ Catch ex As Exception
+ VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+ End Try
+
+
+ End Sub
+
+ Private Function checkIfFirmaIsFilled(initialSave As Boolean, Optional setWarning As Boolean = True)
+
+ If cbxFirma._value = "" Then
+ If ((dgvMailvorlagen.SelectedRows(0).Cells("txt_FIRMA").Value Is DBNull.Value Or dgvMailvorlagen.SelectedRows(0).Cells("txt_FIRMA").Value Is Nothing Or dgvMailvorlagen.SelectedRows(0).Cells("txt_FIRMA").Value = "") Or initialSave = True) Then 'And initialSave = False ???
+
+ If setWarning Then
+ lblWarning.Text = "Bitte Firma auswählen!"
+ Else
+ lblWarning.Text = ""
+ End If
+
+ Return False
+ End If
+ lblWarning.Text = ""
+ Return True
+
+ Else
+
+ lblWarning.Text = ""
+ Return True
+
+
+ End If
+
+ Return False
+
+ End Function
+
+ Private Function checkFields() As Boolean
+
+ lblWarning.Text = ""
+ Return True
+
+
+ End Function
+
+ Private Sub txtSuche_KeyDown(sender As Object, e As KeyEventArgs) Handles txtSuche.KeyDown
+ If e.KeyCode = Keys.Enter Then
+
+ initDGVMailvorlagen(cbxFirma._value, txtSuche.Text, cboSprache._value)
+ e.Handled = True
+
+ End If
+ End Sub
+
+ Private Sub rtb_Emailtext_TextChanged(sender As Object, e As EventArgs) Handles rtb_Emailtext.TextChanged
+ Dim wordcount = rtb_Emailtext.TextLength
+ lblWordcount.Text = "(" & wordcount & "/65500)"
+
+ End Sub
+
+ Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click
+
+ Try
+
+ Dim outl As New Outlook.Application
+ Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
+ Mail = outl.CreateItem(0)
+
+
+ If rtb_Emailtext.Text <> "" AndAlso cboSprache._value <> "" Then
+
+ Dim TextHTML = ""
+ TextHTML &= rtb_Emailtext.Text
+ TextHTML &= "
"
+ TextHTML &= "
"
+ TextHTML &= "Mit freundlichen Grüßen
"
+ TextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "
"
+ TextHTML &= "
"
+ TextHTML &= cFakturierung.getSignature(cboSprache._value, cboFirmensignatur._value, True, True)
+
+
+ Mail.HTMLBody = "" & TextHTML & "
"
+
+ Mail.Subject = txtBetreff.Text
+
+ End If
+
+ Mail.Display()
+
+ Catch ex As Exception
+ VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+ End Try
+
+
+ End Sub
+
+ Private Sub Label1_Click(sender As Object, e As EventArgs) Handles Label1.Click
+
+ End Sub
+End Class
\ No newline at end of file
diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb
index 4ea34dd9..d4c87c8c 100644
--- a/SDL/kunden/frmKundenblatt.Designer.vb
+++ b/SDL/kunden/frmKundenblatt.Designer.vb
@@ -155,6 +155,8 @@ Partial Class frmKundenblatt
Me.tbUSTV = New System.Windows.Forms.TabPage()
Me.tbcntrUSTV = New System.Windows.Forms.TabControl()
Me.tbUSTVDokumente = New System.Windows.Forms.TabPage()
+ Me.Label8 = New System.Windows.Forms.Label()
+ Me.scanUSTVsonstigeDokumente = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
Me.Label27 = New System.Windows.Forms.Label()
Me.Label37 = New System.Windows.Forms.Label()
Me.scanUSTVFABest = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
@@ -186,8 +188,6 @@ Partial Class frmKundenblatt
Me.tbiKartenverwaltung = New System.Windows.Forms.ToolStripMenuItem()
Me.tbiLKW = New System.Windows.Forms.ToolStripMenuItem()
Me.tbiVERAGCard = New System.Windows.Forms.ToolStripMenuItem()
- Me.scanUSTVsonstigeDokumente = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
- Me.Label8 = New System.Windows.Forms.Label()
Me.pnlInfo.SuspendLayout()
Me.tbFirmendaten.SuspendLayout()
Me.Panel4.SuspendLayout()
@@ -1846,6 +1846,35 @@ Partial Class frmKundenblatt
Me.tbUSTVDokumente.Text = "Dokumente"
Me.tbUSTVDokumente.UseVisualStyleBackColor = True
'
+ 'Label8
+ '
+ Me.Label8.AutoSize = True
+ Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label8.Location = New System.Drawing.Point(604, 17)
+ Me.Label8.Name = "Label8"
+ Me.Label8.Size = New System.Drawing.Size(126, 13)
+ Me.Label8.TabIndex = 8
+ Me.Label8.Text = "sonstige Dokumente:"
+ '
+ 'scanUSTVsonstigeDokumente
+ '
+ Me.scanUSTVsonstigeDokumente._DATENSERVER_KATEGORIE = "DOKUMENTE"
+ Me.scanUSTVsonstigeDokumente._DATENSERVER_ORDNER = "MDM"
+ Me.scanUSTVsonstigeDokumente._DATENSERVER_UOrdner1 = ""
+ Me.scanUSTVsonstigeDokumente._DATENSERVER_UOrdner2 = ""
+ Me.scanUSTVsonstigeDokumente._DATENSERVER_UOrdner3 = ""
+ Me.scanUSTVsonstigeDokumente._OPEN_ORIGINAL = False
+ Me.scanUSTVsonstigeDokumente._TYPE = "PDF"
+ Me.scanUSTVsonstigeDokumente.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+ Me.scanUSTVsonstigeDokumente.BackColor = System.Drawing.Color.White
+ Me.scanUSTVsonstigeDokumente.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.scanUSTVsonstigeDokumente.Cursor = System.Windows.Forms.Cursors.Default
+ Me.scanUSTVsonstigeDokumente.Location = New System.Drawing.Point(607, 36)
+ Me.scanUSTVsonstigeDokumente.Margin = New System.Windows.Forms.Padding(0)
+ Me.scanUSTVsonstigeDokumente.Name = "scanUSTVsonstigeDokumente"
+ Me.scanUSTVsonstigeDokumente.Size = New System.Drawing.Size(285, 505)
+ Me.scanUSTVsonstigeDokumente.TabIndex = 7
+ '
'Label27
'
Me.Label27.AutoSize = True
@@ -2065,6 +2094,7 @@ Partial Class frmKundenblatt
'
Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM"
+ Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8
Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4)
Me.cntxtCntxtMDM.Text = "cntxtMDM"
'
@@ -2198,35 +2228,6 @@ Partial Class frmKundenblatt
Me.tbiVERAGCard.Size = New System.Drawing.Size(186, 22)
Me.tbiVERAGCard.Text = "VERAG Card"
'
- 'scanUSTVsonstigeDokumente
- '
- Me.scanUSTVsonstigeDokumente._DATENSERVER_KATEGORIE = "DOKUMENTE"
- Me.scanUSTVsonstigeDokumente._DATENSERVER_ORDNER = "MDM"
- Me.scanUSTVsonstigeDokumente._DATENSERVER_UOrdner1 = ""
- Me.scanUSTVsonstigeDokumente._DATENSERVER_UOrdner2 = ""
- Me.scanUSTVsonstigeDokumente._DATENSERVER_UOrdner3 = ""
- Me.scanUSTVsonstigeDokumente._OPEN_ORIGINAL = False
- Me.scanUSTVsonstigeDokumente._TYPE = "PDF"
- Me.scanUSTVsonstigeDokumente.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
- Me.scanUSTVsonstigeDokumente.BackColor = System.Drawing.Color.White
- Me.scanUSTVsonstigeDokumente.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.scanUSTVsonstigeDokumente.Cursor = System.Windows.Forms.Cursors.Default
- Me.scanUSTVsonstigeDokumente.Location = New System.Drawing.Point(607, 36)
- Me.scanUSTVsonstigeDokumente.Margin = New System.Windows.Forms.Padding(0)
- Me.scanUSTVsonstigeDokumente.Name = "scanUSTVsonstigeDokumente"
- Me.scanUSTVsonstigeDokumente.Size = New System.Drawing.Size(285, 505)
- Me.scanUSTVsonstigeDokumente.TabIndex = 7
- '
- 'Label8
- '
- Me.Label8.AutoSize = True
- Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label8.Location = New System.Drawing.Point(604, 17)
- Me.Label8.Name = "Label8"
- Me.Label8.Size = New System.Drawing.Size(126, 13)
- Me.Label8.TabIndex = 8
- Me.Label8.Text = "sonstige Dokumente:"
- '
'frmKundenblatt
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cTextkonserve.vb b/VERAG_PROG_ALLGEMEIN/Classes/cTextkonserve.vb
index 17511f25..1cf33a58 100644
--- a/VERAG_PROG_ALLGEMEIN/Classes/cTextkonserve.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cTextkonserve.vb
@@ -1,7 +1,40 @@
Imports System.Data.SqlClient
- Imports System.Reflection
+Imports System.Reflection
+Public Class cTextkonserve_LIST
+
+ Public LIST As New List(Of cTextkonserve)
+ Dim SQL As New SQL
+
+
+ Sub New(txt_kategorie As String, txt_sprache As String, txt_FIRMA As String)
+
+ LOAD_LIST(txt_kategorie, txt_sprache, txt_FIRMA)
+
+ End Sub
+
+
+ Public Sub LOAD_LIST(txt_kategorie As String, txt_sprache As String, txt_FIRMA As String)
+ Try
+
+ LIST.Clear()
+ Dim sqlSprache As String = ""
+ If txt_sprache <> "" Then sqlSprache = " And txt_sprache = '" & txt_sprache & "'"
+
+
+ For Each r In SQL.loadDgvBySql("Select txt_Id FROM [tblTextkonserve] WHERE txt_kategorie='" & txt_kategorie & "' AND txt_FIRMA = '" & txt_FIRMA & "' and txt_dynMailvorlage = 1" & sqlSprache & " ORDER BY txt_kategorie asc", "FMZOLL").Rows
+ LIST.Add(New VERAG_PROG_ALLGEMEIN.cTextkonserve(r("txt_Id")))
+ Next
+
+ Catch ex As Exception
+ MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+ End Try
+ End Sub
+
+
+
+End Class
Public Class cTextkonserve
Property txt_Id As Integer
Property txt_kategorie As String
@@ -10,7 +43,8 @@ Public Class cTextkonserve
Property txt_text As String
Property txt_betreff As String
Property txt_FIRMA As String
- Property txt_firmaSig As Integer = 1
+ Property txt_firmaSig As Integer
+ Property txt_dynMailvorlage As Boolean
Public hasEntry As Boolean = False
@@ -38,7 +72,6 @@ Public Class cTextkonserve
End Sub
-
Public Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("txt_Id", txt_Id, , True, True))
@@ -49,6 +82,7 @@ Public Class cTextkonserve
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("txt_betreff", txt_betreff))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("txt_FIRMA", txt_FIRMA))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("txt_firmaSig", txt_firmaSig))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("txt_dynMailvorlage", txt_dynMailvorlage))
Return list
End Function
@@ -125,6 +159,7 @@ Public Class cTextkonserve
End Try
End Sub
+
Public Function getUpdateCmd() As String
Try
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()