Update Version 2.3

2021-05-25 21:01:12 +02:00
parent 1cc7ed8893
commit 97ef665fd1
183 changed files with 86758 additions and 197 deletions
--- a/_AllgMainObjekte/AllgMainObjekte.Designer.vb
+++ b/_AllgMainObjekte/AllgMainObjekte.Designer.vb
@@ -25,6 +25,7 @@ Partial Class AllgMainObjekte
        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(AllgMainObjekte))
        Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+        Me.cbboxVerantwTKBMA = New DevComponents.DotNetBar.Controls.ComboBoxEx()
        Me.dtPickernaechstePruefung = New System.Windows.Forms.DateTimePicker()
        Me.txtnaechstePruefung = New System.Windows.Forms.MaskedTextBox()
        Me.lblnaechstepruefung = New System.Windows.Forms.Label()
@@ -77,7 +78,8 @@ Partial Class AllgMainObjekte
        Me.ctxMenuBeziehungen = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.InEinemNeuenFensterÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.Beziehungen1 = New _MyBeziehungen.Beziehungen()
-        Me.cbboxVerantwTKBMA = New DevComponents.DotNetBar.Controls.ComboBoxEx()
+        Me.txtMail = New System.Windows.Forms.TextBox()
+        Me.lblEmail = New System.Windows.Forms.Label()
        Me.GroupBox2.SuspendLayout()
        Me.ctxMenuAktiv.SuspendLayout()
        CType(Me.txtSequenz, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -87,6 +89,8 @@ Partial Class AllgMainObjekte
        '
        'GroupBox2
        '
+        Me.GroupBox2.Controls.Add(Me.lblEmail)
+        Me.GroupBox2.Controls.Add(Me.txtMail)
        Me.GroupBox2.Controls.Add(Me.cbboxVerantwTKBMA)
        Me.GroupBox2.Controls.Add(Me.dtPickernaechstePruefung)
        Me.GroupBox2.Controls.Add(Me.txtnaechstePruefung)
@@ -136,6 +140,18 @@ Partial Class AllgMainObjekte
        Me.GroupBox2.TabStop = False
        Me.GroupBox2.Text = "Allgemein"
        '
+        'cbboxVerantwTKBMA
+        '
+        Me.cbboxVerantwTKBMA.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
+        Me.cbboxVerantwTKBMA.DisplayMember = "Text"
+        Me.cbboxVerantwTKBMA.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed
+        Me.cbboxVerantwTKBMA.FormattingEnabled = True
+        Me.cbboxVerantwTKBMA.ItemHeight = 14
+        Me.cbboxVerantwTKBMA.Location = New System.Drawing.Point(543, 193)
+        Me.cbboxVerantwTKBMA.Name = "cbboxVerantwTKBMA"
+        Me.cbboxVerantwTKBMA.Size = New System.Drawing.Size(187, 20)
+        Me.cbboxVerantwTKBMA.TabIndex = 47
+        '
        'dtPickernaechstePruefung
        '
        Me.dtPickernaechstePruefung.Location = New System.Drawing.Point(608, 165)
@@ -596,17 +612,21 @@ Partial Class AllgMainObjekte
        Me.Beziehungen1.TempFilePath = Nothing
        Me.Beziehungen1.Type = Nothing
        '
-        'cbboxVerantwTKBMA
+        'txtMail
        '
-        Me.cbboxVerantwTKBMA.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.cbboxVerantwTKBMA.DisplayMember = "Text"
-        Me.cbboxVerantwTKBMA.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed
-        Me.cbboxVerantwTKBMA.FormattingEnabled = True
-        Me.cbboxVerantwTKBMA.ItemHeight = 14
-        Me.cbboxVerantwTKBMA.Location = New System.Drawing.Point(543, 193)
-        Me.cbboxVerantwTKBMA.Name = "cbboxVerantwTKBMA"
-        Me.cbboxVerantwTKBMA.Size = New System.Drawing.Size(187, 20)
-        Me.cbboxVerantwTKBMA.TabIndex = 47
+        Me.txtMail.Location = New System.Drawing.Point(662, 44)
+        Me.txtMail.Name = "txtMail"
+        Me.txtMail.Size = New System.Drawing.Size(150, 20)
+        Me.txtMail.TabIndex = 48
+        '
+        'lblEmail
+        '
+        Me.lblEmail.AutoSize = True
+        Me.lblEmail.Location = New System.Drawing.Point(630, 47)
+        Me.lblEmail.Name = "lblEmail"
+        Me.lblEmail.Size = New System.Drawing.Size(26, 13)
+        Me.lblEmail.TabIndex = 49
+        Me.lblEmail.Text = "Mail"
        '
        'AllgMainObjekte
        '
@@ -680,4 +700,6 @@ Partial Class AllgMainObjekte
    Friend WithEvents txtnaechstePruefung As MaskedTextBox
    Friend WithEvents lblnaechstepruefung As Label
    Friend WithEvents cbboxVerantwTKBMA As DevComponents.DotNetBar.Controls.ComboBoxEx
+    Friend WithEvents lblEmail As Label
+    Friend WithEvents txtMail As TextBox
 End Class
--- a/_AllgMainObjekte/AllgMainObjekte.resx
+++ b/_AllgMainObjekte/AllgMainObjekte.resx
@@ -112,18 +112,18 @@
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <metadata name="ctxMenuAktiv.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="ctxMenuAktiv.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>462, 17</value>
  </metadata>
-  <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="TSBtnSave.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -175,19 +175,19 @@
  <data name="TSBtnSetSecurityObject.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKvSURBVDhPvY5bSJNhHMa/XKcbE4PKQIIgrPS7SrST4UUg
-        YlF4YUUhKoqWZTZtJ5u9njZtM/087HPTTWNm6ubmaiO1tT4zJuoMRaekbk7zfCFM6qKj/7bxmawD3fWD
-        9+J5n/8PHuy/Es4NieJ23nkTKgvdRn95o1Kptg8ODSVaLJZqo9FU1NraGuwpEOZzrinCP1wQlMyiUtZi
-        GsICTukO+3q6DYxGo9+odczS19f3yfiKeq3XdzraNO1fpNK6y0cEgfj9t2nLaCTeidoT1nkDl1Yuqk+b
-        sEhsK61jWH+/haAoakWr1Qa5s2sNg6yR1YvED53B1w4Eh6QxZFES35fp1J7Px1gM+cEEn3tYHMbwyG5M
-        JtN0m1ZXQEcPHA7Hj8XinQGALUJmcnRksW8i37rTeSgD20GfbKJW6xxyeX0+HX8yqpGFzXSpexc6GkEo
-        jH12grW71mv6BiQplYhElcsZGWiXO1say/bbX6ge9ZjU35d0MlhQV8EUiT6mxIYHeoRf4fEE+9jsvDVm
-        JpOYfN7MdRg0H5b1Clhsk8B8cznMNT6A2foiGC7nPKaV31GIBQ1WfROsdChhUUOCmJkGJTcT4X2DEGbr
-        8sFRkwsGxFnvzk09SSubGKpRgPUp+rbULoUFVSXMN5VC5e0kiIk4DqMEBxySHLBXsGGylAndOUnNtObN
-        iKK4dv5JGcwpS2BWUQgzMgTRoSHQeOsK2MqyYaw44WsvP6XCwL3qTyvemMXZe60Ecs7U5rnm8mG6igu2
-        8rswIcqEAZTa2c2OP0qf/h2LKCvL7hLtBAumXHMHC65P9HCTztP1v1GhuO2DhenvhtENp5mfnO3OdPVn
-        bDYbbjabcb1ejyuVSpwkSVxWwL9A5PLOIiTA3U8gEONigsBJuRxvadHgXRSFj4+P46urq/gP8XZY2IdU
-        G+AAAAAASUVORK5CYII=
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKvSURBVDhPvY5bSFNxHMdPrtuLiUFlIEEQVnqeEu1m+BCI
+        WBQ+WFGIiqJlmU3bzWbH25m2mR4vO266aWyZurm5OpLaWkeLiTpD0Smpm9O8PwiTeujqr20ck3Whtz7w
+        f/j+v78PfJH/Sjg/JIrfeedNqDx0G/PljUaj2T44NJRosViqjUZTUUtLS7CnwBCfc40R/uF4UDKHTlmL
+        aQgLOGU47OvpNjAajX6j1jFLX1/fJ+MruoeiOh2turYvMlnd5SN4IHr/bdoyNhLvxPQJ64KBSysXtadN
+        SCSyldERpL/fQtA0vaLX64Pc2bWGRdbI68WSh87gaweCQ9JY8iip78t0es/nYxyW4mCCzz0kDmF5ZDcm
+        k2m6VW8oYKIHHo/nx+EIzgDAFhE7OTqy2DdRaN3pPJSB7GBONtFqDQ6Foj6fiT8Z1cnDZrq0vQsdahCJ
+        Yp+d4Oyu9Zq+AUnKpGJx5XJGBrbLnS3qsv32F5pHPSbt9yWDHBa0VTBFYh9TYsMDPcKvCAT4Pi43b42d
+        ySYmnzfxHe26D8uUEhZbpTDfVA5z6gcwW18Ew+W8x4zyO0oJ3mClGmGlQwWLOhIk7DQouZkI7xtEMFuX
+        D46aXKAw3np3bupJRtmkvRoLsD7Fvi21yWBBUwnzjaVQeTsJYiKOwyjBA4c0B+wVXJgsZUN3TlITo3kz
+        oiyunX9SBnOqEphVFsKMHIPo0BBQ37oCtrJsGCtO+NorTKlo51/1ZxRvzJLsvVYCc87U5rnmCmG6ig+2
+        8rswIc6EASy1s5sbf5Q5/TsWcVaW3SXaCQ5MueYOFlyfeM1POs/U/0aDxW0fLEx/N4zdcJqFydnuzFR/
+        xmazoWazGaUoClWpVChJkqi8QHiByBWcxTAcdT8cl6ASgkBJhQJtbtahXTSNjo+Po6urq+gP6p1Y1cYg
+        GAYAAAAASUVORK5CYII=
 </value>
  </data>
  <data name="tsbtnReport.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -207,16 +207,16 @@
  <data name="tsbtncopy1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIeSURBVDhPjZPPb9JgGMeJevHgwYNnb8Z40f+AxX9ALxw8
-        4o0Jh84Q4olkWbI4TIzLEgNTmBnzRzcE7GgLBdpCV0bXsnaD0ene4E0PXowns/jEt/CSdwY0fm593uf7
-        eZ/nTer7F/F4/FwwGLwSiURuxGIPZ0Kh0GVy9Hf8fv+FZpM/cN3G18HAOjX3eOgfKWCZArDseyMajV4i
-        rdMJBALnNVn+hVwF0LEK6GMT0CcNej0ZqtUabAuiwjDMRdJOSSQWb29srIa54ttFx5G/N5QcyPUtyKRX
-        wO6UodetQ6GQA54vQjqdTJIYxdqVtNGtDTj9+fnYuxWd7IAkcZDP58C2ysNJvJphVPIkRjF0sYr6Mowl
-        49HlOg+63oJM5gU4+yOJ3VHfkRilpXAcOqoDlYz2Nw0e2u0SOI4EGl7Lq+3tSuskRmnWipuoW4NpkvHo
-        eiM/rLVblZckRqmJuXV0KAHqVgH1PNFZCV4JS3QVT4BrOw3+OYlRqjybQgcVmJD0qURXtoY1vVl6RmKU
-        8oc3y8gRYVLirYQlrgq6vDmsKVIhQWKUUi67hGwBRhL82lMkpiZ8sXShnH2VukNilAK7No86PKB9LLHH
-        EjzNGcnCQvwWaZ+Eza4+QtY2/CFxsASv5OLvwUn7x9zcg2ukfZK15DKDTA4ONfzStvrN1EqSyL1eSq08
-        vRcOh697fyZpnU6MYW4+eTx/d3b2/lVS+g98vt8nzfXKHzEqRAAAAABJRU5ErkJggg==
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIbSURBVDhPjZPLbxJRFIeJunHhwoVrd8a40f8A4z+gGxYu
+        cUeFxdQQ4oqkadJYTIzVxAApqSn1MVCg0BmGGeYBw1DeDI8C1Wtwpws3xpVpPPHOcMmtAY3fbs6c33fO
+        mWQc/yIYDJ5zu91XfD7fjUDg0W2Px3OZvPo7Tqfzgq7z/cmk/HU6bZ82GxyMjlVoNXlg2VTD7/dfIq3L
+        cblc53VV/YXGKqCJBuikDOiDDsOhApJUhMO8oDEMc5G0U0KhjTt7e1Fv7uDdRq+nfi+pSVDkBMS2X0C3
+        LcBwIEM6nQSOy0AsFg6TGKVdkyqzqSU4/fn5xJqKPlZAFLOQSiWh2xLsTaxaoyGmSYzSqApFNFJgLpmv
+        rsgcGEYVT42C2ZlJzE7pPYlRjrRcDh3LQCWz+5t1Dmq1QzBNEXR8ll2rSbskRtHlgwQaFGGZZL66UUrZ
+        tfqRuE1iFFnY30V9EdBAAjS0RGcl+CQsMTS8Aa4ZZf4ViVGKPBtBvQIsSEZUYqgJu1bVueckRilk324h
+        Mw+LEuskLBlrYCisXdOkTIjEKNx+fBN1eZhJ8NdeImlV8l/a1Xwh/jpyl8QoGXZnDbU5QB0s6c4leJsz
+        kvX14C3Svggbjz5GrRz8ITGxBJ80xs9TVP+xuvrwGmlfZCe8xaBmFvp6Ej6ZpW+tCicJuTebkZfP7nu9
+        3uvWn0lalxNgmJtPn6zdW1l5cJWU/gOH4zeErvR/o5VWkgAAAABJRU5ErkJggg==
 </value>
  </data>
  <data name="tsbtnCopy2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -232,7 +232,7 @@
        qkQ53DIyZRg/yW2pDIFIxosAAAAASUVORK5CYII=
 </value>
  </data>
-  <metadata name="ctxMenuBeziehungen.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="ctxMenuBeziehungen.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>293, 17</value>
  </metadata>
 </root>
--- a/_AllgMainObjekte/AllgMainObjekte.vb
+++ b/_AllgMainObjekte/AllgMainObjekte.vb
@@ -347,6 +347,8 @@ Public Class AllgMainObjekte
            Me.cbboxDateneigentuemer.Visible = False
            Me.lblCID.Visible = False
            Me.cbCID.Visible = False
+            Me.lblEmail.Visible = False
+            Me.txtMail.Visible = False

            '20200114 - Erweiterungen
            Me.lblVerantwTKBMA.Visible = False
@@ -462,6 +464,8 @@ Public Class AllgMainObjekte
                    'Case 3 'PLATTFORM
                Case 2 'PERSONAL
                    VerantwTKBMa = Datenklasse.Get_Stammdaten("Personal", "Bezeichznung")
+                    Me.lblEmail.Visible = True
+                    Me.txtMail.Visible = True
                    Me.tsbtncopy1.Visible = True
                    Me.tsbtncopy1.Visible = True
                    Me.lblName.Visible = True
@@ -477,6 +481,7 @@ Public Class AllgMainObjekte
                    Me.txtnaechstePruefung.Visible = True
                    Me.dtPickernaechstePruefung.Visible = True
                    Me.txtnaechstePruefung.Text = DBObject.snextcontroldate.ToString
+                    Me.txtMail.Text = DBObject.semail.ToString
                    Me.txtVerantwTKBMa.Text = DBObject.sverantwTKBma.ToString
                    Me.cbboxVerantwTKBMA.DataSource = VerantwTKBMa
                    Me.cbboxVerantwTKBMA.DisplayMember = "Bezeichnung"
@@ -657,13 +662,13 @@ Public Class AllgMainObjekte

        If f.cbTemporaer.Checked = True Then
            If DBObjektname = "_DataClass.db.Personal_FunktionStelle" Then
-                Datenklasse.Update_Temporaer_Berechtigung(f.TextBox1.Text, f.TextBox2.Text, f.TextBox3.Text, f.TextBox4.Text, f.DateTimePicker1.Value, i, 0)
+                Datenklasse.Update_Temporaer_Berechtigung(f.TextBox1.Text, f.TextBox2.Text, f.TextBox3.Text, f.TextBox4.Text, f.DateTimePicker1.Value, i, 0, f.cbboxKontaktFB.SelectedValue)
            End If
            If DBObjektname = "_DataClass.db.Personal_Berechtigung" Then
-                Datenklasse.Update_Temporaer_Berechtigung(f.TextBox1.Text, f.TextBox2.Text, f.TextBox3.Text, f.TextBox4.Text, f.DateTimePicker1.Value, i, 1)
+                Datenklasse.Update_Temporaer_Berechtigung(f.TextBox1.Text, f.TextBox2.Text, f.TextBox3.Text, f.TextBox4.Text, f.DateTimePicker1.Value, i, 1, f.cbboxKontaktFB.SelectedValue)
            End If
            If DBObjektname = "_DataClass.db.Personal_Plattform" Then
-                Datenklasse.Update_Temporaer_Berechtigung(f.TextBox1.Text, f.TextBox2.Text, f.TextBox3.Text, f.TextBox4.Text, f.DateTimePicker1.Value, i, 2)
+                Datenklasse.Update_Temporaer_Berechtigung(f.TextBox1.Text, f.TextBox2.Text, f.TextBox3.Text, f.TextBox4.Text, f.DateTimePicker1.Value, i, 2, f.cbboxKontaktFB.SelectedValue)
            End If
        End If

@@ -832,6 +837,7 @@ Public Class AllgMainObjekte
                DBObject.stgnummer = New SqlString(CType(Me.txtTGNummer.Text, String))
                DBObject.sVerantwTKBMA = New SqlString(CType(Me.txtVerantwTKBMa.Text, String))
                DBObject.sNextControlDate = New SqlString(CType(Me.txtnaechstePruefung.Text, String))
+                DBObject.sEMail = New SqlString(CType(Me.txtMail.Text, String))
                If Me.cbboxVerantwTKBMA.SelectedValue = 0 Then
                    DBObject.sVerantwTKBMA = New SqlString(CType("", String))
                Else
@@ -960,7 +966,13 @@ Public Class AllgMainObjekte
                f.TextBox1.Text = dt.Rows(0).Item("Beschreibung")
                f.TextBox2.Text = dt.Rows(0).Item("Unterlagen")
                f.TextBox3.Text = dt.Rows(0).Item("Bearbeiter_Isi")
-                f.TextBox4.Text = dt.Rows(0).Item("Kontaktperson_FB")
+                f.TextBox4.Text = dt.Rows(0).Item("Kontaktperson_FB").ToString
+                Try
+                    f.Kontaktid = dt.Rows(0).Item("KontaktID")
+                Catch
+                    f.Kontaktid = 0
+                End Try
+
                f.DateTimePicker1.Value = dt.Rows(0).Item("termin")
            Else
                f.Panel2.Height = 1
@@ -976,7 +988,7 @@ Public Class AllgMainObjekte
                DBObjekt.ibeziehungstypnr = New SqlInt32(CType(f.cbbeziehungstyp.SelectedValue, Int32))
                DBObjekt.save_data()
                If is_temporaer = True And f.cbAktiv.Checked = True Then
-                    Datenklasse.Update_Temporaer_Berechtigung(f.TextBox1.Text, f.TextBox2.Text, f.TextBox3.Text, f.TextBox4.Text, f.DateTimePicker1.Value, Keyvalue, 0)
+                    Datenklasse.Update_Temporaer_Berechtigung(f.TextBox1.Text, f.TextBox2.Text, f.TextBox3.Text, f.TextBox4.Text, f.DateTimePicker1.Value, Keyvalue, 0, f.cbboxKontaktFB.SelectedValue)
                End If
            End If
            DBObjekt.dispose()
--- a/_AllgMainObjekte/Diverse_Formulare/frmBeziehungEdit.Designer.vb
+++ b/_AllgMainObjekte/Diverse_Formulare/frmBeziehungEdit.Designer.vb
@@ -49,6 +49,7 @@ Partial Class frmBeziehungEdit
        Me.Panel3 = New System.Windows.Forms.Panel()
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.tsmnuSecurityObjekte = New System.Windows.Forms.ToolStripMenuItem()
+        Me.cbboxKontaktFB = New DevComponents.DotNetBar.Controls.ComboBoxEx()
        CType(Me.txtSeqeunz, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        Me.Panel2.SuspendLayout()
@@ -162,6 +163,7 @@ Partial Class frmBeziehungEdit
        '
        'Panel2
        '
+        Me.Panel2.Controls.Add(Me.cbboxKontaktFB)
        Me.Panel2.Controls.Add(Me.Label5)
        Me.Panel2.Controls.Add(Me.DateTimePicker1)
        Me.Panel2.Controls.Add(Me.Label4)
@@ -216,9 +218,9 @@ Partial Class frmBeziehungEdit
        Me.Label3.AutoSize = True
        Me.Label3.Location = New System.Drawing.Point(7, 133)
        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(71, 13)
+        Me.Label3.Size = New System.Drawing.Size(73, 13)
        Me.Label3.TabIndex = 17
-        Me.Label3.Text = "Bearbeiter ISI"
+        Me.Label3.Text = "Bearbeiter SD"
        '
        'TextBox3
        '
@@ -284,6 +286,18 @@ Partial Class frmBeziehungEdit
        Me.tsmnuSecurityObjekte.Size = New System.Drawing.Size(160, 22)
        Me.tsmnuSecurityObjekte.Text = "Security Objekte"
        '
+        'cbboxKontaktFB
+        '
+        Me.cbboxKontaktFB.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
+        Me.cbboxKontaktFB.DisplayMember = "Text"
+        Me.cbboxKontaktFB.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed
+        Me.cbboxKontaktFB.FormattingEnabled = True
+        Me.cbboxKontaktFB.ItemHeight = 14
+        Me.cbboxKontaktFB.Location = New System.Drawing.Point(85, 156)
+        Me.cbboxKontaktFB.Name = "cbboxKontaktFB"
+        Me.cbboxKontaktFB.Size = New System.Drawing.Size(230, 20)
+        Me.cbboxKontaktFB.TabIndex = 49
+        '
        'frmBeziehungEdit
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -331,4 +345,5 @@ Partial Class frmBeziehungEdit
    Friend WithEvents Panel3 As System.Windows.Forms.Panel
    Friend WithEvents ContextMenuStrip1 As System.Windows.Forms.ContextMenuStrip
    Friend WithEvents tsmnuSecurityObjekte As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents cbboxKontaktFB As DevComponents.DotNetBar.Controls.ComboBoxEx
 End Class
--- a/_AllgMainObjekte/Diverse_Formulare/frmBeziehungEdit.resx
+++ b/_AllgMainObjekte/Diverse_Formulare/frmBeziehungEdit.resx
@@ -112,15 +112,15 @@
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAABAAkAAAAAAAEAIAAoIAQAlgAAAICAAAABACAAKAgBAL4gBABgYAAAAQAgAKiUAADmKAUASEgAAAEA
--- a/_AllgMainObjekte/Diverse_Formulare/frmBeziehungEdit.vb
+++ b/_AllgMainObjekte/Diverse_Formulare/frmBeziehungEdit.vb
@@ -1,7 +1,9 @@
 Public Class frmBeziehungEdit
-
+    Dim kontaktfb As New DataTable
    Dim dc As New _DataClass.DataClass
    Dim sec As New Utils.MySecurity
+    Dim Datenklasse As New _DataClass.DataClass
+    Public Kontaktid As Integer = 0

    Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click
        Me.DialogResult = Windows.Forms.DialogResult.OK
@@ -14,6 +16,11 @@
    End Sub

    Private Sub frmBeziehungEdit_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        kontaktfb = Datenklasse.Get_Stammdaten("Personal", "Bezeichznung")
+        Me.cbboxKontaktFB.DataSource = kontaktfb
+        Me.cbboxKontaktFB.DisplayMember = "Bezeichnung"
+        Me.cbboxKontaktFB.ValueMember = "Keyvalue"
+        Me.cbboxKontaktFB.SelectedValue = Me.Kontaktid
        sec.Set_Form_Security(Me)
    End Sub

--- a/_AllgMainObjekte/Diverse_Formulare/frmNeueBeziehung.Designer.vb
+++ b/_AllgMainObjekte/Diverse_Formulare/frmNeueBeziehung.Designer.vb
@@ -52,6 +52,7 @@ Partial Class frmNeueBeziehung
        Me.Panel3 = New System.Windows.Forms.Panel()
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.SecurityObjekte = New System.Windows.Forms.ToolStripMenuItem()
+        Me.cbboxKontaktFB = New DevComponents.DotNetBar.Controls.ComboBoxEx()
        CType(Me.txtSeqeunz, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        Me.Panel2.SuspendLayout()
@@ -193,6 +194,7 @@ Partial Class frmNeueBeziehung
        '
        'Panel2
        '
+        Me.Panel2.Controls.Add(Me.cbboxKontaktFB)
        Me.Panel2.Controls.Add(Me.Label5)
        Me.Panel2.Controls.Add(Me.DateTimePicker1)
        Me.Panel2.Controls.Add(Me.Label4)
@@ -247,9 +249,9 @@ Partial Class frmNeueBeziehung
        Me.Label3.AutoSize = True
        Me.Label3.Location = New System.Drawing.Point(7, 133)
        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(71, 13)
+        Me.Label3.Size = New System.Drawing.Size(73, 13)
        Me.Label3.TabIndex = 17
-        Me.Label3.Text = "Bearbeiter ISI"
+        Me.Label3.Text = "Bearbeiter SD"
        '
        'TextBox3
        '
@@ -314,11 +316,23 @@ Partial Class frmNeueBeziehung
        Me.SecurityObjekte.Size = New System.Drawing.Size(162, 22)
        Me.SecurityObjekte.Text = "Secuirty-Objekte"
        '
+        'cbboxKontaktFB
+        '
+        Me.cbboxKontaktFB.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
+        Me.cbboxKontaktFB.DisplayMember = "Text"
+        Me.cbboxKontaktFB.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed
+        Me.cbboxKontaktFB.FormattingEnabled = True
+        Me.cbboxKontaktFB.ItemHeight = 14
+        Me.cbboxKontaktFB.Location = New System.Drawing.Point(85, 156)
+        Me.cbboxKontaktFB.Name = "cbboxKontaktFB"
+        Me.cbboxKontaktFB.Size = New System.Drawing.Size(230, 20)
+        Me.cbboxKontaktFB.TabIndex = 48
+        '
        'frmNeueBeziehung
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(337, 275)
+        Me.ClientSize = New System.Drawing.Size(337, 502)
        Me.ContextMenuStrip = Me.ContextMenuStrip1
        Me.Controls.Add(Me.Panel3)
        Me.Controls.Add(Me.Panel2)
@@ -364,4 +378,5 @@ Partial Class frmNeueBeziehung
    Friend WithEvents Panel3 As System.Windows.Forms.Panel
    Friend WithEvents ContextMenuStrip1 As System.Windows.Forms.ContextMenuStrip
    Friend WithEvents SecurityObjekte As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents cbboxKontaktFB As DevComponents.DotNetBar.Controls.ComboBoxEx
 End Class
--- a/_AllgMainObjekte/Diverse_Formulare/frmNeueBeziehung.resx
+++ b/_AllgMainObjekte/Diverse_Formulare/frmNeueBeziehung.resx
@@ -112,15 +112,15 @@
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAABAAkAAAAAAAEAIAAoIAQAlgAAAICAAAABACAAKAgBAL4gBABgYAAAAQAgAKiUAADmKAUASEgAAAEA
--- a/_AllgMainObjekte/Diverse_Formulare/frmNeueBeziehung.vb
+++ b/_AllgMainObjekte/Diverse_Formulare/frmNeueBeziehung.vb
@@ -3,6 +3,8 @@
    Dim dc As New _DataClass.DataClass
    Dim sec As New Utils.MySecurity
    Dim m_temporaer As Boolean
+    Dim Datenklasse As New _DataClass.DataClass
+    Dim kontaktfb As New DataTable
    Property Temporaer As Boolean
        Get
            Return m_temporaer
@@ -14,6 +16,11 @@

    Private Sub frmNeueBeziehung_Load(sender As Object, e As EventArgs) Handles MyBase.Load
        Me.Panel2.Height = 1
+
+        kontaktfb = Datenklasse.Get_Stammdaten("Personal", "Bezeichznung")
+        Me.cbboxKontaktFB.DataSource = kontaktfb
+        Me.cbboxKontaktFB.DisplayMember = "Bezeichnung"
+        Me.cbboxKontaktFB.ValueMember = "Keyvalue"
        sec.Set_Form_Security(Me)
    End Sub

--- a/_AllgMainObjekte/bin/Debug/DevComponents.DotNetBar2.dll
+++ b/_AllgMainObjekte/bin/Debug/DevComponents.DotNetBar2.dll
--- a/_AllgMainObjekte/bin/Debug/System.Windows.Forms.DataVisualization.dll
+++ b/_AllgMainObjekte/bin/Debug/System.Windows.Forms.DataVisualization.dll
--- a/_AllgMainObjekte/bin/Debug/_AllgMainObjekte.dll
+++ b/_AllgMainObjekte/bin/Debug/_AllgMainObjekte.dll
--- a/_AllgMainObjekte/bin/Debug/_AllgMainObjekte.pdb
+++ b/_AllgMainObjekte/bin/Debug/_AllgMainObjekte.pdb
--- a/_AllgMainObjekte/bin/Debug/_DataClass.dll
+++ b/_AllgMainObjekte/bin/Debug/_DataClass.dll
--- a/_AllgMainObjekte/bin/Debug/_DataClass.pdb
+++ b/_AllgMainObjekte/bin/Debug/_DataClass.pdb
--- a/_AllgMainObjekte/bin/Debug/_MyBeziehungen.dll
+++ b/_AllgMainObjekte/bin/Debug/_MyBeziehungen.dll
--- a/_AllgMainObjekte/bin/Debug/_MyBeziehungen.pdb
+++ b/_AllgMainObjekte/bin/Debug/_MyBeziehungen.pdb
--- a/_AllgMainObjekte/obj/Debug/DesignTimeResolveAssemblyReferences.cache
+++ b/_AllgMainObjekte/obj/Debug/DesignTimeResolveAssemblyReferences.cache
--- a/_AllgMainObjekte/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/_AllgMainObjekte/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
--- a/_AllgMainObjekte/obj/Debug/TempPE/My
+++ b/_AllgMainObjekte/obj/Debug/TempPE/My
--- a/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.AllgMainObjekte.resources
+++ b/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.AllgMainObjekte.resources
--- a/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.dll
+++ b/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.dll
--- a/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.pdb
+++ b/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.pdb
--- a/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.vbproj.CoreCompileInputs.cache
+++ b/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.vbproj.CoreCompileInputs.cache
@@ -1 +1 @@
-80f28b5de5e450653f6d52ba6c9254e4e0b6b37f
+e9d11d344ded2227a28f82b050c968387ed86e2c
--- a/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.vbproj.FileListAbsolute.txt
+++ b/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.vbproj.FileListAbsolute.txt
@@ -9,7 +9,6 @@ E:\Software-Projekte\TKBDiverse\BEA\_AllgMainObjekte\bin\Debug\_Generic_Event_Ha
 E:\Software-Projekte\TKBDiverse\BEA\_AllgMainObjekte\bin\Debug\_MyBeziehungen.dll
 E:\Software-Projekte\TKBDiverse\BEA\_AllgMainObjekte\bin\Debug\FastReport.dll
 E:\Software-Projekte\TKBDiverse\BEA\_AllgMainObjekte\bin\Debug\FastReport.Bars.dll
-E:\Software-Projekte\TKBDiverse\BEA\_AllgMainObjekte\bin\Debug\System.Windows.Forms.DataVisualization.dll
 E:\Software-Projekte\TKBDiverse\BEA\_AllgMainObjekte\bin\Debug\FastReport.Editor.dll
 E:\Software-Projekte\TKBDiverse\BEA\_AllgMainObjekte\bin\Debug\_MyBeziehungen.pdb
 E:\Software-Projekte\TKBDiverse\BEA\_AllgMainObjekte\bin\Debug\_MyBeziehungen.xml
--- a/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.vbproj.GenerateResource.cache
+++ b/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.vbproj.GenerateResource.cache
--- a/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.vbprojAssemblyReference.cache
+++ b/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.vbprojAssemblyReference.cache
--- a/_AllgMainObjekte/obj/Debug/_allgmainobjekte.dll.licenses
+++ b/_AllgMainObjekte/obj/Debug/_allgmainobjekte.dll.licenses