Merge branch 'ADMIN' of https://verag.visualstudio.com/ADMIN/_git/ADMIN into ADMIN

UID/Mitarbeiter/frmMitarbDetails.Designer.vb

@@ -36,22 +36,15 @@ 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()
         Me.txtATGRNAccessCode_AT51FP7 = New System.Windows.Forms.TextBox()
         Me.txtATGRNAccessCode_AT52VA6 = New System.Windows.Forms.TextBox()
@@ -64,8 +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 = 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()
@@ -75,15 +66,14 @@ Partial Class frmMitarbDetails
         Me.txtCSUser = New System.Windows.Forms.TextBox()
         Me.Label59 = New System.Windows.Forms.Label()
         Me.TabPage6 = New System.Windows.Forms.TabPage()
+        Me.btnDelete = New System.Windows.Forms.Button()
         Me.TabControl1 = New System.Windows.Forms.TabControl()
-        Me.dgvData = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.rtfInfoTimas = New System.Windows.Forms.RichTextBox()
         Me.btngetInfo = New System.Windows.Forms.Button()
         Me.cbxTimasAngelegt = New System.Windows.Forms.CheckBox()
         Me.txtLohnNr = New System.Windows.Forms.TextBox()
         Me.btnMAanlegen = New System.Windows.Forms.Button()
         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()
@@ -92,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()
@@ -122,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.cbxChatBenutzer = New System.Windows.Forms.CheckBox()
@@ -160,7 +142,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()
@@ -204,9 +185,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.btnDelete = New System.Windows.Forms.Button()
+        Me.cbxHO = 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.Label62 = New System.Windows.Forms.Label()
+        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()
@@ -216,7 +217,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()
@@ -229,6 +229,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
@@ -386,30 +387,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
@@ -430,18 +407,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
@@ -452,42 +417,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
@@ -529,35 +458,9 @@ 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)
-        Me.TabPage4.Controls.Add(Me.cboEZOLL_SB_UNISPED)
         Me.TabPage4.Controls.Add(Me.Label61)
         Me.TabPage4.Controls.Add(Me.txtATGRNAccessCode_AT51FP7)
         Me.TabPage4.Controls.Add(Me.txtATGRNAccessCode_AT52VA6)
@@ -570,6 +473,7 @@ Partial Class frmMitarbDetails
         Me.TabPage4.Controls.Add(Me.Label46)
         Me.TabPage4.Controls.Add(Me.Label44)
         Me.TabPage4.Controls.Add(Me.Label43)
+        Me.TabPage4.Controls.Add(Me.cboEZOLL_SB_UNISPED)
         Me.TabPage4.Controls.Add(Me.cboEZOLL_SB)
         Me.TabPage4.Controls.Add(Me.cboATLAS_SB)
         Me.TabPage4.Location = New System.Drawing.Point(4, 22)
@@ -580,6 +484,16 @@ Partial Class frmMitarbDetails
         Me.TabPage4.Text = "Zollprogramme"
         Me.TabPage4.UseVisualStyleBackColor = True
         '
+        'Label62
+        '
+        Me.Label62.AutoSize = True
+        Me.Label62.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label62.Location = New System.Drawing.Point(375, 13)
+        Me.Label62.Name = "Label62"
+        Me.Label62.Size = New System.Drawing.Size(61, 13)
+        Me.Label62.TabIndex = 122
+        Me.Label62.Text = "(UNISPED)"
+        '
         'Label61
         '
         Me.Label61.AutoSize = True
@@ -692,34 +606,6 @@ Partial Class frmMitarbDetails
         Me.Label43.TabIndex = 108
         Me.Label43.Text = "EZOLL Sachbearbeiter:"
         '
-        '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)
@@ -809,12 +695,12 @@ Partial Class frmMitarbDetails
         '
         Me.TabPage6.Controls.Add(Me.btnDelete)
         Me.TabPage6.Controls.Add(Me.TabControl1)
-        Me.TabPage6.Controls.Add(Me.dgvData)
         Me.TabPage6.Controls.Add(Me.rtfInfoTimas)
         Me.TabPage6.Controls.Add(Me.btngetInfo)
         Me.TabPage6.Controls.Add(Me.cbxTimasAngelegt)
         Me.TabPage6.Controls.Add(Me.txtLohnNr)
         Me.TabPage6.Controls.Add(Me.btnMAanlegen)
+        Me.TabPage6.Controls.Add(Me.dgvData)
         Me.TabPage6.Location = New System.Drawing.Point(4, 22)
         Me.TabPage6.Name = "TabPage6"
         Me.TabPage6.Size = New System.Drawing.Size(442, 174)
@@ -822,6 +708,19 @@ Partial Class frmMitarbDetails
         Me.TabPage6.Text = "Zeiterfassung"
         Me.TabPage6.UseVisualStyleBackColor = True
         '
+        'btnDelete
+        '
+        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(384, 3)
+        Me.btnDelete.Name = "btnDelete"
+        Me.btnDelete.Size = New System.Drawing.Size(55, 26)
+        Me.btnDelete.TabIndex = 123
+        Me.btnDelete.Text = "löschen"
+        Me.btnDelete.UseVisualStyleBackColor = False
+        Me.btnDelete.Visible = False
+        '
         'TabControl1
         '
         Me.TabControl1.Location = New System.Drawing.Point(5, 26)
@@ -830,16 +729,6 @@ Partial Class frmMitarbDetails
         Me.TabControl1.Size = New System.Drawing.Size(287, 145)
         Me.TabControl1.TabIndex = 122
         '
-        '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
-        '
         'rtfInfoTimas
         '
         Me.rtfInfoTimas.Location = New System.Drawing.Point(3, 27)
@@ -902,18 +791,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
@@ -1033,20 +910,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))
@@ -1056,19 +919,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))
@@ -1098,20 +948,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
@@ -1122,19 +958,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))
@@ -1174,31 +997,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
@@ -1345,20 +1143,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))
@@ -1405,20 +1189,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
@@ -1431,6 +1201,7 @@ Partial Class frmMitarbDetails
         '
         'GroupBox1
         '
+        Me.GroupBox1.Controls.Add(Me.cbxHO)
         Me.GroupBox1.Controls.Add(Me.cbxChatBenutzer)
         Me.GroupBox1.Controls.Add(Me.cbxTestaccount)
         Me.GroupBox1.Controls.Add(Me.cbxGebDat)
