diff --git a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
index f8b82fd..7786ef4 100644
--- a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
@@ -36,21 +36,13 @@ Partial Class frmMitarbDetails
         Me.TabPage1 = New System.Windows.Forms.TabPage()
         Me.tbcntr = New System.Windows.Forms.TabControl()
         Me.TabPage2 = New System.Windows.Forms.TabPage()
-        Me.cboDPFirma2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.cboDPFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Label50 = New System.Windows.Forms.Label()
         Me.Label38 = New System.Windows.Forms.Label()
-        Me.cboPersonal = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Label37 = New System.Windows.Forms.Label()
-        Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.cboDP = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.cboKasse = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Label42 = New System.Windows.Forms.Label()
         Me.Label40 = New System.Windows.Forms.Label()
         Me.cbxSpedBuch = New System.Windows.Forms.CheckBox()
         Me.Label41 = New System.Windows.Forms.Label()
-        Me.cboSpedbuch = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.MyComboBox3 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.TabPage4 = New System.Windows.Forms.TabPage()
         Me.Label62 = New System.Windows.Forms.Label()
         Me.Label61 = New System.Windows.Forms.Label()
@@ -65,9 +57,6 @@ Partial Class frmMitarbDetails
         Me.Label46 = New System.Windows.Forms.Label()
         Me.Label44 = New System.Windows.Forms.Label()
         Me.Label43 = New System.Windows.Forms.Label()
-        Me.cboEZOLL_SB_UNISPED = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.cboEZOLL_SB = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.cboATLAS_SB = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.TabPage5 = New System.Windows.Forms.TabPage()
         Me.cbxShowPW = New System.Windows.Forms.CheckBox()
         Me.lblCheckconnection = New System.Windows.Forms.Label()
@@ -84,9 +73,7 @@ Partial Class frmMitarbDetails
         Me.cbxTimasAngelegt = New System.Windows.Forms.CheckBox()
         Me.txtLohnNr = New System.Windows.Forms.TextBox()
         Me.btnMAanlegen = New System.Windows.Forms.Button()
-        Me.dgvData = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.TabPage7 = New System.Windows.Forms.TabPage()
-        Me.lbSprachen = New VERAG_PROG_ALLGEMEIN.MyListBox()
         Me.Label4 = New System.Windows.Forms.Label()
         Me.GroupBox2 = New System.Windows.Forms.GroupBox()
         Me.txtTelNr = New System.Windows.Forms.TextBox()
@@ -95,21 +82,15 @@ Partial Class frmMitarbDetails
         Me.lblEmailExtension = New System.Windows.Forms.Label()
         Me.txtAbweichenderAnzeigename = New System.Windows.Forms.TextBox()
         Me.Label57 = New System.Windows.Forms.Label()
-        Me.cboFaktGrp = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Label56 = New System.Windows.Forms.Label()
-        Me.cboALIASDomain2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.txtALIASUser2 = New System.Windows.Forms.TextBox()
         Me.Label54 = New System.Windows.Forms.Label()
         Me.cboFirmaHaupt = New System.Windows.Forms.ComboBox()
-        Me.cboTeam = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Label53 = New System.Windows.Forms.Label()
-        Me.cboALIASDomain = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.txtALIASUser = New System.Windows.Forms.TextBox()
         Me.Label52 = New System.Windows.Forms.Label()
         Me.lkl = New System.Windows.Forms.LinkLabel()
         Me.Label45 = New System.Windows.Forms.Label()
-        Me.MyListBox1 = New VERAG_PROG_ALLGEMEIN.MyListBox()
-        Me.cboFirmaFMZOLL = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Label39 = New System.Windows.Forms.Label()
         Me.cboFirma = New System.Windows.Forms.ComboBox()
         Me.Label36 = New System.Windows.Forms.Label()
@@ -125,13 +106,11 @@ Partial Class frmMitarbDetails
         Me.txtDurchwahl = New System.Windows.Forms.TextBox()
         Me.Label19 = New System.Windows.Forms.Label()
         Me.Label8 = New System.Windows.Forms.Label()
-        Me.cboAbteilung = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.txtPwd = New System.Windows.Forms.TextBox()
         Me.Label11 = New System.Windows.Forms.Label()
         Me.Label6 = New System.Windows.Forms.Label()
         Me.txtUsername = New System.Windows.Forms.TextBox()
         Me.Label3 = New System.Windows.Forms.Label()
-        Me.cboNiederlassung = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Label9 = New System.Windows.Forms.Label()
         Me.GroupBox1 = New System.Windows.Forms.GroupBox()
         Me.cbxHO = New System.Windows.Forms.CheckBox()
@@ -164,7 +143,6 @@ Partial Class frmMitarbDetails
         Me.Label2 = New System.Windows.Forms.Label()
         Me.txtInfo = New System.Windows.Forms.RichTextBox()
         Me.TabPage3 = New System.Windows.Forms.TabPage()
-        Me.cboProgSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Label55 = New System.Windows.Forms.Label()
         Me.Button5 = New System.Windows.Forms.Button()
         Me.Button4 = New System.Windows.Forms.Button()
@@ -208,6 +186,29 @@ Partial Class frmMitarbDetails
         Me.cboAdminBer = New System.Windows.Forms.ComboBox()
         Me.Label7 = New System.Windows.Forms.Label()
         Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.cbxTimasNichtStempeln = New System.Windows.Forms.CheckBox()
+        Me.cboDPFirma2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cboDPFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cboPersonal = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cboDP = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cboKasse = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cboSpedbuch = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.MyComboBox3 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cboEZOLL_SB_UNISPED = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cboEZOLL_SB = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cboATLAS_SB = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.dgvData = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.lbSprachen = New VERAG_PROG_ALLGEMEIN.MyListBox()
+        Me.cboFaktGrp = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cboALIASDomain2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cboTeam = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cboALIASDomain = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.MyListBox1 = New VERAG_PROG_ALLGEMEIN.MyListBox()
+        Me.cboFirmaFMZOLL = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cboAbteilung = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cboNiederlassung = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cboProgSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel1.SuspendLayout()
         Me.TabControl2.SuspendLayout()
@@ -217,7 +218,6 @@ Partial Class frmMitarbDetails
         Me.TabPage4.SuspendLayout()
         Me.TabPage5.SuspendLayout()
         Me.TabPage6.SuspendLayout()