@@ -1472,7 +1243,7 @@ Partial Class frmMitarbDetails
         Me.cbxChatBenutzer.Checked = True
         Me.cbxChatBenutzer.CheckState = System.Windows.Forms.CheckState.Checked
         Me.cbxChatBenutzer.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cbxChatBenutzer.Location = New System.Drawing.Point(304, 194)
+        Me.cbxChatBenutzer.Location = New System.Drawing.Point(304, 179)
         Me.cbxChatBenutzer.Name = "cbxChatBenutzer"
         Me.cbxChatBenutzer.Size = New System.Drawing.Size(93, 17)
         Me.cbxChatBenutzer.TabIndex = 93
@@ -1483,7 +1254,7 @@ Partial Class frmMitarbDetails
         '
         Me.cbxTestaccount.AutoSize = True
         Me.cbxTestaccount.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cbxTestaccount.Location = New System.Drawing.Point(304, 174)
+        Me.cbxTestaccount.Location = New System.Drawing.Point(304, 159)
         Me.cbxTestaccount.Name = "cbxTestaccount"
         Me.cbxTestaccount.Size = New System.Drawing.Size(86, 17)
         Me.cbxTestaccount.TabIndex = 92
@@ -1524,7 +1295,7 @@ Partial Class frmMitarbDetails
         '
         Me.cbxAnrufen.AutoSize = True
         Me.cbxAnrufen.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cbxAnrufen.Location = New System.Drawing.Point(304, 157)
+        Me.cbxAnrufen.Location = New System.Drawing.Point(304, 142)
         Me.cbxAnrufen.Name = "cbxAnrufen"
         Me.cbxAnrufen.Size = New System.Drawing.Size(133, 17)
         Me.cbxAnrufen.TabIndex = 9
@@ -1790,19 +1561,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
@@ -2249,18 +2007,113 @@ Partial Class frmMitarbDetails
         Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
         Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
         '
-        'btnDelete
+        'cbxHO
         '
-        Me.btnDelete.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.cbxHO.AutoSize = True
-        Me.btnDelete.BackColor = System.Drawing.Color.White
+        Me.cbxHO.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnDelete.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.cbxHO.Location = New System.Drawing.Point(304, 199)
-        Me.btnDelete.Location = New System.Drawing.Point(384, 3)
+        Me.cbxHO.Name = "cbxHO"
-        Me.btnDelete.Name = "btnDelete"
+        Me.cbxHO.Size = New System.Drawing.Size(80, 17)
-        Me.btnDelete.Size = New System.Drawing.Size(55, 26)
+        Me.cbxHO.TabIndex = 94
-        Me.btnDelete.TabIndex = 123
+        Me.cbxHO.Text = "Homeoffice"
-        Me.btnDelete.Text = "löschen"
+        Me.cbxHO.UseVisualStyleBackColor = True
-        Me.btnDelete.UseVisualStyleBackColor = False
+        '
-        Me.btnDelete.Visible = False
+        '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
         '
@@ -2276,15 +2129,175 @@ Partial Class frmMitarbDetails
         Me.cboEZOLL_SB_UNISPED.Size = New System.Drawing.Size(104, 21)
         Me.cboEZOLL_SB_UNISPED.TabIndex = 121
         '
-        'Label62
+        'cboEZOLL_SB
         '
-        Me.Label62.AutoSize = True
+        Me.cboEZOLL_SB._allowedValuesFreiText = Nothing
-        Me.Label62.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboEZOLL_SB._allowFreiText = False
-        Me.Label62.Location = New System.Drawing.Point(375, 13)
+        Me.cboEZOLL_SB._value = ""
-        Me.Label62.Name = "Label62"
+        Me.cboEZOLL_SB.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.Label62.Size = New System.Drawing.Size(61, 13)
+        Me.cboEZOLL_SB.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.Label62.TabIndex = 122
+        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.Label62.Text = "(UNISPED)"
+        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
         '
@@ -2315,7 +2328,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()
@@ -2331,6 +2343,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
@@ -2517,4 +2530,5 @@ Partial Class frmMitarbDetails
     Friend WithEvents btnDelete As Button
     Friend WithEvents Label62 As Label
     Friend WithEvents cboEZOLL_SB_UNISPED As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents cbxHO As CheckBox
 End Class

UID/Mitarbeiter/frmMitarbDetails.vb

@@ -312,6 +312,8 @@ Public Class frmMitarbDetails
 
         cboTeam.changeItem(If(mitarbeiter.mit_teamId, ""))
 
+        cbxHO.Checked = mitarbeiter.mit_homeoffice
+
 
 
         cboKasse.changeItem("")
@@ -585,6 +587,7 @@ Public Class frmMitarbDetails
         mitarbeiter.mit_CSpwd = txtCSPW.Text
         mitarbeiter.mit_PersonalNr = txtLohnNr.Text
         mitarbeiter.mit_telefonnr = txtTelNr.Text
+        mitarbeiter.mit_homeoffice = cbxHO.Checked
 
 
         If IsNumeric(cboPersonal._value) AndAlso cboPersonal._value > 0 Then

UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb

@@ -47,6 +47,7 @@ Partial Class usrCntlMitarbeiter
         Me.TabPage8 = New System.Windows.Forms.TabPage()
         Me.dgvTimasNew = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.cbxZE = New System.Windows.Forms.CheckBox()
         Me.cbx = New System.Windows.Forms.CheckBox()
         Me.txtSuche = New System.Windows.Forms.TextBox()
         Me.Button1 = New System.Windows.Forms.Button()
@@ -57,7 +58,6 @@ Partial Class usrCntlMitarbeiter
         Me.UserKopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.BerechtigungenSetzenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.cbxZE = New System.Windows.Forms.CheckBox()
         Me.Panel2.SuspendLayout()
         Me.TabControl1.SuspendLayout()
         Me.TabPage1.SuspendLayout()
@@ -347,6 +347,19 @@ Partial Class usrCntlMitarbeiter
         Me.Panel1.Size = New System.Drawing.Size(889, 36)
         Me.Panel1.TabIndex = 26
         '