-        CType(Me.dgvData, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.TabPage7.SuspendLayout()
         Me.GroupBox2.SuspendLayout()
         Me.GroupBox1.SuspendLayout()
@@ -230,6 +230,7 @@ Partial Class frmMitarbDetails
         CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.dgvData, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'PictureBox1
@@ -387,30 +388,6 @@ Partial Class frmMitarbDetails
         Me.TabPage2.Text = "Intern"
         Me.TabPage2.UseVisualStyleBackColor = True
         '
-        'cboDPFirma2
-        '
-        Me.cboDPFirma2._allowedValuesFreiText = Nothing
-        Me.cboDPFirma2._allowFreiText = False
-        Me.cboDPFirma2._value = ""
-        Me.cboDPFirma2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cboDPFirma2.FormattingEnabled = True
-        Me.cboDPFirma2.Location = New System.Drawing.Point(106, 151)
-        Me.cboDPFirma2.Name = "cboDPFirma2"
-        Me.cboDPFirma2.Size = New System.Drawing.Size(101, 21)
-        Me.cboDPFirma2.TabIndex = 108
-        '
-        'cboDPFirma
-        '
-        Me.cboDPFirma._allowedValuesFreiText = Nothing
-        Me.cboDPFirma._allowFreiText = False
-        Me.cboDPFirma._value = ""
-        Me.cboDPFirma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cboDPFirma.FormattingEnabled = True
-        Me.cboDPFirma.Location = New System.Drawing.Point(7, 151)
-        Me.cboDPFirma.Name = "cboDPFirma"
-        Me.cboDPFirma.Size = New System.Drawing.Size(101, 21)
-        Me.cboDPFirma.TabIndex = 107
-        '
         'Label50
         '
         Me.Label50.AutoSize = True
@@ -431,18 +408,6 @@ Partial Class frmMitarbDetails
         Me.Label38.TabIndex = 96
         Me.Label38.Text = "Standard-Filiale (SpedBuch)"
         '
-        'cboPersonal
-        '
-        Me.cboPersonal._allowedValuesFreiText = Nothing
-        Me.cboPersonal._allowFreiText = False
-        Me.cboPersonal._value = ""
-        Me.cboPersonal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cboPersonal.FormattingEnabled = True
-        Me.cboPersonal.Location = New System.Drawing.Point(7, 65)
-        Me.cboPersonal.Name = "cboPersonal"
-        Me.cboPersonal.Size = New System.Drawing.Size(200, 21)
-        Me.cboPersonal.TabIndex = 95
-        '
         'Label37
         '
         Me.Label37.AutoSize = True
@@ -453,42 +418,6 @@ Partial Class frmMitarbDetails
         Me.Label37.TabIndex = 94
         Me.Label37.Text = "Zuordnung / FM-ZOLL Personal - Tabelle:"
         '
-        'MyComboBox2
-        '
-        Me.MyComboBox2._allowedValuesFreiText = Nothing
-        Me.MyComboBox2._allowFreiText = False
-        Me.MyComboBox2._value = ""
-        Me.MyComboBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.MyComboBox2.FormattingEnabled = True
-        Me.MyComboBox2.Location = New System.Drawing.Point(9, 24)
-        Me.MyComboBox2.Name = "MyComboBox2"
-        Me.MyComboBox2.Size = New System.Drawing.Size(198, 21)
-        Me.MyComboBox2.TabIndex = 97
-        '
-        'cboDP
-        '
-        Me.cboDP._allowedValuesFreiText = Nothing
-        Me.cboDP._allowFreiText = False
-        Me.cboDP._value = ""
-        Me.cboDP.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cboDP.FormattingEnabled = True
-        Me.cboDP.Location = New System.Drawing.Point(217, 151)
-        Me.cboDP.Name = "cboDP"
-        Me.cboDP.Size = New System.Drawing.Size(198, 21)
-        Me.cboDP.TabIndex = 105
-        '
-        'cboKasse
-        '
-        Me.cboKasse._allowedValuesFreiText = Nothing
-        Me.cboKasse._allowFreiText = False
-        Me.cboKasse._value = ""
-        Me.cboKasse.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cboKasse.FormattingEnabled = True
-        Me.cboKasse.Location = New System.Drawing.Point(7, 106)
-        Me.cboKasse.Name = "cboKasse"
-        Me.cboKasse.Size = New System.Drawing.Size(200, 21)
-        Me.cboKasse.TabIndex = 99
-        '
         'Label42
         '
         Me.Label42.AutoSize = True
@@ -530,31 +459,6 @@ Partial Class frmMitarbDetails
         Me.Label41.TabIndex = 100
         Me.Label41.Text = "Standard-Preisliste:"
         '
-        'cboSpedbuch
-        '
-        Me.cboSpedbuch._allowedValuesFreiText = Nothing
-        Me.cboSpedbuch._allowFreiText = False
-        Me.cboSpedbuch._value = ""
-        Me.cboSpedbuch.Enabled = False
-        Me.cboSpedbuch.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cboSpedbuch.FormattingEnabled = True
-        Me.cboSpedbuch.Location = New System.Drawing.Point(217, 66)
-        Me.cboSpedbuch.Name = "cboSpedbuch"
-        Me.cboSpedbuch.Size = New System.Drawing.Size(200, 21)
-        Me.cboSpedbuch.TabIndex = 103
-        '
-        'MyComboBox3
-        '
-        Me.MyComboBox3._allowedValuesFreiText = Nothing
-        Me.MyComboBox3._allowFreiText = False
-        Me.MyComboBox3._value = ""
-        Me.MyComboBox3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.MyComboBox3.FormattingEnabled = True
-        Me.MyComboBox3.Location = New System.Drawing.Point(217, 106)
-        Me.MyComboBox3.Name = "MyComboBox3"
-        Me.MyComboBox3.Size = New System.Drawing.Size(198, 21)
-        Me.MyComboBox3.TabIndex = 101
-        '
         'TabPage4
         '
         Me.TabPage4.Controls.Add(Me.Label62)
@@ -703,48 +607,6 @@ Partial Class frmMitarbDetails
         Me.Label43.TabIndex = 108
         Me.Label43.Text = "EZOLL Sachbearbeiter:"
         '
-        'cboEZOLL_SB_UNISPED
-        '
-        Me.cboEZOLL_SB_UNISPED._allowedValuesFreiText = Nothing
-        Me.cboEZOLL_SB_UNISPED._allowFreiText = False
-        Me.cboEZOLL_SB_UNISPED._value = ""
-        Me.cboEZOLL_SB_UNISPED.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.cboEZOLL_SB_UNISPED.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.cboEZOLL_SB_UNISPED.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cboEZOLL_SB_UNISPED.FormattingEnabled = True
-        Me.cboEZOLL_SB_UNISPED.Location = New System.Drawing.Point(332, 29)
-        Me.cboEZOLL_SB_UNISPED.Name = "cboEZOLL_SB_UNISPED"
-        Me.cboEZOLL_SB_UNISPED.Size = New System.Drawing.Size(104, 21)
-        Me.cboEZOLL_SB_UNISPED.TabIndex = 121
-        '
-        'cboEZOLL_SB
-        '
-        Me.cboEZOLL_SB._allowedValuesFreiText = Nothing
-        Me.cboEZOLL_SB._allowFreiText = False
-        Me.cboEZOLL_SB._value = ""
-        Me.cboEZOLL_SB.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.cboEZOLL_SB.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.cboEZOLL_SB.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cboEZOLL_SB.FormattingEnabled = True
-        Me.cboEZOLL_SB.Location = New System.Drawing.Point(217, 29)
-        Me.cboEZOLL_SB.Name = "cboEZOLL_SB"
-        Me.cboEZOLL_SB.Size = New System.Drawing.Size(116, 21)
-        Me.cboEZOLL_SB.TabIndex = 109
-        '
-        'cboATLAS_SB
-        '
-        Me.cboATLAS_SB._allowedValuesFreiText = Nothing
-        Me.cboATLAS_SB._allowFreiText = False
-        Me.cboATLAS_SB._value = ""
-        Me.cboATLAS_SB.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.cboATLAS_SB.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.cboATLAS_SB.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cboATLAS_SB.FormattingEnabled = True
-        Me.cboATLAS_SB.Location = New System.Drawing.Point(9, 29)
-        Me.cboATLAS_SB.Name = "cboATLAS_SB"
-        Me.cboATLAS_SB.Size = New System.Drawing.Size(200, 21)
-        Me.cboATLAS_SB.TabIndex = 107
-        '
         'TabPage5
         '
         Me.TabPage5.Controls.Add(Me.cbxShowPW)
@@ -852,7 +714,7 @@ Partial Class frmMitarbDetails
         Me.btnDelete.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.btnDelete.BackColor = System.Drawing.Color.White
         Me.btnDelete.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnDelete.Location = New System.Drawing.Point(310, -1)
+        Me.btnDelete.Location = New System.Drawing.Point(310, 0)
         Me.btnDelete.Name = "btnDelete"
         Me.btnDelete.Size = New System.Drawing.Size(55, 26)
         Me.btnDelete.TabIndex = 123
@@ -895,17 +757,17 @@ Partial Class frmMitarbDetails
         Me.cbxTimasAngelegt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.cbxTimasAngelegt.Location = New System.Drawing.Point(2, 5)
         Me.cbxTimasAngelegt.Name = "cbxTimasAngelegt"
-        Me.cbxTimasAngelegt.Size = New System.Drawing.Size(181, 17)
+        Me.cbxTimasAngelegt.Size = New System.Drawing.Size(175, 17)
         Me.cbxTimasAngelegt.TabIndex = 116
-        Me.cbxTimasAngelegt.Text = "Account - PersonalNr (Lohnverr.)"
+        Me.cbxTimasAngelegt.Text = "Account-PersonalNr (Lohnverr.)"
         Me.cbxTimasAngelegt.UseVisualStyleBackColor = True
         '
         'txtLohnNr
         '
         Me.txtLohnNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtLohnNr.Location = New System.Drawing.Point(189, 3)
+        Me.txtLohnNr.Location = New System.Drawing.Point(179, 3)
         Me.txtLohnNr.Name = "txtLohnNr"
-        Me.txtLohnNr.Size = New System.Drawing.Size(47, 20)
+        Me.txtLohnNr.Size = New System.Drawing.Size(63, 20)
         Me.txtLohnNr.TabIndex = 114
         '
         'btnMAanlegen
@@ -920,16 +782,6 @@ Partial Class frmMitarbDetails
         Me.btnMAanlegen.Text = "anlegen"
         Me.btnMAanlegen.UseVisualStyleBackColor = False
         '
-        'dgvData
-        '
-        Me.dgvData.AKTUALISIERUNGS_INTERVALL = -1
-        Me.dgvData.BackgroundColor = System.Drawing.Color.White
-        Me.dgvData.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.dgvData.Location = New System.Drawing.Point(2, 27)
-        Me.dgvData.Name = "dgvData"
-        Me.dgvData.Size = New System.Drawing.Size(364, 144)
-        Me.dgvData.TabIndex = 118
-        '
         'TabPage7
         '
         Me.TabPage7.Controls.Add(Me.lbSprachen)
@@ -940,18 +792,6 @@ Partial Class frmMitarbDetails
         Me.TabPage7.Text = "Sprachen"
         Me.TabPage7.UseVisualStyleBackColor = True
         '
-        'lbSprachen
-        '
-        Me.lbSprachen._value = ""
-        Me.lbSprachen.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lbSprachen.FormattingEnabled = True
-        Me.lbSprachen.Location = New System.Drawing.Point(5, 3)
-        Me.lbSprachen.MultiColumn = True
-        Me.lbSprachen.Name = "lbSprachen"
-        Me.lbSprachen.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple
-        Me.lbSprachen.Size = New System.Drawing.Size(152, 134)
-        Me.lbSprachen.TabIndex = 97
-        '
         'Label4
         '
         Me.Label4.AutoSize = True
@@ -963,6 +803,7 @@ Partial Class frmMitarbDetails
         '
         'GroupBox2
         '
+        Me.GroupBox2.Controls.Add(Me.cbxTimasNichtStempeln)
         Me.GroupBox2.Controls.Add(Me.txtTelNr)
         Me.GroupBox2.Controls.Add(Me.btnUpdateAD)
         Me.GroupBox2.Controls.Add(Me.txtEmailExtension)
@@ -1071,20 +912,6 @@ Partial Class frmMitarbDetails
         Me.Label57.TabIndex = 110
         Me.Label57.Text = "And. Anzeigename (Aviso,TV):"
         '
-        'cboFaktGrp
-        '
-        Me.cboFaktGrp._allowedValuesFreiText = Nothing
-        Me.cboFaktGrp._allowFreiText = False
-        Me.cboFaktGrp._value = ""
-        Me.cboFaktGrp.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.cboFaktGrp.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cboFaktGrp.FormattingEnabled = True
-        Me.cboFaktGrp.Items.AddRange(New Object() {"Buchhaltung", "EDV", "Fiskal", "Geschäftsführung", "Lager", "MDM", "quick-stop", "Verrechnung", "Zollabteilung"})
-        Me.cboFaktGrp.Location = New System.Drawing.Point(211, 155)
-        Me.cboFaktGrp.Name = "cboFaktGrp"
-        Me.cboFaktGrp.Size = New System.Drawing.Size(177, 21)
-        Me.cboFaktGrp.TabIndex = 107
-        '
         'Label56
         '
         Me.Label56.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -1094,19 +921,6 @@ Partial Class frmMitarbDetails
         Me.Label56.TabIndex = 108
         Me.Label56.Text = "Fakturierungs-Gruppe:"
         '
-        'cboALIASDomain2
-        '
-        Me.cboALIASDomain2._allowedValuesFreiText = Nothing
-        Me.cboALIASDomain2._allowFreiText = False
-        Me.cboALIASDomain2._value = ""
-        Me.cboALIASDomain2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cboALIASDomain2.FormattingEnabled = True
-        Me.cboALIASDomain2.Items.AddRange(New Object() {"Suben", "Salzburg", "Waidhaus", "Nickelsdorf"})
-        Me.cboALIASDomain2.Location = New System.Drawing.Point(402, 60)
-        Me.cboALIASDomain2.Name = "cboALIASDomain2"
-        Me.cboALIASDomain2.Size = New System.Drawing.Size(116, 21)
-        Me.cboALIASDomain2.TabIndex = 106
-        '
         'txtALIASUser2
         '
         Me.txtALIASUser2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -1136,20 +950,6 @@ Partial Class frmMitarbDetails
         Me.cboFirmaHaupt.Size = New System.Drawing.Size(57, 21)
         Me.cboFirmaHaupt.TabIndex = 103
         '
-        'cboTeam
-        '
-        Me.cboTeam._allowedValuesFreiText = Nothing
-        Me.cboTeam._allowFreiText = False
-        Me.cboTeam._value = ""
-        Me.cboTeam.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.cboTeam.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cboTeam.FormattingEnabled = True
-        Me.cboTeam.Items.AddRange(New Object() {"Buchhaltung", "EDV", "Fiskal", "Geschäftsführung", "Lager", "MDM", "quick-stop", "Verrechnung", "Zollabteilung"})
-        Me.cboTeam.Location = New System.Drawing.Point(399, 116)
-        Me.cboTeam.Name = "cboTeam"
-        Me.cboTeam.Size = New System.Drawing.Size(148, 21)
-        Me.cboTeam.TabIndex = 101
-        '
         'Label53
         '
         Me.Label53.AutoSize = True
@@ -1160,19 +960,6 @@ Partial Class frmMitarbDetails
         Me.Label53.TabIndex = 102
         Me.Label53.Text = "Team:"
         '
-        'cboALIASDomain
-        '
-        Me.cboALIASDomain._allowedValuesFreiText = Nothing
-        Me.cboALIASDomain._allowFreiText = False
-        Me.cboALIASDomain._value = ""
-        Me.cboALIASDomain.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cboALIASDomain.FormattingEnabled = True
-        Me.cboALIASDomain.Items.AddRange(New Object() {"Suben", "Salzburg", "Waidhaus", "Nickelsdorf"})
-        Me.cboALIASDomain.Location = New System.Drawing.Point(402, 37)
-        Me.cboALIASDomain.Name = "cboALIASDomain"
-        Me.cboALIASDomain.Size = New System.Drawing.Size(116, 21)
-        Me.cboALIASDomain.TabIndex = 100
-        '
         'txtALIASUser
         '
         Me.txtALIASUser.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -1212,31 +999,6 @@ Partial Class frmMitarbDetails
         Me.Label45.TabIndex = 97
         Me.Label45.Text = "Einsicht Firmen-Daten:" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(Offene Posten, Umsätze, ... )"
         '
-        'MyListBox1
-        '
-        Me.MyListBox1._value = ""
-        Me.MyListBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.MyListBox1.FormattingEnabled = True
-        Me.MyListBox1.Location = New System.Drawing.Point(551, 133)
-        Me.MyListBox1.MultiColumn = True
-        Me.MyListBox1.Name = "MyListBox1"
-        Me.MyListBox1.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple
-        Me.MyListBox1.Size = New System.Drawing.Size(152, 95)
-        Me.MyListBox1.TabIndex = 96
-        '
-        'cboFirmaFMZOLL
-        '
-        Me.cboFirmaFMZOLL._allowedValuesFreiText = Nothing
-        Me.cboFirmaFMZOLL._allowFreiText = False
-        Me.cboFirmaFMZOLL._value = ""
-        Me.cboFirmaFMZOLL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.cboFirmaFMZOLL.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cboFirmaFMZOLL.FormattingEnabled = True
-        Me.cboFirmaFMZOLL.Location = New System.Drawing.Point(210, 76)
-        Me.cboFirmaFMZOLL.Name = "cboFirmaFMZOLL"
-        Me.cboFirmaFMZOLL.Size = New System.Drawing.Size(178, 21)
-        Me.cboFirmaFMZOLL.TabIndex = 95
-        '
         'Label39
         '
         Me.Label39.AutoSize = True
@@ -1383,20 +1145,6 @@ Partial Class frmMitarbDetails
         Me.Label8.TabIndex = 1
         Me.Label8.Text = "(erst bei Doppelklick sichtbar)"
         '
-        'cboAbteilung
-        '
-        Me.cboAbteilung._allowedValuesFreiText = Nothing
-        Me.cboAbteilung._allowFreiText = False
-        Me.cboAbteilung._value = ""
-        Me.cboAbteilung.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.cboAbteilung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cboAbteilung.FormattingEnabled = True
-        Me.cboAbteilung.Items.AddRange(New Object() {"Buchhaltung", "EDV", "Fiskal", "Geschäftsführung", "Lager", "MDM", "quick-stop", "Verrechnung", "Zollabteilung"})
-        Me.cboAbteilung.Location = New System.Drawing.Point(211, 116)
-        Me.cboAbteilung.Name = "cboAbteilung"
-        Me.cboAbteilung.Size = New System.Drawing.Size(177, 21)
-        Me.cboAbteilung.TabIndex = 4
-        '
         'txtPwd
         '
         Me.txtPwd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -1443,20 +1191,6 @@ Partial Class frmMitarbDetails
         Me.Label3.TabIndex = 56
         Me.Label3.Text = "Username:"
         '
-        'cboNiederlassung
-        '
-        Me.cboNiederlassung._allowedValuesFreiText = Nothing
-        Me.cboNiederlassung._allowFreiText = False
-        Me.cboNiederlassung._value = ""
-        Me.cboNiederlassung.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.cboNiederlassung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cboNiederlassung.FormattingEnabled = True
-        Me.cboNiederlassung.Items.AddRange(New Object() {"Suben", "Salzburg", "Waidhaus", "Nickelsdorf"})
-        Me.cboNiederlassung.Location = New System.Drawing.Point(18, 116)
-        Me.cboNiederlassung.Name = "cboNiederlassung"
-        Me.cboNiederlassung.Size = New System.Drawing.Size(177, 21)
-        Me.cboNiederlassung.TabIndex = 3
-        '
         'Label9
         '
         Me.Label9.AutoSize = True
@@ -1840,19 +1574,6 @@ Partial Class frmMitarbDetails
         Me.TabPage3.Text = "Programme"
         Me.TabPage3.UseVisualStyleBackColor = True
         '
-        'cboProgSprache
-        '
-        Me.cboProgSprache._allowedValuesFreiText = Nothing
-        Me.cboProgSprache._allowFreiText = False
-        Me.cboProgSprache._value = ""
-        Me.cboProgSprache.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.cboProgSprache.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cboProgSprache.FormattingEnabled = True
-        Me.cboProgSprache.Location = New System.Drawing.Point(16, 526)
-        Me.cboProgSprache.Name = "cboProgSprache"
-        Me.cboProgSprache.Size = New System.Drawing.Size(178, 21)
-        Me.cboProgSprache.TabIndex = 120
-        '
         'Label55
         '
         Me.Label55.AutoSize = True
@@ -2299,6 +2020,298 @@ Partial Class frmMitarbDetails
         Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
         Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
         '
+        'cbxTimasNichtStempeln
+        '
+        Me.cbxTimasNichtStempeln.AutoSize = True
+        Me.cbxTimasNichtStempeln.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cbxTimasNichtStempeln.Location = New System.Drawing.Point(324, 241)
+        Me.cbxTimasNichtStempeln.Name = "cbxTimasNichtStempeln"
+        Me.cbxTimasNichtStempeln.Size = New System.Drawing.Size(164, 17)
+        Me.cbxTimasNichtStempeln.TabIndex = 124
+        Me.cbxTimasNichtStempeln.Text = "Zeiterfassung: Kein Stempeln"
+        Me.cbxTimasNichtStempeln.UseVisualStyleBackColor = True
+        '
+        'cboDPFirma2
+        '
+        Me.cboDPFirma2._allowedValuesFreiText = Nothing
+        Me.cboDPFirma2._allowFreiText = False
+        Me.cboDPFirma2._value = ""
+        Me.cboDPFirma2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboDPFirma2.FormattingEnabled = True
+        Me.cboDPFirma2.Location = New System.Drawing.Point(106, 151)
+        Me.cboDPFirma2.Name = "cboDPFirma2"
+        Me.cboDPFirma2.Size = New System.Drawing.Size(101, 21)
+        Me.cboDPFirma2.TabIndex = 108
+        '
+        'cboDPFirma
+        '
+        Me.cboDPFirma._allowedValuesFreiText = Nothing
+        Me.cboDPFirma._allowFreiText = False
+        Me.cboDPFirma._value = ""
+        Me.cboDPFirma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboDPFirma.FormattingEnabled = True
+        Me.cboDPFirma.Location = New System.Drawing.Point(7, 151)
+        Me.cboDPFirma.Name = "cboDPFirma"
+        Me.cboDPFirma.Size = New System.Drawing.Size(101, 21)
+        Me.cboDPFirma.TabIndex = 107
+        '
+        'cboPersonal
+        '
+        Me.cboPersonal._allowedValuesFreiText = Nothing
+        Me.cboPersonal._allowFreiText = False
+        Me.cboPersonal._value = ""
+        Me.cboPersonal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboPersonal.FormattingEnabled = True
+        Me.cboPersonal.Location = New System.Drawing.Point(7, 65)
+        Me.cboPersonal.Name = "cboPersonal"
+        Me.cboPersonal.Size = New System.Drawing.Size(200, 21)
+        Me.cboPersonal.TabIndex = 95
+        '
+        'MyComboBox2
+        '
+        Me.MyComboBox2._allowedValuesFreiText = Nothing
+        Me.MyComboBox2._allowFreiText = False
+        Me.MyComboBox2._value = ""
+        Me.MyComboBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.MyComboBox2.FormattingEnabled = True
+        Me.MyComboBox2.Location = New System.Drawing.Point(9, 24)
+        Me.MyComboBox2.Name = "MyComboBox2"
+        Me.MyComboBox2.Size = New System.Drawing.Size(198, 21)
+        Me.MyComboBox2.TabIndex = 97
+        '
+        'cboDP
+        '
+        Me.cboDP._allowedValuesFreiText = Nothing
+        Me.cboDP._allowFreiText = False
+        Me.cboDP._value = ""
+        Me.cboDP.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboDP.FormattingEnabled = True
+        Me.cboDP.Location = New System.Drawing.Point(217, 151)
+        Me.cboDP.Name = "cboDP"
+        Me.cboDP.Size = New System.Drawing.Size(198, 21)
+        Me.cboDP.TabIndex = 105
+        '
+        'cboKasse
+        '
+        Me.cboKasse._allowedValuesFreiText = Nothing
+        Me.cboKasse._allowFreiText = False
+        Me.cboKasse._value = ""
+        Me.cboKasse.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboKasse.FormattingEnabled = True
+        Me.cboKasse.Location = New System.Drawing.Point(7, 106)
+        Me.cboKasse.Name = "cboKasse"
+        Me.cboKasse.Size = New System.Drawing.Size(200, 21)
+        Me.cboKasse.TabIndex = 99
+        '
+        'cboSpedbuch
+        '
+        Me.cboSpedbuch._allowedValuesFreiText = Nothing
+        Me.cboSpedbuch._allowFreiText = False
+        Me.cboSpedbuch._value = ""
+        Me.cboSpedbuch.Enabled = False
+        Me.cboSpedbuch.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboSpedbuch.FormattingEnabled = True
+        Me.cboSpedbuch.Location = New System.Drawing.Point(217, 66)
+        Me.cboSpedbuch.Name = "cboSpedbuch"
+        Me.cboSpedbuch.Size = New System.Drawing.Size(200, 21)
+        Me.cboSpedbuch.TabIndex = 103
+        '
+        'MyComboBox3
+        '
+        Me.MyComboBox3._allowedValuesFreiText = Nothing
+        Me.MyComboBox3._allowFreiText = False
+        Me.MyComboBox3._value = ""
+        Me.MyComboBox3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.MyComboBox3.FormattingEnabled = True
+        Me.MyComboBox3.Location = New System.Drawing.Point(217, 106)
+        Me.MyComboBox3.Name = "MyComboBox3"
+        Me.MyComboBox3.Size = New System.Drawing.Size(198, 21)
+        Me.MyComboBox3.TabIndex = 101
+        '
+        'cboEZOLL_SB_UNISPED
+        '
+        Me.cboEZOLL_SB_UNISPED._allowedValuesFreiText = Nothing
+        Me.cboEZOLL_SB_UNISPED._allowFreiText = False
+        Me.cboEZOLL_SB_UNISPED._value = ""
+        Me.cboEZOLL_SB_UNISPED.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
+        Me.cboEZOLL_SB_UNISPED.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
+        Me.cboEZOLL_SB_UNISPED.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboEZOLL_SB_UNISPED.FormattingEnabled = True
+        Me.cboEZOLL_SB_UNISPED.Location = New System.Drawing.Point(332, 29)
+        Me.cboEZOLL_SB_UNISPED.Name = "cboEZOLL_SB_UNISPED"
+        Me.cboEZOLL_SB_UNISPED.Size = New System.Drawing.Size(104, 21)
+        Me.cboEZOLL_SB_UNISPED.TabIndex = 121
+        '
+        'cboEZOLL_SB
+        '
+        Me.cboEZOLL_SB._allowedValuesFreiText = Nothing
+        Me.cboEZOLL_SB._allowFreiText = False
+        Me.cboEZOLL_SB._value = ""
+        Me.cboEZOLL_SB.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
+        Me.cboEZOLL_SB.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
+        Me.cboEZOLL_SB.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboEZOLL_SB.FormattingEnabled = True
+        Me.cboEZOLL_SB.Location = New System.Drawing.Point(217, 29)
+        Me.cboEZOLL_SB.Name = "cboEZOLL_SB"
+        Me.cboEZOLL_SB.Size = New System.Drawing.Size(116, 21)
+        Me.cboEZOLL_SB.TabIndex = 109
+        '
+        'cboATLAS_SB
+        '
+        Me.cboATLAS_SB._allowedValuesFreiText = Nothing
+        Me.cboATLAS_SB._allowFreiText = False
+        Me.cboATLAS_SB._value = ""
+        Me.cboATLAS_SB.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
+        Me.cboATLAS_SB.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
+        Me.cboATLAS_SB.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboATLAS_SB.FormattingEnabled = True
+        Me.cboATLAS_SB.Location = New System.Drawing.Point(9, 29)
+        Me.cboATLAS_SB.Name = "cboATLAS_SB"
+        Me.cboATLAS_SB.Size = New System.Drawing.Size(200, 21)
+        Me.cboATLAS_SB.TabIndex = 107
+        '
+        'dgvData
+        '
+        Me.dgvData.AKTUALISIERUNGS_INTERVALL = -1
+        Me.dgvData.BackgroundColor = System.Drawing.Color.White
+        Me.dgvData.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.dgvData.Location = New System.Drawing.Point(2, 27)
+        Me.dgvData.Name = "dgvData"
+        Me.dgvData.Size = New System.Drawing.Size(364, 144)
+        Me.dgvData.TabIndex = 118
+        '
+        'lbSprachen
+        '
+        Me.lbSprachen._value = ""
+        Me.lbSprachen.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lbSprachen.FormattingEnabled = True
+        Me.lbSprachen.Location = New System.Drawing.Point(5, 3)
+        Me.lbSprachen.MultiColumn = True
+        Me.lbSprachen.Name = "lbSprachen"
+        Me.lbSprachen.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple
+        Me.lbSprachen.Size = New System.Drawing.Size(152, 134)
+        Me.lbSprachen.TabIndex = 97
+        '
+        'cboFaktGrp
+        '
+        Me.cboFaktGrp._allowedValuesFreiText = Nothing
+        Me.cboFaktGrp._allowFreiText = False
+        Me.cboFaktGrp._value = ""
+        Me.cboFaktGrp.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboFaktGrp.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboFaktGrp.FormattingEnabled = True
+        Me.cboFaktGrp.Items.AddRange(New Object() {"Buchhaltung", "EDV", "Fiskal", "Geschäftsführung", "Lager", "MDM", "quick-stop", "Verrechnung", "Zollabteilung"})
+        Me.cboFaktGrp.Location = New System.Drawing.Point(211, 155)
+        Me.cboFaktGrp.Name = "cboFaktGrp"
+        Me.cboFaktGrp.Size = New System.Drawing.Size(177, 21)
+        Me.cboFaktGrp.TabIndex = 107
+        '
+        'cboALIASDomain2
+        '
+        Me.cboALIASDomain2._allowedValuesFreiText = Nothing
+        Me.cboALIASDomain2._allowFreiText = False
+        Me.cboALIASDomain2._value = ""
+        Me.cboALIASDomain2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboALIASDomain2.FormattingEnabled = True
+        Me.cboALIASDomain2.Items.AddRange(New Object() {"Suben", "Salzburg", "Waidhaus", "Nickelsdorf"})
+        Me.cboALIASDomain2.Location = New System.Drawing.Point(402, 60)
+        Me.cboALIASDomain2.Name = "cboALIASDomain2"
+        Me.cboALIASDomain2.Size = New System.Drawing.Size(116, 21)
+        Me.cboALIASDomain2.TabIndex = 106
+        '
+        'cboTeam
+        '
+        Me.cboTeam._allowedValuesFreiText = Nothing
+        Me.cboTeam._allowFreiText = False
+        Me.cboTeam._value = ""
+        Me.cboTeam.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboTeam.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboTeam.FormattingEnabled = True
+        Me.cboTeam.Items.AddRange(New Object() {"Buchhaltung", "EDV", "Fiskal", "Geschäftsführung", "Lager", "MDM", "quick-stop", "Verrechnung", "Zollabteilung"})
+        Me.cboTeam.Location = New System.Drawing.Point(399, 116)
+        Me.cboTeam.Name = "cboTeam"
+        Me.cboTeam.Size = New System.Drawing.Size(148, 21)
+        Me.cboTeam.TabIndex = 101
+        '
+        'cboALIASDomain
+        '
+        Me.cboALIASDomain._allowedValuesFreiText = Nothing
+        Me.cboALIASDomain._allowFreiText = False
+        Me.cboALIASDomain._value = ""
+        Me.cboALIASDomain.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboALIASDomain.FormattingEnabled = True
+        Me.cboALIASDomain.Items.AddRange(New Object() {"Suben", "Salzburg", "Waidhaus", "Nickelsdorf"})
+        Me.cboALIASDomain.Location = New System.Drawing.Point(402, 37)
+        Me.cboALIASDomain.Name = "cboALIASDomain"
+        Me.cboALIASDomain.Size = New System.Drawing.Size(116, 21)
+        Me.cboALIASDomain.TabIndex = 100
+        '
+        'MyListBox1
+        '
+        Me.MyListBox1._value = ""
+        Me.MyListBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.MyListBox1.FormattingEnabled = True
+        Me.MyListBox1.Location = New System.Drawing.Point(551, 133)
+        Me.MyListBox1.MultiColumn = True
+        Me.MyListBox1.Name = "MyListBox1"
+        Me.MyListBox1.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple
+        Me.MyListBox1.Size = New System.Drawing.Size(152, 95)
+        Me.MyListBox1.TabIndex = 96
+        '
+        'cboFirmaFMZOLL
+        '
+        Me.cboFirmaFMZOLL._allowedValuesFreiText = Nothing
+        Me.cboFirmaFMZOLL._allowFreiText = False
+        Me.cboFirmaFMZOLL._value = ""
+        Me.cboFirmaFMZOLL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboFirmaFMZOLL.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboFirmaFMZOLL.FormattingEnabled = True
+        Me.cboFirmaFMZOLL.Location = New System.Drawing.Point(210, 76)
+        Me.cboFirmaFMZOLL.Name = "cboFirmaFMZOLL"
+        Me.cboFirmaFMZOLL.Size = New System.Drawing.Size(178, 21)
+        Me.cboFirmaFMZOLL.TabIndex = 95
+        '
+        'cboAbteilung
+        '
+        Me.cboAbteilung._allowedValuesFreiText = Nothing
+        Me.cboAbteilung._allowFreiText = False
+        Me.cboAbteilung._value = ""
+        Me.cboAbteilung.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboAbteilung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboAbteilung.FormattingEnabled = True
+        Me.cboAbteilung.Items.AddRange(New Object() {"Buchhaltung", "EDV", "Fiskal", "Geschäftsführung", "Lager", "MDM", "quick-stop", "Verrechnung", "Zollabteilung"})
+        Me.cboAbteilung.Location = New System.Drawing.Point(211, 116)
+        Me.cboAbteilung.Name = "cboAbteilung"
+        Me.cboAbteilung.Size = New System.Drawing.Size(177, 21)
+        Me.cboAbteilung.TabIndex = 4
+        '
+        'cboNiederlassung
+        '
+        Me.cboNiederlassung._allowedValuesFreiText = Nothing
+        Me.cboNiederlassung._allowFreiText = False
+        Me.cboNiederlassung._value = ""
+        Me.cboNiederlassung.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboNiederlassung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboNiederlassung.FormattingEnabled = True
+        Me.cboNiederlassung.Items.AddRange(New Object() {"Suben", "Salzburg", "Waidhaus", "Nickelsdorf"})
+        Me.cboNiederlassung.Location = New System.Drawing.Point(18, 116)
+        Me.cboNiederlassung.Name = "cboNiederlassung"
+        Me.cboNiederlassung.Size = New System.Drawing.Size(177, 21)
+        Me.cboNiederlassung.TabIndex = 3
+        '
+        'cboProgSprache
+        '
+        Me.cboProgSprache._allowedValuesFreiText = Nothing
+        Me.cboProgSprache._allowFreiText = False
+        Me.cboProgSprache._value = ""
+        Me.cboProgSprache.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboProgSprache.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboProgSprache.FormattingEnabled = True
+        Me.cboProgSprache.Location = New System.Drawing.Point(16, 526)
+        Me.cboProgSprache.Name = "cboProgSprache"
+        Me.cboProgSprache.Size = New System.Drawing.Size(178, 21)
+        Me.cboProgSprache.TabIndex = 120
+        '
         'frmMitarbDetails
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -2328,7 +2341,6 @@ Partial Class frmMitarbDetails
         Me.TabPage5.PerformLayout()
         Me.TabPage6.ResumeLayout(False)
         Me.TabPage6.PerformLayout()
-        CType(Me.dgvData, System.ComponentModel.ISupportInitialize).EndInit()
         Me.TabPage7.ResumeLayout(False)
         Me.GroupBox2.ResumeLayout(False)
         Me.GroupBox2.PerformLayout()
@@ -2344,6 +2356,7 @@ Partial Class frmMitarbDetails
         CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.dgvData, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
 
     End Sub
@@ -2531,4 +2544,5 @@ Partial Class frmMitarbDetails
     Friend WithEvents Label62 As Label
     Friend WithEvents cboEZOLL_SB_UNISPED As VERAG_PROG_ALLGEMEIN.MyComboBox
     Friend WithEvents cbxHO As CheckBox
+    Friend WithEvents cbxTimasNichtStempeln As CheckBox
 End Class
diff --git a/UID/Mitarbeiter/frmMitarbDetails.vb b/UID/Mitarbeiter/frmMitarbDetails.vb
index 53cf3a1..182c93c 100644
--- a/UID/Mitarbeiter/frmMitarbDetails.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.vb
@@ -313,6 +313,7 @@ Public Class frmMitarbDetails
         cboTeam.changeItem(If(mitarbeiter.mit_teamId, ""))
 
         cbxHO.Checked = mitarbeiter.mit_homeoffice
+        cbxTimasNichtStempeln.Checked = mitarbeiter.mit_timasNichtStempeln
 
 
 
@@ -588,6 +589,7 @@ Public Class frmMitarbDetails
         mitarbeiter.mit_PersonalNr = txtLohnNr.Text
         mitarbeiter.mit_telefonnr = txtTelNr.Text
         mitarbeiter.mit_homeoffice = cbxHO.Checked
+        mitarbeiter.mit_timasNichtStempeln = cbxTimasNichtStempeln.Checked
 
 
         If IsNumeric(cboPersonal._value) AndAlso cboPersonal._value > 0 Then
diff --git a/UID/cSqlDb.vb b/UID/cSqlDb.vb
index ac57394..bb100c5 100644
--- a/UID/cSqlDb.vb
+++ b/UID/cSqlDb.vb
@@ -1550,8 +1550,8 @@ Public Class cMitarbeiter
 
         'Änderung
         Dim sql = "INSERT INTO tblMitarbeiter " &
-                       "(mit_username,mit_abweichenderAnzeigename, mit_pwd, mit_geschlecht, mit_affix, mit_vname, mit_nname, mit_gebdat, mit_strasse,mit_hausnr,mit_land,mit_plz,mit_ort,mit_niederlassung, mit_abteilung, mit_position, mit_durchwahl, mit_email, mit_mobiltel, mit_allowAnruf,mit_info, mit_einstiegsdatum, mit_gekuendigt, mit_kuendigungsdatum, mit_foto,mit_firma,mit_firmaFMZoll,mit_FMZollPersID,mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch,mit_standartFiliale,mit_DpUserStandardDP,mit_EZOLL_SB,mit_ATLAS_SB,mit_FirmenDatenAnzeige,mit_DAKOSY_SB,mit_DAKOSY_SBFull,mit_DpUserStandardFirma,mit_DpUserStandardFirma2,mit_TESTonly,mit_PasswortChanged,mit_TELOTEC_SB,mit_AliasAD_Domain,mit_AliasAD_Username,mit_AliasAD_Domain2,mit_AliasAD_Username2,mit_teamId,mit_ChatBenutzer,mit_FirmaHaupt,mit_ChatEasteregg,mit_MAVerzeichnis_SettingsTstmp,mit_MAVerzeichnis_allowGebDat,mit_MAVerzeichnis_allowWohnadresse,mit_MAVerzeichnis_allowGebDatOhneJahr,mit_MAVerzeichnis_Spitzname,mit_foto_DocId,mit_MAVerzeichnis_Motto,mit_sprache,mit_fakturierungsgruppe, mit_CSuser, mit_CSpwd, mit_PersonalNr, mit_telefonnr,mit_ATGRNAccessCode_AT51FP7,mit_ATGRNAccessCode_AT52VA6 , mit_Sprachkentnisse,mit_EZOLL_SB_UNISPED, mit_homeoffice) OUTPUT INSERTED.mit_id VALUES " &
-                       "(@mit_username,@mit_abweichenderAnzeigename,@mit_pwd,@mit_geschlecht,@mit_affix,@mit_vname,@mit_nname,@mit_gebdat,@mit_strasse,@mit_hausnr,@mit_land,@mit_plz,@mit_ort,@mit_niederlassung,@mit_abteilung,@mit_position,@mit_durchwahl,@mit_email,@mit_mobiltel,@mit_allowAnruf,@mit_info,@mit_einstiegsdatum,@mit_gekuendigt,@mit_kuendigungsdatum,@mit_foto,@mit_firma,@mit_firmaFMZoll,@mit_FMZollPersID,@mit_FMZollPersIDKasseIsnotSpedBuch,@mit_FMZollPersIDSpedBuch,@mit_standartFiliale,@mit_DpUserStandardDP,@mit_EZOLL_SB,@mit_ATLAS_SB,@mit_FirmenDatenAnzeige,@mit_DAKOSY_SB,@mit_DAKOSY_SBFull,@mit_DpUserStandardFirma,@mit_DpUserStandardFirma2,@mit_TESTonly,@mit_PasswortChanged,@mit_TELOTEC_SB,@mit_AliasAD_Domain,@mit_AliasAD_Username,@mit_AliasAD_Domain2,@mit_AliasAD_Username2,@mit_teamId,@mit_ChatBenutzer,@mit_FirmaHaupt,@mit_ChatEasteregg,@mit_MAVerzeichnis_SettingsTstmp,@mit_MAVerzeichnis_allowGebDat,@mit_MAVerzeichnis_allowWohnadresse,@mit_MAVerzeichnis_allowGebDatOhneJahr,@mit_MAVerzeichnis_Spitzname,@mit_foto_DocId,@mit_MAVerzeichnis_Motto ,@mit_sprache,@mit_fakturierungsgruppe, @mit_CSuser, @mit_CSpwd, @mit_PersonalNr, @mit_telefonnr,@mit_ATGRNAccessCode_AT51FP7 ,@mit_ATGRNAccessCode_AT52VA6, @mit_Sprachkentnisse,@mit_EZOLL_SB_UNISPED, @mit_homeoffice)"
+                       "(mit_username,mit_abweichenderAnzeigename, mit_pwd, mit_geschlecht, mit_affix, mit_vname, mit_nname, mit_gebdat, mit_strasse,mit_hausnr,mit_land,mit_plz,mit_ort,mit_niederlassung, mit_abteilung, mit_position, mit_durchwahl, mit_email, mit_mobiltel, mit_allowAnruf,mit_info, mit_einstiegsdatum, mit_gekuendigt, mit_kuendigungsdatum, mit_foto,mit_firma,mit_firmaFMZoll,mit_FMZollPersID,mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch,mit_standartFiliale,mit_DpUserStandardDP,mit_EZOLL_SB,mit_ATLAS_SB,mit_FirmenDatenAnzeige,mit_DAKOSY_SB,mit_DAKOSY_SBFull,mit_DpUserStandardFirma,mit_DpUserStandardFirma2,mit_TESTonly,mit_PasswortChanged,mit_TELOTEC_SB,mit_AliasAD_Domain,mit_AliasAD_Username,mit_AliasAD_Domain2,mit_AliasAD_Username2,mit_teamId,mit_ChatBenutzer,mit_FirmaHaupt,mit_ChatEasteregg,mit_MAVerzeichnis_SettingsTstmp,mit_MAVerzeichnis_allowGebDat,mit_MAVerzeichnis_allowWohnadresse,mit_MAVerzeichnis_allowGebDatOhneJahr,mit_MAVerzeichnis_Spitzname,mit_foto_DocId,mit_MAVerzeichnis_Motto,mit_sprache,mit_fakturierungsgruppe, mit_CSuser, mit_CSpwd, mit_PersonalNr, mit_telefonnr,mit_ATGRNAccessCode_AT51FP7,mit_ATGRNAccessCode_AT52VA6 , mit_Sprachkentnisse,mit_EZOLL_SB_UNISPED, mit_homeoffice,mit_timasNichtStempeln) OUTPUT INSERTED.mit_id VALUES " &
+                       "(@mit_username,@mit_abweichenderAnzeigename,@mit_pwd,@mit_geschlecht,@mit_affix,@mit_vname,@mit_nname,@mit_gebdat,@mit_strasse,@mit_hausnr,@mit_land,@mit_plz,@mit_ort,@mit_niederlassung,@mit_abteilung,@mit_position,@mit_durchwahl,@mit_email,@mit_mobiltel,@mit_allowAnruf,@mit_info,@mit_einstiegsdatum,@mit_gekuendigt,@mit_kuendigungsdatum,@mit_foto,@mit_firma,@mit_firmaFMZoll,@mit_FMZollPersID,@mit_FMZollPersIDKasseIsnotSpedBuch,@mit_FMZollPersIDSpedBuch,@mit_standartFiliale,@mit_DpUserStandardDP,@mit_EZOLL_SB,@mit_ATLAS_SB,@mit_FirmenDatenAnzeige,@mit_DAKOSY_SB,@mit_DAKOSY_SBFull,@mit_DpUserStandardFirma,@mit_DpUserStandardFirma2,@mit_TESTonly,@mit_PasswortChanged,@mit_TELOTEC_SB,@mit_AliasAD_Domain,@mit_AliasAD_Username,@mit_AliasAD_Domain2,@mit_AliasAD_Username2,@mit_teamId,@mit_ChatBenutzer,@mit_FirmaHaupt,@mit_ChatEasteregg,@mit_MAVerzeichnis_SettingsTstmp,@mit_MAVerzeichnis_allowGebDat,@mit_MAVerzeichnis_allowWohnadresse,@mit_MAVerzeichnis_allowGebDatOhneJahr,@mit_MAVerzeichnis_Spitzname,@mit_foto_DocId,@mit_MAVerzeichnis_Motto ,@mit_sprache,@mit_fakturierungsgruppe, @mit_CSuser, @mit_CSpwd, @mit_PersonalNr, @mit_telefonnr,@mit_ATGRNAccessCode_AT51FP7 ,@mit_ATGRNAccessCode_AT52VA6, @mit_Sprachkentnisse,@mit_EZOLL_SB_UNISPED, @mit_homeoffice,@mit_timasNichtStempeln)"
 
 
 
@@ -1631,6 +1631,7 @@ Public Class cMitarbeiter
                 cmd.Parameters.AddWithValue("@mit_ATGRNAccessCode_AT52VA6 ", If(m.mit_ATGRNAccessCode_AT52VA6, DBNull.Value))
                 cmd.Parameters.AddWithValue("@mit_Sprachkentnisse ", If(m.mit_Sprachkentnisse, DBNull.Value))
                 cmd.Parameters.AddWithValue("@mit_homeoffice ", m.mit_homeoffice)
+                cmd.Parameters.AddWithValue("@mit_timasNichtStempeln ", m.mit_timasNichtStempeln)
 
                 Try
                     mid = cmd.ExecuteScalar()
@@ -1649,7 +1650,7 @@ Public Class cMitarbeiter
 
         Dim sql = "UPDATE tblMitarbeiter " &
                      "SET mit_username=@mit_username, mit_abweichenderAnzeigename=@mit_abweichenderAnzeigename,mit_pwd=@mit_pwd, mit_geschlecht=@mit_geschlecht, mit_affix=@mit_affix, mit_vname=@mit_vname, mit_nname=@mit_nname, mit_gebdat=@mit_gebdat, mit_strasse=@mit_strasse, mit_hausnr=@mit_hausnr, mit_land=@mit_land, mit_plz=@mit_plz, mit_ort=@mit_ort, mit_niederlassung=@mit_niederlassung, mit_abteilung=@mit_abteilung, mit_position=@mit_position, mit_durchwahl=@mit_durchwahl, mit_email=@mit_email, mit_mobiltel=@mit_mobiltel, mit_allowAnruf=@mit_allowAnruf, mit_info=@mit_info, mit_einstiegsdatum=@mit_einstiegsdatum, mit_gekuendigt=@mit_gekuendigt, mit_kuendigungsdatum=@mit_kuendigungsdatum, mit_foto=@mit_foto, mit_firma=@mit_firma,mit_firmaFMZoll=@mit_firmaFMZoll,mit_FMZollPersID=@mit_FMZollPersID, mit_FMZollPersIDKasseIsnotSpedBuch=@mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch=@mit_FMZollPersIDSpedBuch,mit_standartFiliale=@mit_standartFiliale,mit_standardPreisliste=@mit_standardPreisliste,mit_DpUserStandardDP=@mit_DpUserStandardDP, mit_EZOLL_SB=@mit_EZOLL_SB, mit_ATLAS_SB=@mit_ATLAS_SB,mit_FirmenDatenAnzeige=@mit_FirmenDatenAnzeige,mit_DAKOSY_SB=@mit_DAKOSY_SB, mit_DAKOSY_SBFull=@mit_DAKOSY_SBFull ,mit_DpUserStandardFirma=@mit_DpUserStandardFirma,mit_DpUserStandardFirma2=@mit_DpUserStandardFirma2, mit_TESTonly=@mit_TESTonly,mit_PasswortChanged=@mit_PasswortChanged,mit_TELOTEC_SB=@mit_TELOTEC_SB,mit_AliasAD_Domain=@mit_AliasAD_Domain,mit_AliasAD_Username=@mit_AliasAD_Username,mit_AliasAD_Domain2=@mit_AliasAD_Domain2,mit_AliasAD_Username2=@mit_AliasAD_Username2,mit_teamId=@mit_teamId,mit_ChatBenutzer=@mit_ChatBenutzer,mit_FirmaHaupt=@mit_FirmaHaupt ,mit_EZOLL_SB_UNISPED=@mit_EZOLL_SB_UNISPED " &
-                     " ,mit_ChatEasteregg=@mit_ChatEasteregg,mit_MAVerzeichnis_SettingsTstmp=@mit_MAVerzeichnis_SettingsTstmp,mit_MAVerzeichnis_allowGebDat=@mit_MAVerzeichnis_allowGebDat,mit_MAVerzeichnis_allowWohnadresse=@mit_MAVerzeichnis_allowWohnadresse,mit_MAVerzeichnis_allowGebDatOhneJahr=@mit_MAVerzeichnis_allowGebDatOhneJahr,mit_MAVerzeichnis_Spitzname=@mit_MAVerzeichnis_Spitzname,mit_foto_DocId=@mit_foto_DocId,mit_MAVerzeichnis_Motto=@mit_MAVerzeichnis_Motto,mit_sprache=@mit_sprache,mit_fakturierungsgruppe=@mit_fakturierungsgruppe, mit_CSuser=@mit_CSuser, mit_CSpwd=@mit_CSpwd, mit_PersonalNr = @mit_PersonalNr, mit_timasId = @mit_timasId, mit_telefonnr = @mit_telefonnr, mit_ATGRNAccessCode_AT51FP7 =@mit_ATGRNAccessCode_AT51FP7 ,mit_ATGRNAccessCode_AT52VA6=@mit_ATGRNAccessCode_AT52VA6, mit_Sprachkentnisse=@mit_Sprachkentnisse, mit_homeoffice=@mit_homeoffice" &
+                     " ,mit_ChatEasteregg=@mit_ChatEasteregg,mit_MAVerzeichnis_SettingsTstmp=@mit_MAVerzeichnis_SettingsTstmp,mit_MAVerzeichnis_allowGebDat=@mit_MAVerzeichnis_allowGebDat,mit_MAVerzeichnis_allowWohnadresse=@mit_MAVerzeichnis_allowWohnadresse,mit_MAVerzeichnis_allowGebDatOhneJahr=@mit_MAVerzeichnis_allowGebDatOhneJahr,mit_MAVerzeichnis_Spitzname=@mit_MAVerzeichnis_Spitzname,mit_foto_DocId=@mit_foto_DocId,mit_MAVerzeichnis_Motto=@mit_MAVerzeichnis_Motto,mit_sprache=@mit_sprache,mit_fakturierungsgruppe=@mit_fakturierungsgruppe, mit_CSuser=@mit_CSuser, mit_CSpwd=@mit_CSpwd, mit_PersonalNr = @mit_PersonalNr, mit_timasId = @mit_timasId, mit_telefonnr = @mit_telefonnr, mit_ATGRNAccessCode_AT51FP7 =@mit_ATGRNAccessCode_AT51FP7 ,mit_ATGRNAccessCode_AT52VA6=@mit_ATGRNAccessCode_AT52VA6, mit_Sprachkentnisse=@mit_Sprachkentnisse, mit_homeoffice=@mit_homeoffice, mit_timasNichtStempeln=@mit_timasNichtStempeln" &
                      " WHERE mit_id=@mit_id "
 
 
@@ -1731,6 +1732,7 @@ Public Class cMitarbeiter
                 cmd.Parameters.AddWithValue("@mit_ATGRNAccessCode_AT52VA6 ", If(m.mit_ATGRNAccessCode_AT52VA6, DBNull.Value))
                 cmd.Parameters.AddWithValue("@mit_Sprachkentnisse", If(m.mit_Sprachkentnisse, DBNull.Value))
                 cmd.Parameters.AddWithValue("@mit_homeoffice", m.mit_homeoffice)
+                cmd.Parameters.AddWithValue("@mit_timasNichtStempeln", m.mit_timasNichtStempeln)
 
 
 
diff --git a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb
index 92c5398..b0e6b78 100644
--- a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb
+++ b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb
@@ -1193,10 +1193,14 @@ Public Class frmDYNachrichtenVerarbeitung
                                     BezugsNr = ge.Quittungsobjekt.QuittungTech(0).BezugsObjekt
                                     STATUS2.dySt_ergCode = "" 'erg.EreignisCode
                                     STATUS2.dySt_ergMitteilung = "" 'erg.Ereignismitteilung
-                                    If ge.Quittungsobjekt.QuittungTech(0).ErgebnisTech.Contains("OKAY") Then
-                                        STATUS2.dySt_status = DAKOSY_Worker.cDY_Statusliste.S_04
-                                    ElseIf ge.Quittungsobjekt.QuittungTech(0).ErgebnisTech.Contains("INFO") Then
-                                        STATUS2.dySt_status = DAKOSY_Worker.cDY_Statusliste.S_08
+                                    If ge.Quittungsobjekt.QuittungTech(0).ErgebnisTech IsNot Nothing Then
+                                        If ge.Quittungsobjekt.QuittungTech(0).ErgebnisTech.Contains("OKAY") Then
+                                            STATUS2.dySt_status = DAKOSY_Worker.cDY_Statusliste.S_04
+                                        ElseIf ge.Quittungsobjekt.QuittungTech(0).ErgebnisTech.Contains("INFO") Then
+                                            STATUS2.dySt_status = DAKOSY_Worker.cDY_Statusliste.S_08
+                                        Else
+                                            STATUS2.dySt_status = DAKOSY_Worker.cDY_Statusliste.S_98
+                                        End If
                                     Else
                                         STATUS2.dySt_status = DAKOSY_Worker.cDY_Statusliste.S_98
                                     End If
diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb
index e0ef4cd..505b4af 100644
--- a/initATLASAufschubkonten/frmStartOptions.Designer.vb
+++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb
@@ -160,6 +160,7 @@ Partial Class frmStartOptions
         Me.LinkLabel30 = New System.Windows.Forms.LinkLabel()
         Me.Label11 = New System.Windows.Forms.Label()
         Me.TabPage4 = New System.Windows.Forms.TabPage()
+        Me.LinkLabel49 = New System.Windows.Forms.LinkLabel()
         Me.Label25 = New System.Windows.Forms.Label()
         Me.txtTBLNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtTWLNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -201,7 +202,8 @@ Partial Class frmStartOptions
         Me.lblRoutineManager = New System.Windows.Forms.Label()
         Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.Button21 = New System.Windows.Forms.Button()
-        Me.LinkLabel49 = New System.Windows.Forms.LinkLabel()
+        Me.LinkLabel50 = New System.Windows.Forms.LinkLabel()
+        Me.Label26 = New System.Windows.Forms.Label()
         Me.pnl.SuspendLayout()
         CType(Me.piceZollAnh, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.tbcntr.SuspendLayout()
@@ -1848,6 +1850,8 @@ Partial Class frmStartOptions
         '
         'TabPage3
         '
+        Me.TabPage3.Controls.Add(Me.LinkLabel50)
+        Me.TabPage3.Controls.Add(Me.Label26)
         Me.TabPage3.Controls.Add(Me.LinkLabel39)
         Me.TabPage3.Controls.Add(Me.LinkLabel40)
         Me.TabPage3.Controls.Add(Me.Label22)
@@ -2007,6 +2011,17 @@ Partial Class frmStartOptions
         Me.TabPage4.Text = "Asfinag"
         Me.TabPage4.UseVisualStyleBackColor = True
         '
+        'LinkLabel49
+        '
+        Me.LinkLabel49.AutoSize = True
+        Me.LinkLabel49.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.LinkLabel49.Location = New System.Drawing.Point(17, 276)
+        Me.LinkLabel49.Name = "LinkLabel49"
+        Me.LinkLabel49.Size = New System.Drawing.Size(136, 13)
+        Me.LinkLabel49.TabIndex = 80
+        Me.LinkLabel49.TabStop = True
+        Me.LinkLabel49.Text = "6. Black-List und White List"
+        '
         'Label25
         '
         Me.Label25.AutoSize = True
@@ -2514,16 +2529,26 @@ Partial Class frmStartOptions
         Me.Button21.Text = "AAS Sendung 24h"
         Me.Button21.UseVisualStyleBackColor = True
         '
-        'LinkLabel49
+        'LinkLabel50
         '
-        Me.LinkLabel49.AutoSize = True
-        Me.LinkLabel49.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.LinkLabel49.Location = New System.Drawing.Point(17, 276)
-        Me.LinkLabel49.Name = "LinkLabel49"
-        Me.LinkLabel49.Size = New System.Drawing.Size(136, 13)
-        Me.LinkLabel49.TabIndex = 80
-        Me.LinkLabel49.TabStop = True
-        Me.LinkLabel49.Text = "6. Black-List und White List"
+        Me.LinkLabel50.AutoSize = True
+        Me.LinkLabel50.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.LinkLabel50.Location = New System.Drawing.Point(416, 152)
+        Me.LinkLabel50.Name = "LinkLabel50"
+        Me.LinkLabel50.Size = New System.Drawing.Size(54, 13)
+        Me.LinkLabel50.TabIndex = 34
+        Me.LinkLabel50.TabStop = True
+        Me.LinkLabel50.Text = "Send Mail"
+        '
+        'Label26
+        '
+        Me.Label26.AutoSize = True
+        Me.Label26.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label26.Location = New System.Drawing.Point(416, 125)
+        Me.Label26.Name = "Label26"
+        Me.Label26.Size = New System.Drawing.Size(38, 13)
+        Me.Label26.TabIndex = 33
+        Me.Label26.Text = "RMC:"
         '
         'frmStartOptions
         '
@@ -2755,4 +2780,6 @@ Partial Class frmStartOptions
     Friend WithEvents txtTWLNr As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents Label25 As Label
     Friend WithEvents LinkLabel49 As LinkLabel
+    Friend WithEvents LinkLabel50 As LinkLabel
+    Friend WithEvents Label26 As Label
 End Class
diff --git a/initATLASAufschubkonten/frmStartOptions.resx b/initATLASAufschubkonten/frmStartOptions.resx
index 897a717..1c52ea3 100644
--- a/initATLASAufschubkonten/frmStartOptions.resx
+++ b/initATLASAufschubkonten/frmStartOptions.resx
@@ -140,174 +140,6 @@
         WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
         nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
         CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="PictureBox21.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
-        oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
-        QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
-        j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
-        VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
-        XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
-        9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
-        VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
-        42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
-        pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
-        lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
-        d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
-        hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
-        LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
-        8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
-        NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
-        ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
-        WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
-        nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
-        CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="PictureBox19.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
-        oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
-        QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
-        j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
-        VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
-        XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
-        9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
-        VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
-        42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
-        pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
-        lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
-        d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
-        hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
-        LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
-        8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
-        NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
-        ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
-        WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
-        nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
-        CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="PictureBox18.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
-        oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
-        QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
-        j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
-        VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
-        XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
-        9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
-        VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
-        42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
-        pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
-        lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
-        d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
-        hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
-        LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
-        8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
-        NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
-        ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
-        WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
-        nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
-        CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="PictureBox12.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
-        oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
-        QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
-        j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
-        VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
-        XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
-        9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
-        VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
-        42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
-        pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
-        lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
-        d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
-        hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
-        LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
-        8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
-        NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
-        ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
-        WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
-        nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
-        CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="PictureBox11.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
-        oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
-        QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
-        j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
-        VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
-        XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
-        9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
-        VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
-        42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
-        pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
-        lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
-        d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
-        hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
-        LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
-        8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
-        NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
-        ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
-        WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
-        nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
-        CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="PictureBox10.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
-        oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
-        QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
-        j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
-        VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
-        XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
-        9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
-        VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
-        42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
-        pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
-        lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
-        d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
-        hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
-        LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
-        8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
-        NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
-        ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
-        WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
-        nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
-        CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="PictureBox9.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
-        oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
-        QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
-        j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
-        VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
-        XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
-        9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
-        VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
-        42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
-        pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
-        lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
-        d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
-        hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
-        LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
-        8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
-        NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
-        ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
-        WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
-        nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
-        CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="PictureBox99.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -649,9 +481,6 @@
   <metadata name="clmnMRN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="clmnMRN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <data name="PictureBox15.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
@@ -698,6 +527,174 @@
         WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
         nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
         CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="PictureBox21.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
+        oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
+        QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
+        j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
+        VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
+        XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
+        9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
+        VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
+        42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
+        pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
+        lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
+        d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
+        hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
+        LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
+        8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
+        NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
+        ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
+        WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
+        nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
+        CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="PictureBox19.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
+        oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
+        QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
+        j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
+        VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
+        XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
+        9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
+        VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
+        42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
+        pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
+        lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
+        d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
+        hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
+        LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
+        8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
+        NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
+        ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
+        WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
+        nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
+        CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="PictureBox18.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
+        oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
+        QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
+        j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
+        VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
+        XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
+        9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
+        VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
+        42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
+        pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
+        lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
+        d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
+        hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
+        LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
+        8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
+        NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
+        ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
+        WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
+        nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
+        CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="PictureBox12.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
+        oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
+        QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
+        j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
+        VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
+        XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
+        9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
+        VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
+        42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
+        pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
+        lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
+        d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
+        hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
+        LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
+        8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
+        NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
+        ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
+        WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
+        nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
+        CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="PictureBox11.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
+        oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
+        QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
+        j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
+        VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
+        XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
+        9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
+        VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
+        42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
+        pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
+        lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
+        d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
+        hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
+        LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
+        8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
+        NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
+        ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
+        WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
+        nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
+        CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="PictureBox10.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
+        oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
+        QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
+        j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
+        VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
+        XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
+        9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
+        VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
+        42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
+        pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
+        lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
+        d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
+        hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
+        LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
+        8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
+        NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
+        ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
+        WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
+        nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
+        CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="PictureBox9.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
+        oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
+        QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
+        j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
+        VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
+        XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
+        9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
+        VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
+        42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
+        pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
+        lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
+        d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
+        hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
+        LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
+        8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
+        NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
+        ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
+        WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
+        nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
+        CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb
index 2120a04..260e3ee 100644
--- a/initATLASAufschubkonten/frmStartOptions.vb
+++ b/initATLASAufschubkonten/frmStartOptions.vb
@@ -1831,10 +1831,16 @@ Public Class frmStartOptions
                 betreff = betreff.replace("FW: ", "")
                 betreff = betreff.replace("VBD - Versandbegleitdokument (DE), ", "")
 
+                If betreff.contains(",") Then
+                    betreff = betreff.ToString.Split(",")(0).Trim
+                End If
                 'Dim dy_id As String = sql.getValueTxtBySql("SELECT isnull(ncts_dyaAnmID,-1)  FROM [tblDakosy_NCTSOut] inner join tblDakosy_Zollanmeldungen on dy_id=ncts_dyaAnmID where ncts_ObjectName='" & betreff.ToString.Trim & "' ", "FMZOLL")
                 Dim dy_id As String = ""
                 If betreff.ToString.Length > 15 Then
-                    dy_id = sql.getValueTxtBySql("SELECT isnull(ncts_dyaAnmID,-1)  FROM [tblDakosy_NCTSOut004] inner join tblDakosy_Zollanmeldungen on dy_id=ncts_dyaAnmID where '" & betreff.ToString.Trim & "' LIKE ncts_ObjectName +'%'  and LEN(ncts_ObjectName)>=13 ", "FMZOLL")
+                    dy_id = sql.getValueTxtBySql("SELECT isnull(ncts_dyaAnmID,-1)  FROM [tblDakosy_NCTSOut004] inner join tblDakosy_Zollanmeldungen on dy_id=ncts_dyaAnmID where ncts_ObjectName='" & betreff.ToString.Trim & "' ", "FMZOLL")
+                    If dy_id = "" Then
+                        dy_id = sql.getValueTxtBySql("SELECT isnull(ncts_dyaAnmID,-1)  FROM [tblDakosy_NCTSOut004] inner join tblDakosy_Zollanmeldungen on dy_id=ncts_dyaAnmID where '" & betreff.ToString.Trim & "' LIKE ncts_ObjectName +'%'  and LEN(ncts_ObjectName)>=13 ", "FMZOLL")
+                    End If
                 Else
                     dy_id = sql.getValueTxtBySql("SELECT isnull(ncts_dyaAnmID,-1)  FROM [tblDakosy_NCTSOut004] inner join tblDakosy_Zollanmeldungen on dy_id=ncts_dyaAnmID where ncts_ObjectName='" & betreff.ToString.Trim & "' ", "FMZOLL")
                 End If
@@ -1863,91 +1869,135 @@ Public Class frmStartOptions
 
 
                 If Not found Then 'OLD --- NCTS < 004!
-                    'Dim dy_id As String = sql.getValueTxtBySql("SELECT isnull(ncts_dyaAnmID,-1)  FROM [tblDakosy_NCTSOut] inner join tblDakosy_Zollanmeldungen on dy_id=ncts_dyaAnmID where ncts_ObjectName='" & betreff.ToString.Trim & "' ", "FMZOLL")
-                    dy_id = ""
-                    If betreff.ToString.Length > 15 Then
-                        dy_id = sql.getValueTxtBySql("SELECT isnull(ncts_dyaAnmID,-1)  FROM [tblDakosy_NCTSOut] inner join tblDakosy_Zollanmeldungen on dy_id=ncts_dyaAnmID where '" & betreff.ToString.Trim & "' LIKE ncts_ObjectName +'%'  and LEN(ncts_ObjectName)>=13 ", "FMZOLL")
-                    Else
-                        dy_id = sql.getValueTxtBySql("SELECT isnull(ncts_dyaAnmID,-1)  FROM [tblDakosy_NCTSOut] inner join tblDakosy_Zollanmeldungen on dy_id=ncts_dyaAnmID where ncts_ObjectName='" & betreff.ToString.Trim & "' ", "FMZOLL")
-                    End If
-
-
-                    '  IO.Directory.CreateDirectory(VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\TEST3\")
-
-                    DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("ZOLLDATEN", "VBD", dy_id, "", "", betreff.ToString.Replace("/", "-").Replace(",", "-").Replace("\", "-").Replace(":", "."), 0, False)
-                    DS.da_vorlage = False
-
-                    ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\VBD\NOT_IDENTIFIED\"
-                    If IsNumeric(dy_id) AndAlso dy_id > 0 Then ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\VBD\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\"
-                    If Not IO.Directory.Exists(ZIEL_PFAD) Then IO.Directory.CreateDirectory(ZIEL_PFAD)
-
-                    destFull = ""
-                    moveFile(pfad, ZIEL_PFAD, destFull)
-
-
-                    If DS.insertDataToDATENSERVER(destFull) Then
-                        If IsNumeric(dy_id) AndAlso dy_id > 0 Then
-                            sql.doSQL("UPDATE tblDakosy_Zollanmeldungen SET dy_VBD_dsId='" & DS.da_id & "' where dy_id='" & dy_id & "'", "FMZOLL")
-                            sql.doSQL("UPDATE Speditionsbuch SET DokumentId_VBD='" & DS.da_id & "' where AtlasBezNrNCTS='" & betreff.ToString.Trim & "' AND DokumentId_VBD is null", "FMZOLL") 'Falls Spedbuch schon zuvor generiert wurde!
-                            doMailZollbeleg(DS.GET_TOP1_PATH, "VBD", dy_id)
+                        'Dim dy_id As String = sql.getValueTxtBySql("SELECT isnull(ncts_dyaAnmID,-1)  FROM [tblDakosy_NCTSOut] inner join tblDakosy_Zollanmeldungen on dy_id=ncts_dyaAnmID where ncts_ObjectName='" & betreff.ToString.Trim & "' ", "FMZOLL")
+                        dy_id = ""
+                        If betreff.ToString.Length > 15 Then
+                            dy_id = sql.getValueTxtBySql("SELECT isnull(ncts_dyaAnmID,-1)  FROM [tblDakosy_NCTSOut] inner join tblDakosy_Zollanmeldungen on dy_id=ncts_dyaAnmID where '" & betreff.ToString.Trim & "' LIKE ncts_ObjectName +'%'  and LEN(ncts_ObjectName)>=13 ", "FMZOLL")
+                        Else
+                            dy_id = sql.getValueTxtBySql("SELECT isnull(ncts_dyaAnmID,-1)  FROM [tblDakosy_NCTSOut] inner join tblDakosy_Zollanmeldungen on dy_id=ncts_dyaAnmID where ncts_ObjectName='" & betreff.ToString.Trim & "' ", "FMZOLL")
                         End If
+
+
+                        '  IO.Directory.CreateDirectory(VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\TEST3\")
+
+                        DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("ZOLLDATEN", "VBD", dy_id, "", "", betreff.ToString.Replace("/", "-").Replace(",", "-").Replace("\", "-").Replace(":", "."), 0, False)
+                        DS.da_vorlage = False
+
+                        ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\VBD\NOT_IDENTIFIED\"
+                        If IsNumeric(dy_id) AndAlso dy_id > 0 Then ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\VBD\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\"
+                        If Not IO.Directory.Exists(ZIEL_PFAD) Then IO.Directory.CreateDirectory(ZIEL_PFAD)
+
+                        destFull = ""
+                        moveFile(pfad, ZIEL_PFAD, destFull)
+
+
+                        If DS.insertDataToDATENSERVER(destFull) Then
+                            If IsNumeric(dy_id) AndAlso dy_id > 0 Then
+                                sql.doSQL("UPDATE tblDakosy_Zollanmeldungen SET dy_VBD_dsId='" & DS.da_id & "' where dy_id='" & dy_id & "'", "FMZOLL")
+                                sql.doSQL("UPDATE Speditionsbuch SET DokumentId_VBD='" & DS.da_id & "' where AtlasBezNrNCTS='" & betreff.ToString.Trim & "' AND DokumentId_VBD is null", "FMZOLL") 'Falls Spedbuch schon zuvor generiert wurde!
+                                doMailZollbeleg(DS.GET_TOP1_PATH, "VBD", dy_id)
+                            End If
+                        End If
+
                     End If
 
-                End If
+
+                    '=====ATEZ BEREITSTELLUNG==========
+                    cWorker_NCTS.checkATEZ_Bereitstellung_VBD(betreff.ToString.Trim, destFull)
+
+                    '==================================
 
 
-                '=====ATEZ BEREITSTELLUNG==========
-                cWorker_NCTS.checkATEZ_Bereitstellung_VBD(betreff.ToString.Trim, destFull)
-
-                '==================================
+                ElseIf betreff.ToString.Contains("DAKOSY GE - Abgabenbescheid/Befund , Bezugsnr.: ") Then
+                    betreff = betreff.replace("WG: ", "")
+                    betreff = betreff.replace("FW: ", "")
+                    betreff = betreff.replace("DAKOSY GE - Abgabenbescheid/Befund , Bezugsnr.: ", "")
+                    If betreff.ToString.Contains(",") Then
+                        Dim sp = betreff.ToString.Split(",")
 
 
-            ElseIf betreff.ToString.Contains("DAKOSY GE - Abgabenbescheid/Befund , Bezugsnr.: ") Then
-                betreff = betreff.replace("WG: ", "")
-                betreff = betreff.replace("FW: ", "")
-                betreff = betreff.replace("DAKOSY GE - Abgabenbescheid/Befund , Bezugsnr.: ", "")
-                If betreff.ToString.Contains(",") Then
-                    Dim sp = betreff.ToString.Split(",")
+                        If betreff.contains("Registriernr.: ATD") Then ' ZNV!!!!
+                            betreff = sp(0).Trim
+                            Dim SND_ID = sql.getValueTxtBySql("SELECT TOP (1) [tblSnd_SendungID]  FROM [tblSendungen]  where '" & betreff.ToString.Trim & "' LIKE (cast(FilialenNr as varchar(4))+ '/' + cast(AbfertigungsNr as varchar(8))+'%')", "AVISO")
+                            If IsNumeric(SND_ID) AndAlso SND_ID > 0 Then
+                                DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("ZOLLDATEN", "ZNV", "SND_ID_" & SND_ID, "", "", betreff.ToString.Replace("/", "-").Replace(",", "-").Replace("\", "-").Replace(":", "."), 0, False)
+                                DS.da_vorlage = False
+                                Dim destFull = ""
+                                Dim ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\ZNV\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\"
+                                If Not IO.Directory.Exists(ZIEL_PFAD) Then IO.Directory.CreateDirectory(ZIEL_PFAD)
+                                moveFile(pfad, ZIEL_PFAD, destFull)
+
+                                If DS.insertDataToDATENSERVER(destFull) Then
+                                    ' sql.doSQL("UPDATE tblDakosy_Zollanmeldungen SET dy_STEUERBESCHEID_dsId='" & DS.da_id & "' where dy_id='" & dy_id & "'", "FMZOLL")
+                                    sql.doSQL("UPDATE Speditionsbuch SET DokumentId_Steuerbeleg='" & DS.da_id & "' where AtlasBezNrEZA='" & betreff.ToString.Trim & "' AND DokumentId_Steuerbeleg is null", "FMZOLL") 'Falls Spedbuch schon zuvor generiert wurde!
+                                    doMailZollbeleg(DS.GET_TOP1_PATH, "ZNV", SND_ID, betreff)
+                                End If
+
+                            End If
 
 
-                    If betreff.contains("Registriernr.: ATD") Then ' ZNV!!!!
-                        betreff = sp(0).Trim
-                        Dim SND_ID = sql.getValueTxtBySql("SELECT TOP (1) [tblSnd_SendungID]  FROM [tblSendungen]  where '" & betreff.ToString.Trim & "' LIKE (cast(FilialenNr as varchar(4))+ '/' + cast(AbfertigungsNr as varchar(8))+'%')", "AVISO")
-                        If IsNumeric(SND_ID) AndAlso SND_ID > 0 Then
-                            DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("ZOLLDATEN", "ZNV", "SND_ID_" & SND_ID, "", "", betreff.ToString.Replace("/", "-").Replace(",", "-").Replace("\", "-").Replace(":", "."), 0, False)
+                        Else ' STB !!!!
+
+                            betreff = sp(0).Trim
+
+
+                            Dim dy_id As String = ""
+                        If betreff.ToString.Length > 15 Then
+                            dy_id = sql.getValueTxtBySql("SELECT isnull(eza_dyaAnmID,-1)  FROM [tblDakosy_EZA] inner join tblDakosy_Zollanmeldungen on dy_id=eza_dyaAnmID where eza_ObjectName='" & betreff.ToString.Trim & "'", "FMZOLL")
+                            If dy_id = "" Then
+                                dy_id = sql.getValueTxtBySql("SELECT isnull(eza_dyaAnmID,-1)  FROM [tblDakosy_EZA] inner join tblDakosy_Zollanmeldungen on dy_id=eza_dyaAnmID where '" & betreff.ToString.Trim & "' LIKE eza_ObjectName +'%'  and LEN(eza_ObjectName)>=13", "FMZOLL")
+                            End If
+                        Else
+                            dy_id = sql.getValueTxtBySql("SELECT isnull(eza_dyaAnmID,-1)  FROM [tblDakosy_EZA] inner join tblDakosy_Zollanmeldungen on dy_id=eza_dyaAnmID where eza_ObjectName='" & betreff.ToString.Trim & "'", "FMZOLL")
+                            End If
+                            '  IO.Directory.CreateDirectory(VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\TEST3\")
+
+                            DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("ZOLLDATEN", "STEUERBESCHEID", dy_id, "", "", betreff.ToString.Replace("/", "-").Replace(",", "-").Replace("\", "-").Replace(":", "."), 0, False)
                             DS.da_vorlage = False
-                            Dim destFull = ""
-                            Dim ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\ZNV\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\"
+
+                            Dim ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\STEUERBESCHEID\NOT_IDENTIFIED\"
+                            If IsNumeric(dy_id) AndAlso dy_id > 0 Then ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\STEUERBESCHEID\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\"
                             If Not IO.Directory.Exists(ZIEL_PFAD) Then IO.Directory.CreateDirectory(ZIEL_PFAD)
+
+                            Dim destFull = ""
                             moveFile(pfad, ZIEL_PFAD, destFull)
 
                             If DS.insertDataToDATENSERVER(destFull) Then
-                                ' sql.doSQL("UPDATE tblDakosy_Zollanmeldungen SET dy_STEUERBESCHEID_dsId='" & DS.da_id & "' where dy_id='" & dy_id & "'", "FMZOLL")
-                                sql.doSQL("UPDATE Speditionsbuch SET DokumentId_Steuerbeleg='" & DS.da_id & "' where AtlasBezNrEZA='" & betreff.ToString.Trim & "' AND DokumentId_Steuerbeleg is null", "FMZOLL") 'Falls Spedbuch schon zuvor generiert wurde!
-                                doMailZollbeleg(DS.GET_TOP1_PATH, "ZNV", SND_ID, betreff)
+                                If IsNumeric(dy_id) AndAlso dy_id > 0 Then
+                                    sql.doSQL("UPDATE tblDakosy_Zollanmeldungen SET dy_STEUERBESCHEID_dsId='" & DS.da_id & "' where dy_id='" & dy_id & "'", "FMZOLL")
+                                    sql.doSQL("UPDATE Speditionsbuch SET DokumentId_Steuerbeleg='" & DS.da_id & "' where AtlasBezNrEZA='" & betreff.ToString.Trim & "' AND DokumentId_Steuerbeleg is null", "FMZOLL") 'Falls Spedbuch schon zuvor generiert wurde!
+                                    doMailZollbeleg(DS.GET_TOP1_PATH, "STB", dy_id)
+                                End If
                             End If
 
                         End If
+                    End If
 
-
-                    Else ' STB !!!!
-
+                    'ABD
+                ElseIf betreff.ToString.Contains("ABD - Ausfuhrbegleitdokument (DE), ") Then
+                    betreff = betreff.replace("WG: ", "")
+                    betreff = betreff.replace("FW: ", "")
+                    betreff = betreff.replace("ABD - Ausfuhrbegleitdokument (DE), ", "")
+                    If betreff.ToString.Contains(",") Then
+                        Dim sp = betreff.ToString.Split(",")
                         betreff = sp(0).Trim
 
-
                         Dim dy_id As String = ""
                         If betreff.ToString.Length > 15 Then
-                            dy_id = sql.getValueTxtBySql("SELECT isnull(eza_dyaAnmID,-1)  FROM [tblDakosy_EZA] inner join tblDakosy_Zollanmeldungen on dy_id=eza_dyaAnmID where '" & betreff.ToString.Trim & "' LIKE eza_ObjectName +'%'  and LEN(eza_ObjectName)>=13", "FMZOLL")
-                        Else
-                            dy_id = sql.getValueTxtBySql("SELECT isnull(eza_dyaAnmID,-1)  FROM [tblDakosy_EZA] inner join tblDakosy_Zollanmeldungen on dy_id=eza_dyaAnmID where eza_ObjectName='" & betreff.ToString.Trim & "'", "FMZOLL")
+                        dy_id = sql.getValueTxtBySql("SELECT isnull(aes_dyaAnmID,-1)  FROM [tblDakosy_AES] inner join tblDakosy_Zollanmeldungen on dy_id=aes_dyaAnmID where aes_ObjectName='" & betreff.ToString.Trim & "'", "FMZOLL")
+                        If dy_id = "" Then
+                            dy_id = sql.getValueTxtBySql("SELECT isnull(aes_dyaAnmID,-1)  FROM [tblDakosy_AES] inner join tblDakosy_Zollanmeldungen on dy_id=aes_dyaAnmID where '" & betreff.ToString.Trim & "' LIKE aes_ObjectName +'%'  and LEN(aes_ObjectName)>=13", "FMZOLL")
+                        End If
+                    Else
+                        dy_id = sql.getValueTxtBySql("SELECT isnull(aes_dyaAnmID,-1)  FROM [tblDakosy_AES] inner join tblDakosy_Zollanmeldungen on dy_id=aes_dyaAnmID where aes_ObjectName='" & betreff.ToString.Trim & "'", "FMZOLL")
                         End If
                         '  IO.Directory.CreateDirectory(VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\TEST3\")
 
-                        DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("ZOLLDATEN", "STEUERBESCHEID", dy_id, "", "", betreff.ToString.Replace("/", "-").Replace(",", "-").Replace("\", "-").Replace(":", "."), 0, False)
+                        DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("ZOLLDATEN", "ABD", dy_id, "", "", betreff.ToString.Replace("/", "-").Replace(",", "-").Replace("\", "-").Replace(":", "."), 0, False)
                         DS.da_vorlage = False
 
-                        Dim ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\STEUERBESCHEID\NOT_IDENTIFIED\"
-                        If IsNumeric(dy_id) AndAlso dy_id > 0 Then ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\STEUERBESCHEID\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\"
+                        Dim ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\ABD\NOT_IDENTIFIED\"
+                        If IsNumeric(dy_id) AndAlso dy_id > 0 Then ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\ABD\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\"
                         If Not IO.Directory.Exists(ZIEL_PFAD) Then IO.Directory.CreateDirectory(ZIEL_PFAD)
 
                         Dim destFull = ""
@@ -1955,51 +2005,13 @@ Public Class frmStartOptions
 
                         If DS.insertDataToDATENSERVER(destFull) Then
                             If IsNumeric(dy_id) AndAlso dy_id > 0 Then
-                                sql.doSQL("UPDATE tblDakosy_Zollanmeldungen SET dy_STEUERBESCHEID_dsId='" & DS.da_id & "' where dy_id='" & dy_id & "'", "FMZOLL")
-                                sql.doSQL("UPDATE Speditionsbuch SET DokumentId_Steuerbeleg='" & DS.da_id & "' where AtlasBezNrEZA='" & betreff.ToString.Trim & "' AND DokumentId_Steuerbeleg is null", "FMZOLL") 'Falls Spedbuch schon zuvor generiert wurde!
-                                doMailZollbeleg(DS.GET_TOP1_PATH, "STB", dy_id)
+                                sql.doSQL("UPDATE tblDakosy_Zollanmeldungen SET dy_ABD_dsId='" & DS.da_id & "' where dy_id='" & dy_id & "'", "FMZOLL")
+                                sql.doSQL("UPDATE Speditionsbuch SET DokumentId_ABD='" & DS.da_id & "' where AtlasBezNrEZA='" & betreff.ToString.Trim & "' AND DokumentId_ABD is null", "FMZOLL") 'Falls Spedbuch schon zuvor generiert wurde!
+                                doMailZollbeleg(DS.GET_TOP1_PATH, "ABD", dy_id)
                             End If
                         End If
 
                     End If
-                End If
-
-                'ABD
-            ElseIf betreff.ToString.Contains("ABD - Ausfuhrbegleitdokument (DE), ") Then
-                betreff = betreff.replace("WG: ", "")
-                betreff = betreff.replace("FW: ", "")
-                betreff = betreff.replace("ABD - Ausfuhrbegleitdokument (DE), ", "")
-                If betreff.ToString.Contains(",") Then
-                    Dim sp = betreff.ToString.Split(",")
-                    betreff = sp(0).Trim
-
-                    Dim dy_id As String = ""
-                    If betreff.ToString.Length > 15 Then
-                        dy_id = sql.getValueTxtBySql("SELECT isnull(aes_dyaAnmID,-1)  FROM [tblDakosy_AES] inner join tblDakosy_Zollanmeldungen on dy_id=aes_dyaAnmID where '" & betreff.ToString.Trim & "' LIKE aes_ObjectName +'%'  and LEN(aes_ObjectName)>=13", "FMZOLL")
-                    Else
-                        dy_id = sql.getValueTxtBySql("SELECT isnull(aes_dyaAnmID,-1)  FROM [tblDakosy_AES] inner join tblDakosy_Zollanmeldungen on dy_id=aes_dyaAnmID where aes_ObjectName='" & betreff.ToString.Trim & "'", "FMZOLL")
-                    End If
-                    '  IO.Directory.CreateDirectory(VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\TEST3\")
-
-                    DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("ZOLLDATEN", "ABD", dy_id, "", "", betreff.ToString.Replace("/", "-").Replace(",", "-").Replace("\", "-").Replace(":", "."), 0, False)
-                    DS.da_vorlage = False
-
-                    Dim ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\ABD\NOT_IDENTIFIED\"
-                    If IsNumeric(dy_id) AndAlso dy_id > 0 Then ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\ABD\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\"
-                    If Not IO.Directory.Exists(ZIEL_PFAD) Then IO.Directory.CreateDirectory(ZIEL_PFAD)
-
-                    Dim destFull = ""
-                    moveFile(pfad, ZIEL_PFAD, destFull)
-
-                    If DS.insertDataToDATENSERVER(destFull) Then
-                        If IsNumeric(dy_id) AndAlso dy_id > 0 Then
-                            sql.doSQL("UPDATE tblDakosy_Zollanmeldungen SET dy_ABD_dsId='" & DS.da_id & "' where dy_id='" & dy_id & "'", "FMZOLL")
-                            sql.doSQL("UPDATE Speditionsbuch SET DokumentId_ABD='" & DS.da_id & "' where AtlasBezNrEZA='" & betreff.ToString.Trim & "' AND DokumentId_ABD is null", "FMZOLL") 'Falls Spedbuch schon zuvor generiert wurde!
-                            doMailZollbeleg(DS.GET_TOP1_PATH, "ABD", dy_id)
-                        End If
-                    End If
-
-                End If
 
                 'AVM
             ElseIf betreff.ToString.Contains("AVM - Ausgangsvermerk (DE), ") Then
@@ -2012,7 +2024,10 @@ Public Class frmStartOptions
 
                     Dim dy_id As String = ""
                     If betreff.ToString.Length > 15 Then
-                        dy_id = sql.getValueTxtBySql("SELECT isnull(aes_dyaAnmID,-1)  FROM [tblDakosy_AES] inner join tblDakosy_Zollanmeldungen on dy_id=aes_dyaAnmID where '" & betreff.ToString.Trim & "' LIKE aes_ObjectName +'%'  and LEN(aes_ObjectName)>=13", "FMZOLL")
+                        dy_id = sql.getValueTxtBySql("SELECT isnull(aes_dyaAnmID,-1)  FROM [tblDakosy_AES] inner join tblDakosy_Zollanmeldungen on dy_id=aes_dyaAnmID where aes_ObjectName='" & betreff.ToString.Trim & "'", "FMZOLL")
+                        If dy_id = "" Then
+                            dy_id = sql.getValueTxtBySql("SELECT isnull(aes_dyaAnmID,-1)  FROM [tblDakosy_AES] inner join tblDakosy_Zollanmeldungen on dy_id=aes_dyaAnmID where '" & betreff.ToString.Trim & "' LIKE aes_ObjectName +'%'  and LEN(aes_ObjectName)>=13", "FMZOLL")
+                        End If
                     Else
                         dy_id = sql.getValueTxtBySql("SELECT isnull(aes_dyaAnmID,-1)  FROM [tblDakosy_AES] inner join tblDakosy_Zollanmeldungen on dy_id=aes_dyaAnmID where aes_ObjectName='" & betreff.ToString.Trim & "'", "FMZOLL")
                     End If
@@ -4064,4 +4079,9 @@ Public Class frmStartOptions
         showPic(blt.exportiereBlackList, PictureBox19)
         Me.Cursor = Cursors.Default
     End Sub
+
+    Private Sub LinkLabel50_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel50.LinkClicked
+        VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
+        sendWOELFL_USTVAntraege("al@verag.ag")
+    End Sub
 End Class
\ No newline at end of file