+        'cbxZE
+        '
+        Me.cbxZE.AutoSize = True
+        Me.cbxZE.Checked = True
+        Me.cbxZE.CheckState = System.Windows.Forms.CheckState.Indeterminate
+        Me.cbxZE.Location = New System.Drawing.Point(659, 13)
+        Me.cbxZE.Name = "cbxZE"
+        Me.cbxZE.Size = New System.Drawing.Size(133, 17)
+        Me.cbxZE.TabIndex = 51
+        Me.cbxZE.Text = "Zeiterfassung-Account"
+        Me.cbxZE.ThreeState = True
+        Me.cbxZE.UseVisualStyleBackColor = True
+        '
         'cbx
         '
         Me.cbx.AutoSize = True
@@ -424,19 +437,6 @@ Partial Class usrCntlMitarbeiter
         Me.ContextMenuStrip2.Name = "ContextMenuStrip2"
         Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4)
         '
-        'cbxZE
-        '
-        Me.cbxZE.AutoSize = True
-        Me.cbxZE.Checked = True
-        Me.cbxZE.CheckState = System.Windows.Forms.CheckState.Indeterminate
-        Me.cbxZE.Location = New System.Drawing.Point(659, 13)
-        Me.cbxZE.Name = "cbxZE"
-        Me.cbxZE.Size = New System.Drawing.Size(133, 17)
-        Me.cbxZE.TabIndex = 51
-        Me.cbxZE.Text = "Zeiterfassung-Account"
-        Me.cbxZE.ThreeState = True
-        Me.cbxZE.UseVisualStyleBackColor = True
-        '
         'usrCntlMitarbeiter
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

UID/Mitarbeiter/usrCntlMitarbeiter.vb

@@ -856,7 +856,7 @@ Public Class usrCntlMitarbeiter
         Me.Cursor = Cursors.Default
     End Sub
 
-    Private Sub cbxZE_CheckedChanged(sender As Object, e As EventArgs) Handles cbxZE.CheckedChanged
+    Private Sub cbxZE_CheckStateChanged(sender As Object, e As EventArgs) Handles cbxZE.CheckStateChanged
         Tabelle_anzeigen()
     End Sub
 End Class

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) 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) 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_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)"
 
 
 
@@ -1630,6 +1630,7 @@ Public Class cMitarbeiter
                 cmd.Parameters.AddWithValue("@mit_ATGRNAccessCode_AT51FP7 ", If(m.mit_ATGRNAccessCode_AT51FP7, DBNull.Value))
                 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)
 
                 Try
                     mid = cmd.ExecuteScalar()
@@ -1648,7 +1649,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_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" &
                      " WHERE mit_id=@mit_id "
 
 
@@ -1729,6 +1730,7 @@ Public Class cMitarbeiter
                 cmd.Parameters.AddWithValue("@mit_ATGRNAccessCode_AT51FP7 ", If(m.mit_ATGRNAccessCode_AT51FP7, DBNull.Value))
                 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)
 
 
 

initATLASAufschubkonten/cAsfinag.vb

@@ -1,12 +1,6 @@
 Imports System.Data.SqlClient
-Imports System.Data.SqlTypes
-Imports System.Diagnostics.Eventing
 Imports System.IO
 Imports System.Reflection
-Imports System.Security.Cryptography
-Imports com.itextpdf.text.pdf
-Imports DocumentFormat.OpenXml.VariantTypes
-Imports RoutineManager.cAsfinag
 Imports VERAG_PROG_ALLGEMEIN
 
 Public Class cAsfinag
@@ -1357,8 +1351,9 @@ Public Class cAsfinag
                         '    zielPfad = SERVER_Path & "\" & Now.ToString("yyyyMMdd_HHmmss_") & fi.Name
                         'End While
                         IO.File.Copy(f, zielPfad & "\" & fi.Name, True)
-                        If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM And IO.File.Exists(zielPfad & "\" & fi.Name) Then
+                        If IO.File.Exists(zielPfad & "\" & fi.Name) Then
-                            IO.File.Move(BEREITSTELLUNG_PFAD & "\" & fi.Name, ARCHIV_PFAD & "\" & fi.Name)
+                            If Not IO.Directory.Exists(ARCHIV_PFAD & "\" & Now.Year & "\" & filename & "\") Then IO.Directory.CreateDirectory(ARCHIV_PFAD & "\" & Now.Year & "\" & filename & "\")
+                            IO.File.Move(BEREITSTELLUNG_PFAD & "\" & fi.Name, ARCHIV_PFAD & "\" & Now.Year & "\" & filename & "\" & fi.Name)
                         End If
                         cnt += 1
                     End If
@@ -1399,16 +1394,15 @@ Public Class cAsfinag
         FTP_PFAD = cAsfinag.Paramter.GET_PARAM_ByName("SERVER_Path_In", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
 
         If Not IO.Directory.Exists(VERARBEITUNG_PFAD) Then IO.Directory.CreateDirectory(VERARBEITUNG_PFAD)
-        If Not IO.Directory.Exists(FTP_PFAD_TEST) Then IO.Directory.CreateDirectory(FTP_PFAD_TEST)
 
     End Function
 
-    Function getNachrichtenDatenFromFTP(ByRef filenameList As List(Of String), ByVal fileType As String) As Integer
+    Function getNachrichtenDatenFromFTP(ByRef filenameList As List(Of String), ByVal fileType As String, ByRef testFTP As Boolean) As Integer
         Dim cnt = 0
         Try
             Dim SERVERPath = ""
 
-            If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
+            If testFTP Then
 
                 SERVERPath = Me.FTP_PFAD_TEST
             Else
@@ -1419,7 +1413,7 @@ Public Class cAsfinag
 
             For Each f In IO.Directory.GetFiles(SERVERPath)
                 Dim fi As New IO.FileInfo(f)
-                If fi.Name.ToLower.Contains(fileType) Then
+                If fi.Name.ToUpper.Contains(fileType) Then
                     If Not fi.Name.StartsWith(".") Then
                         Dim zielPfad = VERARBEITUNG_PFAD & "\" & fi.Name
                         While IO.File.Exists(zielPfad)
@@ -1431,7 +1425,7 @@ Public Class cAsfinag
                         End If
 
                         Dim filename = frmStartOptions.cut_file((New FileInfo(zielPfad)).Name)
-                        If filename.ToLower.Contains(fileType) Then
+                        If filename.ToUpper.Contains(fileType) Then
                             filenameList.Add(filename)
                             cnt += 1
                         End If

initATLASAufschubkonten/frmAsfinag_NachrichtenVerarbeitung.Designer.vb

@@ -26,10 +26,8 @@ Partial Class frmAsfinag_NachrichtenVerabeitung
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAsfinag_NachrichtenVerabeitung))
         Me.btn = New System.Windows.Forms.Button()
         Me.pnl = New System.Windows.Forms.Panel()
+        Me.lblTestsystem = New System.Windows.Forms.Label()
         Me.lblDatenCnt = New System.Windows.Forms.Label()
-        Me.dgvEinarbeitung = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
-        Me.clmnArt = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.Column1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.Label9 = New System.Windows.Forms.Label()
         Me.Button2 = New System.Windows.Forms.Button()
         Me.Label7 = New System.Windows.Forms.Label()
@@ -40,7 +38,10 @@ Partial Class frmAsfinag_NachrichtenVerabeitung
         Me.btnOK = New System.Windows.Forms.Button()
         Me.Label2 = New System.Windows.Forms.Label()
         Me.Label1 = New System.Windows.Forms.Label()
-        Me.lblTestsystem = New System.Windows.Forms.Label()
+        Me.dgvEinarbeitung = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.clmnArt = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.Column1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.lblFTP = New System.Windows.Forms.Label()
         Me.pnl.SuspendLayout()
         CType(Me.dgvEinarbeitung, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
@@ -65,6 +66,7 @@ Partial Class frmAsfinag_NachrichtenVerabeitung
         '
         Me.pnl.BackColor = System.Drawing.Color.White
         Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.pnl.Controls.Add(Me.lblFTP)
         Me.pnl.Controls.Add(Me.lblTestsystem)
         Me.pnl.Controls.Add(Me.lblDatenCnt)
         Me.pnl.Controls.Add(Me.dgvEinarbeitung)
@@ -85,6 +87,18 @@ Partial Class frmAsfinag_NachrichtenVerabeitung
         Me.pnl.Size = New System.Drawing.Size(456, 319)
         Me.pnl.TabIndex = 1
         '
+        'lblTestsystem
+        '
+        Me.lblTestsystem.AutoSize = True
+        Me.lblTestsystem.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblTestsystem.ForeColor = System.Drawing.Color.Red
+        Me.lblTestsystem.Location = New System.Drawing.Point(274, 8)
+        Me.lblTestsystem.Name = "lblTestsystem"
+        Me.lblTestsystem.Size = New System.Drawing.Size(89, 13)
+        Me.lblTestsystem.TabIndex = 20
+        Me.lblTestsystem.Text = "TESTSYSTEM"
+        Me.lblTestsystem.Visible = False
+        '
         'lblDatenCnt
         '
         Me.lblDatenCnt.AutoSize = True
@@ -96,35 +110,6 @@ Partial Class frmAsfinag_NachrichtenVerabeitung
         Me.lblDatenCnt.Text = "0"
         Me.lblDatenCnt.Visible = False
         '
-        'dgvEinarbeitung
-        '
-        Me.dgvEinarbeitung.AKTUALISIERUNGS_INTERVALL = -1
-        Me.dgvEinarbeitung.AllowUserToAddRows = False
-        Me.dgvEinarbeitung.AllowUserToDeleteRows = False
-        Me.dgvEinarbeitung.AllowUserToOrderColumns = True
-        Me.dgvEinarbeitung.AllowUserToResizeColumns = False
-        Me.dgvEinarbeitung.AllowUserToResizeRows = False
-        Me.dgvEinarbeitung.BackgroundColor = System.Drawing.Color.White
-        Me.dgvEinarbeitung.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.dgvEinarbeitung.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnArt, Me.Column1})
-        Me.dgvEinarbeitung.Location = New System.Drawing.Point(12, 164)
-        Me.dgvEinarbeitung.Name = "dgvEinarbeitung"
-        Me.dgvEinarbeitung.RowHeadersVisible = False
-        Me.dgvEinarbeitung.Size = New System.Drawing.Size(291, 145)
-        Me.dgvEinarbeitung.TabIndex = 18
-        '
-        'clmnArt
-        '
-        Me.clmnArt.HeaderText = "Dateiname"
-        Me.clmnArt.Name = "clmnArt"
-        Me.clmnArt.Width = 150
-        '
-        'Column1
-        '
-        Me.Column1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
-        Me.Column1.HeaderText = "Status"
-        Me.Column1.Name = "Column1"
-        '
         'Label9
         '
         Me.Label9.AutoSize = True
@@ -152,9 +137,9 @@ Partial Class frmAsfinag_NachrichtenVerabeitung
         Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Label7.Location = New System.Drawing.Point(8, 34)
         Me.Label7.Name = "Label7"
-        Me.Label7.Size = New System.Drawing.Size(90, 13)
+        Me.Label7.Size = New System.Drawing.Size(107, 13)
         Me.Label7.TabIndex = 13
-        Me.Label7.Text = "Daten sichern:"
+        Me.Label7.Text = "Daten laden vom:"
         '
         'ListBox3
         '
@@ -226,17 +211,44 @@ Partial Class frmAsfinag_NachrichtenVerabeitung
         Me.Label1.TabIndex = 8
         Me.Label1.Text = "Einarbeitung:"
         '
-        'lblTestsystem
+        'dgvEinarbeitung
         '
-        Me.lblTestsystem.AutoSize = True
+        Me.dgvEinarbeitung.AKTUALISIERUNGS_INTERVALL = -1
-        Me.lblTestsystem.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.dgvEinarbeitung.AllowUserToAddRows = False
-        Me.lblTestsystem.ForeColor = System.Drawing.Color.Red
+        Me.dgvEinarbeitung.AllowUserToDeleteRows = False
-        Me.lblTestsystem.Location = New System.Drawing.Point(274, 8)
+        Me.dgvEinarbeitung.AllowUserToOrderColumns = True
-        Me.lblTestsystem.Name = "lblTestsystem"
+        Me.dgvEinarbeitung.AllowUserToResizeColumns = False
-        Me.lblTestsystem.Size = New System.Drawing.Size(89, 13)
+        Me.dgvEinarbeitung.AllowUserToResizeRows = False
-        Me.lblTestsystem.TabIndex = 20
+        Me.dgvEinarbeitung.BackgroundColor = System.Drawing.Color.White
-        Me.lblTestsystem.Text = "TESTSYSTEM"
+        Me.dgvEinarbeitung.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.lblTestsystem.Visible = False
+        Me.dgvEinarbeitung.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnArt, Me.Column1})
+        Me.dgvEinarbeitung.Location = New System.Drawing.Point(12, 164)
+        Me.dgvEinarbeitung.Name = "dgvEinarbeitung"
+        Me.dgvEinarbeitung.RowHeadersVisible = False
+        Me.dgvEinarbeitung.Size = New System.Drawing.Size(291, 145)
+        Me.dgvEinarbeitung.TabIndex = 18
+        '
+        'clmnArt
+        '
+        Me.clmnArt.HeaderText = "Dateiname"
+        Me.clmnArt.Name = "clmnArt"
+        Me.clmnArt.Width = 150
+        '
+        'Column1
+        '
+        Me.Column1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
+        Me.Column1.HeaderText = "Status"
+        Me.Column1.Name = "Column1"
+        '
+        'lblFTP
+        '
+        Me.lblFTP.AutoSize = True
+        Me.lblFTP.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblFTP.ForeColor = System.Drawing.Color.Red
+        Me.lblFTP.Location = New System.Drawing.Point(121, 34)
+        Me.lblFTP.Name = "lblFTP"
+        Me.lblFTP.Size = New System.Drawing.Size(0, 13)
+        Me.lblFTP.TabIndex = 21
         '
         'frmAsfinag_NachrichtenVerabeitung
         '
@@ -272,4 +284,5 @@ Partial Class frmAsfinag_NachrichtenVerabeitung
     Friend WithEvents clmnArt As DataGridViewTextBoxColumn
     Friend WithEvents Column1 As DataGridViewTextBoxColumn
     Friend WithEvents lblTestsystem As Label
+    Friend WithEvents lblFTP As Label
 End Class

initATLASAufschubkonten/frmAsfinag_NachrichtenVerarbeitung.vb

@@ -1,39 +1,31 @@
 Imports System.IO
-Imports System.Globalization
-Imports System.Xml
-Imports Renci.SshNet
-Imports System.Net
-Imports System.Text
-Imports System.ComponentModel
-Imports RoutineManager.cAsfinag
-Imports DocumentFormat.OpenXml.Drawing.Charts
-Imports DocumentFormat.OpenXml.VariantTypes
 
 Public Class frmAsfinag_NachrichtenVerabeitung
     Dim cntDatenEingelesen As Integer = 0
     Dim dsNichtErkannt As Integer = 0
     Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
     Dim allowClose = False
-    '  Dim DY_PFAD = "C:\Users\DEVELOPER1\Desktop\test\TEST\"
     Dim PARTNERSYSTEM = "ASFINAG"
     Dim FileType As String
+    Dim testFTP As Boolean
     Dim asfinag As New cAsfinag()
-
     Dim Dateiname = ""
 
-    Sub New(FileType)
+    Sub New(FileType, testFTP)
 
         ' Dieser Aufruf ist für den Designer erforderlich.
         InitializeComponent()
 
         ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
         Me.FileType = FileType
+        Me.testFTP = testFTP
     End Sub
-    Sub New(FileType, allowClose) 'autostart
+    Sub New(FileType, testFTP, allowClose) 'autostart
 
         ' Dieser Aufruf ist für den Designer erforderlich.
         InitializeComponent()
-        FileType = FileType
+        Me.FileType = FileType
+        Me.testFTP = testFTP
         Me.allowClose = allowClose
         ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
 
@@ -41,6 +33,7 @@ Public Class frmAsfinag_NachrichtenVerabeitung
 
     Private Sub frmDYNachrichtenVerarbeitung_Load(sender As Object, e As EventArgs) Handles Me.Load
         lblTestsystem.Visible = VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM
+        lblFTP.Text = IIf(testFTP, "TEST-FTP", "PROD-FTP")
         asfinag.initImportPfade()
 
         If FileType <> "" Then
@@ -49,7 +42,7 @@ Public Class frmAsfinag_NachrichtenVerabeitung
 
             For Each d In System.IO.Directory.GetFiles(asfinag.VERARBEITUNG_PFAD)
                 Dim filename = frmStartOptions.cut_file(d)
-                If filename.ToLower.Contains(FileType) Then
+                If filename.ToUpper.Contains(FileType) Then
                     Dim targetsystem As String = "nicht definiert"
                     If filename.Substring(0, 1) = "T" Then
                         targetsystem = "Test"
@@ -59,7 +52,7 @@ Public Class frmAsfinag_NachrichtenVerabeitung
                     ListBox3.Items.Add(filename)
                 End If
 
-                    Me.Refresh()
+                Me.Refresh()
             Next
         End If
 
@@ -70,7 +63,7 @@ Public Class frmAsfinag_NachrichtenVerabeitung
         Try
             Dim stringLIst As New List(Of String)
             Label9.Visible = True
-            Dim cnt = asfinag.getNachrichtenDatenFromFTP(stringLIst, FileType)
+            Dim cnt = asfinag.getNachrichtenDatenFromFTP(stringLIst, FileType, testFTP)
             For Each s In stringLIst
                 Dim targetsystem As String = "nicht definiert"
                 If s.Substring(0, 1) = "T" Then
@@ -154,7 +147,7 @@ Public Class frmAsfinag_NachrichtenVerabeitung
                                        MsgBoxStyle.DefaultButton2 = MsgBoxStyle.OkOnly)
                             Exit Sub
 
-                        ElseIf FileType = "clf" Then
+                        ElseIf FileType = "CLF" Then
 
                             If asfinag.readAndSaveCLF(objFileRead, fi) Then
                                 addDGVEinarbeitung(fi.Name, "OK")
@@ -164,7 +157,7 @@ Public Class frmAsfinag_NachrichtenVerabeitung
                             End If
 
 
-                        ElseIf FileType = "ttr" Then
+                        ElseIf FileType = "TTR" Then
 
                             If asfinag.readAndSaveTTR(objFileRead, fi) Then
                                 addDGVEinarbeitung(fi.Name, "OK")
@@ -178,13 +171,13 @@ Public Class frmAsfinag_NachrichtenVerabeitung
                     End If
 
                     If found Then
-                        If Not IO.Directory.Exists(asfinag.ARCHIV_PFAD & "\" & Now.Year & "\" & Now.ToString("MMdd") & "\") Then IO.Directory.CreateDirectory(asfinag.ARCHIV_PFAD & "\" & Now.Year & "\" & Now.ToString("MMdd") & "\")
+                        If Not IO.Directory.Exists(asfinag.ARCHIV_PFAD & "\" & Now.Year & "\" & FileType) Then IO.Directory.CreateDirectory(asfinag.ARCHIV_PFAD & "\" & Now.Year & "\" & FileType & "\")
-                        frmStartOptions.moveFile(d, asfinag.ARCHIV_PFAD & "\" & Now.Year & "\" & Now.ToString("MMdd") & "\", asfinag.VERARBEITUNG_PFAD)
+                        frmStartOptions.moveFile(d, asfinag.ARCHIV_PFAD & "\" & Now.Year & "\" & FileType & "\", asfinag.VERARBEITUNG_PFAD)
                         cntDatenEingelesen += 1
                     Else
                         If Not found Then
-                            If Not IO.Directory.Exists(asfinag.ERROR_PFAD & "\" & Now.Year & "\" & Now.ToString("MMdd") & "\") Then IO.Directory.CreateDirectory(asfinag.ERROR_PFAD & "\" & Now.Year & "\" & Now.ToString("MMdd") & "\")
+                            If Not IO.Directory.Exists(asfinag.ERROR_PFAD & "\" & Now.Year & "\" & FileType & "\") Then IO.Directory.CreateDirectory(asfinag.ERROR_PFAD & "\" & Now.Year & "\" & FileType & "\")
-                            frmStartOptions.moveFile(d, asfinag.ERROR_PFAD & "\" & Now.Year & "\" & Now.ToString("MMdd") & "\", asfinag.VERARBEITUNG_PFAD)
+                            frmStartOptions.moveFile(d, asfinag.ERROR_PFAD & "\" & Now.Year & "\" & FileType & "\", asfinag.VERARBEITUNG_PFAD)
                             ' nciht gefunden, oder durch ERROR nicht eingearbt,.
                             dsNichtErkannt += 1
                         End If

initATLASAufschubkonten/frmStartOptions.Designer.vb

@@ -25,6 +25,7 @@ Partial Class frmStartOptions
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmStartOptions))
         Me.pnl = New System.Windows.Forms.Panel()
+        Me.LinkLabel48 = New System.Windows.Forms.LinkLabel()
         Me.cbxVermerk = New System.Windows.Forms.CheckBox()
         Me.cbxDatevTest = New System.Windows.Forms.CheckBox()
         Me.cbxDatevOpen = New System.Windows.Forms.CheckBox()
@@ -159,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.CheckBox8 = New System.Windows.Forms.CheckBox()
         Me.PictureBox21 = New System.Windows.Forms.PictureBox()
         Me.LinkLabel47 = New System.Windows.Forms.LinkLabel()
         Me.LinkLabel46 = New System.Windows.Forms.LinkLabel()
@@ -195,7 +197,7 @@ 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.LinkLabel48 = New System.Windows.Forms.LinkLabel()
+        Me.cbxTestFTP = New System.Windows.Forms.CheckBox()
         Me.pnl.SuspendLayout()
         CType(Me.piceZollAnh, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.tbcntr.SuspendLayout()
@@ -304,6 +306,17 @@ Partial Class frmStartOptions
         Me.pnl.Size = New System.Drawing.Size(861, 827)
         Me.pnl.TabIndex = 0
         '
+        'LinkLabel48
+        '
+        Me.LinkLabel48.AutoSize = True
+        Me.LinkLabel48.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.LinkLabel48.Location = New System.Drawing.Point(405, 135)
+        Me.LinkLabel48.Name = "LinkLabel48"
+        Me.LinkLabel48.Size = New System.Drawing.Size(129, 13)
+        Me.LinkLabel48.TabIndex = 77
+        Me.LinkLabel48.TabStop = True
+        Me.LinkLabel48.Text = "ZOLARIS Anh. UNISPED"
+        '
         'cbxVermerk
         '
         Me.cbxVermerk.AutoSize = True
@@ -1966,6 +1979,8 @@ Partial Class frmStartOptions
         '
         'TabPage4
         '
+        Me.TabPage4.Controls.Add(Me.cbxTestFTP)
+        Me.TabPage4.Controls.Add(Me.CheckBox8)
         Me.TabPage4.Controls.Add(Me.PictureBox21)
         Me.TabPage4.Controls.Add(Me.LinkLabel47)
         Me.TabPage4.Controls.Add(Me.LinkLabel46)
@@ -1984,11 +1999,24 @@ Partial Class frmStartOptions
         Me.TabPage4.Text = "Asfinag"
         Me.TabPage4.UseVisualStyleBackColor = True
         '
+        'CheckBox8
+        '
+        Me.CheckBox8.AutoSize = True
+        Me.CheckBox8.Checked = True
+        Me.CheckBox8.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.CheckBox8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.CheckBox8.Location = New System.Drawing.Point(20, 13)
+        Me.CheckBox8.Name = "CheckBox8"
+        Me.CheckBox8.Size = New System.Drawing.Size(122, 17)
+        Me.CheckBox8.TabIndex = 76
+        Me.CheckBox8.Text = "Import in Testsystem"
+        Me.CheckBox8.UseVisualStyleBackColor = True
+        '
         'PictureBox21
         '
         Me.PictureBox21.BackgroundImage = CType(resources.GetObject("PictureBox21.BackgroundImage"), System.Drawing.Image)
         Me.PictureBox21.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.PictureBox21.Location = New System.Drawing.Point(99, 115)
+        Me.PictureBox21.Location = New System.Drawing.Point(99, 168)
         Me.PictureBox21.Name = "PictureBox21"
         Me.PictureBox21.Size = New System.Drawing.Size(18, 18)
         Me.PictureBox21.TabIndex = 40
@@ -1999,7 +2027,7 @@ Partial Class frmStartOptions
         '
         Me.LinkLabel47.AutoSize = True
         Me.LinkLabel47.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.LinkLabel47.Location = New System.Drawing.Point(17, 115)
+        Me.LinkLabel47.Location = New System.Drawing.Point(17, 168)
         Me.LinkLabel47.Name = "LinkLabel47"
         Me.LinkLabel47.Size = New System.Drawing.Size(72, 13)
         Me.LinkLabel47.TabIndex = 39
@@ -2010,7 +2038,7 @@ Partial Class frmStartOptions
         '
         Me.LinkLabel46.AutoSize = True
         Me.LinkLabel46.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.LinkLabel46.Location = New System.Drawing.Point(17, 91)
+        Me.LinkLabel46.Location = New System.Drawing.Point(17, 144)
         Me.LinkLabel46.Name = "LinkLabel46"
         Me.LinkLabel46.Size = New System.Drawing.Size(120, 13)
         Me.LinkLabel46.TabIndex = 38
@@ -2021,7 +2049,7 @@ Partial Class frmStartOptions
         '
         Me.PictureBox19.BackgroundImage = CType(resources.GetObject("PictureBox19.BackgroundImage"), System.Drawing.Image)
         Me.PictureBox19.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.PictureBox19.Location = New System.Drawing.Point(321, 68)
+        Me.PictureBox19.Location = New System.Drawing.Point(110, 250)
         Me.PictureBox19.Name = "PictureBox19"
         Me.PictureBox19.Size = New System.Drawing.Size(18, 18)
         Me.PictureBox19.TabIndex = 37
@@ -2032,7 +2060,7 @@ Partial Class frmStartOptions
         '
         Me.PictureBox18.BackgroundImage = CType(resources.GetObject("PictureBox18.BackgroundImage"), System.Drawing.Image)
         Me.PictureBox18.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.PictureBox18.Location = New System.Drawing.Point(321, 38)
+        Me.PictureBox18.Location = New System.Drawing.Point(110, 220)
         Me.PictureBox18.Name = "PictureBox18"
         Me.PictureBox18.Size = New System.Drawing.Size(18, 18)
         Me.PictureBox18.TabIndex = 36
@@ -2043,7 +2071,7 @@ Partial Class frmStartOptions
         '
         Me.LinkLabel41.AutoSize = True
         Me.LinkLabel41.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.LinkLabel41.Location = New System.Drawing.Point(228, 68)
+        Me.LinkLabel41.Location = New System.Drawing.Point(17, 250)
         Me.LinkLabel41.Name = "LinkLabel41"
         Me.LinkLabel41.Size = New System.Drawing.Size(82, 13)
         Me.LinkLabel41.TabIndex = 35
@@ -2054,7 +2082,7 @@ Partial Class frmStartOptions
         '
         Me.LinkLabel42.AutoSize = True
         Me.LinkLabel42.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.LinkLabel42.Location = New System.Drawing.Point(228, 43)
+        Me.LinkLabel42.Location = New System.Drawing.Point(17, 225)
         Me.LinkLabel42.Name = "LinkLabel42"
         Me.LinkLabel42.Size = New System.Drawing.Size(87, 13)
         Me.LinkLabel42.TabIndex = 34
@@ -2064,9 +2092,9 @@ Partial Class frmStartOptions
         'Label23
         '
         Me.Label23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label23.Location = New System.Drawing.Point(228, 16)
+        Me.Label23.Location = New System.Drawing.Point(17, 198)
         Me.Label23.Name = "Label23"
-        Me.Label23.Size = New System.Drawing.Size(296, 16)
+        Me.Label23.Size = New System.Drawing.Size(111, 19)
         Me.Label23.TabIndex = 33
         Me.Label23.Text = "Export"
         '
@@ -2074,7 +2102,7 @@ Partial Class frmStartOptions
         '
         Me.LinkLabel43.AutoSize = True
         Me.LinkLabel43.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.LinkLabel43.Location = New System.Drawing.Point(17, 68)
+        Me.LinkLabel43.Location = New System.Drawing.Point(17, 121)
         Me.LinkLabel43.Name = "LinkLabel43"
         Me.LinkLabel43.Size = New System.Drawing.Size(102, 13)
         Me.LinkLabel43.TabIndex = 32
@@ -2085,7 +2113,7 @@ Partial Class frmStartOptions
         '
         Me.LinkLabel44.AutoSize = True
         Me.LinkLabel44.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.LinkLabel44.Location = New System.Drawing.Point(17, 43)
+        Me.LinkLabel44.Location = New System.Drawing.Point(17, 96)
         Me.LinkLabel44.Name = "LinkLabel44"
         Me.LinkLabel44.Size = New System.Drawing.Size(126, 13)
         Me.LinkLabel44.TabIndex = 31
@@ -2096,7 +2124,7 @@ Partial Class frmStartOptions
         '
         Me.Label24.AutoSize = True
         Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label24.Location = New System.Drawing.Point(17, 16)
+        Me.Label24.Location = New System.Drawing.Point(17, 69)
         Me.Label24.Name = "Label24"
         Me.Label24.Size = New System.Drawing.Size(42, 13)
         Me.Label24.TabIndex = 30
@@ -2408,16 +2436,18 @@ Partial Class frmStartOptions
         Me.Button21.Text = "AAS Sendung 24h"
         Me.Button21.UseVisualStyleBackColor = True
         '
-        'LinkLabel48
+        'cbxTestFTP
         '
-        Me.LinkLabel48.AutoSize = True
+        Me.cbxTestFTP.AutoSize = True
-        Me.LinkLabel48.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.cbxTestFTP.Checked = True
-        Me.LinkLabel48.Location = New System.Drawing.Point(405, 135)
+        Me.cbxTestFTP.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.LinkLabel48.Name = "LinkLabel48"
+        Me.cbxTestFTP.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.LinkLabel48.Size = New System.Drawing.Size(129, 13)
+        Me.cbxTestFTP.Location = New System.Drawing.Point(20, 36)
-        Me.LinkLabel48.TabIndex = 77
+        Me.cbxTestFTP.Name = "cbxTestFTP"
-        Me.LinkLabel48.TabStop = True
+        Me.cbxTestFTP.Size = New System.Drawing.Size(123, 17)
-        Me.LinkLabel48.Text = "ZOLARIS Anh. UNISPED"
+        Me.cbxTestFTP.TabIndex = 77
+        Me.cbxTestFTP.Text = "Import von Test-FTP"
+        Me.cbxTestFTP.UseVisualStyleBackColor = True
         '
         'frmStartOptions
         '
@@ -2643,4 +2673,6 @@ Partial Class frmStartOptions
     Friend WithEvents LinkLabel47 As LinkLabel
     Friend WithEvents PictureBox21 As PictureBox
     Friend WithEvents LinkLabel48 As LinkLabel
+    Friend WithEvents CheckBox8 As CheckBox
+    Friend WithEvents cbxTestFTP As CheckBox
 End Class

initATLASAufschubkonten/frmStartOptions.resx

@@ -140,6 +140,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="PictureBox99.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -481,6 +649,9 @@
   <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
@@ -527,174 +698,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="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

initATLASAufschubkonten/frmStartOptions.vb

@@ -3240,14 +3240,14 @@ Public Class frmStartOptions
 
                 ' Kfz Kennzeichen einlesen.
 
-
                 Dim strSQLASFINAG = "SELECT cardNumber, ValidTo, OBUID, vehicleLicensePlate, nationality, contractDate, vehicleCategory, emissionCategory, status FROM vwCLFBody"
 
                 Dim dtAsfinag As DataTable = SQl.loadDgvBySql_Param(strSQLASFINAG, "ASFINAG")
 
-                If dtAsfinag.Rows.Count < 1 Then
+                ' ????????
-                    Return False
+                'If dtAsfinag.Rows.Count < 1 Then
-                End If
+                '    Return False
+                'End If
 
                 For Each row As DataRow In dtAsfinag.Rows
 
@@ -3272,7 +3272,7 @@ Public Class frmStartOptions
                         Else
                             SDL.Änderungsdatum = Now
                         End If
-                        SDL.Sachbearbeiter = "ASFINAG"
+                        SDL.Sachbearbeiter = "ASFINAG" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "_TEST", "")
 
                         Dim Validto = SQL.checkNullStr(row.Item("contractDate"))
 
@@ -3603,23 +3603,26 @@ Public Class frmStartOptions
 
     Private Sub LinkLabel44_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel44.LinkClicked
         Me.Visible = False
-        VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
+        VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = CheckBox8.Checked
-        Dim f As New frmAsfinag_NachrichtenVerabeitung("ttr")
+        If Not checkTestsystemSettings() Then Exit Sub
+        Dim f As New frmAsfinag_NachrichtenVerabeitung("TTR", cbxTestFTP.Checked)
         f.ShowDialog()
         Me.Visible = True
     End Sub
 
     Private Sub LinkLabel43_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel43.LinkClicked
         Me.Visible = False
-        VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
+        VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = CheckBox8.Checked
-        Dim f As New frmAsfinag_NachrichtenVerabeitung("clf")
+        If Not checkTestsystemSettings() Then Exit Sub
+        Dim f As New frmAsfinag_NachrichtenVerabeitung("CLF", cbxTestFTP.Checked)
         f.ShowDialog()
         Me.Visible = True
         'ASFINAG_LKW(False)
     End Sub
 
     Private Sub LinkLabel42_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel42.LinkClicked
-        VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
+        VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = CheckBox8.Checked
+        If Not checkTestsystemSettings() Then Exit Sub
         Me.Cursor = Cursors.WaitCursor
         Dim blt = New cAsfinag.Exportist
         blt.initExportPfade()
@@ -3628,7 +3631,8 @@ Public Class frmStartOptions
     End Sub
 
     Private Sub LinkLabel41_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel41.LinkClicked
-        VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
+        VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = CheckBox8.Checked
+        If Not checkTestsystemSettings() Then Exit Sub
         Me.Cursor = Cursors.WaitCursor
         Dim blt = New cAsfinag.Exportist
         blt.initExportPfade()
@@ -3792,11 +3796,29 @@ Public Class frmStartOptions
     Private Sub LinkLabel99_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel46.LinkClicked
 
         Try
+            VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = CheckBox8.Checked
 
             Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
             Dim frm As New Form
             Dim dgv As New DataGridView()
-            Dim dt As DataTable = SQL.loadDgvBySql("SELECT dbo.CLFBody.* FROM dbo.CLF INNER JOIN dbo.CLFBody ON dbo.CLF.PKHistory = dbo.CLFBody.PKHistory AND dbo.CLF.PKFileName = dbo.CLFBody.PKFileName", "ASFINAG")
+            Dim dt As DataTable = SQL.loadDgvBySql("SELECT dbo.CLFBody.PKHistory,
+                                                    dbo.CLFBody.PKFileName,
+                                                    dbo.CLFBody.PKLine,
+                                                    dbo.CLFBody.RecordType,
+                                                    dbo.CLFBody.fileNumber,
+                                                    dbo.CLFBody.cardNumber,
+                                                    dbo.CLFBody.validTo	OBUID,
+                                                    dbo.CLFBody.vehicleLicensePlate,
+                                                    dbo.CLFBody.nationality,
+                                                    dbo.CLFBody.vehicleCategory,
+                                                    dbo.CLFBody.emissionCategory,
+                                                    dbo.CLFBody.status,
+                                                    dbo.CLFBody.contractDate,
+                                                    dbo.CLFBody.fileVersion,
+                                                    dbo.CLFBody.engineCharacteristics,
+                                                    dbo.CLFBody.CO2EmissionsClass,
+                                                    dbo.CLFBody.contractType FROM dbo.CLF INNER JOIN dbo.CLFBody ON dbo.CLF.PKHistory = dbo.CLFBody.PKHistory AND dbo.CLF.PKFileName = dbo.CLFBody.PKFileName
+                                                    ", "ASFINAG")
 
             dgv.DataSource = dt
             If dgv IsNot Nothing Then
@@ -3805,6 +3827,7 @@ Public Class frmStartOptions
                 dgv.Dock = DockStyle.Fill
                 dgv.Anchor = AnchorStyles.Left
                 dgv.Anchor = AnchorStyles.Top
+                dgv.ReadOnly = True
                 frm.Controls.Add(dgv)
                 frm.StartPosition = FormStartPosition.CenterScreen
                 frm.ShowDialog()
@@ -3917,7 +3940,7 @@ Public Class frmStartOptions
     End Function
 
     Private Sub LinkLabel47_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel47.LinkClicked
-        VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
+        VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = CheckBox8.Checked
         showPic(ASFINAG_LKW(False), PictureBox21)
     End Sub
 
@@ -3937,4 +3960,15 @@ Public Class frmStartOptions
         importFileFromEZOLL(If(CheckBox2.Checked, Now.AddDays(-7), If(CheckBox3.Checked, Now.AddMonths(-1), Now)))
         VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = f
     End Sub
+
+    Private Function checkTestsystemSettings() As Boolean
+        Dim check As Boolean = False
+        If cbxTestFTP.Checked And Not CheckBox8.Checked Then
+            MsgBox("Testdaten von/auf TEST-FTP in/von Prod-Umgebung importieren/exportieren?" & vbNewLine & " Keine gute Idee!")
+        Else
+            check = True
+        End If
+        Return check
+
+    End Function
 End Class