Update 6.12.23

DPM2016/Behandlung/Benhandungdetail.Designer.vb

@@ -24,6 +24,8 @@ Partial Class Benhandungdetail
     Private Sub InitializeComponent()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Benhandungdetail))
         Me.GrpPatient = New System.Windows.Forms.GroupBox()
+        Me.cbansprechperson = New DPM2016.MyCombobox()
+        Me.lblAnsprechen = New System.Windows.Forms.Label()
         Me.txtProjekt = New System.Windows.Forms.TextBox()
         Me.lblProjekt = New System.Windows.Forms.Label()
         Me.cbboxNRESTyp = New DPM2016.MyCombobox()
@@ -184,6 +186,8 @@ Partial Class Benhandungdetail
         '
         'GrpPatient
         '
+        Me.GrpPatient.Controls.Add(Me.cbansprechperson)
+        Me.GrpPatient.Controls.Add(Me.lblAnsprechen)
         Me.GrpPatient.Controls.Add(Me.txtProjekt)
         Me.GrpPatient.Controls.Add(Me.lblProjekt)
         Me.GrpPatient.Controls.Add(Me.cbboxNRESTyp)
@@ -192,11 +196,34 @@ Partial Class Benhandungdetail
         Me.GrpPatient.Controls.Add(Me.Label7)
         Me.GrpPatient.Location = New System.Drawing.Point(3, 31)
         Me.GrpPatient.Name = "GrpPatient"
-        Me.GrpPatient.Size = New System.Drawing.Size(300, 84)
+        Me.GrpPatient.Size = New System.Drawing.Size(300, 87)
         Me.GrpPatient.TabIndex = 9
         Me.GrpPatient.TabStop = False
         Me.GrpPatient.Text = "Patient / Behandler"
         '
+        'cbansprechperson
+        '
+        Me.cbansprechperson.Dataselection = Nothing
+        Me.cbansprechperson.Displaymember = Nothing
+        Me.cbansprechperson.Location = New System.Drawing.Point(93, 100)
+        Me.cbansprechperson.Name = "cbansprechperson"
+        Me.cbansprechperson.Size = New System.Drawing.Size(192, 21)
+        Me.cbansprechperson.TabIndex = 24
+        Me.cbansprechperson.Table = Nothing
+        Me.cbansprechperson.TableAlias = ""
+        Me.cbansprechperson.Valuemember = Nothing
+        Me.cbansprechperson.Visible = False
+        '
+        'lblAnsprechen
+        '
+        Me.lblAnsprechen.AutoSize = True
+        Me.lblAnsprechen.Location = New System.Drawing.Point(6, 101)
+        Me.lblAnsprechen.Name = "lblAnsprechen"
+        Me.lblAnsprechen.Size = New System.Drawing.Size(84, 13)
+        Me.lblAnsprechen.TabIndex = 25
+        Me.lblAnsprechen.Text = "Ansprechperson"
+        Me.lblAnsprechen.Visible = False
+        '
         'txtProjekt
         '
         Me.txtProjekt.Location = New System.Drawing.Point(72, 24)
@@ -272,7 +299,7 @@ Partial Class Benhandungdetail
         Me.grpZusammenfassugn.Controls.Add(Me.lblBehandlungstotal)
         Me.grpZusammenfassugn.Controls.Add(Me.txtcKVTotal)
         Me.grpZusammenfassugn.Controls.Add(Me.Label2)
-        Me.grpZusammenfassugn.Location = New System.Drawing.Point(0, 364)
+        Me.grpZusammenfassugn.Location = New System.Drawing.Point(0, 371)
         Me.grpZusammenfassugn.Name = "grpZusammenfassugn"
         Me.grpZusammenfassugn.Size = New System.Drawing.Size(306, 141)
         Me.grpZusammenfassugn.TabIndex = 11
@@ -803,7 +830,7 @@ Partial Class Benhandungdetail
         Me.GrpRaten.Controls.Add(Me.Label3)
         Me.GrpRaten.Controls.Add(Me.lblZuschlagRaten)
         Me.GrpRaten.Controls.Add(Me.lblAnzahlRaten)
-        Me.GrpRaten.Location = New System.Drawing.Point(3, 282)
+        Me.GrpRaten.Location = New System.Drawing.Point(3, 289)
         Me.GrpRaten.Name = "GrpRaten"
         Me.GrpRaten.Size = New System.Drawing.Size(303, 76)
         Me.GrpRaten.TabIndex = 12
@@ -905,7 +932,7 @@ Partial Class Benhandungdetail
         Me.grpBehandlungsdaten.Controls.Add(Me.lblRGStellung)
         Me.grpBehandlungsdaten.Controls.Add(Me.Label15)
         Me.grpBehandlungsdaten.Controls.Add(Me.lblBegin)
-        Me.grpBehandlungsdaten.Location = New System.Drawing.Point(3, 124)
+        Me.grpBehandlungsdaten.Location = New System.Drawing.Point(3, 131)
         Me.grpBehandlungsdaten.Name = "grpBehandlungsdaten"
         Me.grpBehandlungsdaten.Size = New System.Drawing.Size(303, 151)
         Me.grpBehandlungsdaten.TabIndex = 10
@@ -1962,4 +1989,6 @@ Partial Class Benhandungdetail
     Friend WithEvents cbboxNrVerguetungsart As MyCombobox
     Friend WithEvents lblmwstsatz As Label
     Friend WithEvents cbboxmwstsatz As MyCombobox
+    Friend WithEvents cbansprechperson As MyCombobox
+    Friend WithEvents lblAnsprechen As Label
 End Class

DPM2016/Behandlung/Benhandungdetail.resx

@@ -202,9 +202,6 @@
   <metadata name="ToolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>143, 17</value>
   </metadata>
-  <metadata name="ToolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>143, 17</value>
-  </metadata>
   <data name="ToolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -435,7 +432,7 @@
         AHQrG9+C7Bp/GACiFJkBoHxLL3XR+gEAAOiGAaCOU2QzvUzd4ZTyLT3UResDAACgW9n45mTX+MMAEKVI
         DQCbu6uLxg8DAAAA6IMBoI5TaDeNoO5wSvnmruqi9QQAANCtbHwu2TX+MABEKTIDwMnNXdhP+7sDAADo
         tnx8Dtk1/jAARClum2k4dYdTTm7urC5at7j3w95u7MyOLuzMdgAAqCtfftiM7Bp/462G74usaY1i2TRn
-        04Zjx3a6RFRrfERmACjf1JH9tK9LXDq2oj1bMymXzR2VQf5uAAAAerisys/uPGWb+r/fLLYbu4qajd0U
+        04Zjx3a6RFRrfERmACjf1JH9tK9LXDq2oj1bMymXzR2VQf5uAAAAetitys/uPGWb+r/fLLYbu4qajd0U
         2U3D/H+JQMo3dVDLtHNcObG+A1vybhb5+wAAAERLYZ6ptMSlZIq6jb1IDQAb26mlyj8FiA8HFrVm011m
         8ncBAACItqn29PJiu3GQqNzYSpFNyaduNKV8Y1u1WPmnALHvwGJtXzIBAAAQVda0H4scylWidmMnbrvi
         Im8woXxjG7Vc+acAsa18g/rOPx/v/AEAIEZYla+n2pU0Ub2xEbkBoDU7v69tzFs6Dsf8AQAgtrjtpk9E
@@ -467,7 +464,7 @@
         1TU1WNN+nGxt+UtRtbGZeBwANk7VvgFw79LryUUEAACQcXKv1AbA1aJmYzdFNtMz9I2vKVYGgC/eNZK3
         j/LNtnvIhQQAAJBxaNUtZM+QbKb3Rc3GbqQGgOWxMQDMGK7tDAD+ZQ1nD/FLAAMAAOizdc7VZNdQ3Hbl
         cVGzsZuiPNNfqBtP+ToGBoDTG7RvAFz8fntyEQEAAGStmNiN7BqK26H0EjUbu3HbTU9TN54SCwPAoYXa
-        NwCuK+xDLiIAAICseW+0JLvGn8uq/DzZ2vgyUbOxm3gbALYUat8AuHvREHXRHgIAANDl9P4HWbHTTHZN
+        NwCuK+xDLiIAAICseW+0JLvGn92q/DzZ2vgyUbOxm3gbALYUat8AuHvREHXRHgIAANDl9P4HWbHTTHZN
         TaatomJjO4V5pqfoX6CmWBgAvvxA+wbA45vuIBcSAABAxpF1t5I9Q7Ipn4qKje1IDQBldT8AzB6pbQPg
         9PwMduYgvwTw7wAAAHTZMW8g2TUU/iV7omJjO+qNfdL/xgdS1wPAuc3aNwAuHNuGXEQAAABZq6f0ILuG
         UmhTBoiKje2oNzZuBoAjX6SRt4uyekpPchEBAABkLRzbmuwayjRn04aiYmM7bpvyBPULUOp6ANhWrP0M
@@ -484,7 +481,7 @@
         mvbjZGvLX4pajZ/E+gCwcYr2DYD7lg5SF+1uAAAAXU7tltgAaDeuFpUaX1Fv/O9r/jK0uhgAvnhH+wbA
         77beQi4kAACAjMMrh5I9QzO9Jyo1vqLeeO0DwBe1PwDMGKZtAJgxIpNcRAAAAFnbZl9Bdg3JpvxZVGp8
         xW1THiZ/IUJtDwCnN2jfALjk/bbqot0FAACg24pPO5NdQymwKT1FpcZXZAaAI7U8ABxamEbeDsq6wh7k
-        IgIAAMia90Zzsmv8uazKz5OtjS8TlRpfKbSbH6J+KUptDwBbCrVvANyzaIC6aHcCAADocmbf7azYaSa7
+        IgIAAMia90Zzsmv82a3Kz5OtjS8TlRpfKbSbH6J+KUptDwBbCrVvANyzaIC6aHcCAADocmbf7azYaSa7
         xl9BnnGLqNP4C794AfVLUWp7APhynJG8HZSvN91ALiQAAICMo2uvJXsmgP+KOo2/SA0AS2p3AJg1UtsG
         wOn5Fnb2AL2QAAAAMnbM6092TQDPiTqNv7jtpgeJX4hUmwPA2c3aNwAuHNtKXbQ7AAAAdFv9WReyayiF
         NmWAqNP4i8wA8FUtDgB82KBuA2XNlK7kIgIAAMha+HZLsmso05xNG4o6jb+4baYHqF+KUpsDwLZi7ZcA
@@ -501,7 +498,7 @@
         smtqavzDZGvLX4oKje/E0gCwcYr2DYD7l/YnFxEAAEDG6d3aNwAW5BlXifqM/7gdptupX5IS7QHgi3e0
         bwA8sW2IunA3AgAA6HJ4pdQGwPdEfcZ/ZAaAgwuiNwBc2J3KSodpGwBmjMgkFxEAAEDWtlk9ya6hGR8T
         9Rn/cduV2+hfsqZoDgCn1mvfAPjFuFbkIgIAAMha+Wl7smtITnMPUZ/xn1gZAA4uTCP/Tsr6ws7s+wM3
-        AAAA6DZvTA7ZNf5cVuXnWSNSfy3qM/5TnKfcSv2ilGgOAFsKtG8A3LuoL7mIAAAAMs7uvY4VO8xk1/gr
+        AAAA6DZvTA7ZNf7sVuXnWSNSfy3qM/5TnKfcSv2ilGgOAFsKtG8A3LuoL7mIAAAAMs7uvY4VO8xk1/gr
         yDNuEdWZGImVAeDLcUby76R8s3GQunDXAwAA6HJ0zQCyZyhum2mCqM7EiPpL3eL/SwZyYH70BoBZL2vb
         ADg938LO7acXEgAAQMbOz3uRXUOyKc+K6kyMuPPMN5O/KCFaA8DZTdo3AC56pwW5iAAAALJWT+5Adg3J
         oVwlqjMxEgsDwFdLtG8AXDOlo7po1wEAAOi28O3mZNdQZlqNBlGdiZFiu/km6helRGsA2FasfQPgrnm9
@@ -601,7 +598,7 @@
         MhsATY+IGkPCjZ4BYOWHGAAAACAClpnYqgnaNwAWvWTsImoMCTf8KkrknavBtmlZrHxFcwAAAF1Or8lh
         816nu6YGq3Kef4+NqDEk3OgZAL5eex37+fgTAAAAulw48qhnYznVNf4K85QNosIQvaHuYC2+33cvuZAA
         AAAyTu24h+wZSqHd+LGoL0RvqDs4lJkjzOqiPVZjEQEAAGQdLruW7BqK2256WtQXojfUHRxK2UetyEUE
-        AACQtaWkD9k1JIexn6gvRG9cVuVn8k4OYsesXuQiAgAAyFo6ri3ZNZTJ+ZkNRH0hehPOAHB05RByEQEA
+        AACQtaWkD9k1JIexn6gvRG/sVuVn8k4OYsesXuQiAgAAyFo6ri3ZNZTJ+ZkNRH0hehPOAHB05RByEQEA
         AGRcOPo4m+7KILvGX6Gt6S5RXUgkot6pF/zv5FDO7L6LXEgAAAAZp3ffT/YMxW03fiaqC4lE+DmV1B0d
         yHSXwn4+9idyIQEAAGQcXXkD2TUUt830T1FdSCRSZDWdpO7oQJa+n0suIgAAgKzts/qRXUMzXyOqC4lE
         Cu2mtfQdTdtS0o1cRAAAAFnLx7cnu4bidmSkiupCIpFCm/IGdUcHsmZyB3bwi0EAAAC6lQ7PJLumBmva
@@ -613,8 +610,8 @@
         giAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAI
         giAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAI
         giAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAI
-        giAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAxnaSk/wdKel0Z
+        giAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAxnaSk/wefl10B
-        lqGCUQAAAABJRU5ErkJggg==
+        h339owAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="ToolStripDropDownButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

DPM2016/Behandlung/Benhandungdetail.vb

@@ -19,6 +19,7 @@
                 Get_Stammdaten()
                 Globals.OnLoad = True
                 OnGetData = True
+
                 Get_Data()
                 OnGetData = False
                 Globals.OnLoad = False
@@ -47,6 +48,12 @@
 
 
                     GrpPatient.Text = "Verantwortung / Rechnungsart"
+
+                    GrpPatient.Height = GrpPatient.Height + 30
+                    Me.cbansprechperson.Visible = True
+
+
+                    Me.lblAnsprechen.Visible = True
                     Me.grpZusammenfassugn.Top = grpZusammenfassugn.Top + 20
                     Me.GrpRaten.Top = GrpRaten.Top + 20
                     Me.grpBehandlungsdaten.Top = Me.grpBehandlungsdaten.Top + 20
@@ -368,6 +375,22 @@
             End Try
         End If
         chk_dateien()
+
+        If r("nransprechpartner") > 0 Then
+            Dim pap As New clsDB
+            pap.Get_Tabledata("AP", "", "Select name from privat_ansprechpartner where id=" + r("nransprechpartner").ToString)
+            Dim i As Integer = 0
+            Dim x As Integer
+            Dim result As String
+
+            For Each itm As Object In cbansprechperson.Items
+                result = itm.ToString()
+                If result = pap.dsDaten.Tables(0).Rows(0).Item(0) Then
+                    Me.cbansprechperson.SelectedText = pap.dsDaten.Tables(0).Rows(0).Item(0)
+                End If
+            Next
+        End If
+
         AddChanges(Me)
         Me.HasChanges = False
     End Sub
@@ -565,9 +588,16 @@
         r("mutierer") = Globals.ActUser
         r("total") = Me.txtcTotal.Text
 
+        If Me.cbansprechperson.Text <> "" Then
+            Dim ap As New clsDB
+            ap.Get_Tabledata("Ansprechpartner", "", "select id from privat_ansprechpartner where name='" + Me.cbansprechperson.Text + "' and nrprivat=" + Me.Patientnr.ToString)
+            r("nransprechpartner") = ap.dsDaten.Tables(0).Rows(0).Item(0).ToString
+        End If
+
         db.Update_Data()
 
 
+
         Me.HasChanges = False
 
     End Sub
@@ -706,6 +736,20 @@
         dbx.Dispose()
 
 
+        Try
+            Me.cbansprechperson.Items.Clear()
+            Me.cbansprechperson.Items.Add("")
+            Dim ap As New clsDB
+            ap.Get_Tabledata("Ansprechpartner", "", "Select id,Name from privat_ansprechpartner where aktiv=1 and nrprivat=" + Me.Patientnr.ToString + " order by name")
+            Dim i As Integer = 0
+            Me.cbansprechperson.SelectedIndex = i
+            For Each r1 As DataRow In ap.dsDaten.Tables(0).Rows
+                Me.cbansprechperson.Items.Add(r1("Name"))
+            Next
+            ap.Dispose()
+        Catch ex As Exception
+
+        End Try
 
     End Sub
 
@@ -1092,6 +1136,7 @@
     End Sub
 
     Private Sub cbboxNrAnsatz_SelectedIndexChanged_1(sender As Object, e As EventArgs) Handles cbboxNrAnsatz.SelectedIndexChanged
+        If Me.OnLoad Then Exit Sub
         If Me.Behandlungsstatus <> 1 And Me.Behandlungsstatus <> 4 Then Exit Sub
         Me.Save_Data()
         db.Recalc_Leistungen(Me.Behandlungsnr, Me.mtxtTaxpunktwert.Text)

DPM2016/Behandlung/LeistungDruck.Designer.vb

@@ -86,11 +86,11 @@ Partial Class LeistungDruck
         Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripButton3 = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripButton4 = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripButton5 = New System.Windows.Forms.ToolStripButton()
         Me.GroupBox2 = New System.Windows.Forms.GroupBox()
         Me.C1Produktzusatz = New C1.Win.C1TrueDBGrid.C1TrueDBGrid()
         Me.ToolStrip4 = New System.Windows.Forms.ToolStrip()
         Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripButton5 = New System.Windows.Forms.ToolStripButton()
         CType(Me.diwert, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DIMenge, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.dtdatum, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -415,7 +415,6 @@ Partial Class LeistungDruck
         '
         Me.lbtarif1.BackgroundStyle.Class = "ListBoxAdv"
         Me.lbtarif1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
-        Me.lbtarif1.CheckStateMember = Nothing
         Me.lbtarif1.ContainerControlProcessDialogKey = True
         Me.lbtarif1.ContextMenuStrip = Me.ContextMenuStrip1
         Me.lbtarif1.DragDropSupport = True
@@ -559,7 +558,6 @@ Partial Class LeistungDruck
         '
         Me.lbPakete.BackgroundStyle.Class = "ListBoxAdv"
         Me.lbPakete.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
-        Me.lbPakete.CheckStateMember = Nothing
         Me.lbPakete.ContainerControlProcessDialogKey = True
         Me.lbPakete.Dock = System.Windows.Forms.DockStyle.Fill
         Me.lbPakete.DragDropSupport = True
@@ -735,7 +733,7 @@ Partial Class LeistungDruck
         '
         Me.GroupBox1.Controls.Add(Me.C1Produkte)
         Me.GroupBox1.Dock = System.Windows.Forms.DockStyle.Left
-        Me.GroupBox1.Location = New System.Drawing.Point(35, 16)
+        Me.GroupBox1.Location = New System.Drawing.Point(27, 16)
         Me.GroupBox1.Name = "GroupBox1"
         Me.GroupBox1.Size = New System.Drawing.Size(498, 152)
         Me.GroupBox1.TabIndex = 0
@@ -766,7 +764,7 @@ Partial Class LeistungDruck
         Me.ToolStrip3.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton1, Me.ToolStripButton3, Me.ToolStripButton4, Me.ToolStripButton5})
         Me.ToolStrip3.Location = New System.Drawing.Point(3, 16)
         Me.ToolStrip3.Name = "ToolStrip3"
-        Me.ToolStrip3.Size = New System.Drawing.Size(32, 152)
+        Me.ToolStrip3.Size = New System.Drawing.Size(24, 152)
         Me.ToolStrip3.TabIndex = 5
         Me.ToolStrip3.Text = "ToolStrip3"
         '
@@ -776,7 +774,7 @@ Partial Class LeistungDruck
         Me.ToolStripButton1.Image = CType(resources.GetObject("ToolStripButton1.Image"), System.Drawing.Image)
         Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton1.Name = "ToolStripButton1"
-        Me.ToolStripButton1.Size = New System.Drawing.Size(29, 20)
+        Me.ToolStripButton1.Size = New System.Drawing.Size(21, 20)
         Me.ToolStripButton1.Text = "Neues Produkt"
         '
         'ToolStripButton3
@@ -785,7 +783,7 @@ Partial Class LeistungDruck
         Me.ToolStripButton3.Image = CType(resources.GetObject("ToolStripButton3.Image"), System.Drawing.Image)
         Me.ToolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton3.Name = "ToolStripButton3"
-        Me.ToolStripButton3.Size = New System.Drawing.Size(29, 20)
+        Me.ToolStripButton3.Size = New System.Drawing.Size(21, 20)
         Me.ToolStripButton3.Text = "Speichern"
         '
         'ToolStripButton4
@@ -794,9 +792,18 @@ Partial Class LeistungDruck
         Me.ToolStripButton4.Image = CType(resources.GetObject("ToolStripButton4.Image"), System.Drawing.Image)
         Me.ToolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton4.Name = "ToolStripButton4"
-        Me.ToolStripButton4.Size = New System.Drawing.Size(29, 20)
+        Me.ToolStripButton4.Size = New System.Drawing.Size(21, 20)
         Me.ToolStripButton4.Text = "Löschen"
         '
+        'ToolStripButton5
+        '
+        Me.ToolStripButton5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.ToolStripButton5.Image = CType(resources.GetObject("ToolStripButton5.Image"), System.Drawing.Image)
+        Me.ToolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripButton5.Name = "ToolStripButton5"
+        Me.ToolStripButton5.Size = New System.Drawing.Size(21, 20)
+        Me.ToolStripButton5.Text = "Kopieren"
+        '
         'GroupBox2
         '
         Me.GroupBox2.Controls.Add(Me.C1Produktzusatz)
@@ -845,15 +852,6 @@ Partial Class LeistungDruck
         Me.ToolStripButton2.Size = New System.Drawing.Size(21, 20)
         Me.ToolStripButton2.Text = "Speichern"
         '
-        'ToolStripButton5
-        '
-        Me.ToolStripButton5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripButton5.Image = CType(resources.GetObject("ToolStripButton5.Image"), System.Drawing.Image)
-        Me.ToolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripButton5.Name = "ToolStripButton5"
-        Me.ToolStripButton5.Size = New System.Drawing.Size(29, 20)
-        Me.ToolStripButton5.Text = "Kopieren"
-        '
         'LeistungDruck
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

DPM2016/Behandlung/LeistungDruck.resx

@@ -158,11 +158,8 @@
 </value>
   </data>
   <data name="C1Leistungen.PropBag" xml:space="preserve">
-    <value>&lt;?xml version="1.0"?&gt;&lt;Blob&gt;&lt;Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"&gt;&lt;Data&gt;HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style1{}Caption{AlignHorz:Center;}Style6{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"&gt;&lt;CaptionStyle parent="Style2" me="Style10" /&gt;&lt;EditorStyle parent="Editor" me="Style5" /&gt;&lt;EvenRowStyle parent="EvenRow" me="Style8" /&gt;&lt;FilterBarStyle parent="FilterBar" me="Style13" /&gt;&lt;FilterWatermarkStyle parent="FilterWatermark" me="Style14" /&gt;&lt;FooterStyle parent="Footer" me="Style3" /&gt;&lt;GroupStyle parent="Group" me="Style12" /&gt;&lt;HeadingStyle parent="Heading" me="Style2" /&gt;&lt;HighLightRowStyle parent="HighlightRow" me="Style7" /&gt;&lt;InactiveStyle parent="Inactive" me="Style4" /&gt;&lt;OddRowStyle parent="OddRow" me="Style9" /&gt;&lt;RecordSelectorStyle parent="RecordSelector" me="Style11" /&gt;&lt;SelectedStyle parent="Selected" me="Style6" /&gt;&lt;Style parent="Normal" me="Style1" /&gt;&lt;ClientRect&gt;0, 0, 1140, 104&lt;/ClientRect&gt;&lt;BorderSide&gt;0&lt;/BorderSide&gt;&lt;/C1.Win.C1TrueDBGrid.MergeView&gt;&lt;/Splits&gt;&lt;NamedStyles&gt;&lt;Style parent="" me="Normal" /&gt;&lt;Style parent="Normal" me="Heading" /&gt;&lt;Style parent="Heading" me="Footer" /&gt;&lt;Style parent="Heading" me="Caption" /&gt;&lt;Style parent="Heading" me="Inactive" /&gt;&lt;Style parent="Normal" me="Selected" /&gt;&lt;Style parent="Normal" me="Editor" /&gt;&lt;Style parent="Normal" me="HighlightRow" /&gt;&lt;Style parent="Normal" me="EvenRow" /&gt;&lt;Style parent="Normal" me="OddRow" /&gt;&lt;Style parent="Heading" me="RecordSelector" /&gt;&lt;Style parent="Normal" me="FilterBar" /&gt;&lt;Style parent="FilterBar" me="FilterWatermark" /&gt;&lt;Style parent="Caption" me="Group" /&gt;&lt;/NamedStyles&gt;&lt;vertSplits&gt;1&lt;/vertSplits&gt;&lt;horzSplits&gt;1&lt;/horzSplits&gt;&lt;Layout&gt;None&lt;/Layout&gt;&lt;DefaultRecSelWidth&gt;17&lt;/DefaultRecSelWidth&gt;&lt;ClientArea&gt;0, 0, 1140, 104&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
+    <value>&lt;?xml version="1.0"?&gt;&lt;Blob&gt;&lt;Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"&gt;&lt;Data&gt;HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}Style4{}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{ForeColor:ControlText;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style9{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style1{}Caption{AlignHorz:Center;}Style6{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"&gt;&lt;CaptionStyle parent="Style2" me="Style10" /&gt;&lt;EditorStyle parent="Editor" me="Style5" /&gt;&lt;EvenRowStyle parent="EvenRow" me="Style8" /&gt;&lt;FilterBarStyle parent="FilterBar" me="Style13" /&gt;&lt;FilterWatermarkStyle parent="FilterWatermark" me="Style14" /&gt;&lt;FooterStyle parent="Footer" me="Style3" /&gt;&lt;GroupStyle parent="Group" me="Style12" /&gt;&lt;HeadingStyle parent="Heading" me="Style2" /&gt;&lt;HighLightRowStyle parent="HighlightRow" me="Style7" /&gt;&lt;InactiveStyle parent="Inactive" me="Style4" /&gt;&lt;OddRowStyle parent="OddRow" me="Style9" /&gt;&lt;RecordSelectorStyle parent="RecordSelector" me="Style11" /&gt;&lt;SelectedStyle parent="Selected" me="Style6" /&gt;&lt;Style parent="Normal" me="Style1" /&gt;&lt;ClientRect&gt;0, 0, 1140, 104&lt;/ClientRect&gt;&lt;BorderSide&gt;0&lt;/BorderSide&gt;&lt;/C1.Win.C1TrueDBGrid.MergeView&gt;&lt;/Splits&gt;&lt;NamedStyles&gt;&lt;Style parent="" me="Normal" /&gt;&lt;Style parent="Normal" me="Heading" /&gt;&lt;Style parent="Heading" me="Footer" /&gt;&lt;Style parent="Heading" me="Caption" /&gt;&lt;Style parent="Heading" me="Inactive" /&gt;&lt;Style parent="Normal" me="Selected" /&gt;&lt;Style parent="Normal" me="Editor" /&gt;&lt;Style parent="Normal" me="HighlightRow" /&gt;&lt;Style parent="Normal" me="EvenRow" /&gt;&lt;Style parent="Normal" me="OddRow" /&gt;&lt;Style parent="Heading" me="RecordSelector" /&gt;&lt;Style parent="Normal" me="FilterBar" /&gt;&lt;Style parent="FilterBar" me="FilterWatermark" /&gt;&lt;Style parent="Caption" me="Group" /&gt;&lt;/NamedStyles&gt;&lt;vertSplits&gt;1&lt;/vertSplits&gt;&lt;horzSplits&gt;1&lt;/horzSplits&gt;&lt;Layout&gt;None&lt;/Layout&gt;&lt;DefaultRecSelWidth&gt;17&lt;/DefaultRecSelWidth&gt;&lt;ClientArea&gt;0, 0, 1140, 104&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
   </data>
-  <metadata name="ToolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>983, 17</value>
-  </metadata>
   <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>826, 17</value>
   </metadata>
@@ -202,26 +199,65 @@
   <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1411, 17</value>
   </metadata>
+  <data name="C1Produkte.Images" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAA0SURBVChTdYkBCgAgDAL9/6eLIsd0eSCKhw/r9aCLtC88
+        vAdHMEIXKUIUhMK76EfagglgA6CqHOQpL6GyAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="C1Produkte.PrintInfo.PageSettings" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0
+        dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAACRTeXN0ZW0uRHJh
+        d2luZy5QcmludGluZy5QYWdlU2V0dGluZ3MHAAAAD3ByaW50ZXJTZXR0aW5ncwVjb2xvcglwYXBlclNp
+        emULcGFwZXJTb3VyY2URcHJpbnRlclJlc29sdXRpb24JbGFuZHNjYXBlB21hcmdpbnMEBAQEBAQEJ1N5
+        c3RlbS5EcmF3aW5nLlByaW50aW5nLlByaW50ZXJTZXR0aW5ncwIAAAAgU3lzdGVtLkRyYXdpbmcuUHJp
+        bnRpbmcuVHJpU3RhdGUCAAAAIVN5c3RlbS5EcmF3aW5nLlByaW50aW5nLlBhcGVyU2l6ZQIAAAAjU3lz
+        dGVtLkRyYXdpbmcuUHJpbnRpbmcuUGFwZXJTb3VyY2UCAAAAKVN5c3RlbS5EcmF3aW5nLlByaW50aW5n
+        LlByaW50ZXJSZXNvbHV0aW9uAgAAACBTeXN0ZW0uRHJhd2luZy5QcmludGluZy5UcmlTdGF0ZQIAAAAf
+        U3lzdGVtLkRyYXdpbmcuUHJpbnRpbmcuTWFyZ2lucwIAAAACAAAACQMAAAAF/P///yBTeXN0ZW0uRHJh
+        d2luZy5QcmludGluZy5UcmlTdGF0ZQEAAAAFdmFsdWUAAgIAAAAACgoKAfv////8////AAkGAAAABQMA
+        AAAnU3lzdGVtLkRyYXdpbmcuUHJpbnRpbmcuUHJpbnRlclNldHRpbmdzEgAAAAtwcmludGVyTmFtZQpk
+        cml2ZXJOYW1lCm91dHB1dFBvcnQLcHJpbnRUb0ZpbGUUcHJpbnREaWFsb2dEaXNwbGF5ZWQKZXh0cmFi
+        eXRlcwlleHRyYWluZm8GY29waWVzBmR1cGxleAdjb2xsYXRlE2RlZmF1bHRQYWdlU2V0dGluZ3MIZnJv
+        bVBhZ2UGdG9QYWdlB21heFBhZ2UHbWluUGFnZQpwcmludFJhbmdlDGRldm1vZGVieXRlcw1jYWNoZWRE
+        ZXZtb2RlAQEBAAAABwAEBAQAAAAABAAHAQEHAgceU3lzdGVtLkRyYXdpbmcuUHJpbnRpbmcuRHVwbGV4
+        AgAAACBTeXN0ZW0uRHJhd2luZy5QcmludGluZy5UcmlTdGF0ZQIAAAAkU3lzdGVtLkRyYXdpbmcuUHJp
+        bnRpbmcuUGFnZVNldHRpbmdzAgAAAAgICAgiU3lzdGVtLkRyYXdpbmcuUHJpbnRpbmcuUHJpbnRSYW5n
+        ZQIAAAAHAgIAAAAKBgcAAAAACQcAAAAAAAAACv//Bfj///8eU3lzdGVtLkRyYXdpbmcuUHJpbnRpbmcu
+        RHVwbGV4AQAAAAd2YWx1ZV9fAAgCAAAA/////wH3/////P///wAJCgAAAAAAAAAAAAAADycAAAAAAAAF
+        9f///yJTeXN0ZW0uRHJhd2luZy5QcmludGluZy5QcmludFJhbmdlAQAAAAd2YWx1ZV9fAAgCAAAAAAAA
+        AAAACgUGAAAAH1N5c3RlbS5EcmF3aW5nLlByaW50aW5nLk1hcmdpbnMIAAAABGxlZnQFcmlnaHQDdG9w
+        BmJvdHRvbQpkb3VibGVMZWZ0C2RvdWJsZVJpZ2h0CWRvdWJsZVRvcAxkb3VibGVCb3R0b20AAAAAAAAA
+        AAgICAgGBgYGAgAAAGQAAABkAAAAZAAAAGQAAAAAAAAAAABZQAAAAAAAAFlAAAAAAAAAWUAAAAAAAABZ
+        QAEKAAAAAQAAAAkDAAAAAfP////8////AAoKCgHy/////P///wAJDwAAAAEPAAAABgAAAGQAAABkAAAA
+        ZAAAAGQAAAAAAAAAAABZQAAAAAAAAFlAAAAAAAAAWUAAAAAAAABZQAs=
+</value>
+  </data>
+  <data name="C1Produkte.PropBag" xml:space="preserve">
+    <value>&lt;?xml version="1.0"?&gt;&lt;Blob&gt;&lt;Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"&gt;&lt;Data&gt;HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}Style4{}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style9{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style1{}Caption{AlignHorz:Center;}Style6{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"&gt;&lt;CaptionStyle parent="Style2" me="Style10" /&gt;&lt;EditorStyle parent="Editor" me="Style5" /&gt;&lt;EvenRowStyle parent="EvenRow" me="Style8" /&gt;&lt;FilterBarStyle parent="FilterBar" me="Style13" /&gt;&lt;FilterWatermarkStyle parent="FilterWatermark" me="Style14" /&gt;&lt;FooterStyle parent="Footer" me="Style3" /&gt;&lt;GroupStyle parent="Group" me="Style12" /&gt;&lt;HeadingStyle parent="Heading" me="Style2" /&gt;&lt;HighLightRowStyle parent="HighlightRow" me="Style7" /&gt;&lt;InactiveStyle parent="Inactive" me="Style4" /&gt;&lt;OddRowStyle parent="OddRow" me="Style9" /&gt;&lt;RecordSelectorStyle parent="RecordSelector" me="Style11" /&gt;&lt;SelectedStyle parent="Selected" me="Style6" /&gt;&lt;Style parent="Normal" me="Style1" /&gt;&lt;ClientRect&gt;0, 0, 490, 131&lt;/ClientRect&gt;&lt;BorderSide&gt;0&lt;/BorderSide&gt;&lt;/C1.Win.C1TrueDBGrid.MergeView&gt;&lt;/Splits&gt;&lt;NamedStyles&gt;&lt;Style parent="" me="Normal" /&gt;&lt;Style parent="Normal" me="Heading" /&gt;&lt;Style parent="Heading" me="Footer" /&gt;&lt;Style parent="Heading" me="Caption" /&gt;&lt;Style parent="Heading" me="Inactive" /&gt;&lt;Style parent="Normal" me="Selected" /&gt;&lt;Style parent="Normal" me="Editor" /&gt;&lt;Style parent="Normal" me="HighlightRow" /&gt;&lt;Style parent="Normal" me="EvenRow" /&gt;&lt;Style parent="Normal" me="OddRow" /&gt;&lt;Style parent="Heading" me="RecordSelector" /&gt;&lt;Style parent="Normal" me="FilterBar" /&gt;&lt;Style parent="FilterBar" me="FilterWatermark" /&gt;&lt;Style parent="Caption" me="Group" /&gt;&lt;/NamedStyles&gt;&lt;vertSplits&gt;1&lt;/vertSplits&gt;&lt;horzSplits&gt;1&lt;/horzSplits&gt;&lt;Layout&gt;None&lt;/Layout&gt;&lt;DefaultRecSelWidth&gt;17&lt;/DefaultRecSelWidth&gt;&lt;ClientArea&gt;0, 0, 490, 131&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
+  </data>
   <metadata name="ToolStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1518, 17</value>
   </metadata>
   <data name="ToolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAMMSURBVEhLnVXNS1RRFH8VtKhoUf9ECLWRyXnvDmmQMtp7
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAMOSURBVEhLnVXNS1RRFH8VtKhoUf9ECLXIzHnvSho0g9p7
-        T7GmItq0apNQQURtpi8IglwargohSReziJhm3rvz0apdH2D0YZpR1qIPnCQtUW/nd99743t6HUeP/Bi5
+        b8SaimjTqk1CBRG1mb4gCHJpuCqEJF3MohGZee+O2qpdH2D0YZpR1qIPnCQt0bmd333vje85Vx098mPk
-        99zfue+c3z1HU1laaJuP5uK7zJy+x+LsrOUaAzaPP7O5Pk6/Y/J/Wut0jZ5OJ763jXxTw6kt/vEaJrRN
+        3nN/575zfvccTWVpoW0+novtMnP6Houz85Zr9Ng89szm+gT9jsv/aS3pGh1JJ7Y3Qb6p/tQW//gqJrRN
-        5qPGbTZPNNh51tfOjR82Z6IWOrKxactld7uKTY2t+X3bfSaFEXmXG9ttOvpput17FdmqyLLFds4mTc7O
+        5pPabTZvqLHzrKuFGz9szsRqaB2om7Fcdr9tqL42nt+33WdSGJG3uXW7TUc/S7d7ryJbEVlWauFsyuTs
-        JLP7d/qMIfPJifhi0jUWlCR1wOTGlFVgl1Ol5h0+s2dIC25ei7yTJ8TxUqs4UW5T7lfhxn5ZBaMnNdyw
+        XPPgwZ0+Y8h8ciK+HHeNRSVJFTC5MW0V2NXUcOMOn9kzpAU3X408yRvEyeG4ODWSUO6X4R74ZRWMjlR/
-        VZKjoMi5xfV3ygMEkJ96elgMfOgXD8fviWOlQ0q/ACaPf+0o6IYMALWgoCrHAN2FFnH1xQUBq8xNid7X
+        zVZJjoIi5xbX3ykPEEB+5ulR0fOhWzyeeCBODB9R+gUweexra0E3ZACoBQVVOQZoLzSJ6y8uCVhxflp0
-        15V+AZI5NkPpHkyN0FdAimup5UixRdx8eUkG+D1XEX1vbiv9wsBXWMUE06BzlUMYGwlAqFiOcUPzHlF0
+        vr6p9AuQyLFZSndvapS+AlJcSy3HhprE7ZdXZIDf80XR9eau0i8MfIU11MA06FzlEMZGAhCKlmPc0rxH
-        EznvLjRLYgDFvfXqigwwTQH6396p7gHwXc5hZtmc7eiO5r3QKDkKmqac49YAyIc+3pcBZub/iOznTHUP
+        FN1EztsLjZIYQHHvvLomA8xQgO6398p7AHyXc5hZNm87uqN5LzRKjoKmKee4NQDyvo8PZYDZhT9i8HOm
-        SD8/L06Wk5EAHuJjFADPf2kRt4Va1mMImpkYDBEHaPqEL6DesrQInUOKUAvyDSAtIIEt0t/s/Gx1D/j5
+        vAekn18Up0eaIwE8xMYpAJ7/0iJuC7WsxxA0M9kbIg5Q/wlfQL1laRE6hxShFuQbQFpAAivR39zCXHkP
-        97twJh+HiAN4ASIpAqBzSBHFBJBzpAUG8vK3fHUP6B25Jr88wvOELZJURzV0xciGAigkcg3DjUGq8gsj
+        +Pn3u3CmBkLEAbwAkRQB0DmkiGICyDnSAgP5yLd8eQ/oHL0hvzzCM8BKJNUxDV0xsqEAColcw3BjkKr8
-        ydk/WWS0XJVDGBsJQPBkin6OlqtwqGLdAai7Iv92Xj+gYVign3uLCmcCdA4potAoKHKu8gtgZWOzpM4h
+        wohz9k8WGS1X5RDGRgIQPJmin6PlKhzKWHcA6q7Iv53XD2kYFujn3qLCmQCdQ4ooNAqKnKv8AljZ/XOk
-        2YswiTAs0M9VzgGg88zEA6mWFQUNQXZkl43aOeOgDADDJMKwQD9XHaoXVNgFO8e+WA4751MvGSYRhgX6
+        zj7ZizCJMCzQz1XOAaDzzOQjqZaKgoYgO7LLxuyccVgGgGESYVign6sOVQsq7KKdY18sh13wqZcMkwjD
-        uerwWpA3J3LTMdI+5UrDJMKwQCeULVdBtAJUO5lzSovy5ssNkwjDAv0cgYikIhtXmJQekdQ57Um1UEEj
+        Av1cdXgtyJsTuekYaZ+y0jCJMCzQCWXLVRBVgGonc05pUd58uWESYVignyMQkRRl4wqT0iOSOqc9qRYq
-        Oa/HMCzQz6FlPBivpYCMQC8Ua3IPUlzVNO0/43uuD4YnYP8AAAAASUVORK5CYII=
+        aCTn1RiGBfo5tIwH47UUkBHohWJN7kGKK5qm/QcPjq3M/qGargAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="ToolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -315,51 +351,6 @@
         TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
   </data>
-  <metadata name="ToolStrip4.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1625, 17</value>
-  </metadata>
-  <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1411, 17</value>
-  </metadata>
-  <data name="C1Produkte.Images" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAA0SURBVChTdYkBCgAgDAL9/6eLIsd0eSCKhw/r9aCLtC88
-        vAdHMEIXKUIUhMK76EfagglgA6CqHOQpL6GyAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="C1Produkte.PrintInfo.PageSettings" mimetype="application/x-microsoft.net.object.binary.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0
-        dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAACRTeXN0ZW0uRHJh
-        d2luZy5QcmludGluZy5QYWdlU2V0dGluZ3MHAAAAD3ByaW50ZXJTZXR0aW5ncwVjb2xvcglwYXBlclNp
-        emULcGFwZXJTb3VyY2URcHJpbnRlclJlc29sdXRpb24JbGFuZHNjYXBlB21hcmdpbnMEBAQEBAQEJ1N5
-        c3RlbS5EcmF3aW5nLlByaW50aW5nLlByaW50ZXJTZXR0aW5ncwIAAAAgU3lzdGVtLkRyYXdpbmcuUHJp
-        bnRpbmcuVHJpU3RhdGUCAAAAIVN5c3RlbS5EcmF3aW5nLlByaW50aW5nLlBhcGVyU2l6ZQIAAAAjU3lz
-        dGVtLkRyYXdpbmcuUHJpbnRpbmcuUGFwZXJTb3VyY2UCAAAAKVN5c3RlbS5EcmF3aW5nLlByaW50aW5n
-        LlByaW50ZXJSZXNvbHV0aW9uAgAAACBTeXN0ZW0uRHJhd2luZy5QcmludGluZy5UcmlTdGF0ZQIAAAAf
-        U3lzdGVtLkRyYXdpbmcuUHJpbnRpbmcuTWFyZ2lucwIAAAACAAAACQMAAAAF/P///yBTeXN0ZW0uRHJh
-        d2luZy5QcmludGluZy5UcmlTdGF0ZQEAAAAFdmFsdWUAAgIAAAAACgoKAfv////8////AAkGAAAABQMA
-        AAAnU3lzdGVtLkRyYXdpbmcuUHJpbnRpbmcuUHJpbnRlclNldHRpbmdzEgAAAAtwcmludGVyTmFtZQpk
-        cml2ZXJOYW1lCm91dHB1dFBvcnQLcHJpbnRUb0ZpbGUUcHJpbnREaWFsb2dEaXNwbGF5ZWQKZXh0cmFi
-        eXRlcwlleHRyYWluZm8GY29waWVzBmR1cGxleAdjb2xsYXRlE2RlZmF1bHRQYWdlU2V0dGluZ3MIZnJv
-        bVBhZ2UGdG9QYWdlB21heFBhZ2UHbWluUGFnZQpwcmludFJhbmdlDGRldm1vZGVieXRlcw1jYWNoZWRE
-        ZXZtb2RlAQEBAAAABwAEBAQAAAAABAAHAQEHAgceU3lzdGVtLkRyYXdpbmcuUHJpbnRpbmcuRHVwbGV4
-        AgAAACBTeXN0ZW0uRHJhd2luZy5QcmludGluZy5UcmlTdGF0ZQIAAAAkU3lzdGVtLkRyYXdpbmcuUHJp
-        bnRpbmcuUGFnZVNldHRpbmdzAgAAAAgICAgiU3lzdGVtLkRyYXdpbmcuUHJpbnRpbmcuUHJpbnRSYW5n
-        ZQIAAAAHAgIAAAAKBgcAAAAACQcAAAAAAAAACv//Bfj///8eU3lzdGVtLkRyYXdpbmcuUHJpbnRpbmcu
-        RHVwbGV4AQAAAAd2YWx1ZV9fAAgCAAAA/////wH3/////P///wAJCgAAAAAAAAAAAAAADycAAAAAAAAF
-        9f///yJTeXN0ZW0uRHJhd2luZy5QcmludGluZy5QcmludFJhbmdlAQAAAAd2YWx1ZV9fAAgCAAAAAAAA
-        AAAACgUGAAAAH1N5c3RlbS5EcmF3aW5nLlByaW50aW5nLk1hcmdpbnMIAAAABGxlZnQFcmlnaHQDdG9w
-        BmJvdHRvbQpkb3VibGVMZWZ0C2RvdWJsZVJpZ2h0CWRvdWJsZVRvcAxkb3VibGVCb3R0b20AAAAAAAAA
-        AAgICAgGBgYGAgAAAGQAAABkAAAAZAAAAGQAAAAAAAAAAABZQAAAAAAAAFlAAAAAAAAAWUAAAAAAAABZ
-        QAEKAAAAAQAAAAkDAAAAAfP////8////AAoKCgHy/////P///wAJDwAAAAEPAAAABgAAAGQAAABkAAAA
-        ZAAAAGQAAAAAAAAAAABZQAAAAAAAAFlAAAAAAAAAWUAAAAAAAABZQAs=
-</value>
-  </data>
-  <data name="C1Produkte.PropBag" xml:space="preserve">
-    <value>&lt;?xml version="1.0"?&gt;&lt;Blob&gt;&lt;Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"&gt;&lt;Data&gt;HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}Style4{}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{Wrap:True;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style9{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style1{}Caption{AlignHorz:Center;}Style6{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"&gt;&lt;CaptionStyle parent="Style2" me="Style10" /&gt;&lt;EditorStyle parent="Editor" me="Style5" /&gt;&lt;EvenRowStyle parent="EvenRow" me="Style8" /&gt;&lt;FilterBarStyle parent="FilterBar" me="Style13" /&gt;&lt;FilterWatermarkStyle parent="FilterWatermark" me="Style14" /&gt;&lt;FooterStyle parent="Footer" me="Style3" /&gt;&lt;GroupStyle parent="Group" me="Style12" /&gt;&lt;HeadingStyle parent="Heading" me="Style2" /&gt;&lt;HighLightRowStyle parent="HighlightRow" me="Style7" /&gt;&lt;InactiveStyle parent="Inactive" me="Style4" /&gt;&lt;OddRowStyle parent="OddRow" me="Style9" /&gt;&lt;RecordSelectorStyle parent="RecordSelector" me="Style11" /&gt;&lt;SelectedStyle parent="Selected" me="Style6" /&gt;&lt;Style parent="Normal" me="Style1" /&gt;&lt;ClientRect&gt;0, 0, 490, 131&lt;/ClientRect&gt;&lt;BorderSide&gt;0&lt;/BorderSide&gt;&lt;/C1.Win.C1TrueDBGrid.MergeView&gt;&lt;/Splits&gt;&lt;NamedStyles&gt;&lt;Style parent="" me="Normal" /&gt;&lt;Style parent="Normal" me="Heading" /&gt;&lt;Style parent="Heading" me="Footer" /&gt;&lt;Style parent="Heading" me="Caption" /&gt;&lt;Style parent="Heading" me="Inactive" /&gt;&lt;Style parent="Normal" me="Selected" /&gt;&lt;Style parent="Normal" me="Editor" /&gt;&lt;Style parent="Normal" me="HighlightRow" /&gt;&lt;Style parent="Normal" me="EvenRow" /&gt;&lt;Style parent="Normal" me="OddRow" /&gt;&lt;Style parent="Heading" me="RecordSelector" /&gt;&lt;Style parent="Normal" me="FilterBar" /&gt;&lt;Style parent="FilterBar" me="FilterWatermark" /&gt;&lt;Style parent="Caption" me="Group" /&gt;&lt;/NamedStyles&gt;&lt;vertSplits&gt;1&lt;/vertSplits&gt;&lt;horzSplits&gt;1&lt;/horzSplits&gt;&lt;Layout&gt;None&lt;/Layout&gt;&lt;DefaultRecSelWidth&gt;17&lt;/DefaultRecSelWidth&gt;&lt;ClientArea&gt;0, 0, 490, 131&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
-  </data>
   <data name="C1Produktzusatz.Images" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -397,7 +388,7 @@
 </value>
   </data>
   <data name="C1Produktzusatz.PropBag" xml:space="preserve">
-    <value>&lt;?xml version="1.0"?&gt;&lt;Blob&gt;&lt;Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"&gt;&lt;Data&gt;HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;Wrap:True;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style1{}Caption{AlignHorz:Center;}Style6{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"&gt;&lt;CaptionStyle parent="Style2" me="Style10" /&gt;&lt;EditorStyle parent="Editor" me="Style5" /&gt;&lt;EvenRowStyle parent="EvenRow" me="Style8" /&gt;&lt;FilterBarStyle parent="FilterBar" me="Style13" /&gt;&lt;FilterWatermarkStyle parent="FilterWatermark" me="Style14" /&gt;&lt;FooterStyle parent="Footer" me="Style3" /&gt;&lt;GroupStyle parent="Group" me="Style12" /&gt;&lt;HeadingStyle parent="Heading" me="Style2" /&gt;&lt;HighLightRowStyle parent="HighlightRow" me="Style7" /&gt;&lt;InactiveStyle parent="Inactive" me="Style4" /&gt;&lt;OddRowStyle parent="OddRow" me="Style9" /&gt;&lt;RecordSelectorStyle parent="RecordSelector" me="Style11" /&gt;&lt;SelectedStyle parent="Selected" me="Style6" /&gt;&lt;Style parent="Normal" me="Style1" /&gt;&lt;ClientRect&gt;0, 0, 381, 130&lt;/ClientRect&gt;&lt;BorderSide&gt;0&lt;/BorderSide&gt;&lt;/C1.Win.C1TrueDBGrid.MergeView&gt;&lt;/Splits&gt;&lt;NamedStyles&gt;&lt;Style parent="" me="Normal" /&gt;&lt;Style parent="Normal" me="Heading" /&gt;&lt;Style parent="Heading" me="Footer" /&gt;&lt;Style parent="Heading" me="Caption" /&gt;&lt;Style parent="Heading" me="Inactive" /&gt;&lt;Style parent="Normal" me="Selected" /&gt;&lt;Style parent="Normal" me="Editor" /&gt;&lt;Style parent="Normal" me="HighlightRow" /&gt;&lt;Style parent="Normal" me="EvenRow" /&gt;&lt;Style parent="Normal" me="OddRow" /&gt;&lt;Style parent="Heading" me="RecordSelector" /&gt;&lt;Style parent="Normal" me="FilterBar" /&gt;&lt;Style parent="FilterBar" me="FilterWatermark" /&gt;&lt;Style parent="Caption" me="Group" /&gt;&lt;/NamedStyles&gt;&lt;vertSplits&gt;1&lt;/vertSplits&gt;&lt;horzSplits&gt;1&lt;/horzSplits&gt;&lt;Layout&gt;None&lt;/Layout&gt;&lt;DefaultRecSelWidth&gt;17&lt;/DefaultRecSelWidth&gt;&lt;ClientArea&gt;0, 0, 381, 130&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
+    <value>&lt;?xml version="1.0"?&gt;&lt;Blob&gt;&lt;Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"&gt;&lt;Data&gt;HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}Style4{}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{Wrap:True;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style9{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style1{}Caption{AlignHorz:Center;}Style6{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"&gt;&lt;CaptionStyle parent="Style2" me="Style10" /&gt;&lt;EditorStyle parent="Editor" me="Style5" /&gt;&lt;EvenRowStyle parent="EvenRow" me="Style8" /&gt;&lt;FilterBarStyle parent="FilterBar" me="Style13" /&gt;&lt;FilterWatermarkStyle parent="FilterWatermark" me="Style14" /&gt;&lt;FooterStyle parent="Footer" me="Style3" /&gt;&lt;GroupStyle parent="Group" me="Style12" /&gt;&lt;HeadingStyle parent="Heading" me="Style2" /&gt;&lt;HighLightRowStyle parent="HighlightRow" me="Style7" /&gt;&lt;InactiveStyle parent="Inactive" me="Style4" /&gt;&lt;OddRowStyle parent="OddRow" me="Style9" /&gt;&lt;RecordSelectorStyle parent="RecordSelector" me="Style11" /&gt;&lt;SelectedStyle parent="Selected" me="Style6" /&gt;&lt;Style parent="Normal" me="Style1" /&gt;&lt;ClientRect&gt;0, 0, 381, 130&lt;/ClientRect&gt;&lt;BorderSide&gt;0&lt;/BorderSide&gt;&lt;/C1.Win.C1TrueDBGrid.MergeView&gt;&lt;/Splits&gt;&lt;NamedStyles&gt;&lt;Style parent="" me="Normal" /&gt;&lt;Style parent="Normal" me="Heading" /&gt;&lt;Style parent="Heading" me="Footer" /&gt;&lt;Style parent="Heading" me="Caption" /&gt;&lt;Style parent="Heading" me="Inactive" /&gt;&lt;Style parent="Normal" me="Selected" /&gt;&lt;Style parent="Normal" me="Editor" /&gt;&lt;Style parent="Normal" me="HighlightRow" /&gt;&lt;Style parent="Normal" me="EvenRow" /&gt;&lt;Style parent="Normal" me="OddRow" /&gt;&lt;Style parent="Heading" me="RecordSelector" /&gt;&lt;Style parent="Normal" me="FilterBar" /&gt;&lt;Style parent="FilterBar" me="FilterWatermark" /&gt;&lt;Style parent="Caption" me="Group" /&gt;&lt;/NamedStyles&gt;&lt;vertSplits&gt;1&lt;/vertSplits&gt;&lt;horzSplits&gt;1&lt;/horzSplits&gt;&lt;Layout&gt;None&lt;/Layout&gt;&lt;DefaultRecSelWidth&gt;17&lt;/DefaultRecSelWidth&gt;&lt;ClientArea&gt;0, 0, 381, 130&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
   </data>
   <metadata name="ToolStrip4.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1625, 17</value>

DPM2016/DPM2016.vbproj

@@ -804,6 +804,12 @@
     </Compile>
     <Compile Include="Klassen\MySecurity.vb" />
     <Compile Include="Mobile\Models\Patient.vb" />
+    <Compile Include="Patient\frmPrivatAnsprechpartner.Designer.vb">
+      <DependentUpon>frmPrivatAnsprechpartner.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Patient\frmPrivatAnsprechpartner.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Patient\Patient.Designer.vb">
       <DependentUpon>Patient.vb</DependentUpon>
     </Compile>
@@ -1139,6 +1145,9 @@
     <EmbeddedResource Include="KG\Krankengeschichte.resx">
       <DependentUpon>Krankengeschichte.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Patient\frmPrivatAnsprechpartner.resx">
+      <DependentUpon>frmPrivatAnsprechpartner.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Patient\Patient.resx">
       <DependentUpon>Patient.vb</DependentUpon>
     </EmbeddedResource>

DPM2016/Diverses/frmProgrammeinstellungen.Designer.vb

@@ -1,316 +1,377 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
-Partial Class frmProgrammeinstellungen
+Partial Class frmProgrammeinstellungen
-    Inherits System.Windows.Forms.Form
+    Inherits System.Windows.Forms.Form
-
+
-    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
-    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
-        Try
+        Try
-            If disposing AndAlso components IsNot Nothing Then
+            If disposing AndAlso components IsNot Nothing Then
-                components.Dispose()
+                components.Dispose()
-            End If
+            End If
-        Finally
+        Finally
-            MyBase.Dispose(disposing)
+            MyBase.Dispose(disposing)
-        End Try
+        End Try
-    End Sub
+    End Sub
-
+
-    'Wird vom Windows Form-Designer benötigt.
+    'Wird vom Windows Form-Designer benötigt.
-    Private components As System.ComponentModel.IContainer
+    Private components As System.ComponentModel.IContainer
-
+
-    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
-    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
-    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
-    Private Sub InitializeComponent()
+    Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
+        Me.components = New System.ComponentModel.Container()
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmProgrammeinstellungen))
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmProgrammeinstellungen))
-        Me.Properties = New PropertyGridEx.PropertyGridEx()
+        Me.Properties = New PropertyGridEx.PropertyGridEx()
-        Me.TabControl1 = New System.Windows.Forms.TabControl()
+        Me.TabControl1 = New System.Windows.Forms.TabControl()
-        Me.Tarif = New System.Windows.Forms.TabPage()
+        Me.Tarif = New System.Windows.Forms.TabPage()
-        Me.ClsStammdaten_flat1 = New DPM2016.clsStammdaten_flat()
+        Me.ClsStammdaten_flat1 = New DPM2016.clsStammdaten_flat()
-        Me.Konto = New System.Windows.Forms.TabPage()
+        Me.Konto = New System.Windows.Forms.TabPage()
-        Me.ClsStammdaten_flat3 = New DPM2016.clsStammdaten_flat()
+        Me.ClsStammdaten_flat3 = New DPM2016.clsStammdaten_flat()
-        Me.MailTexte = New System.Windows.Forms.TabPage()
+        Me.MailTexte = New System.Windows.Forms.TabPage()
-        Me.ClsStammdaten_flat2 = New DPM2016.clsStammdaten_flat()
+        Me.ClsStammdaten_flat2 = New DPM2016.clsStammdaten_flat()
-        Me.AllgEinstellungen = New System.Windows.Forms.TabPage()
+        Me.AllgEinstellungen = New System.Windows.Forms.TabPage()
-        Me.TabPage1 = New System.Windows.Forms.TabPage()
+        Me.TabPage1 = New System.Windows.Forms.TabPage()
-        Me.Properties_DMS = New PropertyGridEx.PropertyGridEx()
+        Me.Properties_DMS = New PropertyGridEx.PropertyGridEx()
-        Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
+        Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
-        Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
-        Me.TabControl1.SuspendLayout()
+        Me.ProduktZusatz = New System.Windows.Forms.TabPage()
-        Me.Tarif.SuspendLayout()
+        Me.ProduktZusaatzDetails = New System.Windows.Forms.TabPage()
-        Me.Konto.SuspendLayout()
+        Me.ClsStammdaten_flat4 = New DPM2016.clsStammdaten_flat()
-        Me.MailTexte.SuspendLayout()
+        Me.ClsStammdaten_flat5 = New DPM2016.clsStammdaten_flat()
-        Me.AllgEinstellungen.SuspendLayout()
+        Me.TabControl1.SuspendLayout()
-        Me.TabPage1.SuspendLayout()
+        Me.Tarif.SuspendLayout()
-        Me.ToolStrip1.SuspendLayout()
+        Me.Konto.SuspendLayout()
-        Me.SuspendLayout()
+        Me.MailTexte.SuspendLayout()
-        '
+        Me.AllgEinstellungen.SuspendLayout()
-        'Properties
+        Me.TabPage1.SuspendLayout()
-        '
+        Me.ToolStrip1.SuspendLayout()
-        Me.Properties.CategoryForeColor = System.Drawing.SystemColors.InactiveCaptionText
+        Me.ProduktZusatz.SuspendLayout()
-        Me.Properties.CommandsVisibleIfAvailable = False
+        Me.ProduktZusaatzDetails.SuspendLayout()
-        '
+        Me.SuspendLayout()
-        '
+        '
-        '
+        'Properties
-        Me.Properties.DocCommentDescription.AccessibleName = ""
+        '
-        Me.Properties.DocCommentDescription.AutoEllipsis = True
+        Me.Properties.CategoryForeColor = System.Drawing.SystemColors.InactiveCaptionText
-        Me.Properties.DocCommentDescription.BackColor = System.Drawing.Color.Transparent
+        Me.Properties.CommandsVisibleIfAvailable = False
-        Me.Properties.DocCommentDescription.Cursor = System.Windows.Forms.Cursors.Default
+        '
-        Me.Properties.DocCommentDescription.ForeColor = System.Drawing.Color.WhiteSmoke
+        '
-        Me.Properties.DocCommentDescription.Location = New System.Drawing.Point(3, 18)
+        '
-        Me.Properties.DocCommentDescription.Name = ""
+        Me.Properties.DocCommentDescription.AccessibleName = ""
-        Me.Properties.DocCommentDescription.Size = New System.Drawing.Size(892, 37)
+        Me.Properties.DocCommentDescription.AutoEllipsis = True
-        Me.Properties.DocCommentDescription.TabIndex = 1
+        Me.Properties.DocCommentDescription.BackColor = System.Drawing.Color.Transparent
-        Me.Properties.DocCommentImage = CType(resources.GetObject("Properties.DocCommentImage"), System.Drawing.Image)
+        Me.Properties.DocCommentDescription.Cursor = System.Windows.Forms.Cursors.Default
-        '
+        Me.Properties.DocCommentDescription.ForeColor = System.Drawing.Color.WhiteSmoke
-        '
+        Me.Properties.DocCommentDescription.Location = New System.Drawing.Point(3, 18)
-        '
+        Me.Properties.DocCommentDescription.Name = ""
-        Me.Properties.DocCommentTitle.AutoSize = True
+        Me.Properties.DocCommentDescription.Size = New System.Drawing.Size(892, 37)
-        Me.Properties.DocCommentTitle.BackColor = System.Drawing.Color.Transparent
+        Me.Properties.DocCommentDescription.TabIndex = 1
-        Me.Properties.DocCommentTitle.Cursor = System.Windows.Forms.Cursors.Default
+        Me.Properties.DocCommentImage = CType(resources.GetObject("Properties.DocCommentImage"), System.Drawing.Image)
-        Me.Properties.DocCommentTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold)
+        '
-        Me.Properties.DocCommentTitle.ForeColor = System.Drawing.Color.WhiteSmoke
+        '
-        Me.Properties.DocCommentTitle.Location = New System.Drawing.Point(3, 3)
+        '
-        Me.Properties.DocCommentTitle.Name = ""
+        Me.Properties.DocCommentTitle.AutoSize = True
-        Me.Properties.DocCommentTitle.Size = New System.Drawing.Size(110, 13)
+        Me.Properties.DocCommentTitle.BackColor = System.Drawing.Color.Transparent
-        Me.Properties.DocCommentTitle.TabIndex = 0
+        Me.Properties.DocCommentTitle.Cursor = System.Windows.Forms.Cursors.Default
-        Me.Properties.DocCommentTitle.Text = "DocComment Title"
+        Me.Properties.DocCommentTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold)
-        Me.Properties.DocCommentTitle.UseMnemonic = False
+        Me.Properties.DocCommentTitle.ForeColor = System.Drawing.Color.WhiteSmoke
-        Me.Properties.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.Properties.DocCommentTitle.Location = New System.Drawing.Point(3, 3)
-        Me.Properties.Location = New System.Drawing.Point(3, 3)
+        Me.Properties.DocCommentTitle.Name = ""
-        Me.Properties.Name = "Properties"
+        Me.Properties.DocCommentTitle.Size = New System.Drawing.Size(110, 13)
-        Me.Properties.PropertySort = System.Windows.Forms.PropertySort.Categorized
+        Me.Properties.DocCommentTitle.TabIndex = 0
-        Me.Properties.SelectedObject = Me.Properties.Item
+        Me.Properties.DocCommentTitle.Text = "DocComment Title"
-        Me.Properties.Size = New System.Drawing.Size(898, 584)
+        Me.Properties.DocCommentTitle.UseMnemonic = False
-        Me.Properties.TabIndex = 5
+        Me.Properties.Dock = System.Windows.Forms.DockStyle.Fill
-        '
+        Me.Properties.Location = New System.Drawing.Point(3, 3)
-        '
+        Me.Properties.Name = "Properties"
-        '
+        Me.Properties.PropertySort = System.Windows.Forms.PropertySort.Categorized
-        Me.Properties.ToolStrip.AccessibleName = "ToolBar"
+        Me.Properties.SelectedObject = Me.Properties.Item
-        Me.Properties.ToolStrip.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar
+        Me.Properties.Size = New System.Drawing.Size(1166, 559)
-        Me.Properties.ToolStrip.AllowMerge = False
+        Me.Properties.TabIndex = 5
-        Me.Properties.ToolStrip.AutoSize = False
+        '
-        Me.Properties.ToolStrip.CanOverflow = False
+        '
-        Me.Properties.ToolStrip.Dock = System.Windows.Forms.DockStyle.None
+        '
-        Me.Properties.ToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+        Me.Properties.ToolStrip.AccessibleName = "ToolBar"
-        Me.Properties.ToolStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow
+        Me.Properties.ToolStrip.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar
-        Me.Properties.ToolStrip.Location = New System.Drawing.Point(0, 1)
+        Me.Properties.ToolStrip.AllowMerge = False
-        Me.Properties.ToolStrip.Name = ""
+        Me.Properties.ToolStrip.AutoSize = False
-        Me.Properties.ToolStrip.Padding = New System.Windows.Forms.Padding(2, 0, 1, 0)
+        Me.Properties.ToolStrip.CanOverflow = False
-        Me.Properties.ToolStrip.Size = New System.Drawing.Size(898, 25)
+        Me.Properties.ToolStrip.Dock = System.Windows.Forms.DockStyle.None
-        Me.Properties.ToolStrip.TabIndex = 1
+        Me.Properties.ToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
-        Me.Properties.ToolStrip.TabStop = True
+        Me.Properties.ToolStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow
-        Me.Properties.ToolStrip.Text = "PropertyGridToolBar"
+        Me.Properties.ToolStrip.Location = New System.Drawing.Point(0, 1)
-        '
+        Me.Properties.ToolStrip.Name = ""
-        'TabControl1
+        Me.Properties.ToolStrip.Padding = New System.Windows.Forms.Padding(2, 0, 1, 0)
-        '
+        Me.Properties.ToolStrip.Size = New System.Drawing.Size(898, 25)
-        Me.TabControl1.Controls.Add(Me.Tarif)
+        Me.Properties.ToolStrip.TabIndex = 1
-        Me.TabControl1.Controls.Add(Me.Konto)
+        Me.Properties.ToolStrip.TabStop = True
-        Me.TabControl1.Controls.Add(Me.MailTexte)
+        Me.Properties.ToolStrip.Text = "PropertyGridToolBar"
-        Me.TabControl1.Controls.Add(Me.AllgEinstellungen)
+        '
-        Me.TabControl1.Controls.Add(Me.TabPage1)
+        'TabControl1
-        Me.TabControl1.Dock = System.Windows.Forms.DockStyle.Fill
+        '
-        Me.TabControl1.Location = New System.Drawing.Point(0, 25)
+        Me.TabControl1.Controls.Add(Me.Tarif)
-        Me.TabControl1.Name = "TabControl1"
+        Me.TabControl1.Controls.Add(Me.ProduktZusatz)
-        Me.TabControl1.SelectedIndex = 0
+        Me.TabControl1.Controls.Add(Me.ProduktZusaatzDetails)
-        Me.TabControl1.Size = New System.Drawing.Size(912, 591)
+        Me.TabControl1.Controls.Add(Me.Konto)
-        Me.TabControl1.TabIndex = 6
+        Me.TabControl1.Controls.Add(Me.MailTexte)
-        '
+        Me.TabControl1.Controls.Add(Me.AllgEinstellungen)
-        'Tarif
+        Me.TabControl1.Controls.Add(Me.TabPage1)
-        '
+        Me.TabControl1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.Tarif.Controls.Add(Me.ClsStammdaten_flat1)
+        Me.TabControl1.Location = New System.Drawing.Point(0, 25)
-        Me.Tarif.Location = New System.Drawing.Point(4, 22)
+        Me.TabControl1.Name = "TabControl1"
-        Me.Tarif.Name = "Tarif"
+        Me.TabControl1.SelectedIndex = 0
-        Me.Tarif.Padding = New System.Windows.Forms.Padding(3)
+        Me.TabControl1.Size = New System.Drawing.Size(1180, 591)
-        Me.Tarif.Size = New System.Drawing.Size(904, 565)
+        Me.TabControl1.TabIndex = 6
-        Me.Tarif.TabIndex = 1
+        '
-        Me.Tarif.Text = "Tarif"
+        'Tarif
-        Me.Tarif.UseVisualStyleBackColor = True
+        '
-        '
+        Me.Tarif.Controls.Add(Me.ClsStammdaten_flat1)
-        'ClsStammdaten_flat1
+        Me.Tarif.Location = New System.Drawing.Point(4, 22)
-        '
+        Me.Tarif.Name = "Tarif"
-        Me.ClsStammdaten_flat1.Connectionstring = "data source=shu00;initial catalog=shub_padm;persist secu" &
+        Me.Tarif.Padding = New System.Windows.Forms.Padding(3)
-    "rity info=false;workstation id=;packet size=4096;user id=sa;password=*shu29"
+        Me.Tarif.Size = New System.Drawing.Size(1172, 565)
-        Me.ClsStammdaten_flat1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.Tarif.TabIndex = 1
-        Me.ClsStammdaten_flat1.Location = New System.Drawing.Point(3, 3)
+        Me.Tarif.Text = "Tarif"
-        Me.ClsStammdaten_flat1.Name = "ClsStammdaten_flat1"
+        Me.Tarif.UseVisualStyleBackColor = True
-        Me.ClsStammdaten_flat1.Size = New System.Drawing.Size(898, 559)
+        '
-        Me.ClsStammdaten_flat1.TabIndex = 0
+        'ClsStammdaten_flat1
-        Me.ClsStammdaten_flat1.Tablename = Nothing
+        '
-        '
+        Me.ClsStammdaten_flat1.Connectionstring = "data source=shu00;initial catalog=shub_padm;persist security info=false;workstati" &
-        'Konto
+    "on id=;packet size=4096;user id=sa;password=*shu29"
-        '
+        Me.ClsStammdaten_flat1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.Konto.Controls.Add(Me.ClsStammdaten_flat3)
+        Me.ClsStammdaten_flat1.Location = New System.Drawing.Point(3, 3)
-        Me.Konto.Location = New System.Drawing.Point(4, 22)
+        Me.ClsStammdaten_flat1.Name = "ClsStammdaten_flat1"
-        Me.Konto.Name = "Konto"
+        Me.ClsStammdaten_flat1.Size = New System.Drawing.Size(1166, 559)
-        Me.Konto.Size = New System.Drawing.Size(904, 590)
+        Me.ClsStammdaten_flat1.SQL = ""
-        Me.Konto.TabIndex = 4
+        Me.ClsStammdaten_flat1.TabIndex = 0
-        Me.Konto.Text = "Konto"
+        Me.ClsStammdaten_flat1.Tablename = Nothing
-        Me.Konto.UseVisualStyleBackColor = True
+        '
-        '
+        'Konto
-        'ClsStammdaten_flat3
+        '
-        '
+        Me.Konto.Controls.Add(Me.ClsStammdaten_flat3)
-        Me.ClsStammdaten_flat3.Connectionstring = "data source=shu00;initial catalog=shub_padm;persist secu" &
+        Me.Konto.Location = New System.Drawing.Point(4, 22)
-    "rity info=false;workstation id=;packet size=4096;user id=sa;password=*shu29"
+        Me.Konto.Name = "Konto"
-        Me.ClsStammdaten_flat3.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.Konto.Size = New System.Drawing.Size(1172, 565)
-        Me.ClsStammdaten_flat3.Location = New System.Drawing.Point(0, 0)
+        Me.Konto.TabIndex = 4
-        Me.ClsStammdaten_flat3.Name = "ClsStammdaten_flat3"
+        Me.Konto.Text = "Konto"
-        Me.ClsStammdaten_flat3.Size = New System.Drawing.Size(904, 590)
+        Me.Konto.UseVisualStyleBackColor = True
-        Me.ClsStammdaten_flat3.TabIndex = 1
+        '
-        Me.ClsStammdaten_flat3.Tablename = Nothing
+        'ClsStammdaten_flat3
-        '
+        '
-        'MailTexte
+        Me.ClsStammdaten_flat3.Connectionstring = "data source=shu00;initial catalog=shub_padm;persist security info=false;workstati" &
-        '
+    "on id=;packet size=4096;user id=sa;password=*shu29"
-        Me.MailTexte.Controls.Add(Me.ClsStammdaten_flat2)
+        Me.ClsStammdaten_flat3.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.MailTexte.Location = New System.Drawing.Point(4, 22)
+        Me.ClsStammdaten_flat3.Location = New System.Drawing.Point(0, 0)
-        Me.MailTexte.Name = "MailTexte"
+        Me.ClsStammdaten_flat3.Name = "ClsStammdaten_flat3"
-        Me.MailTexte.Size = New System.Drawing.Size(904, 590)
+        Me.ClsStammdaten_flat3.Size = New System.Drawing.Size(1172, 565)
-        Me.MailTexte.TabIndex = 2
+        Me.ClsStammdaten_flat3.SQL = ""
-        Me.MailTexte.Text = "Mailtexte"
+        Me.ClsStammdaten_flat3.TabIndex = 1
-        Me.MailTexte.UseVisualStyleBackColor = True
+        Me.ClsStammdaten_flat3.Tablename = Nothing
-        '
+        '
-        'ClsStammdaten_flat2
+        'MailTexte
-        '
+        '
-        Me.ClsStammdaten_flat2.Connectionstring = "data source=shu00;initial catalog=shub_padm;persist secu" &
+        Me.MailTexte.Controls.Add(Me.ClsStammdaten_flat2)
-    "rity info=false;workstation id=;packet size=4096;user id=sa;password=*shu29"
+        Me.MailTexte.Location = New System.Drawing.Point(4, 22)
-        Me.ClsStammdaten_flat2.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.MailTexte.Name = "MailTexte"
-        Me.ClsStammdaten_flat2.Location = New System.Drawing.Point(0, 0)
+        Me.MailTexte.Size = New System.Drawing.Size(1172, 565)
-        Me.ClsStammdaten_flat2.Name = "ClsStammdaten_flat2"
+        Me.MailTexte.TabIndex = 2
-        Me.ClsStammdaten_flat2.Size = New System.Drawing.Size(904, 590)
+        Me.MailTexte.Text = "Mailtexte"
-        Me.ClsStammdaten_flat2.TabIndex = 0
+        Me.MailTexte.UseVisualStyleBackColor = True
-        Me.ClsStammdaten_flat2.Tablename = Nothing
+        '
-        '
+        'ClsStammdaten_flat2
-        'AllgEinstellungen
+        '
-        '
+        Me.ClsStammdaten_flat2.Connectionstring = "data source=shu00;initial catalog=shub_padm;persist security info=false;workstati" &
-        Me.AllgEinstellungen.Controls.Add(Me.Properties)
+    "on id=;packet size=4096;user id=sa;password=*shu29"
-        Me.AllgEinstellungen.Location = New System.Drawing.Point(4, 22)
+        Me.ClsStammdaten_flat2.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.AllgEinstellungen.Name = "AllgEinstellungen"
+        Me.ClsStammdaten_flat2.Location = New System.Drawing.Point(0, 0)
-        Me.AllgEinstellungen.Padding = New System.Windows.Forms.Padding(3)
+        Me.ClsStammdaten_flat2.Name = "ClsStammdaten_flat2"
-        Me.AllgEinstellungen.Size = New System.Drawing.Size(904, 590)
+        Me.ClsStammdaten_flat2.Size = New System.Drawing.Size(1172, 565)
-        Me.AllgEinstellungen.TabIndex = 0
+        Me.ClsStammdaten_flat2.SQL = ""
-        Me.AllgEinstellungen.Text = "Allg. Programm-Einstallungen"
+        Me.ClsStammdaten_flat2.TabIndex = 0
-        Me.AllgEinstellungen.UseVisualStyleBackColor = True
+        Me.ClsStammdaten_flat2.Tablename = Nothing
-        '
+        '
-        'TabPage1
+        'AllgEinstellungen
-        '
+        '
-        Me.TabPage1.Controls.Add(Me.Properties_DMS)
+        Me.AllgEinstellungen.Controls.Add(Me.Properties)
-        Me.TabPage1.Location = New System.Drawing.Point(4, 22)
+        Me.AllgEinstellungen.Location = New System.Drawing.Point(4, 22)
-        Me.TabPage1.Name = "TabPage1"
+        Me.AllgEinstellungen.Name = "AllgEinstellungen"
-        Me.TabPage1.Size = New System.Drawing.Size(904, 590)
+        Me.AllgEinstellungen.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage1.TabIndex = 3
+        Me.AllgEinstellungen.Size = New System.Drawing.Size(1172, 565)
-        Me.TabPage1.Text = "DMS-Einstellungen"
+        Me.AllgEinstellungen.TabIndex = 0
-        Me.TabPage1.UseVisualStyleBackColor = True
+        Me.AllgEinstellungen.Text = "Allg. Programm-Einstallungen"
-        '
+        Me.AllgEinstellungen.UseVisualStyleBackColor = True
-        'Properties_DMS
+        '
-        '
+        'TabPage1
-        Me.Properties_DMS.CategoryForeColor = System.Drawing.SystemColors.InactiveCaptionText
+        '
-        Me.Properties_DMS.CommandsVisibleIfAvailable = False
+        Me.TabPage1.Controls.Add(Me.Properties_DMS)
-        '
+        Me.TabPage1.Location = New System.Drawing.Point(4, 22)
-        '
+        Me.TabPage1.Name = "TabPage1"
-        '
+        Me.TabPage1.Size = New System.Drawing.Size(1172, 565)
-        Me.Properties_DMS.DocCommentDescription.AccessibleName = ""
+        Me.TabPage1.TabIndex = 3
-        Me.Properties_DMS.DocCommentDescription.AutoEllipsis = True
+        Me.TabPage1.Text = "DMS-Einstellungen"
-        Me.Properties_DMS.DocCommentDescription.BackColor = System.Drawing.Color.Transparent
+        Me.TabPage1.UseVisualStyleBackColor = True
-        Me.Properties_DMS.DocCommentDescription.Cursor = System.Windows.Forms.Cursors.Default
+        '
-        Me.Properties_DMS.DocCommentDescription.ForeColor = System.Drawing.Color.WhiteSmoke
+        'Properties_DMS
-        Me.Properties_DMS.DocCommentDescription.Location = New System.Drawing.Point(3, 18)
+        '
-        Me.Properties_DMS.DocCommentDescription.Name = ""
+        Me.Properties_DMS.CategoryForeColor = System.Drawing.SystemColors.InactiveCaptionText
-        Me.Properties_DMS.DocCommentDescription.Size = New System.Drawing.Size(898, 37)
+        Me.Properties_DMS.CommandsVisibleIfAvailable = False
-        Me.Properties_DMS.DocCommentDescription.TabIndex = 1
+        '
-        Me.Properties_DMS.DocCommentImage = CType(resources.GetObject("Properties_DMS.DocCommentImage"), System.Drawing.Image)
+        '
-        '
+        '
-        '
+        Me.Properties_DMS.DocCommentDescription.AccessibleName = ""
-        '
+        Me.Properties_DMS.DocCommentDescription.AutoEllipsis = True
-        Me.Properties_DMS.DocCommentTitle.AutoSize = True
+        Me.Properties_DMS.DocCommentDescription.BackColor = System.Drawing.Color.Transparent
-        Me.Properties_DMS.DocCommentTitle.BackColor = System.Drawing.Color.Transparent
+        Me.Properties_DMS.DocCommentDescription.Cursor = System.Windows.Forms.Cursors.Default
-        Me.Properties_DMS.DocCommentTitle.Cursor = System.Windows.Forms.Cursors.Default
+        Me.Properties_DMS.DocCommentDescription.ForeColor = System.Drawing.Color.WhiteSmoke
-        Me.Properties_DMS.DocCommentTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold)
+        Me.Properties_DMS.DocCommentDescription.Location = New System.Drawing.Point(3, 18)
-        Me.Properties_DMS.DocCommentTitle.ForeColor = System.Drawing.Color.WhiteSmoke
+        Me.Properties_DMS.DocCommentDescription.Name = ""
-        Me.Properties_DMS.DocCommentTitle.Location = New System.Drawing.Point(3, 3)
+        Me.Properties_DMS.DocCommentDescription.Size = New System.Drawing.Size(898, 37)
-        Me.Properties_DMS.DocCommentTitle.Name = ""
+        Me.Properties_DMS.DocCommentDescription.TabIndex = 1
-        Me.Properties_DMS.DocCommentTitle.Size = New System.Drawing.Size(110, 13)
+        Me.Properties_DMS.DocCommentImage = CType(resources.GetObject("Properties_DMS.DocCommentImage"), System.Drawing.Image)
-        Me.Properties_DMS.DocCommentTitle.TabIndex = 0
+        '
-        Me.Properties_DMS.DocCommentTitle.Text = "DocComment Title"
+        '
-        Me.Properties_DMS.DocCommentTitle.UseMnemonic = False
+        '
-        Me.Properties_DMS.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.Properties_DMS.DocCommentTitle.AutoSize = True
-        Me.Properties_DMS.Location = New System.Drawing.Point(0, 0)
+        Me.Properties_DMS.DocCommentTitle.BackColor = System.Drawing.Color.Transparent
-        Me.Properties_DMS.Name = "Properties_DMS"
+        Me.Properties_DMS.DocCommentTitle.Cursor = System.Windows.Forms.Cursors.Default
-        Me.Properties_DMS.PropertySort = System.Windows.Forms.PropertySort.Categorized
+        Me.Properties_DMS.DocCommentTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold)
-        Me.Properties_DMS.SelectedObject = Me.Properties_DMS.Item
+        Me.Properties_DMS.DocCommentTitle.ForeColor = System.Drawing.Color.WhiteSmoke
-        Me.Properties_DMS.Size = New System.Drawing.Size(904, 590)
+        Me.Properties_DMS.DocCommentTitle.Location = New System.Drawing.Point(3, 3)
-        Me.Properties_DMS.TabIndex = 6
+        Me.Properties_DMS.DocCommentTitle.Name = ""
-        '
+        Me.Properties_DMS.DocCommentTitle.Size = New System.Drawing.Size(110, 13)
-        '
+        Me.Properties_DMS.DocCommentTitle.TabIndex = 0
-        '
+        Me.Properties_DMS.DocCommentTitle.Text = "DocComment Title"
-        Me.Properties_DMS.ToolStrip.AccessibleName = "ToolBar"
+        Me.Properties_DMS.DocCommentTitle.UseMnemonic = False
-        Me.Properties_DMS.ToolStrip.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar
+        Me.Properties_DMS.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.Properties_DMS.ToolStrip.AllowMerge = False
+        Me.Properties_DMS.Location = New System.Drawing.Point(0, 0)
-        Me.Properties_DMS.ToolStrip.AutoSize = False
+        Me.Properties_DMS.Name = "Properties_DMS"
-        Me.Properties_DMS.ToolStrip.CanOverflow = False
+        Me.Properties_DMS.PropertySort = System.Windows.Forms.PropertySort.Categorized
-        Me.Properties_DMS.ToolStrip.Dock = System.Windows.Forms.DockStyle.None
+        Me.Properties_DMS.SelectedObject = Me.Properties_DMS.Item
-        Me.Properties_DMS.ToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+        Me.Properties_DMS.Size = New System.Drawing.Size(1172, 565)
-        Me.Properties_DMS.ToolStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow
+        Me.Properties_DMS.TabIndex = 6
-        Me.Properties_DMS.ToolStrip.Location = New System.Drawing.Point(0, 1)
+        '
-        Me.Properties_DMS.ToolStrip.Name = ""
+        '
-        Me.Properties_DMS.ToolStrip.Padding = New System.Windows.Forms.Padding(2, 0, 1, 0)
+        '
-        Me.Properties_DMS.ToolStrip.Size = New System.Drawing.Size(904, 25)
+        Me.Properties_DMS.ToolStrip.AccessibleName = "ToolBar"
-        Me.Properties_DMS.ToolStrip.TabIndex = 1
+        Me.Properties_DMS.ToolStrip.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar
-        Me.Properties_DMS.ToolStrip.TabStop = True
+        Me.Properties_DMS.ToolStrip.AllowMerge = False
-        Me.Properties_DMS.ToolStrip.Text = "PropertyGridToolBar"
+        Me.Properties_DMS.ToolStrip.AutoSize = False
-        '
+        Me.Properties_DMS.ToolStrip.CanOverflow = False
-        'ToolStrip1
+        Me.Properties_DMS.ToolStrip.Dock = System.Windows.Forms.DockStyle.None
-        '
+        Me.Properties_DMS.ToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
-        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton1})
+        Me.Properties_DMS.ToolStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow
-        Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
+        Me.Properties_DMS.ToolStrip.Location = New System.Drawing.Point(0, 1)
-        Me.ToolStrip1.Name = "ToolStrip1"
+        Me.Properties_DMS.ToolStrip.Name = ""
-        Me.ToolStrip1.Size = New System.Drawing.Size(912, 25)
+        Me.Properties_DMS.ToolStrip.Padding = New System.Windows.Forms.Padding(2, 0, 1, 0)
-        Me.ToolStrip1.TabIndex = 7
+        Me.Properties_DMS.ToolStrip.Size = New System.Drawing.Size(904, 25)
-        Me.ToolStrip1.Text = "ToolStrip1"
+        Me.Properties_DMS.ToolStrip.TabIndex = 1
-        '
+        Me.Properties_DMS.ToolStrip.TabStop = True
-        'ToolStripButton1
+        Me.Properties_DMS.ToolStrip.Text = "PropertyGridToolBar"
-        '
+        '
-        Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text
+        'ToolStrip1
-        Me.ToolStripButton1.Image = CType(resources.GetObject("ToolStripButton1.Image"), System.Drawing.Image)
+        '
-        Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton1})
-        Me.ToolStripButton1.Name = "ToolStripButton1"
+        Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
-        Me.ToolStripButton1.Size = New System.Drawing.Size(65, 22)
+        Me.ToolStrip1.Name = "ToolStrip1"
-        Me.ToolStripButton1.Text = "Schliessen"
+        Me.ToolStrip1.Size = New System.Drawing.Size(1180, 25)
-        '
+        Me.ToolStrip1.TabIndex = 7
-        'frmProgrammeinstellungen
+        Me.ToolStrip1.Text = "ToolStrip1"
-        '
+        '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        'ToolStripButton1
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        '
-        Me.ClientSize = New System.Drawing.Size(912, 616)
+        Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text
-        Me.Controls.Add(Me.TabControl1)
+        Me.ToolStripButton1.Image = CType(resources.GetObject("ToolStripButton1.Image"), System.Drawing.Image)
-        Me.Controls.Add(Me.ToolStrip1)
+        Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.ToolStripButton1.Name = "ToolStripButton1"
-        Me.Name = "frmProgrammeinstellungen"
+        Me.ToolStripButton1.Size = New System.Drawing.Size(65, 22)
-        Me.Text = "Programmeinstellungen / Stammdaten"
+        Me.ToolStripButton1.Text = "Schliessen"
-        Me.TabControl1.ResumeLayout(False)
+        '
-        Me.Tarif.ResumeLayout(False)
+        'ProduktZusatz
-        Me.Konto.ResumeLayout(False)
+        '
-        Me.MailTexte.ResumeLayout(False)
+        Me.ProduktZusatz.Controls.Add(Me.ClsStammdaten_flat4)
-        Me.AllgEinstellungen.ResumeLayout(False)
+        Me.ProduktZusatz.Location = New System.Drawing.Point(4, 22)
-        Me.TabPage1.ResumeLayout(False)
+        Me.ProduktZusatz.Name = "ProduktZusatz"
-        Me.ToolStrip1.ResumeLayout(False)
+        Me.ProduktZusatz.Size = New System.Drawing.Size(1172, 565)
-        Me.ToolStrip1.PerformLayout()
+        Me.ProduktZusatz.TabIndex = 5
-        Me.ResumeLayout(False)
+        Me.ProduktZusatz.Text = "Produkt Zusatz"
-        Me.PerformLayout()
+        Me.ProduktZusatz.UseVisualStyleBackColor = True
-
+        '
-    End Sub
+        'ProduktZusaatzDetails
-
+        '
-    Friend WithEvents Properties As PropertyGridEx.PropertyGridEx
+        Me.ProduktZusaatzDetails.Controls.Add(Me.ClsStammdaten_flat5)
-    Friend WithEvents TabControl1 As TabControl
+        Me.ProduktZusaatzDetails.Location = New System.Drawing.Point(4, 22)
-    Friend WithEvents AllgEinstellungen As TabPage
+        Me.ProduktZusaatzDetails.Name = "ProduktZusaatzDetails"
-    Friend WithEvents Tarif As TabPage
+        Me.ProduktZusaatzDetails.Size = New System.Drawing.Size(1172, 565)
-    Friend WithEvents ClsStammdaten_flat1 As clsStammdaten_flat
+        Me.ProduktZusaatzDetails.TabIndex = 6
-    Friend WithEvents MailTexte As TabPage
+        Me.ProduktZusaatzDetails.Text = "Produkt Zusatz Details"
-    Friend WithEvents ClsStammdaten_flat2 As clsStammdaten_flat
+        Me.ProduktZusaatzDetails.UseVisualStyleBackColor = True
-    Friend WithEvents TabPage1 As TabPage
+        '
-    Friend WithEvents Properties_DMS As PropertyGridEx.PropertyGridEx
+        'ClsStammdaten_flat4
-    Friend WithEvents Konto As TabPage
+        '
-    Friend WithEvents ClsStammdaten_flat3 As clsStammdaten_flat
+        Me.ClsStammdaten_flat4.Connectionstring = "data source=shu00;initial catalog=shub_padm;persist security info=false;workstati" &
-    Friend WithEvents ToolStrip1 As ToolStrip
+    "on id=;packet size=4096;user id=sa;password=*shu29"
-    Friend WithEvents ToolStripButton1 As ToolStripButton
+        Me.ClsStammdaten_flat4.Dock = System.Windows.Forms.DockStyle.Fill
-End Class
+        Me.ClsStammdaten_flat4.Location = New System.Drawing.Point(0, 0)
+        Me.ClsStammdaten_flat4.Name = "ClsStammdaten_flat4"
+        Me.ClsStammdaten_flat4.Size = New System.Drawing.Size(1172, 565)
+        Me.ClsStammdaten_flat4.SQL = ""
+        Me.ClsStammdaten_flat4.TabIndex = 1
+        Me.ClsStammdaten_flat4.Tablename = Nothing
+        '
+        'ClsStammdaten_flat5
+        '
+        Me.ClsStammdaten_flat5.Connectionstring = "data source=shu00;initial catalog=shub_padm;persist security info=false;workstati" &
+    "on id=;packet size=4096;user id=sa;password=*shu29"
+        Me.ClsStammdaten_flat5.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.ClsStammdaten_flat5.Location = New System.Drawing.Point(0, 0)
+        Me.ClsStammdaten_flat5.Name = "ClsStammdaten_flat5"
+        Me.ClsStammdaten_flat5.Size = New System.Drawing.Size(1172, 565)
+        Me.ClsStammdaten_flat5.SQL = ""
+        Me.ClsStammdaten_flat5.TabIndex = 1
+        Me.ClsStammdaten_flat5.Tablename = Nothing
+        '
+        'frmProgrammeinstellungen
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(1180, 616)
+        Me.Controls.Add(Me.TabControl1)
+        Me.Controls.Add(Me.ToolStrip1)
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.Name = "frmProgrammeinstellungen"
+        Me.Text = "Programmeinstellungen / Stammdaten"
+        Me.TabControl1.ResumeLayout(False)
+        Me.Tarif.ResumeLayout(False)
+        Me.Konto.ResumeLayout(False)
+        Me.MailTexte.ResumeLayout(False)
+        Me.AllgEinstellungen.ResumeLayout(False)
+        Me.TabPage1.ResumeLayout(False)
+        Me.ToolStrip1.ResumeLayout(False)
+        Me.ToolStrip1.PerformLayout()
+        Me.ProduktZusatz.ResumeLayout(False)
+        Me.ProduktZusaatzDetails.ResumeLayout(False)
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+
+    Friend WithEvents Properties As PropertyGridEx.PropertyGridEx
+    Friend WithEvents TabControl1 As TabControl
+    Friend WithEvents AllgEinstellungen As TabPage
+    Friend WithEvents Tarif As TabPage
+    Friend WithEvents ClsStammdaten_flat1 As clsStammdaten_flat
+    Friend WithEvents MailTexte As TabPage
+    Friend WithEvents ClsStammdaten_flat2 As clsStammdaten_flat
+    Friend WithEvents TabPage1 As TabPage
+    Friend WithEvents Properties_DMS As PropertyGridEx.PropertyGridEx
+    Friend WithEvents Konto As TabPage
+    Friend WithEvents ClsStammdaten_flat3 As clsStammdaten_flat
+    Friend WithEvents ToolStrip1 As ToolStrip
+    Friend WithEvents ToolStripButton1 As ToolStripButton
+    Friend WithEvents ProduktZusatz As TabPage
+    Friend WithEvents ProduktZusaatzDetails As TabPage
+    Friend WithEvents ClsStammdaten_flat4 As clsStammdaten_flat
+    Friend WithEvents ClsStammdaten_flat5 As clsStammdaten_flat
+End Class

DPM2016/Klassen/clsStammdaten_flat.vb

@@ -1,492 +1,506 @@
-Imports C1.Win.C1TrueDBGrid
+Imports C1.Win.C1TrueDBGrid
-Public Class clsStammdaten_flat
+Public Class clsStammdaten_flat
-
+
-    Dim m_connectionstring As String
+    Dim m_connectionstring As String
-    Property Connectionstring As String
+    Property Connectionstring As String
-        Get
+        Get
-            Return m_connectionstring
+            Return m_connectionstring
-        End Get
+        End Get
-        Set(value As String)
+        Set(value As String)
-            m_connectionstring = value
+            m_connectionstring = value
-        End Set
+        End Set
-    End Property
+    End Property
-    Dim m_tablename As String
+    Dim m_tablename As String
-    Property Tablename As String
+    Property Tablename As String
-        Get
+        Get
-            Return m_tablename
+            Return m_tablename
-        End Get
+        End Get
-        Set(value As String)
+        Set(value As String)
-            m_tablename = value
+            m_tablename = value
-            Try
+            Try
-                'get_data()
+                'get_data()
-
+
-            Catch
+            Catch
-            End Try
+            End Try
-        End Set
+        End Set
-    End Property
+    End Property
-    Dim m_SQL As String = ""
+    Dim m_SQL As String = ""
-    Property SQL As String
+    Property SQL As String
-        Get
+        Get
-            Return m_SQL
+            Return m_SQL
-        End Get
+        End Get
-        Set(value As String)
+        Set(value As String)
-            m_SQL = value
+            m_SQL = value
-        End Set
+        End Set
-    End Property
+    End Property
-
+
-
+    Dim m_allowaddnew As Boolean = True
-
+    Property AllowAddNew As Boolean
-    Dim db As clsDB
+        Get
-    Dim c1d As New C1.Win.C1TrueDBGrid.C1TrueDBGrid
+            Return m_allowaddnew
-
+        End Get
-
+        Set(value As Boolean)
-
+            m_allowaddnew = value
-    Sub New()
+        End Set
-
+    End Property
-        ' Dieser Aufruf ist für den Designer erforderlich.
+
-        InitializeComponent()
+
-        Me.Connectionstring = My.Settings.ConnectionString
+
-        Me.c1d = Me.c1daten
+    Dim db As clsDB
-        If My.Settings.SoftwareType = "PADM" Then
+    Dim c1d As New C1.Win.C1TrueDBGrid.C1TrueDBGrid
-            Me.NeuerTarifeintragErstellenToolStripMenuItem.Text = "Neuer Artikel"
+
-            Me.TarifBearbeitenToolStripMenuItem.Text = "Artikel bearbeiten"
+
-        End If
+
-    End Sub
+    Sub New()
-
+
-    Public Sub get_data()
+        ' Dieser Aufruf ist für den Designer erforderlich.
-        Try
+        InitializeComponent()
-            Try
+        Me.Connectionstring = My.Settings.ConnectionString
-                db = Nothing
+        Me.c1d = Me.c1daten
-            Catch ex As Exception
+        If My.Settings.SoftwareType = "PADM" Then
-
+            Me.NeuerTarifeintragErstellenToolStripMenuItem.Text = "Neuer Artikel"
-            End Try
+            Me.TarifBearbeitenToolStripMenuItem.Text = "Artikel bearbeiten"
-            db = New clsDB
+        End If
-
+    End Sub
-            Me.c1daten.DataSource = Nothing
+
-            Me.c1daten.DataMember = Nothing
+    Public Sub get_data()
-
+        Try
-            Me.c1daten.DataSource = Nothing
+            Try
-            Me.c1daten.DataMember = Nothing
+                db = Nothing
-            Me.c1daten.Splits(0).DisplayColumns.Clear()
+            Catch ex As Exception
-            db.dsDaten.Tables.Clear()
+
-            If Me.SQL <> "" Then
+            End Try
-                db.Get_Tabledata(Me.Tablename, "", Me.SQL, "", False)
+            db = New clsDB
-            Else
+
-                db.Get_Tabledata(Me.Tablename)
+            Me.c1daten.DataSource = Nothing
-
+            Me.c1daten.DataMember = Nothing
-            End If
+
-
+            Me.c1daten.DataSource = Nothing
-
+            Me.c1daten.DataMember = Nothing
-            Me.c1daten.DataSource = db.dsDaten
+            Me.c1daten.Splits(0).DisplayColumns.Clear()
-            Me.c1daten.DataMember = Tablename
+            db.dsDaten.Tables.Clear()
-
+            If Me.SQL <> "" Then
-            Dim spalten As New Tabellenspalte
+                db.Get_Tabledata(Me.Tablename, "", Me.SQL, "", False)
-            spalten.Spaltentitel_aktualisieren(Me.c1daten, Me.Tablename, db.dsDaten.Tables(0))
+            Else
-
+                db.Get_Tabledata(Me.Tablename)
-            Me.c1d.ContextMenuStrip = Nothing
+
-            Me.c1d.AllowAddNew = True
+            End If
-            Me.tsnewdentotar.Visible = False
+
-            Select Case Tablename
+
-
+            Me.c1daten.DataSource = db.dsDaten
-                Case "Auswertung"
+            Me.c1daten.DataMember = Tablename
-                    Dim printer As New clsPrinter
+
-                    printer.Get_Printers()
+            Dim spalten As New Tabellenspalte
-                    Me.C1TrueDBDropdown1.DataSource = printer.Printers
+            spalten.Spaltentitel_aktualisieren(Me.c1daten, Me.Tablename, db.dsDaten.Tables(0))
-                    Me.C1TrueDBDropdown1.DataMember = printer.Printers.Columns(0).ColumnName
+
-                    Me.C1TrueDBDropdown1.ValueMember = printer.Printers.Columns(0).ColumnName
+            Me.c1d.ContextMenuStrip = Nothing
-                    Me.C1TrueDBDropdown1.DisplayMember = printer.Printers.Columns(0).ColumnName
+            Me.c1d.AllowAddNew = True
-                    Me.c1daten.Columns("Drucker").DropDown = Me.C1TrueDBDropdown1
+            Me.tsnewdentotar.Visible = False
-                Case "User"
+            Select Case Tablename
-                    Me.c1d.ContextMenuStrip = Me.ContextMenuStrip1
+
-                Case "Tarif"
+                Case "Auswertung"
-                    Me.c1d.ContextMenuStrip = Me.ctxMenuTarif
+                    Dim printer As New clsPrinter
-                    Me.c1d.AllowAddNew = False
+                    printer.Get_Printers()
-                Case "Dentotar"
+                    Me.C1TrueDBDropdown1.DataSource = printer.Printers
-                    Me.c1d.ContextMenuStrip = Me.ctxmenuDentotar
+                    Me.C1TrueDBDropdown1.DataMember = printer.Printers.Columns(0).ColumnName
-                    Me.c1d.AllowAddNew = False
+                    Me.C1TrueDBDropdown1.ValueMember = printer.Printers.Columns(0).ColumnName
-                    Me.tsnewdentotar.Visible = True
+                    Me.C1TrueDBDropdown1.DisplayMember = printer.Printers.Columns(0).ColumnName
-                Case "MailTexte"
+                    Me.c1daten.Columns("Drucker").DropDown = Me.C1TrueDBDropdown1
-                    Me.c1d.ContextMenuStrip = Me.ctxMenuMailtext
+                Case "User"
-                Case "Reporting"
+                    Me.c1d.ContextMenuStrip = Me.ContextMenuStrip1
-                    Me.c1d.ContextMenuStrip = Me.ctxmenureporting
+                Case "Tarif"
-                    Me.AllowDrop = True
+                    Me.c1d.ContextMenuStrip = Me.ctxMenuTarif
-                    Me.c1daten.AllowDrop = True
+                    Me.c1d.AllowAddNew = False
-
+                Case "Dentotar"
-            End Select
+                    Me.c1d.ContextMenuStrip = Me.ctxmenuDentotar
-        Catch ex As Exception
+                    Me.c1d.AllowAddNew = False
-        End Try
+                    Me.tsnewdentotar.Visible = True
-    End Sub
+                Case "MailTexte"
-
+                    Me.c1d.ContextMenuStrip = Me.ctxMenuMailtext
-    Public Sub Check_Changes()
+                Case "Reporting"
-
+                    Me.c1d.ContextMenuStrip = Me.ctxmenureporting
-        Try
+                    Me.AllowDrop = True
-            Dim ds As New DataSet
+                    Me.c1daten.AllowDrop = True
-            ds = c1daten.DataSource
+
-            Dim xdata As DataTable = ds.Tables(0).GetChanges
+            End Select
-            If xdata.Rows.Count > 0 Then
+            If Me.AllowAddNew = False Then
-                If MsgBox("Daten wurden geändert. Speichern?", vbYesNo + vbQuestion) = vbYes Then
+                Me.c1daten.AllowAddNew = False
-                    db.Update_Data()
+                Me.c1daten.AllowUpdate = False
-                End If
+            End If
-            End If
+        Catch ex As Exception
-
+        End Try
-        Catch
+    End Sub
-        End Try
+
-
+    Public Sub Check_Changes()
-    End Sub
+
-    Private Sub ToolStripButton5_Click(sender As Object, e As EventArgs) Handles ToolStripButton5.Click
+        Try
-        Check_Changes()
+            Dim ds As New DataSet
-        If Tablename = "Spalten" Then Globals.Spaltendaten.Rows.Clear()
+            ds = c1daten.DataSource
-        Me.c1daten.DataSource = Nothing
+            Dim xdata As DataTable = ds.Tables(0).GetChanges
-        'db.Update_Data()
+            If xdata.Rows.Count > 0 Then
-    End Sub
+                If MsgBox("Daten wurden geändert. Speichern?", vbYesNo + vbQuestion) = vbYes Then
-
+                    db.Update_Data()
-
+                End If
-    Private Sub clsStammdaten_flat_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+            End If
-
+
-    End Sub
+        Catch
-
+        End Try
-    Private Sub ToolStripButton6_Click(sender As Object, e As EventArgs) Handles ToolStripButton6.Click
+
-        db.Update_Data()
+    End Sub
-        If Tablename = "Spalten" Then Globals.Spaltendaten.Rows.Clear()
+    Private Sub ToolStripButton5_Click(sender As Object, e As EventArgs) Handles ToolStripButton5.Click
-        Try
+        Check_Changes()
-            IntTables.Inttables.Tables.Remove(Tablename)
+        If Tablename = "Spalten" Then Globals.Spaltendaten.Rows.Clear()
-        Catch ex As Exception
+        Me.c1daten.DataSource = Nothing
-
+        'db.Update_Data()
-        End Try
+    End Sub
-        Try
+
-            IntTables.Inttables.Tables.Remove(Tablename)
+
-        Catch ex As Exception
+    Private Sub clsStammdaten_flat_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-
+
-        End Try
+    End Sub
-        'MsgBox("Daten wurden gespeichert")
+
-    End Sub
+    Private Sub ToolStripButton6_Click(sender As Object, e As EventArgs) Handles ToolStripButton6.Click
-
+        db.Update_Data()
-
+        If Tablename = "Spalten" Then Globals.Spaltendaten.Rows.Clear()
-
+        Try
-    Private Sub c1daten_RowColChange(sender As Object, e As RowColChangeEventArgs) Handles c1daten.RowColChange
+            IntTables.Inttables.Tables.Remove(Tablename)
-        Try
+        Catch ex As Exception
-            If Tablename = "Auswertung" Then
+
-                Me.C1TrueDBDropdown2.DataSource = Nothing
+        End Try
-                Dim printer As New clsPrinter
+        Try
-                printer.Get_Papersources(Me.c1daten.Columns("Drucker").Value.ToString)
+            IntTables.Inttables.Tables.Remove(Tablename)
-                Me.C1TrueDBDropdown2.DataSource = printer.Papersources
+        Catch ex As Exception
-                Me.C1TrueDBDropdown2.DataMember = printer.Papersources.Columns(0).ColumnName
+
-                Me.C1TrueDBDropdown2.ValueMember = printer.Papersources.Columns(0).ColumnName
+        End Try
-                Me.C1TrueDBDropdown2.DisplayMember = printer.Papersources.Columns(1).ColumnName
+        'MsgBox("Daten wurden gespeichert")
-                Me.c1daten.Columns("Papierschacht").DropDown = Me.C1TrueDBDropdown2
+    End Sub
-            End If
+
-        Catch
+
-        End Try
+
-
+    Private Sub c1daten_RowColChange(sender As Object, e As RowColChangeEventArgs) Handles c1daten.RowColChange
-
+        Try
-
+            If Tablename = "Auswertung" Then
-    End Sub
+                Me.C1TrueDBDropdown2.DataSource = Nothing
-
+                Dim printer As New clsPrinter
-    Private Sub NeuerBenutzerEröffnenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles NeuerBenutzerEröffnenToolStripMenuItem.Click
+                printer.Get_Papersources(Me.c1daten.Columns("Drucker").Value.ToString)
-        Dim f As New frmLogin(True)
+                Me.C1TrueDBDropdown2.DataSource = printer.Papersources
-        f.ShowDialog()
+                Me.C1TrueDBDropdown2.DataMember = printer.Papersources.Columns(0).ColumnName
-        get_data()
+                Me.C1TrueDBDropdown2.ValueMember = printer.Papersources.Columns(0).ColumnName
-    End Sub
+                Me.C1TrueDBDropdown2.DisplayMember = printer.Papersources.Columns(1).ColumnName
-
+                Me.c1daten.Columns("Papierschacht").DropDown = Me.C1TrueDBDropdown2
-    Private Sub ToolStripButton7_Click(sender As Object, e As EventArgs) Handles ToolStripButton7.Click
+            End If
-
+        Catch
-    End Sub
+        End Try
-
+
-    Private Sub c1daten_AfterInsert(sender As Object, e As EventArgs) Handles c1daten.AfterInsert
+
-        Try
+
-            'Me.c1daten.Columns("erstellt_am").Value = Now
+    End Sub
-            'Me.c1daten.Columns("mutiert_am").Value = Now
+
-            'Me.c1daten.Columns("mutierer").Value = Globals.ActUser
+    Private Sub NeuerBenutzerEröffnenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles NeuerBenutzerEröffnenToolStripMenuItem.Click
-            'Me.c1daten.Columns("aktiv").Value = True
+        Dim f As New frmLogin(True)
-            'Me.c1daten.Columns("Mandant").Value = Globals.Mandant
+        f.ShowDialog()
-        Catch ex As Exception
+        get_data()
-
+    End Sub
-        End Try
+
-    End Sub
+    Private Sub ToolStripButton7_Click(sender As Object, e As EventArgs) Handles ToolStripButton7.Click
-
+
-    Private Sub c1daten_DoubleClick(sender As Object, e As EventArgs) Handles c1daten.DoubleClick
+    End Sub
-        Select Case Tablename
+
-            Case "Dentotar"
+    Private Sub c1daten_AfterInsert(sender As Object, e As EventArgs) Handles c1daten.AfterInsert
-                Try
+        Try
-                    Dim f As New frmDentotarDetails
+            'Me.c1daten.Columns("erstellt_am").Value = Now
-                    f.Update_Data(Me.c1daten.Columns("LeistungNrNeu").Value)
+            'Me.c1daten.Columns("mutiert_am").Value = Now
-
+            'Me.c1daten.Columns("mutierer").Value = Globals.ActUser
-                    f.TextBox2.Text = Me.c1daten.Columns("LeistungD").Value.ToString
+            'Me.c1daten.Columns("aktiv").Value = True
-                    f.TextBox3.Text = Me.c1daten.Columns("Interpretationd").Value.ToString
+            'Me.c1daten.Columns("Mandant").Value = Globals.Mandant
-                    f.TextBox4.Text = Me.c1daten.Columns("Abrechnungseinheit").Value.ToString
+        Catch ex As Exception
-                    f.TextBox5.Text = Me.c1daten.Columns("Taxpunkte_UV_MV_IV").Value.ToString
+
-                    f.TextBox6.Text = Me.c1daten.Columns("PP_MIN").Value.ToString
+        End Try
-                    f.TextBox7.Text = Me.c1daten.Columns("PP_Privat").Value.ToString
+    End Sub
-                    f.TextBox8.Text = Me.c1daten.Columns("PP_Max").Value.ToString
+
-                    f.TextBox9.Text = Me.c1daten.Columns("BetragInCHF").Value.ToString
+    Private Sub c1daten_DoubleClick(sender As Object, e As EventArgs) Handles c1daten.DoubleClick
-
+        Select Case Tablename
-
+            Case "Dentotar"
-
+                Try
-                    f.ShowDialog()
+                    Dim f As New frmDentotarDetails
-                    Me.c1daten.Columns("LeistungNrNeu").Value = f.TextBox1.Text
+                    f.Update_Data(Me.c1daten.Columns("LeistungNrNeu").Value)
-                    f.Update_Data(Me.c1daten.Columns("LeistungNrNeu").Value)
+
-                    Me.c1daten.Columns("LeistungD").Value = f.TextBox2.Text
+                    f.TextBox2.Text = Me.c1daten.Columns("LeistungD").Value.ToString
-                    Me.c1daten.Columns("Interpretationd").Value = f.TextBox3.Text
+                    f.TextBox3.Text = Me.c1daten.Columns("Interpretationd").Value.ToString
-                    Me.c1daten.Columns("Abrechnungseinheit").Value = f.TextBox4.Text
+                    f.TextBox4.Text = Me.c1daten.Columns("Abrechnungseinheit").Value.ToString
-                    Me.c1daten.Columns("Taxpunkte_UV_MV_IV").Value = f.TextBox5.Text
+                    f.TextBox5.Text = Me.c1daten.Columns("Taxpunkte_UV_MV_IV").Value.ToString
-                    Me.c1daten.Columns("PP_MIN").Value = f.TextBox6.Text
+                    f.TextBox6.Text = Me.c1daten.Columns("PP_MIN").Value.ToString
-                    Me.c1daten.Columns("PP_Privat").Value = f.TextBox7.Text
+                    f.TextBox7.Text = Me.c1daten.Columns("PP_Privat").Value.ToString
-                    Me.c1daten.Columns("PP_Max").Value = f.TextBox8.Text
+                    f.TextBox8.Text = Me.c1daten.Columns("PP_Max").Value.ToString
-                    Me.c1daten.Columns("BetragInCHF").Value = f.TextBox9.Text
+                    f.TextBox9.Text = Me.c1daten.Columns("BetragInCHF").Value.ToString
-                    ' Me.c1daten.Columns("LeistungD").Value = f.TextBox1.Text
+
-                Catch ex As Exception
+
-                    MsgBox("Ein Fehler bei der Bearbeitung über den Dialog ist aufgetreten: " + ex.Message + vbCrLf + "Bitte Daten direkt in der Tabelle ändern.", vbExclamation)
+
-                End Try
+                    f.ShowDialog()
-
+                    Me.c1daten.Columns("LeistungNrNeu").Value = f.TextBox1.Text
-            Case "Tarif"
+                    f.Update_Data(Me.c1daten.Columns("LeistungNrNeu").Value)
-
+                    Me.c1daten.Columns("LeistungD").Value = f.TextBox2.Text
-                If My.Settings.SoftwareType = "PADM" Then
+                    Me.c1daten.Columns("Interpretationd").Value = f.TextBox3.Text
-                    Dim f1 As New TarifDetail_PADM
+                    Me.c1daten.Columns("Abrechnungseinheit").Value = f.TextBox4.Text
-                    f1.txtnrtarif.Text = Me.c1daten.Columns("nrtarif").Value
+                    Me.c1daten.Columns("Taxpunkte_UV_MV_IV").Value = f.TextBox5.Text
-                    f1.cbboxTarifgruppe.SelectedValue = Me.c1daten.Columns("Nrtarifgruppe").Value
+                    Me.c1daten.Columns("PP_MIN").Value = f.TextBox6.Text
-                    f1.txtNummer.Text = Me.c1daten.Columns("sso_nummer").Value
+                    Me.c1daten.Columns("PP_Privat").Value = f.TextBox7.Text
-                    f1.txtBezd.Text = Me.c1daten.Columns("bezd").Value
+                    Me.c1daten.Columns("PP_Max").Value = f.TextBox8.Text
-                    'f1.txtBezF.Text = Me.c1daten.Columns("bezf").Value
+                    Me.c1daten.Columns("BetragInCHF").Value = f.TextBox9.Text
-                    f1.Handle_RTF(1, Me.c1daten.Columns("bezf").Value)
+                    ' Me.c1daten.Columns("LeistungD").Value = f.TextBox1.Text
-                    f1.txtBezi.Text = Me.c1daten.Columns("bezi").Value
+                Catch ex As Exception
-                    f1.txtprivat.Text = Me.c1daten.Columns("privattarif").Value
+                    MsgBox("Ein Fehler bei der Bearbeitung über den Dialog ist aufgetreten: " + ex.Message + vbCrLf + "Bitte Daten direkt in der Tabelle ändern.", vbExclamation)
-                    f1.txtsuva.Text = Me.c1daten.Columns("suvatarif").Value
+                End Try
-                    f1.txtmin.Text = Me.c1daten.Columns("minimaltarif").Value
+
-                    f1.txtmax.Text = Me.c1daten.Columns("maximaltarif").Value
+            Case "Tarif"
-                    If Me.c1daten.Columns("MitLabor").Value = 1 Then f1.cbboxmitlabor.Checked = True Else f1.cbboxmitlabor.Checked = False
+
-                    f1.txtfrankenwert.Text = Me.c1daten.Columns("Frankenbetrag").Value
+                If My.Settings.SoftwareType = "PADM" Then
-                    f1.ShowDialog()
+                    Dim f1 As New TarifDetail_PADM
-                    If f1.DialogResult = DialogResult.OK Then
+                    f1.txtnrtarif.Text = Me.c1daten.Columns("nrtarif").Value
-                        Me.c1daten.Columns("nrtarif").Value = f1.txtnrtarif.Text
+                    f1.cbboxTarifgruppe.SelectedValue = Me.c1daten.Columns("Nrtarifgruppe").Value
-                        Me.c1daten.Columns("Nrtarifgruppe").Value = f1.cbboxTarifgruppe.SelectedValue
+                    f1.txtNummer.Text = Me.c1daten.Columns("sso_nummer").Value
-                        Me.c1daten.Columns("sso_nummer").Value = f1.txtNummer.Text
+                    f1.txtBezd.Text = Me.c1daten.Columns("bezd").Value
-                        Me.c1daten.Columns("bezd").Value = f1.txtBezd.Text
+                    'f1.txtBezF.Text = Me.c1daten.Columns("bezf").Value
-                        Me.c1daten.Columns("bezf").Value = f1.Handle_RTF(2, "")
+                    f1.Handle_RTF(1, Me.c1daten.Columns("bezf").Value)
-                        'Me.c1daten.Columns("bezf").Value = f1.txtBezf.Text
+                    f1.txtBezi.Text = Me.c1daten.Columns("bezi").Value
-                        Me.c1daten.Columns("bezi").Value = f1.txtBezi.Text
+                    f1.txtprivat.Text = Me.c1daten.Columns("privattarif").Value
-                        Me.c1daten.Columns("privattarif").Value = f1.txtprivat.Text
+                    f1.txtsuva.Text = Me.c1daten.Columns("suvatarif").Value
-                        Me.c1daten.Columns("suvatarif").Value = f1.txtsuva.Text
+                    f1.txtmin.Text = Me.c1daten.Columns("minimaltarif").Value
-                        Me.c1daten.Columns("minimaltarif").Value = f1.txtmin.Text
+                    f1.txtmax.Text = Me.c1daten.Columns("maximaltarif").Value
-                        Me.c1daten.Columns("maximaltarif").Value = f1.txtmax.Text
+                    If Me.c1daten.Columns("MitLabor").Value = 1 Then f1.cbboxmitlabor.Checked = True Else f1.cbboxmitlabor.Checked = False
-                        If f1.cbboxmitlabor.Checked Then
+                    f1.txtfrankenwert.Text = Me.c1daten.Columns("Frankenbetrag").Value
-                            Me.c1daten.Columns("MitLabor").Value = 1
+                    f1.ShowDialog()
-                        Else
+                    If f1.DialogResult = DialogResult.OK Then
-                            Me.c1daten.Columns("MitLabor").Value = 0
+                        Me.c1daten.Columns("nrtarif").Value = f1.txtnrtarif.Text
-                        End If
+                        Me.c1daten.Columns("Nrtarifgruppe").Value = f1.cbboxTarifgruppe.SelectedValue
-                        Me.c1daten.Columns("Frankenbetrag").Value = f1.txtfrankenwert.Text
+                        Me.c1daten.Columns("sso_nummer").Value = f1.txtNummer.Text
-                        Me.c1daten.Bookmark = Me.c1daten.Bookmark - 1
+                        Me.c1daten.Columns("bezd").Value = f1.txtBezd.Text
-                        ToolStripButton6_Click(sender, e)
+                        Me.c1daten.Columns("bezf").Value = f1.Handle_RTF(2, "")
-                        Me.c1daten.Bookmark = Me.c1daten.Bookmark + 1
+                        'Me.c1daten.Columns("bezf").Value = f1.txtBezf.Text
-                    End If
+                        Me.c1daten.Columns("bezi").Value = f1.txtBezi.Text
-
+                        Me.c1daten.Columns("privattarif").Value = f1.txtprivat.Text
-                    Exit Sub
+                        Me.c1daten.Columns("suvatarif").Value = f1.txtsuva.Text
-                End If
+                        Me.c1daten.Columns("minimaltarif").Value = f1.txtmin.Text
-                Dim f As New frmTarifDetail
+                        Me.c1daten.Columns("maximaltarif").Value = f1.txtmax.Text
-                f.txtnrtarif.Text = Me.c1daten.Columns("nrtarif").Value
+                        If f1.cbboxmitlabor.Checked Then
-                f.cbboxTarifgruppe.SelectedValue = Me.c1daten.Columns("Nrtarifgruppe").Value
+                            Me.c1daten.Columns("MitLabor").Value = 1
-                f.txtNummer.Text = Me.c1daten.Columns("sso_nummer").Value
+                        Else
-                f.txtBezd.Text = Me.c1daten.Columns("bezd").Value
+                            Me.c1daten.Columns("MitLabor").Value = 0
-                f.txtBezf.Text = Me.c1daten.Columns("bezf").Value
+                        End If
-                f.txtBezi.Text = Me.c1daten.Columns("bezi").Value
+                        Me.c1daten.Columns("Frankenbetrag").Value = f1.txtfrankenwert.Text
-                f.txtprivat.Text = Me.c1daten.Columns("privattarif").Value
+                        Me.c1daten.Bookmark = Me.c1daten.Bookmark - 1
-                f.txtsuva.Text = Me.c1daten.Columns("suvatarif").Value
+                        ToolStripButton6_Click(sender, e)
-                f.txtmin.Text = Me.c1daten.Columns("minimaltarif").Value
+                        Me.c1daten.Bookmark = Me.c1daten.Bookmark + 1
-                f.txtmax.Text = Me.c1daten.Columns("maximaltarif").Value
+                    End If
-                If Me.c1daten.Columns("MitLabor").Value = 1 Then f.cbboxmitlabor.Checked = True Else f.cbboxmitlabor.Checked = False
+
-                f.txtfrankenwert.Text = Me.c1daten.Columns("Frankenbetrag").Value
+                    Exit Sub
-                f.ShowDialog()
+                End If
-                If f.DialogResult = DialogResult.OK Then
+                Dim f As New frmTarifDetail
-                    Me.c1daten.Columns("nrtarif").Value = f.txtnrtarif.Text
+                f.txtnrtarif.Text = Me.c1daten.Columns("nrtarif").Value
-                    Me.c1daten.Columns("Nrtarifgruppe").Value = f.cbboxTarifgruppe.SelectedValue
+                f.cbboxTarifgruppe.SelectedValue = Me.c1daten.Columns("Nrtarifgruppe").Value
-                    Me.c1daten.Columns("sso_nummer").Value = f.txtNummer.Text
+                f.txtNummer.Text = Me.c1daten.Columns("sso_nummer").Value
-                    Me.c1daten.Columns("bezd").Value = f.txtBezd.Text
+                f.txtBezd.Text = Me.c1daten.Columns("bezd").Value
-                    Me.c1daten.Columns("bezf").Value = f.txtBezf.Text
+                f.txtBezf.Text = Me.c1daten.Columns("bezf").Value
-                    Me.c1daten.Columns("bezi").Value = f.txtBezi.Text
+                f.txtBezi.Text = Me.c1daten.Columns("bezi").Value
-                    Me.c1daten.Columns("privattarif").Value = f.txtprivat.Text
+                f.txtprivat.Text = Me.c1daten.Columns("privattarif").Value
-                    Me.c1daten.Columns("suvatarif").Value = f.txtsuva.Text
+                f.txtsuva.Text = Me.c1daten.Columns("suvatarif").Value
-                    Me.c1daten.Columns("minimaltarif").Value = f.txtmin.Text
+                f.txtmin.Text = Me.c1daten.Columns("minimaltarif").Value
-                    Me.c1daten.Columns("maximaltarif").Value = f.txtmax.Text
+                f.txtmax.Text = Me.c1daten.Columns("maximaltarif").Value
-                    If f.cbboxmitlabor.Checked Then
+                If Me.c1daten.Columns("MitLabor").Value = 1 Then f.cbboxmitlabor.Checked = True Else f.cbboxmitlabor.Checked = False
-                        Me.c1daten.Columns("MitLabor").Value = 1
+                f.txtfrankenwert.Text = Me.c1daten.Columns("Frankenbetrag").Value
-                    Else
+                f.ShowDialog()
-                        Me.c1daten.Columns("MitLabor").Value = 0
+                If f.DialogResult = DialogResult.OK Then
-                    End If
+                    Me.c1daten.Columns("nrtarif").Value = f.txtnrtarif.Text
-                    Me.c1daten.Columns("Frankenbetrag").Value = f.txtfrankenwert.Text
+                    Me.c1daten.Columns("Nrtarifgruppe").Value = f.cbboxTarifgruppe.SelectedValue
-                End If
+                    Me.c1daten.Columns("sso_nummer").Value = f.txtNummer.Text
-
+                    Me.c1daten.Columns("bezd").Value = f.txtBezd.Text
-        End Select
+                    Me.c1daten.Columns("bezf").Value = f.txtBezf.Text
-
+                    Me.c1daten.Columns("bezi").Value = f.txtBezi.Text
-
+                    Me.c1daten.Columns("privattarif").Value = f.txtprivat.Text
-    End Sub
+                    Me.c1daten.Columns("suvatarif").Value = f.txtsuva.Text
-
+                    Me.c1daten.Columns("minimaltarif").Value = f.txtmin.Text
-    Private Sub ContextMenuStrip1_Opening(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles ContextMenuStrip1.Opening
+                    Me.c1daten.Columns("maximaltarif").Value = f.txtmax.Text
-
+                    If f.cbboxmitlabor.Checked Then
-    End Sub
+                        Me.c1daten.Columns("MitLabor").Value = 1
-
+                    Else
-    Private Sub TarifBearbeitenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles TarifBearbeitenToolStripMenuItem.Click
+                        Me.c1daten.Columns("MitLabor").Value = 0
-        c1daten_DoubleClick(sender, e)
+                    End If
-    End Sub
+                    Me.c1daten.Columns("Frankenbetrag").Value = f.txtfrankenwert.Text
-
+                End If
-    Private Sub NeuerTarifeintragErstellenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles NeuerTarifeintragErstellenToolStripMenuItem.Click
+
-        If My.Settings.SoftwareType = "PADM" Then
+        End Select
-            Dim f1 As New TarifDetail_PADM
+
-            Dim newkey1 As Integer = f1.New_Tarif
+
-            f1.Dispose()
+    End Sub
-            get_data()
+
-            Dim d1 As DataSet = c1daten.DataSource
+    Private Sub ContextMenuStrip1_Opening(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles ContextMenuStrip1.Opening
-            Dim i1 As Integer = 0
+
-            For Each r As DataRow In d1.Tables(0).Rows
+    End Sub
-                i1 = i1 + 1
+
-                If newkey1 = r.Item(0) Then
+    Private Sub TarifBearbeitenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles TarifBearbeitenToolStripMenuItem.Click
-                    c1daten.Bookmark = i1
+        c1daten_DoubleClick(sender, e)
-                End If
+    End Sub
-            Next
+
-            c1daten_DoubleClick(sender, e)
+    Private Sub NeuerTarifeintragErstellenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles NeuerTarifeintragErstellenToolStripMenuItem.Click
-
+        If My.Settings.SoftwareType = "PADM" Then
-            Exit Sub
+            Dim f1 As New TarifDetail_PADM
-
+            Dim newkey1 As Integer = f1.New_Tarif
-        End If
+            f1.Dispose()
-        Dim f As New frmTarifDetail
+            get_data()
-        Dim newkey As Integer = f.New_Tarif
+            Dim d1 As DataSet = c1daten.DataSource
-        f.Dispose()
+            Dim i1 As Integer = 0
-        get_data()
+            For Each r As DataRow In d1.Tables(0).Rows
-        Dim d As DataSet = c1daten.DataSource
+                i1 = i1 + 1
-        Dim i As Integer = 0
+                If newkey1 = r.Item(0) Then
-        For Each r As DataRow In d.Tables(0).Rows
+                    c1daten.Bookmark = i1
-            i = i + 1
+                End If
-            If newkey = r.Item(0) Then
+            Next
-                c1daten.Bookmark = i
+            c1daten_DoubleClick(sender, e)
-            End If
+
-        Next
+            Exit Sub
-        c1daten_DoubleClick(sender, e)
+
-    End Sub
+        End If
-
+        Dim f As New frmTarifDetail
-    Private Sub PasswortÄndernToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PasswortÄndernToolStripMenuItem.Click
+        Dim newkey As Integer = f.New_Tarif
-        Dim f As New frmLogin
+        f.Dispose()
-        f.txtUserName.Text = Me.c1daten.Columns("User").Value
+        get_data()
-        f.txtPassword.Text = Me.c1daten.Columns("Passwort").Value
+        Dim d As DataSet = c1daten.DataSource
-        f.Label2.Text = "Neues Passwort"
+        Dim i As Integer = 0
-        f.btnLogin.Text = "Speichern"
+        For Each r As DataRow In d.Tables(0).Rows
-        f.ShowDialog()
+            i = i + 1
-        If f.DialogResult = DialogResult.OK Then
+            If newkey = r.Item(0) Then
-            Me.c1d.Columns("Passwort").Value = Crypto.EncryptText(f.txtPassword.Text, "DPM2018")
+                c1daten.Bookmark = i
-        End If
+            End If
-    End Sub
+        Next
-
+        c1daten_DoubleClick(sender, e)
-    Private Sub TarifBearbeitenToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles TarifBearbeitenToolStripMenuItem1.Click
+    End Sub
-        c1daten_DoubleClick(sender, e)
+
-    End Sub
+    Private Sub PasswortÄndernToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PasswortÄndernToolStripMenuItem.Click
-
+        Dim f As New frmLogin
-    Private Sub tsnewdentotar_Click(sender As Object, e As EventArgs) Handles tsnewdentotar.Click
+        f.txtUserName.Text = Me.c1daten.Columns("User").Value
-        Dim f As New frmDentotarDetail
+        f.txtPassword.Text = Me.c1daten.Columns("Passwort").Value
-        f.pk = -1
+        f.Label2.Text = "Neues Passwort"
-        f.TextBox1.Text = "4.xxxx"
+        f.btnLogin.Text = "Speichern"
-        f.TextBox2.Text = ""
+        f.ShowDialog()
-        f.TextBox3.Text = ""
+        If f.DialogResult = DialogResult.OK Then
-        f.TextBox4.Text = ""
+            Me.c1d.Columns("Passwort").Value = Crypto.EncryptText(f.txtPassword.Text, "DPM2018")
-        f.TextBox5.Text = "CHF"
+        End If
-        f.TextBox6.Text = "0.00"
+    End Sub
-        f.TextBox7.Text = "0.00"
+
-        f.TextBox8.Text = "0.00"
+    Private Sub TarifBearbeitenToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles TarifBearbeitenToolStripMenuItem1.Click
-        f.TextBox9.Text = "0.00"
+        c1daten_DoubleClick(sender, e)
-        f.TextBox10.Text = "0.00"
+    End Sub
-        f.ShowDialog()
+
-        If f.DialogResult = DialogResult.OK Then
+    Private Sub tsnewdentotar_Click(sender As Object, e As EventArgs) Handles tsnewdentotar.Click
-            Dim sql As String
+        Dim f As New frmDentotarDetail
-            db.Get_Tabledata("Dentotarx", "", "Select * from dentotar where pk=-100", "", False)
+        f.pk = -1
-            Dim r As DataRow = db.dsDaten.Tables(0).NewRow
+        f.TextBox1.Text = "4.xxxx"
-            r.Item(0) = ""
+        f.TextBox2.Text = ""
-            r.Item(1) = 3
+        f.TextBox3.Text = ""
-            r.Item(2) = ""
+        f.TextBox4.Text = ""
-            r.Item(3) = f.TextBox1.Text
+        f.TextBox5.Text = "CHF"
-            r.Item(4) = f.TextBox2.Text
+        f.TextBox6.Text = "0.00"
-            r.Item(5) = f.TextBox4.Text
+        f.TextBox7.Text = "0.00"
-            r.Item(6) = f.TextBox4.Text
+        f.TextBox8.Text = "0.00"
-            r.Item(7) = ""
+        f.TextBox9.Text = "0.00"
-            r.Item(8) = ""
+        f.TextBox10.Text = "0.00"
-            r.Item(9) = ""
+        f.ShowDialog()
-            r.Item(10) = f.TextBox5.Text
+        If f.DialogResult = DialogResult.OK Then
-            r.Item(11) = f.TextBox6.Text
+            Dim sql As String
-            r.Item(12) = f.TextBox7.Text
+            db.Get_Tabledata("Dentotarx", "", "Select * from dentotar where pk=-100", "", False)
-            r.Item(13) = f.TextBox8.Text
+            Dim r As DataRow = db.dsDaten.Tables(0).NewRow
-            r.Item(14) = f.TextBox9.Text
+            r.Item(0) = ""
-            r.Item(15) = f.TextBox10.Text
+            r.Item(1) = 3
-            db.dsDaten.Tables(0).Rows.Add(r)
+            r.Item(2) = ""
-            'db.dsDaten.Tables(0).AcceptChanges()
+            r.Item(3) = f.TextBox1.Text
-            db.Update_Data()
+            r.Item(4) = f.TextBox2.Text
-
+            r.Item(5) = f.TextBox4.Text
-            get_data()
+            r.Item(6) = f.TextBox4.Text
-
+            r.Item(7) = ""
-            Dim i As Integer
+            r.Item(8) = ""
-            For i = 0 To Me.c1daten.Splits(0).Rows.Count - 1
+            r.Item(9) = ""
-                Try
+            r.Item(10) = f.TextBox5.Text
-                    If Me.c1daten.Columns("leistungnrneu").CellValue(i) = f.TextBox1.Text Then
+            r.Item(11) = f.TextBox6.Text
-                        Me.c1daten.Bookmark = i
+            r.Item(12) = f.TextBox7.Text
-                        Exit For
+            r.Item(13) = f.TextBox8.Text
-                    End If
+            r.Item(14) = f.TextBox9.Text
-                Catch
+            r.Item(15) = f.TextBox10.Text
-                End Try
+            db.dsDaten.Tables(0).Rows.Add(r)
-            Next
+            'db.dsDaten.Tables(0).AcceptChanges()
-
+            db.Update_Data()
-        End If
+
-    End Sub
+            get_data()
-
+
-    Private Sub c1daten_MouseDown(sender As Object, e As MouseEventArgs) Handles c1daten.MouseDown
+            Dim i As Integer
-        c1daten.Bookmark = c1daten.RowContaining(e.Y)
+            For i = 0 To Me.c1daten.Splits(0).Rows.Count - 1
-    End Sub
+                Try
-
+                    If Me.c1daten.Columns("leistungnrneu").CellValue(i) = f.TextBox1.Text Then
-    Private Sub MailTexteBearbeitenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MailTexteBearbeitenToolStripMenuItem.Click
+                        Me.c1daten.Bookmark = i
-        Dim f As New frmMailtexte
+                        Exit For
-        f.txtBetreff.Text = Me.c1daten.Columns("Betreff").Value
+                    End If
-        f.txtinhalt.Text = Me.c1daten.Columns("Inhalt").Value
+                Catch
-
+                End Try
-        f.ShowDialog()
+            Next
-        If f.DialogResult = DialogResult.OK Then
+
-            Me.c1daten.Columns("Inhalt").Value = f.txtinhalt.Text
+        End If
-            Me.c1daten.Columns("Betreff").Value = f.txtBetreff.Text
+    End Sub
-        End If
+
-    End Sub
+    Private Sub c1daten_MouseDown(sender As Object, e As MouseEventArgs) Handles c1daten.MouseDown
-
+        c1daten.Bookmark = c1daten.RowContaining(e.Y)
-    Private Sub SQLBearbeitenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SQLBearbeitenToolStripMenuItem.Click
+    End Sub
-        Dim f As New frmTexteditor
+
-        f.TextBox1.Text = Me.c1daten.Columns("sql").Value
+    Private Sub MailTexteBearbeitenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MailTexteBearbeitenToolStripMenuItem.Click
-        f.ShowDialog()
+        Dim f As New frmMailtexte
-        If f.DialogResult = DialogResult.OK Then
+        f.txtBetreff.Text = Me.c1daten.Columns("Betreff").Value
-            Me.c1daten.Columns("SQL").Value = f.TextBox1.Text
+        f.txtinhalt.Text = Me.c1daten.Columns("Inhalt").Value
-
+
-        End If
+        f.ShowDialog()
-    End Sub
+        If f.DialogResult = DialogResult.OK Then
-
+            Me.c1daten.Columns("Inhalt").Value = f.txtinhalt.Text
-    Private Sub ReportBearbeitenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ReportBearbeitenToolStripMenuItem.Click
+            Me.c1daten.Columns("Betreff").Value = f.txtBetreff.Text
-        Dim f As New frmTexteditor
+        End If
-        f.TextBox1.Text = Me.c1daten.Columns("reportfile").Value
+    End Sub
-        f.ShowDialog()
+
-        If f.DialogResult = DialogResult.OK Then
+    Private Sub SQLBearbeitenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SQLBearbeitenToolStripMenuItem.Click
-            Me.c1daten.Columns("reportfile").Value = f.TextBox1.Text
+        Dim f As New frmTexteditor
-
+        f.TextBox1.Text = Me.c1daten.Columns("sql").Value
-        End If
+        f.ShowDialog()
-    End Sub
+        If f.DialogResult = DialogResult.OK Then
-
+            Me.c1daten.Columns("SQL").Value = f.TextBox1.Text
-    Private Sub c1daten_DragDrop(sender As Object, e As DragEventArgs) Handles c1daten.DragDrop
+
-        Dim files() As String = e.Data.GetData(DataFormats.FileDrop)
+        End If
-        For Each path In files
+    End Sub
-            Dim tb As New TextBox
+
-
+    Private Sub ReportBearbeitenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ReportBearbeitenToolStripMenuItem.Click
-            tb.Text = System.IO.File.ReadAllText(path)
+        Dim f As New frmTexteditor
-            If UCase(System.IO.Path.GetExtension(path)) = ".SQL" Then
+        f.TextBox1.Text = Me.c1daten.Columns("reportfile").Value
-                Me.c1daten.Columns("SQL").Value = tb.Text
+        f.ShowDialog()
-            Else
+        If f.DialogResult = DialogResult.OK Then
-                Me.c1daten.Columns("reportfile").Value = tb.Text
+            Me.c1daten.Columns("reportfile").Value = f.TextBox1.Text
-            End If
+
-            tb.Text = ""
+        End If
-            tb.Dispose()
+    End Sub
-        Next
+
-
+    Private Sub c1daten_DragDrop(sender As Object, e As DragEventArgs) Handles c1daten.DragDrop
-    End Sub
+        Dim files() As String = e.Data.GetData(DataFormats.FileDrop)
-
+        For Each path In files
-    Private Sub c1daten_DragEnter(sender As Object, e As DragEventArgs) Handles c1daten.DragEnter
+            Dim tb As New TextBox
-        If e.Data.GetDataPresent(DataFormats.FileDrop) Then
+
-            e.Effect = DragDropEffects.Copy
+            tb.Text = System.IO.File.ReadAllText(path)
-        End If
+            If UCase(System.IO.Path.GetExtension(path)) = ".SQL" Then
-    End Sub
+                Me.c1daten.Columns("SQL").Value = tb.Text
-End Class
+            Else
+                Me.c1daten.Columns("reportfile").Value = tb.Text
+            End If
+            tb.Text = ""
+            tb.Dispose()
+        Next
+
+    End Sub
+
+    Private Sub c1daten_DragEnter(sender As Object, e As DragEventArgs) Handles c1daten.DragEnter
+        If e.Data.GetDataPresent(DataFormats.FileDrop) Then
+            e.Effect = DragDropEffects.Copy
+        End If
+    End Sub
+End Class

DPM2016/My Project/Settings.Designer.vb

@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -166,7 +166,7 @@ Namespace My
         
         <Global.System.Configuration.UserScopedSettingAttribute(),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("DPM")>  _
+         Global.System.Configuration.DefaultSettingValueAttribute("PADM")>  _
         Public Property SoftwareType() As String
             Get
                 Return CType(Me("SoftwareType"),String)

DPM2016/My Project/Settings.settings

@@ -30,7 +30,7 @@
       <Value Profile="(Default)">http://192.168.111.67</Value>
     </Setting>
     <Setting Name="SoftwareType" Type="System.String" Scope="User">
-      <Value Profile="(Default)">DPM</Value>
+      <Value Profile="(Default)">PADM</Value>
     </Setting>
   </Settings>
 </SettingsFile>

DPM2016/Patient/Patient.Designer.vb

@@ -46,12 +46,12 @@ Partial Class Patient
         Me.btnVTX = New System.Windows.Forms.Button()
         Me.PatientDetails1 = New DPM2016.PatientDetails()
         Me.Stammdaten = New DevComponents.DotNetBar.SuperTabItem()
-        Me.SuperTabControlPanel3 = New DevComponents.DotNetBar.SuperTabControlPanel()
-        Me.Behandlung1 = New DPM2016.Behandlung()
-        Me.Behandlungen = New DevComponents.DotNetBar.SuperTabItem()
         Me.SuperTabControlPanel8 = New DevComponents.DotNetBar.SuperTabControlPanel()
         Me.PatientDetailsFirma1 = New DPM2016.PatientDetailsFirma()
         Me.Stammdaten_Firma = New DevComponents.DotNetBar.SuperTabItem()
+        Me.SuperTabControlPanel3 = New DevComponents.DotNetBar.SuperTabControlPanel()
+        Me.Behandlung1 = New DPM2016.Behandlung()
+        Me.Behandlungen = New DevComponents.DotNetBar.SuperTabItem()
         Me.SuperTabControlPanel5 = New DevComponents.DotNetBar.SuperTabControlPanel()
         Me.Finanzen1 = New DPM2016.Finanzen()
         Me.Finanzen = New DevComponents.DotNetBar.SuperTabItem()
@@ -75,8 +75,8 @@ Partial Class Patient
         CType(Me.SuperTabControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuperTabControl1.SuspendLayout()
         Me.SuperTabControlPanel1.SuspendLayout()
-        Me.SuperTabControlPanel3.SuspendLayout()
         Me.SuperTabControlPanel8.SuspendLayout()
+        Me.SuperTabControlPanel3.SuspendLayout()
         Me.SuperTabControlPanel5.SuspendLayout()
         Me.SuperTabControlPanel4.SuspendLayout()
         Me.SuperTabControlPanel7.SuspendLayout()
@@ -237,6 +237,7 @@ Partial Class Patient
         Me.ToolStripButton1.Name = "ToolStripButton1"
         Me.ToolStripButton1.Size = New System.Drawing.Size(24, 24)
         Me.ToolStripButton1.Text = "ToolStripButton1"
+        Me.ToolStripButton1.Visible = False
         '
         'SuperTabControl1
         '
@@ -254,8 +255,8 @@ Partial Class Patient
         Me.SuperTabControl1.ControlBox.Name = ""
         Me.SuperTabControl1.ControlBox.SubItems.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.SuperTabControl1.ControlBox.MenuBox, Me.SuperTabControl1.ControlBox.CloseBox})
         Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel1)
-        Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel3)
         Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel8)
+        Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel3)
         Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel5)
         Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel4)
         Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel7)
@@ -312,35 +313,6 @@ Partial Class Patient
         Me.Stammdaten.Name = "Stammdaten"
         Me.Stammdaten.Text = "Stammdaten"
         '
-        'SuperTabControlPanel3
-        '
-        Me.SuperTabControlPanel3.Controls.Add(Me.Behandlung1)
-        Me.SuperTabControlPanel3.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.SuperTabControlPanel3.Location = New System.Drawing.Point(0, 25)
-        Me.SuperTabControlPanel3.Name = "SuperTabControlPanel3"
-        Me.SuperTabControlPanel3.Size = New System.Drawing.Size(1278, 610)
-        Me.SuperTabControlPanel3.TabIndex = 0
-        Me.SuperTabControlPanel3.TabItem = Me.Behandlungen
-        '
-        'Behandlung1
-        '
-        Me.Behandlung1.Auftragsmanagement = False
-        Me.Behandlung1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.Behandlung1.HasChanges = False
-        Me.Behandlung1.Location = New System.Drawing.Point(0, 0)
-        Me.Behandlung1.Margin = New System.Windows.Forms.Padding(4)
-        Me.Behandlung1.Name = "Behandlung1"
-        Me.Behandlung1.PatientNr = 0
-        Me.Behandlung1.Size = New System.Drawing.Size(1278, 610)
-        Me.Behandlung1.TabIndex = 0
-        '
-        'Behandlungen
-        '
-        Me.Behandlungen.AttachedControl = Me.SuperTabControlPanel3
-        Me.Behandlungen.GlobalItem = False
-        Me.Behandlungen.Name = "Behandlungen"
-        Me.Behandlungen.Text = "Behandlungen"
-        '
         'SuperTabControlPanel8
         '
         Me.SuperTabControlPanel8.Controls.Add(Me.PatientDetailsFirma1)
@@ -371,6 +343,35 @@ Partial Class Patient
         Me.Stammdaten_Firma.Name = "Stammdaten_Firma"
         Me.Stammdaten_Firma.Text = "Stammdaten"
         '
+        'SuperTabControlPanel3
+        '
+        Me.SuperTabControlPanel3.Controls.Add(Me.Behandlung1)
+        Me.SuperTabControlPanel3.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.SuperTabControlPanel3.Location = New System.Drawing.Point(0, 25)
+        Me.SuperTabControlPanel3.Name = "SuperTabControlPanel3"
+        Me.SuperTabControlPanel3.Size = New System.Drawing.Size(1278, 610)
+        Me.SuperTabControlPanel3.TabIndex = 0
+        Me.SuperTabControlPanel3.TabItem = Me.Behandlungen
+        '
+        'Behandlung1
+        '
+        Me.Behandlung1.Auftragsmanagement = False
+        Me.Behandlung1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.Behandlung1.HasChanges = False
+        Me.Behandlung1.Location = New System.Drawing.Point(0, 0)
+        Me.Behandlung1.Margin = New System.Windows.Forms.Padding(4)
+        Me.Behandlung1.Name = "Behandlung1"
+        Me.Behandlung1.PatientNr = 0
+        Me.Behandlung1.Size = New System.Drawing.Size(1278, 610)
+        Me.Behandlung1.TabIndex = 0
+        '
+        'Behandlungen
+        '
+        Me.Behandlungen.AttachedControl = Me.SuperTabControlPanel3
+        Me.Behandlungen.GlobalItem = False
+        Me.Behandlungen.Name = "Behandlungen"
+        Me.Behandlungen.Text = "Behandlungen"
+        '
         'SuperTabControlPanel5
         '
         Me.SuperTabControlPanel5.Controls.Add(Me.Finanzen1)
@@ -562,8 +563,8 @@ Partial Class Patient
         CType(Me.SuperTabControl1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.SuperTabControl1.ResumeLayout(False)
         Me.SuperTabControlPanel1.ResumeLayout(False)
-        Me.SuperTabControlPanel3.ResumeLayout(False)
         Me.SuperTabControlPanel8.ResumeLayout(False)
+        Me.SuperTabControlPanel3.ResumeLayout(False)
         Me.SuperTabControlPanel5.ResumeLayout(False)
         Me.SuperTabControlPanel4.ResumeLayout(False)
         Me.SuperTabControlPanel7.ResumeLayout(False)

DPM2016/Patient/Patient.vb

@@ -422,4 +422,7 @@
 
     End Sub
 
+    Private Sub ToolStripButton1_Click_1(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
+
+    End Sub
 End Class

DPM2016/Patient/PatientDetails.resx

@@ -1,120 +1,120 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<root>
+<root>
-  <!-- 
+  <!-- 
-    Microsoft ResX Schema 
+    Microsoft ResX Schema 
-    
+    
-    Version 2.0
+    Version 2.0
-    
+    
-    The primary goals of this format is to allow a simple XML format 
+    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
+    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+    various data types are done through the TypeConverter classes 
-    associated with the data types.
+    associated with the data types.
-    
+    
-    Example:
+    Example:
-    
+    
-    ... ado.net/XML headers & schema ...
+    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
+    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
+    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
+        <comment>This is a comment</comment>
-    </data>
+    </data>
-                
+                
-    There are any number of "resheader" rows that contain simple 
+    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
+    name/value pairs.
-    
+    
-    Each data row contains a name, and value. The row also contains a 
+    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
+    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
+    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+    Classes that don't support this are serialized and stored with the 
-    mimetype set.
+    mimetype set.
-    
+    
-    The mimetype is used for serialized objects, and tells the 
+    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
+    extensible. For a given mimetype the value must be set accordingly:
-    
+    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
+    read any of the formats listed below.
-    
+    
-    mimetype: application/x-microsoft.net.object.binary.base64
+    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
+            : and then encoded with base64 encoding.
-    
+    
-    mimetype: application/x-microsoft.net.object.soap.base64
+    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
+            : and then encoded with base64 encoding.
-
+
-    mimetype: application/x-microsoft.net.object.bytearray.base64
+    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
+            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
+            : and then encoded with base64 encoding.
-    -->
+    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
+    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
+      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
+        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
+          <xsd:element name="metadata">
-            <xsd:complexType>
+            <xsd:complexType>
-              <xsd:sequence>
+              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
+              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
+            </xsd:complexType>
-          </xsd:element>
+          </xsd:element>
-          <xsd:element name="assembly">
+          <xsd:element name="assembly">
-            <xsd:complexType>
+            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
+            </xsd:complexType>
-          </xsd:element>
+          </xsd:element>
-          <xsd:element name="data">
+          <xsd:element name="data">
-            <xsd:complexType>
+            <xsd:complexType>
-              <xsd:sequence>
+              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
+              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
+            </xsd:complexType>
-          </xsd:element>
+          </xsd:element>
-          <xsd:element name="resheader">
+          <xsd:element name="resheader">
-            <xsd:complexType>
+            <xsd:complexType>
-              <xsd:sequence>
+              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
+              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
+              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
+            </xsd:complexType>
-          </xsd:element>
+          </xsd:element>
-        </xsd:choice>
+        </xsd:choice>
-      </xsd:complexType>
+      </xsd:complexType>
-    </xsd:element>
+    </xsd:element>
-  </xsd:schema>
+  </xsd:schema>
-  <resheader name="resmimetype">
+  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
+    <value>text/microsoft-resx</value>
-  </resheader>
+  </resheader>
-  <resheader name="version">
+  <resheader name="version">
-    <value>2.0</value>
+    <value>2.0</value>
-  </resheader>
+  </resheader>
-  <resheader name="reader">
+  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.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>
-  <resheader name="writer">
+  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.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>
+  </resheader>
 </root>

DPM2016/Patient/PatientDetails.vb

@@ -24,6 +24,10 @@ Public Class PatientDetails
             Catch ex As Exception
                 log.Writelog("Partnerdetails: Property PatientNr: " + ex.Message, clsLog.Logtype.ApplError)
             End Try
+            If Globals.DruckBranche Or Globals.Applicationtype = ApplicationTypes.Auftragsadministration Then
+                Me.Label13.Visible = False
+                Me.chklbAdresstyp.Visible = False
+            End If
             Me.ResumeLayout()
         End Set
     End Property

DPM2016/Patient/frmPrivatAnsprechpartner.Designer.vb

@@ -0,0 +1,354 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class frmPrivatAnsprechpartner
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()>
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()>
+    Private Sub InitializeComponent()
+        Me.txtMutierer = New System.Windows.Forms.TextBox()
+        Me.txtMutiert_am = New System.Windows.Forms.TextBox()
+        Me.txtErstellt_am = New System.Windows.Forms.TextBox()
+        Me.Label18 = New System.Windows.Forms.Label()
+        Me.Label17 = New System.Windows.Forms.Label()
+        Me.Label16 = New System.Windows.Forms.Label()
+        Me.txtBemerkung = New System.Windows.Forms.TextBox()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.txtadresse1 = New System.Windows.Forms.TextBox()
+        Me.lblCO = New System.Windows.Forms.Label()
+        Me.txtadresse2 = New System.Windows.Forms.TextBox()
+        Me.lblStrasse = New System.Windows.Forms.Label()
+        Me.txtPLZ = New System.Windows.Forms.TextBox()
+        Me.lblPLZOrt = New System.Windows.Forms.Label()
+        Me.txtOrt = New System.Windows.Forms.TextBox()
+        Me.txttelp = New System.Windows.Forms.TextBox()
+        Me.lblTelefon = New System.Windows.Forms.Label()
+        Me.lblemail = New System.Windows.Forms.Label()
+        Me.txtE_Mail = New System.Windows.Forms.TextBox()
+        Me.txtName = New System.Windows.Forms.TextBox()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.Button1 = New System.Windows.Forms.Button()
+        Me.Button2 = New System.Windows.Forms.Button()
+        Me.txtadresse3 = New System.Windows.Forms.TextBox()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.txtstrasse = New System.Windows.Forms.TextBox()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.SuspendLayout()
+        '
+        'txtMutierer
+        '
+        Me.txtMutierer.Location = New System.Drawing.Point(91, 406)
+        Me.txtMutierer.Name = "txtMutierer"
+        Me.txtMutierer.ReadOnly = True
+        Me.txtMutierer.RightToLeft = System.Windows.Forms.RightToLeft.Yes
+        Me.txtMutierer.Size = New System.Drawing.Size(135, 20)
+        Me.txtMutierer.TabIndex = 295
+        '
+        'txtMutiert_am
+        '
+        Me.txtMutiert_am.Location = New System.Drawing.Point(91, 382)
+        Me.txtMutiert_am.Name = "txtMutiert_am"
+        Me.txtMutiert_am.ReadOnly = True
+        Me.txtMutiert_am.Size = New System.Drawing.Size(135, 20)
+        Me.txtMutiert_am.TabIndex = 294
+        '
+        'txtErstellt_am
+        '
+        Me.txtErstellt_am.Location = New System.Drawing.Point(91, 360)
+        Me.txtErstellt_am.Name = "txtErstellt_am"
+        Me.txtErstellt_am.ReadOnly = True
+        Me.txtErstellt_am.Size = New System.Drawing.Size(135, 20)
+        Me.txtErstellt_am.TabIndex = 293
+        '
+        'Label18
+        '
+        Me.Label18.AutoSize = True
+        Me.Label18.BackColor = System.Drawing.Color.Transparent
+        Me.Label18.Location = New System.Drawing.Point(21, 406)
+        Me.Label18.Name = "Label18"
+        Me.Label18.Size = New System.Drawing.Size(45, 13)
+        Me.Label18.TabIndex = 292
+        Me.Label18.Text = "Mutierer"
+        '
+        'Label17
+        '
+        Me.Label17.AutoSize = True
+        Me.Label17.BackColor = System.Drawing.Color.Transparent
+        Me.Label17.Location = New System.Drawing.Point(21, 384)
+        Me.Label17.Name = "Label17"
+        Me.Label17.Size = New System.Drawing.Size(56, 13)
+        Me.Label17.TabIndex = 291
+        Me.Label17.Text = "Mutiert am"
+        '
+        'Label16
+        '
+        Me.Label16.AutoSize = True
+        Me.Label16.BackColor = System.Drawing.Color.Transparent
+        Me.Label16.Location = New System.Drawing.Point(22, 363)
+        Me.Label16.Name = "Label16"
+        Me.Label16.Size = New System.Drawing.Size(55, 13)
+        Me.Label16.TabIndex = 290
+        Me.Label16.Text = "Erstellt am"
+        '
+        'txtBemerkung
+        '
+        Me.txtBemerkung.Location = New System.Drawing.Point(91, 288)
+        Me.txtBemerkung.Multiline = True
+        Me.txtBemerkung.Name = "txtBemerkung"
+        Me.txtBemerkung.Size = New System.Drawing.Size(326, 66)
+        Me.txtBemerkung.TabIndex = 9
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.BackColor = System.Drawing.Color.Transparent
+        Me.Label2.Location = New System.Drawing.Point(20, 291)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(61, 13)
+        Me.Label2.TabIndex = 289
+        Me.Label2.Text = "Bemerkung"
+        '
+        'txtadresse1
+        '
+        Me.txtadresse1.Location = New System.Drawing.Point(91, 84)
+        Me.txtadresse1.Name = "txtadresse1"
+        Me.txtadresse1.Size = New System.Drawing.Size(228, 20)
+        Me.txtadresse1.TabIndex = 1
+        '
+        'lblCO
+        '
+        Me.lblCO.AutoSize = True
+        Me.lblCO.BackColor = System.Drawing.Color.Transparent
+        Me.lblCO.Location = New System.Drawing.Point(20, 87)
+        Me.lblCO.Name = "lblCO"
+        Me.lblCO.Size = New System.Drawing.Size(54, 13)
+        Me.lblCO.TabIndex = 284
+        Me.lblCO.Text = "Adresse 1"
+        '
+        'txtadresse2
+        '
+        Me.txtadresse2.Location = New System.Drawing.Point(91, 108)
+        Me.txtadresse2.Name = "txtadresse2"
+        Me.txtadresse2.Size = New System.Drawing.Size(228, 20)
+        Me.txtadresse2.TabIndex = 2
+        '
+        'lblStrasse
+        '
+        Me.lblStrasse.AutoSize = True
+        Me.lblStrasse.BackColor = System.Drawing.Color.Transparent
+        Me.lblStrasse.Location = New System.Drawing.Point(20, 115)
+        Me.lblStrasse.Name = "lblStrasse"
+        Me.lblStrasse.Size = New System.Drawing.Size(54, 13)
+        Me.lblStrasse.TabIndex = 285
+        Me.lblStrasse.Text = "Adresse 2"
+        '
+        'txtPLZ
+        '
+        Me.txtPLZ.Location = New System.Drawing.Point(91, 189)
+        Me.txtPLZ.Name = "txtPLZ"
+        Me.txtPLZ.Size = New System.Drawing.Size(48, 20)
+        Me.txtPLZ.TabIndex = 5
+        '
+        'lblPLZOrt
+        '
+        Me.lblPLZOrt.AutoSize = True
+        Me.lblPLZOrt.BackColor = System.Drawing.Color.Transparent
+        Me.lblPLZOrt.Location = New System.Drawing.Point(20, 193)
+        Me.lblPLZOrt.Name = "lblPLZOrt"
+        Me.lblPLZOrt.Size = New System.Drawing.Size(46, 13)
+        Me.lblPLZOrt.TabIndex = 286
+        Me.lblPLZOrt.Text = "PLZ/Ort"
+        '
+        'txtOrt
+        '
+        Me.txtOrt.Location = New System.Drawing.Point(145, 189)
+        Me.txtOrt.Name = "txtOrt"
+        Me.txtOrt.Size = New System.Drawing.Size(174, 20)
+        Me.txtOrt.TabIndex = 6
+        '
+        'txttelp
+        '
+        Me.txttelp.Location = New System.Drawing.Point(91, 223)
+        Me.txttelp.Name = "txttelp"
+        Me.txttelp.Size = New System.Drawing.Size(228, 20)
+        Me.txttelp.TabIndex = 7
+        '
+        'lblTelefon
+        '
+        Me.lblTelefon.AutoSize = True
+        Me.lblTelefon.BackColor = System.Drawing.Color.Transparent
+        Me.lblTelefon.Location = New System.Drawing.Point(20, 226)
+        Me.lblTelefon.Name = "lblTelefon"
+        Me.lblTelefon.Size = New System.Drawing.Size(43, 13)
+        Me.lblTelefon.TabIndex = 287
+        Me.lblTelefon.Text = "Telefon"
+        '
+        'lblemail
+        '
+        Me.lblemail.AutoSize = True
+        Me.lblemail.BackColor = System.Drawing.Color.Transparent
+        Me.lblemail.Location = New System.Drawing.Point(20, 255)
+        Me.lblemail.Name = "lblemail"
+        Me.lblemail.Size = New System.Drawing.Size(36, 13)
+        Me.lblemail.TabIndex = 288
+        Me.lblemail.Text = "E-Mail"
+        '
+        'txtE_Mail
+        '
+        Me.txtE_Mail.Location = New System.Drawing.Point(91, 252)
+        Me.txtE_Mail.Name = "txtE_Mail"
+        Me.txtE_Mail.Size = New System.Drawing.Size(228, 20)
+        Me.txtE_Mail.TabIndex = 8
+        '
+        'txtName
+        '
+        Me.txtName.Location = New System.Drawing.Point(91, 33)
+        Me.txtName.Name = "txtName"
+        Me.txtName.Size = New System.Drawing.Size(228, 20)
+        Me.txtName.TabIndex = 0
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.BackColor = System.Drawing.Color.Transparent
+        Me.Label1.Location = New System.Drawing.Point(20, 36)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(35, 13)
+        Me.Label1.TabIndex = 297
+        Me.Label1.Text = "Name"
+        '
+        'Button1
+        '
+        Me.Button1.Location = New System.Drawing.Point(25, 449)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(75, 23)
+        Me.Button1.TabIndex = 10
+        Me.Button1.Text = "Speichern"
+        Me.Button1.UseVisualStyleBackColor = True
+        '
+        'Button2
+        '
+        Me.Button2.Location = New System.Drawing.Point(355, 449)
+        Me.Button2.Name = "Button2"
+        Me.Button2.Size = New System.Drawing.Size(75, 23)
+        Me.Button2.TabIndex = 11
+        Me.Button2.Text = "Abbruch"
+        Me.Button2.UseVisualStyleBackColor = True
+        '
+        'txtadresse3
+        '
+        Me.txtadresse3.Location = New System.Drawing.Point(91, 137)
+        Me.txtadresse3.Name = "txtadresse3"
+        Me.txtadresse3.Size = New System.Drawing.Size(228, 20)
+        Me.txtadresse3.TabIndex = 3
+        '
+        'Label3
+        '
+        Me.Label3.AutoSize = True
+        Me.Label3.BackColor = System.Drawing.Color.Transparent
+        Me.Label3.Location = New System.Drawing.Point(20, 141)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(54, 13)
+        Me.Label3.TabIndex = 302
+        Me.Label3.Text = "Adresse 3"
+        '
+        'txtstrasse
+        '
+        Me.txtstrasse.Location = New System.Drawing.Point(91, 163)
+        Me.txtstrasse.Name = "txtstrasse"
+        Me.txtstrasse.Size = New System.Drawing.Size(228, 20)
+        Me.txtstrasse.TabIndex = 4
+        '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.BackColor = System.Drawing.Color.Transparent
+        Me.Label4.Location = New System.Drawing.Point(20, 167)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(67, 13)
+        Me.Label4.TabIndex = 304
+        Me.Label4.Text = "Strasse / Nr."
+        '
+        'frmPrivatAnsprechpartner
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(442, 494)
+        Me.Controls.Add(Me.txtstrasse)
+        Me.Controls.Add(Me.Label4)
+        Me.Controls.Add(Me.txtadresse3)
+        Me.Controls.Add(Me.Label3)
+        Me.Controls.Add(Me.Button2)
+        Me.Controls.Add(Me.Button1)
+        Me.Controls.Add(Me.txtName)
+        Me.Controls.Add(Me.Label1)
+        Me.Controls.Add(Me.txtMutierer)
+        Me.Controls.Add(Me.txtMutiert_am)
+        Me.Controls.Add(Me.txtErstellt_am)
+        Me.Controls.Add(Me.Label18)
+        Me.Controls.Add(Me.Label17)
+        Me.Controls.Add(Me.Label16)
+        Me.Controls.Add(Me.txtBemerkung)
+        Me.Controls.Add(Me.Label2)
+        Me.Controls.Add(Me.txtadresse1)
+        Me.Controls.Add(Me.lblCO)
+        Me.Controls.Add(Me.txtadresse2)
+        Me.Controls.Add(Me.lblStrasse)
+        Me.Controls.Add(Me.txtPLZ)
+        Me.Controls.Add(Me.lblPLZOrt)
+        Me.Controls.Add(Me.txtOrt)
+        Me.Controls.Add(Me.txttelp)
+        Me.Controls.Add(Me.lblTelefon)
+        Me.Controls.Add(Me.lblemail)
+        Me.Controls.Add(Me.txtE_Mail)
+        Me.Name = "frmPrivatAnsprechpartner"
+        Me.Text = "Ansprechpartner-Adressen"
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+
+    Friend WithEvents txtMutierer As TextBox
+    Friend WithEvents txtMutiert_am As TextBox
+    Friend WithEvents txtErstellt_am As TextBox
+    Friend WithEvents Label18 As Label
+    Friend WithEvents Label17 As Label
+    Friend WithEvents Label16 As Label
+    Friend WithEvents txtBemerkung As TextBox
+    Friend WithEvents Label2 As Label
+    Friend WithEvents txtadresse1 As TextBox
+    Friend WithEvents lblCO As Label
+    Friend WithEvents txtadresse2 As TextBox
+    Friend WithEvents lblStrasse As Label
+    Friend WithEvents txtPLZ As TextBox
+    Friend WithEvents lblPLZOrt As Label
+    Friend WithEvents txtOrt As TextBox
+    Friend WithEvents txttelp As TextBox
+    Friend WithEvents lblTelefon As Label
+    Friend WithEvents lblemail As Label
+    Friend WithEvents txtE_Mail As TextBox
+    Friend WithEvents txtName As TextBox
+    Friend WithEvents Label1 As Label
+    Friend WithEvents Button1 As Button
+    Friend WithEvents Button2 As Button
+    Friend WithEvents txtadresse3 As TextBox
+    Friend WithEvents Label3 As Label
+    Friend WithEvents txtstrasse As TextBox
+    Friend WithEvents Label4 As Label
+End Class

DPM2016/Patient/frmPrivatAnsprechpartner.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

DPM2016/Patient/frmPrivatAnsprechpartner.vb

@@ -0,0 +1,105 @@
+Public Class frmPrivatAnsprechpartner
+    Dim db As New clsDB
+    Dim m_nrprivat As Integer
+    Property nrprivat As Integer
+        Get
+            Return m_nrprivat
+        End Get
+        Set(value As Integer)
+            m_nrprivat = value
+        End Set
+    End Property
+
+    Dim m_id As Integer
+    Property id As Integer
+        Get
+            Return m_id
+        End Get
+        Set(value As Integer)
+            m_id = value
+        End Set
+    End Property
+
+    Dim m_isnew As Boolean
+    Property is_new As Boolean
+        Get
+            Return m_isnew
+        End Get
+        Set(value As Boolean)
+            m_isnew = value
+        End Set
+    End Property
+
+    Private Sub frmPrivatAnsprechpartner_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        If id > 0 Then
+            db.Get_Tabledata("Ansprechpartner", "", "Select * from privat_ansprechpartner where id=" + Me.id.ToString)
+            Fill_Form()
+        End If
+
+        If is_new Then
+            db.Get_Tabledata("Ansprechpartner", "", "Select top 1 * from privat_ansprechpartner order by id desc")
+            Dim idnew As Integer
+            If db.dsDaten.Tables(0).Rows.Count = 0 Then idnew = 1 Else idnew = db.dsDaten.Tables(0).Rows(0).Item(0) + 1
+            Me.id = idnew
+            db.Exec_SQL("Insert Privat_Ansprechpartner (id,nrprivat, erstellt_am, mutiert_am, mutierer,aktiv) values(" + idnew.ToString + "," + Me.nrprivat.ToString + ",'" + Now.ToString + "','" + Now.ToString + "'," + Globals.ActUser.ToString + ",1)")
+            db.Get_Tabledata("Ansprechpartner", "", "Select * from privat_ansprechpartner where id=" + Me.id.ToString)
+            Me.txtName.Text = ""
+            Me.txtadresse1.Text = ""
+            Me.txtadresse2.Text = ""
+            Me.txtPLZ.Text = ""
+            Me.txtOrt.Text = ""
+            Me.txttelp.Text = ""
+            Me.txtE_Mail.Text = ""
+            Me.txtBemerkung.Text = ""
+            Me.txtErstellt_am.Text = Now.ToString
+            Me.txtMutiert_am.Text = Now.ToString
+            Me.txtMutierer.Text = Globals.ActUser
+            Me.id = idnew
+            update_data()
+        End If
+    End Sub
+
+    Private Sub Fill_Form()
+        Me.txtName.Text = db.dsDaten.Tables(0).Rows(0).Item("Name")
+        Me.txtadresse1.Text = db.dsDaten.Tables(0).Rows(0).Item("Adresse1")
+        Me.txtadresse2.Text = db.dsDaten.Tables(0).Rows(0).Item("adresse2")
+        Me.txtadresse3.Text = db.dsDaten.Tables(0).Rows(0).Item("adresse3")
+        Me.txtstrasse.Text = db.dsDaten.Tables(0).Rows(0).Item("strasse")
+        Me.txtPLZ.Text = db.dsDaten.Tables(0).Rows(0).Item("plz")
+        Me.txtOrt.Text = db.dsDaten.Tables(0).Rows(0).Item("ort")
+        Me.txttelp.Text = db.dsDaten.Tables(0).Rows(0).Item("telefon")
+        Me.txtE_Mail.Text = db.dsDaten.Tables(0).Rows(0).Item("email")
+        Me.txtBemerkung.Text = db.dsDaten.Tables(0).Rows(0).Item("bemerkung")
+        Me.txtErstellt_am.Text = db.dsDaten.Tables(0).Rows(0).Item("erstellt_am").ToString
+        Me.txtMutiert_am.Text = db.dsDaten.Tables(0).Rows(0).Item("mutiert_am").ToString
+        Me.txtMutierer.Text = db.dsDaten.Tables(0).Rows(0).Item("mutierer").ToString
+    End Sub
+
+    Sub update_data()
+        db.dsDaten.Tables(0).Rows(0).Item("Name") = Me.txtName.Text
+        db.dsDaten.Tables(0).Rows(0).Item("Adresse1") = Me.txtadresse1.Text
+        db.dsDaten.Tables(0).Rows(0).Item("adresse2") = Me.txtadresse2.Text
+        db.dsDaten.Tables(0).Rows(0).Item("adresse3") = Me.txtadresse3.Text
+        db.dsDaten.Tables(0).Rows(0).Item("strasse") = Me.txtstrasse.Text
+        db.dsDaten.Tables(0).Rows(0).Item("plz") = Me.txtPLZ.Text
+        db.dsDaten.Tables(0).Rows(0).Item("ort") = Me.txtOrt.Text
+        db.dsDaten.Tables(0).Rows(0).Item("telefon") = Me.txttelp.Text
+        db.dsDaten.Tables(0).Rows(0).Item("email") = Me.txtE_Mail.Text
+        db.dsDaten.Tables(0).Rows(0).Item("bemerkung") = Me.txtBemerkung.Text
+        db.dsDaten.Tables(0).Rows(0).Item("mutierer") = Globals.ActUser
+        db.dsDaten.Tables(0).Rows(0).Item("mutiert_am") = Now
+        db.Update_Data()
+
+    End Sub
+
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+        update_data()
+        Me.DialogResult = DialogResult.OK
+        Me.Close()
+    End Sub
+
+    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
+        Me.DialogResult = DialogResult.Cancel
+        Me.Close()
+    End Sub
+End Class

DPM2016/Patient/subclasses/PatientDetailsFirma.Designer.vb

@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class PatientDetailsFirma
     Inherits System.Windows.Forms.UserControl
 
     'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
     Protected Overrides Sub Dispose(ByVal disposing As Boolean)
         Try
             If disposing AndAlso components IsNot Nothing Then
@@ -20,8 +20,9 @@ Partial Class PatientDetailsFirma
     'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
     'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
         Me.chkMail_Kommunikation = New System.Windows.Forms.CheckBox()
         Me.Label4 = New System.Windows.Forms.Label()
         Me.txtZSR = New System.Windows.Forms.TextBox()
@@ -86,6 +87,9 @@ Partial Class PatientDetailsFirma
         Me.lblTitel = New System.Windows.Forms.Label()
         Me.Label5 = New System.Windows.Forms.Label()
         Me.Label6 = New System.Windows.Forms.Label()
+        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.NeuerAnsprechpartnerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.BearbeitenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ClsStammdaten_flat1 = New DPM2016.clsStammdaten_flat()
         Me.cbboxNRArbeitgeber = New DPM2016.MyCombobox()
         Me.cbboxGeschlecht = New DPM2016.MyCombobox()
@@ -93,6 +97,7 @@ Partial Class PatientDetailsFirma
         Me.cbboxStatus = New DPM2016.MyCombobox()
         Me.cbboxNRTitel = New DPM2016.MyCombobox()
         Me.cbboxNrAnrede = New DPM2016.MyCombobox()
+        Me.ContextMenuStrip1.SuspendLayout()
         Me.SuspendLayout()
         '
         'chkMail_Kommunikation
@@ -696,7 +701,6 @@ Partial Class PatientDetailsFirma
         Me.Label5.Size = New System.Drawing.Size(55, 13)
         Me.Label5.TabIndex = 282
         Me.Label5.Text = "Ansprech-"
-        Me.Label5.Visible = False
         '
         'Label6
         '
@@ -707,19 +711,37 @@ Partial Class PatientDetailsFirma
         Me.Label6.Size = New System.Drawing.Size(41, 13)
         Me.Label6.TabIndex = 283
         Me.Label6.Text = "Partner"
-        Me.Label6.Visible = False
+        '
+        'ContextMenuStrip1
+        '
+        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeuerAnsprechpartnerToolStripMenuItem, Me.BearbeitenToolStripMenuItem})
+        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(198, 48)
+        '
+        'NeuerAnsprechpartnerToolStripMenuItem
+        '
+        Me.NeuerAnsprechpartnerToolStripMenuItem.Name = "NeuerAnsprechpartnerToolStripMenuItem"
+        Me.NeuerAnsprechpartnerToolStripMenuItem.Size = New System.Drawing.Size(197, 22)
+        Me.NeuerAnsprechpartnerToolStripMenuItem.Text = "Neuer Ansprechpartner"
+        '
+        'BearbeitenToolStripMenuItem
+        '
+        Me.BearbeitenToolStripMenuItem.Name = "BearbeitenToolStripMenuItem"
+        Me.BearbeitenToolStripMenuItem.Size = New System.Drawing.Size(197, 22)
+        Me.BearbeitenToolStripMenuItem.Text = "Bearbeiten"
         '
         'ClsStammdaten_flat1
         '
+        Me.ClsStammdaten_flat1.AllowAddNew = True
         Me.ClsStammdaten_flat1.Connectionstring = "data source=shu00;initial catalog=SHUB_PADM;persist security info=false;workstati" &
     "on id=;packet size=4096;user id=sa;password=*shu29"
+        Me.ClsStammdaten_flat1.ContextMenuStrip = Me.ContextMenuStrip1
         Me.ClsStammdaten_flat1.Location = New System.Drawing.Point(79, 336)
         Me.ClsStammdaten_flat1.Name = "ClsStammdaten_flat1"
-        Me.ClsStammdaten_flat1.Size = New System.Drawing.Size(634, 119)
+        Me.ClsStammdaten_flat1.Size = New System.Drawing.Size(634, 178)
         Me.ClsStammdaten_flat1.SQL = ""
         Me.ClsStammdaten_flat1.TabIndex = 281
         Me.ClsStammdaten_flat1.Tablename = Nothing
-        Me.ClsStammdaten_flat1.Visible = False
         '
         'cbboxNRArbeitgeber
         '
@@ -876,9 +898,10 @@ Partial Class PatientDetailsFirma
         Me.Controls.Add(Me.lblNr)
         Me.Controls.Add(Me.lblAnrede)
         Me.Controls.Add(Me.lblTitel)
-        Me.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+        Me.Margin = New System.Windows.Forms.Padding(2)
         Me.Name = "PatientDetailsFirma"
-        Me.Size = New System.Drawing.Size(729, 477)
+        Me.Size = New System.Drawing.Size(729, 535)
+        Me.ContextMenuStrip1.ResumeLayout(False)
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -955,4 +978,7 @@ Partial Class PatientDetailsFirma
     Friend WithEvents ClsStammdaten_flat1 As clsStammdaten_flat
     Friend WithEvents Label5 As Label
     Friend WithEvents Label6 As Label
+    Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
+    Friend WithEvents NeuerAnsprechpartnerToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents BearbeitenToolStripMenuItem As ToolStripMenuItem
 End Class

DPM2016/Patient/subclasses/PatientDetailsFirma.resx

@@ -117,4 +117,7 @@
   <resheader name="writer">
     <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=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>

DPM2016/Patient/subclasses/PatientDetailsFirma.vb

@@ -23,6 +23,8 @@ Public Class PatientDetailsFirma
             Catch ex As Exception
                 log.Writelog("Partnerdetails: Property PatientNr: " + ex.Message, clsLog.Logtype.ApplError)
             End Try
+            Me.Label13.Visible = False
+            Me.chklbAdresstyp.Visible = False
             Me.ResumeLayout()
         End Set
     End Property
@@ -383,6 +385,10 @@ Public Class PatientDetailsFirma
                 End If
 
             Next
+            Me.ClsStammdaten_flat1.SQL = "Select * from privat_ansprechpartner where nrprivat=" + Me.PatientNr.ToString
+            Me.ClsStammdaten_flat1.AllowAddNew = False
+            Me.ClsStammdaten_flat1.Tablename = "Privat_Ansprechpartner"
+            Me.ClsStammdaten_flat1.get_data()
         Catch ex As Exception
             log.Writelog("Privatdetails: Get_Data: " + ctlname + " / " + colname + " " + ex.Message, clsLog.Logtype.ApplError)
         End Try
@@ -565,4 +571,26 @@ Public Class PatientDetailsFirma
     Private Sub txtName_TextChanged(sender As Object, e As EventArgs) Handles txtName.TextChanged
 
     End Sub
+
+    Private Sub ClsStammdaten_flat1_Load(sender As Object, e As EventArgs) Handles ClsStammdaten_flat1.Load
+
+    End Sub
+
+    Private Sub NeuerAnsprechpartnerToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles NeuerAnsprechpartnerToolStripMenuItem.Click
+        Dim f As New frmPrivatAnsprechpartner
+        f.is_new = True
+        f.id = 0
+        f.nrprivat = txtnrprivat.Text
+        f.ShowDialog()
+        If f.DialogResult = DialogResult.OK Then Me.ClsStammdaten_flat1.get_data()
+
+    End Sub
+
+    Private Sub BearbeitenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles BearbeitenToolStripMenuItem.Click
+        Dim f As New frmPrivatAnsprechpartner
+        f.is_new = False
+        f.id = Me.ClsStammdaten_flat1.c1daten.Columns(0).Value
+        f.nrprivat = txtnrprivat.Text
+        f.ShowDialog()
+    End Sub
 End Class

DPM2016/Program.vb

@@ -1,45 +1,45 @@
-Imports System.Threading
+Imports System.Threading
-
+
-Module Program
+Module Program
-
+
-
+
-
+
-    Public splashForm As SplashForm = Nothing
+    Public splashForm As SplashForm = Nothing
-
+
-
+
-
+
-    Public Sub Main()
+    Public Sub Main()
-        Application.EnableVisualStyles()
+        Application.EnableVisualStyles()
-        Application.SetCompatibleTextRenderingDefault(False)
+        Application.SetCompatibleTextRenderingDefault(False)
-        Dim mainForm As Form = New frmMain
+        Dim mainForm As Form = New frmMain
-        AddHandler mainForm.Load, AddressOf mainForm_Load
+        AddHandler mainForm.Load, AddressOf mainForm_Load
-
+
-        Dim splashThread As New Thread(New ThreadStart(Sub()
+        Dim splashThread As New Thread(New ThreadStart(Sub()
-                                                           splashForm = New SplashForm()
+                                                           splashForm = New SplashForm()
-                                                           Application.Run(splashForm)
+                                                           Application.Run(splashForm)
-                                                       End Sub))
+                                                       End Sub))
-        splashThread.SetApartmentState(ApartmentState.STA)
+        splashThread.SetApartmentState(ApartmentState.STA)
-        'splashThread.Start()
+        splashThread.Start()
-
+
-        Application.Run(mainForm)
+        Application.Run(mainForm)
-        mainForm.BringToFront()
+        mainForm.BringToFront()
-
+
-
+
-
+
-    End Sub
+    End Sub
-
+
-
+
-
+
-    Private Sub mainForm_Load(sender As Object, e As EventArgs)
+    Private Sub mainForm_Load(sender As Object, e As EventArgs)
-        If splashForm Is Nothing Then
+        If splashForm Is Nothing Then
-            Return
+            Return
-        End If
+        End If
-        Try
+        Try
-            splashForm.Invoke(Sub() splashForm.Close())
+            splashForm.Invoke(Sub() splashForm.Close())
-        Catch
+        Catch
-        End Try
+        End Try
-
+
-        splashForm.Dispose()
+        splashForm.Dispose()
-        splashForm = Nothing
+        splashForm = Nothing
-    End Sub
+    End Sub
-End Module
+End Module

DPM2016/Sysadmin/frmStammdaten.Designer.vb

@@ -1,300 +1,304 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
-Partial Class frmStammdaten
+Partial Class frmStammdaten
-    Inherits System.Windows.Forms.Form
+    Inherits System.Windows.Forms.Form
-
+
-    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()>
+    <System.Diagnostics.DebuggerNonUserCode()>
-    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
-        Try
+        Try
-            If disposing AndAlso components IsNot Nothing Then
+            If disposing AndAlso components IsNot Nothing Then
-                components.Dispose()
+                components.Dispose()
-            End If
+            End If
-        Finally
+        Finally
-            MyBase.Dispose(disposing)
+            MyBase.Dispose(disposing)
-        End Try
+        End Try
-    End Sub
+    End Sub
-
+
-    'Wird vom Windows Form-Designer benötigt.
+    'Wird vom Windows Form-Designer benötigt.
-    Private components As System.ComponentModel.IContainer
+    Private components As System.ComponentModel.IContainer
-
+
-    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
-    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
-    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()>
+    <System.Diagnostics.DebuggerStepThrough()>
-    Private Sub InitializeComponent()
+    Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
+        Me.components = New System.ComponentModel.Container()
-        Dim TreeNode1 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Konto")
+        Dim TreeNode1 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Konto")
-        Dim TreeNode2 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Finanzen", New System.Windows.Forms.TreeNode() {TreeNode1})
+        Dim TreeNode2 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Finanzen", New System.Windows.Forms.TreeNode() {TreeNode1})
-        Dim TreeNode3 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Anreden")
+        Dim TreeNode3 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Anreden")
-        Dim TreeNode4 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Titel")
+        Dim TreeNode4 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Titel")
-        Dim TreeNode5 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Orte")
+        Dim TreeNode5 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Orte")
-        Dim TreeNode6 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Status")
+        Dim TreeNode6 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Status")
-        Dim TreeNode7 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Patienten", New System.Windows.Forms.TreeNode() {TreeNode3, TreeNode4, TreeNode5, TreeNode6})
+        Dim TreeNode7 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Patienten", New System.Windows.Forms.TreeNode() {TreeNode3, TreeNode4, TreeNode5, TreeNode6})
-        Dim TreeNode8 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Tarif")
+        Dim TreeNode8 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Tarif")
-        Dim TreeNode9 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Tarife")
+        Dim TreeNode9 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Tarife")
-        Dim TreeNode10 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("TarifGruppe")
+        Dim TreeNode10 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("TarifGruppe")
-        Dim TreeNode11 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Taxpunkte")
+        Dim TreeNode11 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Taxpunkte")
-        Dim TreeNode12 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Tarifpakete")
+        Dim TreeNode12 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Tarifpakete")
-        Dim TreeNode13 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Paketpositionen")
+        Dim TreeNode13 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Paketpositionen")
-        Dim TreeNode14 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Dentotar")
+        Dim TreeNode14 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Dentotar")
-        Dim TreeNode15 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Dentotar_Parameter")
+        Dim TreeNode15 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Dentotar_Parameter")
-        Dim TreeNode16 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Zahntechnik (223)")
+        Dim TreeNode16 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Zahntechnik (223)")
-        Dim TreeNode17 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Tarif", New System.Windows.Forms.TreeNode() {TreeNode8, TreeNode9, TreeNode10, TreeNode11, TreeNode12, TreeNode13, TreeNode14, TreeNode15, TreeNode16})
+        Dim TreeNode17 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Produkt Zusatz")
-        Dim TreeNode18 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Ansatz")
+        Dim TreeNode18 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Produkt Zusatz Details")
-        Dim TreeNode19 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Abrechnungstyp")
+        Dim TreeNode19 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Tarif", New System.Windows.Forms.TreeNode() {TreeNode8, TreeNode9, TreeNode10, TreeNode11, TreeNode12, TreeNode13, TreeNode14, TreeNode15, TreeNode16, TreeNode17, TreeNode18})
-        Dim TreeNode20 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Formulartyp / Einzahlungsschein")
+        Dim TreeNode20 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Ansatz")
-        Dim TreeNode21 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Rechnungstyp")
+        Dim TreeNode21 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Abrechnungstyp")
-        Dim TreeNode22 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Standards")
+        Dim TreeNode22 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Formulartyp / Einzahlungsschein")
-        Dim TreeNode23 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Rechnungstexte")
+        Dim TreeNode23 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Rechnungstyp")
-        Dim TreeNode24 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Abrechnung", New System.Windows.Forms.TreeNode() {TreeNode18, TreeNode19, TreeNode20, TreeNode21, TreeNode22, TreeNode23})
+        Dim TreeNode24 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Standards")
-        Dim TreeNode25 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Behandlungsart")
+        Dim TreeNode25 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Rechnungstexte")
-        Dim TreeNode26 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Gesetz")
+        Dim TreeNode26 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Abrechnung", New System.Windows.Forms.TreeNode() {TreeNode20, TreeNode21, TreeNode22, TreeNode23, TreeNode24, TreeNode25})
-        Dim TreeNode27 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Diverse Stammdaten", New System.Windows.Forms.TreeNode() {TreeNode25, TreeNode26})
+        Dim TreeNode27 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Behandlungsart")
-        Dim TreeNode28 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Auswertung")
+        Dim TreeNode28 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Gesetz")
-        Dim TreeNode29 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Reporting")
+        Dim TreeNode29 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Diverse Stammdaten", New System.Windows.Forms.TreeNode() {TreeNode27, TreeNode28})
-        Dim TreeNode30 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Auswertung_Statistiken", New System.Windows.Forms.TreeNode() {TreeNode28, TreeNode29})
+        Dim TreeNode30 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Auswertung")
-        Dim TreeNode31 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Einstellungen")
+        Dim TreeNode31 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Reporting")
-        Dim TreeNode32 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Struktur")
+        Dim TreeNode32 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Auswertung_Statistiken", New System.Windows.Forms.TreeNode() {TreeNode30, TreeNode31})
-        Dim TreeNode33 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("DokumentManagement", New System.Windows.Forms.TreeNode() {TreeNode31, TreeNode32})
+        Dim TreeNode33 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Einstellungen")
-        Dim TreeNode34 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Spalten")
+        Dim TreeNode34 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Struktur")
-        Dim TreeNode35 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Options")
+        Dim TreeNode35 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("DokumentManagement", New System.Windows.Forms.TreeNode() {TreeNode33, TreeNode34})
-        Dim TreeNode36 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("User")
+        Dim TreeNode36 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Spalten")
-        Dim TreeNode37 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Absender")
+        Dim TreeNode37 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Options")
-        Dim TreeNode38 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Konto-Angaben")
+        Dim TreeNode38 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("User")
-        Dim TreeNode39 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("MailTexte")
+        Dim TreeNode39 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Absender")
-        Dim TreeNode40 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("MailTexte_Replacer")
+        Dim TreeNode40 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Konto-Angaben")
-        Dim TreeNode41 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Diverse", New System.Windows.Forms.TreeNode() {TreeNode34, TreeNode35, TreeNode36, TreeNode37, TreeNode38, TreeNode39, TreeNode40})
+        Dim TreeNode41 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("MailTexte")
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmStammdaten))
+        Dim TreeNode42 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("MailTexte_Replacer")
-        Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
+        Dim TreeNode43 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Diverse", New System.Windows.Forms.TreeNode() {TreeNode36, TreeNode37, TreeNode38, TreeNode39, TreeNode40, TreeNode41, TreeNode42})
-        Me.SchliessenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmStammdaten))
-        Me.DentotarImportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
-        Me.TreeView1 = New System.Windows.Forms.TreeView()
+        Me.SchliessenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.C1TrueDBGrid1 = New C1.Win.C1TrueDBGrid.C1TrueDBGrid()
+        Me.DentotarImportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
+        Me.TreeView1 = New System.Windows.Forms.TreeView()
-        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.C1TrueDBGrid1 = New C1.Win.C1TrueDBGrid.C1TrueDBGrid()
-        Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
-        Me.ClsStammdaten_Bez1 = New DPM2016.clsStammdaten_Bez()
+        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.ClsStammdaten_flat1 = New DPM2016.clsStammdaten_flat()
+        Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.MenuStrip1.SuspendLayout()
+        Me.ClsStammdaten_Bez1 = New DPM2016.clsStammdaten_Bez()
-        CType(Me.C1TrueDBGrid1, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.ClsStammdaten_flat1 = New DPM2016.clsStammdaten_flat()
-        Me.SuspendLayout()
+        Me.MenuStrip1.SuspendLayout()
-        '
+        CType(Me.C1TrueDBGrid1, System.ComponentModel.ISupportInitialize).BeginInit()
-        'MenuStrip1
+        Me.SuspendLayout()
-        '
+        '
-        Me.MenuStrip1.AllowMerge = False
+        'MenuStrip1
-        Me.MenuStrip1.ImageScalingSize = New System.Drawing.Size(20, 20)
+        '
-        Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SchliessenToolStripMenuItem, Me.DentotarImportToolStripMenuItem})
+        Me.MenuStrip1.AllowMerge = False
-        Me.MenuStrip1.Location = New System.Drawing.Point(0, 0)
+        Me.MenuStrip1.ImageScalingSize = New System.Drawing.Size(20, 20)
-        Me.MenuStrip1.Name = "MenuStrip1"
+        Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SchliessenToolStripMenuItem, Me.DentotarImportToolStripMenuItem})
-        Me.MenuStrip1.Padding = New System.Windows.Forms.Padding(5, 2, 0, 2)
+        Me.MenuStrip1.Location = New System.Drawing.Point(0, 0)
-        Me.MenuStrip1.Size = New System.Drawing.Size(1276, 28)
+        Me.MenuStrip1.Name = "MenuStrip1"
-        Me.MenuStrip1.TabIndex = 0
+        Me.MenuStrip1.Padding = New System.Windows.Forms.Padding(4, 2, 0, 2)
-        Me.MenuStrip1.Text = "MenuStrip1"
+        Me.MenuStrip1.Size = New System.Drawing.Size(1200, 24)
-        '
+        Me.MenuStrip1.TabIndex = 0
-        'SchliessenToolStripMenuItem
+        Me.MenuStrip1.Text = "MenuStrip1"
-        '
+        '
-        Me.SchliessenToolStripMenuItem.Name = "SchliessenToolStripMenuItem"
+        'SchliessenToolStripMenuItem
-        Me.SchliessenToolStripMenuItem.Size = New System.Drawing.Size(90, 24)
+        '
-        Me.SchliessenToolStripMenuItem.Text = "&Schliessen"
+        Me.SchliessenToolStripMenuItem.Name = "SchliessenToolStripMenuItem"
-        '
+        Me.SchliessenToolStripMenuItem.Size = New System.Drawing.Size(73, 20)
-        'DentotarImportToolStripMenuItem
+        Me.SchliessenToolStripMenuItem.Text = "&Schliessen"
-        '
+        '
-        Me.DentotarImportToolStripMenuItem.Name = "DentotarImportToolStripMenuItem"
+        'DentotarImportToolStripMenuItem
-        Me.DentotarImportToolStripMenuItem.Size = New System.Drawing.Size(133, 24)
+        '
-        Me.DentotarImportToolStripMenuItem.Text = "Dentotar-Import"
+        Me.DentotarImportToolStripMenuItem.Name = "DentotarImportToolStripMenuItem"
-        '
+        Me.DentotarImportToolStripMenuItem.Size = New System.Drawing.Size(106, 20)
-        'TreeView1
+        Me.DentotarImportToolStripMenuItem.Text = "Dentotar-Import"
-        '
+        '
-        Me.TreeView1.Dock = System.Windows.Forms.DockStyle.Left
+        'TreeView1
-        Me.TreeView1.Location = New System.Drawing.Point(0, 28)
+        '
-        Me.TreeView1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.TreeView1.Dock = System.Windows.Forms.DockStyle.Left
-        Me.TreeView1.Name = "TreeView1"
+        Me.TreeView1.Location = New System.Drawing.Point(0, 24)
-        TreeNode1.Name = "Konto"
+        Me.TreeView1.Name = "TreeView1"
-        TreeNode1.Text = "Konto"
+        TreeNode1.Name = "Konto"
-        TreeNode2.Name = "Knoten0"
+        TreeNode1.Text = "Konto"
-        TreeNode2.Text = "Finanzen"
+        TreeNode2.Name = "Knoten0"
-        TreeNode3.Name = "Anrede"
+        TreeNode2.Text = "Finanzen"
-        TreeNode3.Text = "Anreden"
+        TreeNode3.Name = "Anrede"
-        TreeNode4.Name = "Titel"
+        TreeNode3.Text = "Anreden"
-        TreeNode4.Text = "Titel"
+        TreeNode4.Name = "Titel"
-        TreeNode5.Name = "Orte"
+        TreeNode4.Text = "Titel"
-        TreeNode5.Tag = "Demo"
+        TreeNode5.Name = "Orte"
-        TreeNode5.Text = "Orte"
+        TreeNode5.Tag = "Demo"
-        TreeNode6.Name = "Status"
+        TreeNode5.Text = "Orte"
-        TreeNode6.Text = "Status"
+        TreeNode6.Name = "Status"
-        TreeNode7.Name = "Knoten7"
+        TreeNode6.Text = "Status"
-        TreeNode7.Text = "Patienten"
+        TreeNode7.Name = "Knoten7"
-        TreeNode8.Name = "Tarif"
+        TreeNode7.Text = "Patienten"
-        TreeNode8.Tag = "Demo"
+        TreeNode8.Name = "Tarif"
-        TreeNode8.Text = "Tarif"
+        TreeNode8.Tag = "Demo"
-        TreeNode9.Name = "Tarife"
+        TreeNode8.Text = "Tarif"
-        TreeNode9.Text = "Tarife"
+        TreeNode9.Name = "Tarife"
-        TreeNode10.Name = "tarifgrp"
+        TreeNode9.Text = "Tarife"
-        TreeNode10.Text = "TarifGruppe"
+        TreeNode10.Name = "tarifgrp"
-        TreeNode11.Name = "Taxpunkt"
+        TreeNode10.Text = "TarifGruppe"
-        TreeNode11.Text = "Taxpunkte"
+        TreeNode11.Name = "Taxpunkt"
-        TreeNode12.Name = "Tarpaket"
+        TreeNode11.Text = "Taxpunkte"
-        TreeNode12.Text = "Tarifpakete"
+        TreeNode12.Name = "Tarpaket"
-        TreeNode13.Name = "Paketpositionen"
+        TreeNode12.Text = "Tarifpakete"
-        TreeNode13.Tag = "nrpaket;paketbezeichnung;nrtarif;sso_nummer;TarPaket;Tarif;Paketpos"
+        TreeNode13.Name = "Paketpositionen"
-        TreeNode13.Text = "Paketpositionen"
+        TreeNode13.Tag = "nrpaket;paketbezeichnung;nrtarif;sso_nummer;TarPaket;Tarif;Paketpos"
-        TreeNode14.Name = "Dentotar"
+        TreeNode13.Text = "Paketpositionen"
-        TreeNode14.Tag = "Demo"
+        TreeNode14.Name = "Dentotar"
-        TreeNode14.Text = "Dentotar"
+        TreeNode14.Tag = "Demo"
-        TreeNode15.Name = "Dentotar_Parameter"
+        TreeNode14.Text = "Dentotar"
-        TreeNode15.Tag = "Demo"
+        TreeNode15.Name = "Dentotar_Parameter"
-        TreeNode15.Text = "Dentotar_Parameter"
+        TreeNode15.Tag = "Demo"
-        TreeNode16.Name = "Dentotar_223"
+        TreeNode15.Text = "Dentotar_Parameter"
-        TreeNode16.Text = "Zahntechnik (223)"
+        TreeNode16.Name = "Dentotar_223"
-        TreeNode17.Name = "Knoten8"
+        TreeNode16.Text = "Zahntechnik (223)"
-        TreeNode17.Text = "Tarif"
+        TreeNode17.Name = "ProduktZusatz"
-        TreeNode18.Name = "Ansatz"
+        TreeNode17.Text = "Produkt Zusatz"
-        TreeNode18.Tag = "Demo"
+        TreeNode18.Name = "ProduktZusatzDetail"
-        TreeNode18.Text = "Ansatz"
+        TreeNode18.Text = "Produkt Zusatz Details"
-        TreeNode19.Name = "Abrtyp"
+        TreeNode19.Name = "Knoten8"
-        TreeNode19.Text = "Abrechnungstyp"
+        TreeNode19.Text = "Tarif"
-        TreeNode20.Name = "ESTyp"
+        TreeNode20.Name = "Ansatz"
-        TreeNode20.Text = "Formulartyp / Einzahlungsschein"
+        TreeNode20.Tag = "Demo"
-        TreeNode21.Name = "RGTyp"
+        TreeNode20.Text = "Ansatz"
-        TreeNode21.Text = "Rechnungstyp"
+        TreeNode21.Name = "Abrtyp"
-        TreeNode22.Name = "Standards"
+        TreeNode21.Text = "Abrechnungstyp"
-        TreeNode22.Text = "Standards"
+        TreeNode22.Name = "ESTyp"
-        TreeNode23.Name = "Rechtext"
+        TreeNode22.Text = "Formulartyp / Einzahlungsschein"
-        TreeNode23.Text = "Rechnungstexte"
+        TreeNode23.Name = "RGTyp"
-        TreeNode24.Name = "Knoten14"
+        TreeNode23.Text = "Rechnungstyp"
-        TreeNode24.Text = "Abrechnung"
+        TreeNode24.Name = "Standards"
-        TreeNode25.Name = "Behandlungsart"
+        TreeNode24.Text = "Standards"
-        TreeNode25.Text = "Behandlungsart"
+        TreeNode25.Name = "Rechtext"
-        TreeNode26.Name = "Gesetz"
+        TreeNode25.Text = "Rechnungstexte"
-        TreeNode26.Tag = "Demo"
+        TreeNode26.Name = "Knoten14"
-        TreeNode26.Text = "Gesetz"
+        TreeNode26.Text = "Abrechnung"
-        TreeNode27.Name = "Diverse Stammdaten"
+        TreeNode27.Name = "Behandlungsart"
-        TreeNode27.Text = "Diverse Stammdaten"
+        TreeNode27.Text = "Behandlungsart"
-        TreeNode28.Name = "Auswertung"
+        TreeNode28.Name = "Gesetz"
-        TreeNode28.Text = "Auswertung"
+        TreeNode28.Tag = "Demo"
-        TreeNode29.Name = "Reporting"
+        TreeNode28.Text = "Gesetz"
-        TreeNode29.Text = "Reporting"
+        TreeNode29.Name = "Diverse Stammdaten"
-        TreeNode30.Name = "Auswertung_Statistiken"
+        TreeNode29.Text = "Diverse Stammdaten"
-        TreeNode30.Text = "Auswertung_Statistiken"
+        TreeNode30.Name = "Auswertung"
-        TreeNode31.Name = "dms_settings"
+        TreeNode30.Text = "Auswertung"
-        TreeNode31.Tag = "DMS"
+        TreeNode31.Name = "Reporting"
-        TreeNode31.Text = "Einstellungen"
+        TreeNode31.Text = "Reporting"
-        TreeNode32.Name = "DMS_Struktur"
+        TreeNode32.Name = "Auswertung_Statistiken"
-        TreeNode32.Tag = "DMS"
+        TreeNode32.Text = "Auswertung_Statistiken"
-        TreeNode32.Text = "Struktur"
+        TreeNode33.Name = "dms_settings"
-        TreeNode33.Name = "DokumentManagement"
+        TreeNode33.Tag = "DMS"
-        TreeNode33.Tag = "DMS"
+        TreeNode33.Text = "Einstellungen"
-        TreeNode33.Text = "DokumentManagement"
+        TreeNode34.Name = "DMS_Struktur"
-        TreeNode34.Name = "Spalten"
+        TreeNode34.Tag = "DMS"
-        TreeNode34.Text = "Spalten"
+        TreeNode34.Text = "Struktur"
-        TreeNode35.Name = "Options"
+        TreeNode35.Name = "DokumentManagement"
-        TreeNode35.Text = "Options"
+        TreeNode35.Tag = "DMS"
-        TreeNode36.Name = "User"
+        TreeNode35.Text = "DokumentManagement"
-        TreeNode36.Text = "User"
+        TreeNode36.Name = "Spalten"
-        TreeNode37.Name = "Absender"
+        TreeNode36.Text = "Spalten"
-        TreeNode37.Text = "Absender"
+        TreeNode37.Name = "Options"
-        TreeNode38.Name = "vdkonti"
+        TreeNode37.Text = "Options"
-        TreeNode38.Text = "Konto-Angaben"
+        TreeNode38.Name = "User"
-        TreeNode39.Name = "MailTexte"
+        TreeNode38.Text = "User"
-        TreeNode39.Text = "MailTexte"
+        TreeNode39.Name = "Absender"
-        TreeNode40.Name = "MailTexte_Replacer"
+        TreeNode39.Text = "Absender"
-        TreeNode40.Text = "MailTexte_Replacer"
+        TreeNode40.Name = "vdkonti"
-        TreeNode41.Name = "Diverse"
+        TreeNode40.Text = "Konto-Angaben"
-        TreeNode41.Text = "Diverse"
+        TreeNode41.Name = "MailTexte"
-        Me.TreeView1.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode2, TreeNode7, TreeNode17, TreeNode24, TreeNode27, TreeNode30, TreeNode33, TreeNode41})
+        TreeNode41.Text = "MailTexte"
-        Me.TreeView1.Size = New System.Drawing.Size(271, 525)
+        TreeNode42.Name = "MailTexte_Replacer"
-        Me.TreeView1.TabIndex = 1
+        TreeNode42.Text = "MailTexte_Replacer"
-        '
+        TreeNode43.Name = "Diverse"
-        'C1TrueDBGrid1
+        TreeNode43.Text = "Diverse"
-        '
+        Me.TreeView1.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode2, TreeNode7, TreeNode19, TreeNode26, TreeNode29, TreeNode32, TreeNode35, TreeNode43})
-        Me.C1TrueDBGrid1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.TreeView1.Size = New System.Drawing.Size(204, 425)
-        Me.C1TrueDBGrid1.GroupByCaption = "Drag a column header here to group by that column"
+        Me.TreeView1.TabIndex = 1
-        Me.C1TrueDBGrid1.Images.Add(CType(resources.GetObject("C1TrueDBGrid1.Images"), System.Drawing.Image))
+        '
-        Me.C1TrueDBGrid1.Location = New System.Drawing.Point(271, 28)
+        'C1TrueDBGrid1
-        Me.C1TrueDBGrid1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        '
-        Me.C1TrueDBGrid1.Name = "C1TrueDBGrid1"
+        Me.C1TrueDBGrid1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.C1TrueDBGrid1.PreviewInfo.Location = New System.Drawing.Point(0, 0)
+        Me.C1TrueDBGrid1.GroupByCaption = "Drag a column header here to group by that column"
-        Me.C1TrueDBGrid1.PreviewInfo.Size = New System.Drawing.Size(0, 0)
+        Me.C1TrueDBGrid1.Images.Add(CType(resources.GetObject("C1TrueDBGrid1.Images"), System.Drawing.Image))
-        Me.C1TrueDBGrid1.PreviewInfo.ZoomFactor = 75.0R
+        Me.C1TrueDBGrid1.Location = New System.Drawing.Point(204, 24)
-        Me.C1TrueDBGrid1.PrintInfo.PageSettings = CType(resources.GetObject("C1TrueDBGrid1.PrintInfo.PageSettings"), System.Drawing.Printing.PageSettings)
+        Me.C1TrueDBGrid1.Name = "C1TrueDBGrid1"
-        Me.C1TrueDBGrid1.Size = New System.Drawing.Size(1005, 525)
+        Me.C1TrueDBGrid1.PreviewInfo.Location = New System.Drawing.Point(0, 0)
-        Me.C1TrueDBGrid1.TabIndex = 2
+        Me.C1TrueDBGrid1.PreviewInfo.Size = New System.Drawing.Size(0, 0)
-        Me.C1TrueDBGrid1.Text = "C1TrueDBGrid1"
+        Me.C1TrueDBGrid1.PreviewInfo.ZoomFactor = 75.0R
-        Me.C1TrueDBGrid1.PropBag = resources.GetString("C1TrueDBGrid1.PropBag")
+        Me.C1TrueDBGrid1.PrintInfo.PageSettings = CType(resources.GetObject("C1TrueDBGrid1.PrintInfo.PageSettings"), System.Drawing.Printing.PageSettings)
-        '
+        Me.C1TrueDBGrid1.Size = New System.Drawing.Size(996, 425)
-        'OpenFileDialog1
+        Me.C1TrueDBGrid1.TabIndex = 2
-        '
+        Me.C1TrueDBGrid1.Text = "C1TrueDBGrid1"
-        Me.OpenFileDialog1.FileName = "OpenFileDialog1"
+        Me.C1TrueDBGrid1.PropBag = resources.GetString("C1TrueDBGrid1.PropBag")
-        Me.OpenFileDialog1.Filter = "Excel-Dateien|*.xlsx|Alle Dateien|*.*"
+        '
-        '
+        'OpenFileDialog1
-        'ContextMenuStrip1
+        '
-        '
+        Me.OpenFileDialog1.FileName = "OpenFileDialog1"
-        Me.ContextMenuStrip1.ImageScalingSize = New System.Drawing.Size(20, 20)
+        Me.OpenFileDialog1.Filter = "Excel-Dateien|*.xlsx|Alle Dateien|*.*"
-        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
+        '
-        Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
+        'ContextMenuStrip1
-        '
+        '
-        'ContextMenuStrip2
+        Me.ContextMenuStrip1.ImageScalingSize = New System.Drawing.Size(20, 20)
-        '
+        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
-        Me.ContextMenuStrip2.ImageScalingSize = New System.Drawing.Size(20, 20)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
-        Me.ContextMenuStrip2.Name = "ContextMenuStrip2"
+        '
-        Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4)
+        'ContextMenuStrip2
-        '
+        '
-        'ClsStammdaten_Bez1
+        Me.ContextMenuStrip2.ImageScalingSize = New System.Drawing.Size(20, 20)
-        '
+        Me.ContextMenuStrip2.Name = "ContextMenuStrip2"
-        Me.ClsStammdaten_Bez1.Connectionstring = Nothing
+        Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4)
-        Me.ClsStammdaten_Bez1.KeyField_left = Nothing
+        '
-        Me.ClsStammdaten_Bez1.KeyField_right = Nothing
+        'ClsStammdaten_Bez1
-        Me.ClsStammdaten_Bez1.Keyfieldbez_left = Nothing
+        '
-        Me.ClsStammdaten_Bez1.Keyfieldbez_right = Nothing
+        Me.ClsStammdaten_Bez1.Connectionstring = Nothing
-        Me.ClsStammdaten_Bez1.Location = New System.Drawing.Point(767, 362)
+        Me.ClsStammdaten_Bez1.KeyField_left = Nothing
-        Me.ClsStammdaten_Bez1.Margin = New System.Windows.Forms.Padding(5, 5, 5, 5)
+        Me.ClsStammdaten_Bez1.KeyField_right = Nothing
-        Me.ClsStammdaten_Bez1.Name = "ClsStammdaten_Bez1"
+        Me.ClsStammdaten_Bez1.Keyfieldbez_left = Nothing
-        Me.ClsStammdaten_Bez1.Size = New System.Drawing.Size(579, 209)
+        Me.ClsStammdaten_Bez1.Keyfieldbez_right = Nothing
-        Me.ClsStammdaten_Bez1.TabIndex = 4
+        Me.ClsStammdaten_Bez1.Location = New System.Drawing.Point(575, 294)
-        Me.ClsStammdaten_Bez1.Tablename_bottom = Nothing
+        Me.ClsStammdaten_Bez1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
-        Me.ClsStammdaten_Bez1.Tablename_left = Nothing
+        Me.ClsStammdaten_Bez1.Name = "ClsStammdaten_Bez1"
-        Me.ClsStammdaten_Bez1.Tablename_right = Nothing
+        Me.ClsStammdaten_Bez1.Size = New System.Drawing.Size(434, 170)
-        '
+        Me.ClsStammdaten_Bez1.TabIndex = 4
-        'ClsStammdaten_flat1
+        Me.ClsStammdaten_Bez1.Tablename_bottom = Nothing
-        '
+        Me.ClsStammdaten_Bez1.Tablename_left = Nothing
-        Me.ClsStammdaten_flat1.Connectionstring = Nothing
+        Me.ClsStammdaten_Bez1.Tablename_right = Nothing
-        Me.ClsStammdaten_flat1.Location = New System.Drawing.Point(309, 69)
+        '
-        Me.ClsStammdaten_flat1.Margin = New System.Windows.Forms.Padding(5, 5, 5, 5)
+        'ClsStammdaten_flat1
-        Me.ClsStammdaten_flat1.Name = "ClsStammdaten_flat1"
+        '
-        Me.ClsStammdaten_flat1.Size = New System.Drawing.Size(744, 286)
+        Me.ClsStammdaten_flat1.Connectionstring = Nothing
-        Me.ClsStammdaten_flat1.TabIndex = 3
+        Me.ClsStammdaten_flat1.Location = New System.Drawing.Point(232, 56)
-        Me.ClsStammdaten_flat1.Tablename = Nothing
+        Me.ClsStammdaten_flat1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
-        '
+        Me.ClsStammdaten_flat1.Name = "ClsStammdaten_flat1"
-        'frmStammdaten
+        Me.ClsStammdaten_flat1.Size = New System.Drawing.Size(558, 232)
-        '
+        Me.ClsStammdaten_flat1.SQL = ""
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!)
+        Me.ClsStammdaten_flat1.TabIndex = 3
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClsStammdaten_flat1.Tablename = Nothing
-        Me.ClientSize = New System.Drawing.Size(1276, 553)
+        '
-        Me.Controls.Add(Me.ClsStammdaten_Bez1)
+        'frmStammdaten
-        Me.Controls.Add(Me.ClsStammdaten_flat1)
+        '
-        Me.Controls.Add(Me.C1TrueDBGrid1)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        Me.Controls.Add(Me.TreeView1)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.Controls.Add(Me.MenuStrip1)
+        Me.ClientSize = New System.Drawing.Size(1200, 449)
-        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.Controls.Add(Me.ClsStammdaten_Bez1)
-        Me.MainMenuStrip = Me.MenuStrip1
+        Me.Controls.Add(Me.ClsStammdaten_flat1)
-        Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Controls.Add(Me.C1TrueDBGrid1)
-        Me.Name = "frmStammdaten"
+        Me.Controls.Add(Me.TreeView1)
-        Me.Text = "frmStammdaten"
+        Me.Controls.Add(Me.MenuStrip1)
-        Me.MenuStrip1.ResumeLayout(False)
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
-        Me.MenuStrip1.PerformLayout()
+        Me.MainMenuStrip = Me.MenuStrip1
-        CType(Me.C1TrueDBGrid1, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.Name = "frmStammdaten"
-        Me.ResumeLayout(False)
+        Me.Text = "frmStammdaten"
-        Me.PerformLayout()
+        Me.MenuStrip1.ResumeLayout(False)
-
+        Me.MenuStrip1.PerformLayout()
-    End Sub
+        CType(Me.C1TrueDBGrid1, System.ComponentModel.ISupportInitialize).EndInit()
-    Friend WithEvents MenuStrip1 As System.Windows.Forms.MenuStrip
+        Me.ResumeLayout(False)
-    Friend WithEvents SchliessenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+        Me.PerformLayout()
-    Friend WithEvents TreeView1 As System.Windows.Forms.TreeView
+
-    Friend WithEvents C1TrueDBGrid1 As C1.Win.C1TrueDBGrid.C1TrueDBGrid
+    End Sub
-    Friend WithEvents ClsStammdaten_flat1 As DPM2016.clsStammdaten_flat
+    Friend WithEvents MenuStrip1 As System.Windows.Forms.MenuStrip
-    Friend WithEvents ClsStammdaten_Bez1 As DPM2016.clsStammdaten_Bez
+    Friend WithEvents SchliessenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents DentotarImportToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents TreeView1 As System.Windows.Forms.TreeView
-    Friend WithEvents OpenFileDialog1 As OpenFileDialog
+    Friend WithEvents C1TrueDBGrid1 As C1.Win.C1TrueDBGrid.C1TrueDBGrid
-    Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
+    Friend WithEvents ClsStammdaten_flat1 As DPM2016.clsStammdaten_flat
-    Friend WithEvents ContextMenuStrip2 As ContextMenuStrip
+    Friend WithEvents ClsStammdaten_Bez1 As DPM2016.clsStammdaten_Bez
-End Class
+    Friend WithEvents DentotarImportToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents OpenFileDialog1 As OpenFileDialog
+    Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
+    Friend WithEvents ContextMenuStrip2 As ContextMenuStrip
+End Class

DPM2016/Sysadmin/frmStammdaten.vb

@@ -1,254 +1,273 @@
-Imports System.ComponentModel
+Imports System.ComponentModel
-Imports FlexCel.Core
+Imports FlexCel.XlsAdapter
-Imports FlexCel.XlsAdapter
+Public Class frmStammdaten
-Public Class frmStammdaten
+
-
+    Dim db As New clsDB
-    Dim db As New clsDB
+    Dim spalten As New Tabellenspalte
-    Dim spalten As New Tabellenspalte
+    Private Sub SchliessenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SchliessenToolStripMenuItem.Click
-    Private Sub SchliessenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SchliessenToolStripMenuItem.Click
+        Me.Close()
-        Me.Close()
+    End Sub
-    End Sub
+
-
+    Private Sub TreeView1_AfterSelect(sender As Object, e As TreeViewEventArgs) Handles TreeView1.AfterSelect
-    Private Sub TreeView1_AfterSelect(sender As Object, e As TreeViewEventArgs) Handles TreeView1.AfterSelect
+        Refresh_Details()
-        Refresh_Details()
+
-
+    End Sub
-    End Sub
+    Sub Refresh_Details()
-    Sub Refresh_Details()
+        Try
-        Try
+            Select Case UCase(TreeView1.SelectedNode.Tag)
-            Select Case UCase(TreeView1.SelectedNode.Tag)
+                Case "DEMO"
-                Case "DEMO"
+                    If Globals.License.DemoMode = True Then
-                    If Globals.License.DemoMode = True Then
+                        Me.ClsStammdaten_Bez1.Visible = False
-                        Me.ClsStammdaten_Bez1.Visible = False
+                        Me.ClsStammdaten_flat1.Visible = False
-                        Me.ClsStammdaten_flat1.Visible = False
+                        MsgBox("Diese Funktion ist im DEMO-Modus nicht verfügbar.")
-                        MsgBox("Diese Funktion ist im DEMO-Modus nicht verfügbar.")
+                        Exit Sub
-                        Exit Sub
+                    End If
-                    End If
+                Case "DMS"
-                Case "DMS"
+                    If Globals.License.DMS = False Then
-                    If Globals.License.DMS = False Then
+                        MsgBox("Für diese Funktion haben Sie keine entsprechende Lizenz.")
-                        MsgBox("Für diese Funktion haben Sie keine entsprechende Lizenz.")
+                        Me.ClsStammdaten_Bez1.Visible = False
-                        Me.ClsStammdaten_Bez1.Visible = False
+                        Me.ClsStammdaten_flat1.Visible = False
-                        Me.ClsStammdaten_flat1.Visible = False
+                        'MsgBox("Diese Funktion ist im DEMO-Modus nicht verfügbar.")
-                        'MsgBox("Diese Funktion ist im DEMO-Modus nicht verfügbar.")
+                        Exit Sub
-                        Exit Sub
+                    End If
-                    End If
+                Case "DENTOTAR"
-                Case "DENTOTAR"
+
-
+            End Select
-            End Select
+            Me.ClsStammdaten_Bez1.Visible = True
-            Me.ClsStammdaten_Bez1.Visible = True
+            Me.ClsStammdaten_flat1.Visible = True
-            Me.ClsStammdaten_flat1.Visible = True
+            Dim t As String = Me.TreeView1.SelectedNode.Tag
-            Dim t As String = Me.TreeView1.SelectedNode.Tag
+            t = UCase(t)
-            t = UCase(t)
+            If t <> "" And t <> "DEMO" And t <> "DMS" Then
-            If t <> "" And t <> "DEMO" And t <> "DMS" Then
+                Dim splitter()
-                Dim splitter()
+                splitter = Me.TreeView1.SelectedNode.Tag.ToString.Split(";")
-                splitter = Me.TreeView1.SelectedNode.Tag.ToString.Split(";")
+                If splitter.Length > 1 Then
-                If splitter.Length > 1 Then
+                    Dim i As Integer = 0
-                    Dim i As Integer = 0
+
-
+                    For Each s As String In splitter
-                    For Each s As String In splitter
+                        i = i + 1
-                        i = i + 1
+                        If i = 1 Then ClsStammdaten_Bez1.KeyField_left = s
-                        If i = 1 Then ClsStammdaten_Bez1.KeyField_left = s
+                        If i = 2 Then ClsStammdaten_Bez1.Keyfieldbez_left = s
-                        If i = 2 Then ClsStammdaten_Bez1.Keyfieldbez_left = s
+                        If i = 3 Then ClsStammdaten_Bez1.KeyField_right = s
-                        If i = 3 Then ClsStammdaten_Bez1.KeyField_right = s
+                        If i = 4 Then ClsStammdaten_Bez1.Keyfieldbez_right = s
-                        If i = 4 Then ClsStammdaten_Bez1.Keyfieldbez_right = s
+                        If i = 5 Then ClsStammdaten_Bez1.Tablename_left = s
-                        If i = 5 Then ClsStammdaten_Bez1.Tablename_left = s
+                        If i = 6 Then ClsStammdaten_Bez1.Tablename_right = s
-                        If i = 6 Then ClsStammdaten_Bez1.Tablename_right = s
+                        If i = 7 Then ClsStammdaten_Bez1.Tablename_bottom = s
-                        If i = 7 Then ClsStammdaten_Bez1.Tablename_bottom = s
+                        Try
-                        Try
+                        Catch ex As Exception
-                        Catch ex As Exception
+
-
+                        End Try
-                        End Try
+                    Next
-                    Next
+
-
+                End If
-                End If
+
-
+                Me.ClsStammdaten_flat1.Visible = False
-                Me.ClsStammdaten_flat1.Visible = False
+                Me.ClsStammdaten_Bez1.Visible = True
-                Me.ClsStammdaten_Bez1.Visible = True
+                Me.ClsStammdaten_Bez1.Dock = DockStyle.Fill
-                Me.ClsStammdaten_Bez1.Dock = DockStyle.Fill
+                Me.ClsStammdaten_Bez1.Width = Me.ClsStammdaten_Bez1.Width + 1
-                Me.ClsStammdaten_Bez1.Width = Me.ClsStammdaten_Bez1.Width + 1
+                Exit Sub
-                Exit Sub
+            End If
-            End If
+            Me.ClsStammdaten_flat1.Check_Changes()
-            Me.ClsStammdaten_flat1.Check_Changes()
+            Me.ClsStammdaten_Bez1.Visible = False
-            Me.ClsStammdaten_Bez1.Visible = False
+            Me.ClsStammdaten_flat1.Visible = True
-            Me.ClsStammdaten_flat1.Visible = True
+            Me.ClsStammdaten_flat1.Dock = DockStyle.Fill
-            Me.ClsStammdaten_flat1.Dock = DockStyle.Fill
+
-
+            If Me.TreeView1.SelectedNode.Nodes.Count = 0 Then Me.ClsStammdaten_flat1.Visible = True Else Me.ClsStammdaten_flat1.Visible = False
-            If Me.TreeView1.SelectedNode.Nodes.Count = 0 Then Me.ClsStammdaten_flat1.Visible = True Else Me.ClsStammdaten_flat1.Visible = False
+            Me.ClsStammdaten_flat1.Tablename = Me.TreeView1.SelectedNode.Name
-            Me.ClsStammdaten_flat1.Tablename = Me.TreeView1.SelectedNode.Name
+            'If Globals.License.DemoMode Then
-            'If Globals.License.DemoMode Then
+            '    If Me.TreeView1.SelectedNode.Tag = "Demo" Then
-            '    If Me.TreeView1.SelectedNode.Tag = "Demo" Then
+            '        MsgBox("Im Demo-Modus steht diese Funktion nicht zur Verfügung.")
-            '        MsgBox("Im Demo-Modus steht diese Funktion nicht zur Verfügung.")
+            '        Exit Sub
-            '        Exit Sub
+            '    End If
-            '    End If
+            'End If
-            'End If
+            Me.ClsStammdaten_flat1.get_data()
-            Me.ClsStammdaten_flat1.get_data()
+
-
+            Try
-            Try
+
-
+            Catch
-            Catch
+            End Try
-            End Try
+        Catch
-        Catch
+        End Try
-        End Try
+    End Sub
-    End Sub
+
-
+    Private Sub frmStammdaten_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-    Private Sub frmStammdaten_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        Me.TreeView1.ExpandAll()
-        Me.TreeView1.ExpandAll()
+        Me.TreeView1.SelectedNode = Me.TreeView1.Nodes(0)
-        Me.TreeView1.SelectedNode = Me.TreeView1.Nodes(0)
+        If My.Settings.SoftwareType = "PADM" Or Globals.DruckBranche = True Then
-        If My.Settings.SoftwareType = "PADM" Then
+            Me.DentotarImportToolStripMenuItem.Visible = False
-            Me.DentotarImportToolStripMenuItem.Visible = False
+            For Each n As TreeNode In TreeView1.Nodes
-            For Each n As TreeNode In TreeView1.Nodes
+                For Each nn As TreeNode In n.Nodes
-                For Each nn As TreeNode In n.Nodes
+                    Try
-                    Try
+                        Select Case nn.Text
-                        Select Case nn.Text
+                            Case "Tarif"
-                            Case "Tarif"
+                                nn.Text = "Artikel"
-                                nn.Text = "Artikel"
+                            Case "Tarife"
-                            Case "Tarife"
+                                nn.Text = "Artikel-Kategorien"
-                                nn.Text = "Artikel-Kategorien"
+                            Case "TarifGruppe"
-                            Case "TarifGruppe"
+                                nn.Text = "Artikel-Gruppen"
-                                nn.Text = "Artikel-Gruppen"
+                            Case "Tarifpakete"
-                            Case "Tarifpakete"
+                                nn.Text = "Artikel-Pakete"
-                                nn.Text = "Artikel-Pakete"
+                            Case "Produkt Zusatz"
-                        End Select
+                            Case "Produkt Zusatz Details"
-                    Catch
+                        End Select
-                    End Try
+                    Catch
-
+                    End Try
-                Next
+
-                If n.Text = "Tarif" Then n.Text = "Artikel"
+                Next
-                If n.Text = "Patienten" Then n.Text = "Allgemein"
+                If n.Text = "Tarif" Then n.Text = "Artikel"
-            Next
+                If n.Text = "Patienten" Then n.Text = "Allgemein"
-
+            Next
-            For i As Integer = 1 To 10
+
-                Try
+            For i As Integer = 1 To 10
-                    For Each n As TreeNode In TreeView1.Nodes
+                Try
-                        For Each nn As TreeNode In n.Nodes
+                    For Each n As TreeNode In TreeView1.Nodes
-                            If nn.Text = "Dentotar" Then
+                        For Each nn As TreeNode In n.Nodes
-                                nn.Remove()
+                            If nn.Text = "Dentotar" Then
-                            End If
+                                nn.Remove()
-                            If nn.Text = "Dentotar_Parameter" Then
+                            End If
-                                nn.Remove()
+                            If nn.Text = "Dentotar_Parameter" Then
-                            End If
+                                nn.Remove()
-                            If nn.Text = "Taxpunkte" Then
+                            End If
-                                nn.Remove()
+                            If nn.Text = "Taxpunkte" Then
-                            End If
+                                nn.Remove()
-                            If nn.Text = "Zahntechnik (223)" Then
+                            End If
-                                nn.Remove()
+                            If nn.Text = "Zahntechnik (223)" Then
-                            End If
+                                nn.Remove()
-                            If nn.Text = "Behandlungsart" Then
+                            End If
-                                nn.Remove()
+                            If nn.Text = "Behandlungsart" Then
-                            End If
+                                nn.Remove()
-                            If nn.Text = "Gesetz" Then
+                            End If
-                                nn.Remove()
+                            If nn.Text = "Gesetz" Then
-                            End If
+                                nn.Remove()
-
+                            End If
-                        Next
+
-                    Next
+                        Next
-                Catch
+                    Next
-                End Try
+                Catch
-            Next i
+                End Try
-        End If
+            Next i
-
+
-    End Sub
+        Else
-
+            For i As Integer = 1 To 10
-
+                Try
-
+                    For Each n As TreeNode In TreeView1.Nodes
-    Private Sub DentotarImportToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DentotarImportToolStripMenuItem.Click
+                        For Each nn As TreeNode In n.Nodes
-        If MsgBox("Sind Sie sicher, dass Dentotaf neu importier werden soll?", vbYesNo + vbQuestion) = vbYes Then
+                            If nn.Text = "Produkt Zusatz" Then
-            If OpenFileDialog1.ShowDialog = DialogResult.OK Then
+                                nn.Remove()
-                import_dentotar(OpenFileDialog1.FileName)
+                            End If
-            End If
+                            If nn.Text = "Produkt Zusatz Details" Then
-
+                                nn.Remove()
-        End If
+                            End If
-    End Sub
+                        Next
-
+                    Next
-    Private Sub import_dentotar(ByVal Filename As String)
+                Catch
-        Try
+                End Try
-            Dim xls As New XlsFile(Filename)
+            Next i
-            Dim f As New frmprogress(1, xls.RowCount, "Dentotar einlesen")
+
-            f.Show()
+        End If
-            Dim db As New clsDB
+
-            db.Get_Tabledata_for_Update("Dentotar", False, False)
+    End Sub
-            db.daten.WriteXml(Globals.ActUser)
+
-            Dim dt As New DataTable
+
-            Dim dt_Original As New DataTable
+
-            dt = db.daten.Tables(0).Copy
+    Private Sub DentotarImportToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DentotarImportToolStripMenuItem.Click
-            dt_Original = db.daten.Tables(0).Copy
+        If MsgBox("Sind Sie sicher, dass Dentotaf neu importier werden soll?", vbYesNo + vbQuestion) = vbYes Then
-            db.Exec_Prod("sp_update_dentotar")
+            If OpenFileDialog1.ShowDialog = DialogResult.OK Then
-            dt.Rows.Clear()
+                import_dentotar(OpenFileDialog1.FileName)
-            dt.AcceptChanges()
+            End If
-            Dim colindex1 As Integer
+
-            xls.ActiveSheet = 1
+        End If
-            Dim i As Integer = 0
+    End Sub
-            For row As Integer = 2 To xls.RowCount
+
-                Dim dr As DataRow = dt.NewRow
+    Private Sub import_dentotar(ByVal Filename As String)
-                i = row
+        Try
-                Application.DoEvents()
+            Dim xls As New XlsFile(Filename)
-                f.ProgressBar1.Value = row
+            Dim f As New frmprogress(1, xls.RowCount, "Dentotar einlesen")
-                For colIndex As Integer = 1 To 18
+            f.Show()
-
+            Dim db As New clsDB
-                    Try
+            db.Get_Tabledata_for_Update("Dentotar", False, False)
-                        dr.Item(colIndex - 1) = xls.GetCellValue(row, colIndex)
+            db.daten.WriteXml(Globals.ActUser)
-                    Catch
+            Dim dt As New DataTable
-                        dr.Item(colIndex - 1) = System.DBNull.Value
+            Dim dt_Original As New DataTable
-                    End Try
+            dt = db.daten.Tables(0).Copy
-
+            dt_Original = db.daten.Tables(0).Copy
-                Next
+            db.Exec_Prod("sp_update_dentotar")
-                dt.Rows.Add(dr)
+            dt.Rows.Clear()
-            Next
+            dt.AcceptChanges()
-
+            Dim colindex1 As Integer
-
+            xls.ActiveSheet = 1
-            f.Init_Progressbar(1, i, "Privat-Punkte nachführen")
+            Dim i As Integer = 0
-            For Each r As DataRow In dt.Rows
+            For row As Integer = 2 To xls.RowCount
-                f.ProgressBar1.Value = f.ProgressBar1.Value + 1
+                Dim dr As DataRow = dt.NewRow
-                Application.DoEvents()
+                i = row
-                If Not IsDBNull(r.Item("Leistungnrneu")) Then
+                Application.DoEvents()
-                    Dim dv As New DataView(dt_Original, "leistungnrneu='" + r.Item("Leistungnrneu") + "'", "", DataViewRowState.CurrentRows)
+                f.ProgressBar1.Value = row
-                    Dim drv As DataRowView = dv.Item(0)
+                For colIndex As Integer = 1 To 18
-                    r.Item("PP_Privat") = drv.Item("PP_Privat")
+
-                End If
+                    Try
-
+                        dr.Item(colIndex - 1) = xls.GetCellValue(row, colIndex)
-                'For Each rr As DataRow In dt_Original.Rows
+                    Catch
-                '    Try
+                        dr.Item(colIndex - 1) = System.DBNull.Value
-                '        If r.Item("LeistungNrneu") = rr.Item("Leistungnrneu") Then
+                    End Try
-                '            Try
+
-                '                r.Item("PP_Privat") = rr.Item("PP_Privat")
+                Next
-                '            Catch
+                dt.Rows.Add(dr)
-                '            End Try
+            Next
-
+
-                '            Exit For
+
-                '        End If
+            f.Init_Progressbar(1, i, "Privat-Punkte nachführen")
-                '    Catch
+            For Each r As DataRow In dt.Rows
-                '    End Try
+                f.ProgressBar1.Value = f.ProgressBar1.Value + 1
-
+                Application.DoEvents()
-                'Next
+                If Not IsDBNull(r.Item("Leistungnrneu")) Then
-            Next
+                    Dim dv As New DataView(dt_Original, "leistungnrneu='" + r.Item("Leistungnrneu") + "'", "", DataViewRowState.CurrentRows)
-            f.Close()
+                    Dim drv As DataRowView = dv.Item(0)
-            db.daten.Tables.Clear()
+                    r.Item("PP_Privat") = drv.Item("PP_Privat")
-            db.daten.Tables.Add(dt.Copy)
+                End If
-            db.Update_Tabeldata()
+
-            Try
+                'For Each rr As DataRow In dt_Original.Rows
-                IntTables.Inttables.Tables.Remove("Dentotar")
+                '    Try
-            Catch
+                '        If r.Item("LeistungNrneu") = rr.Item("Leistungnrneu") Then
-            End Try
+                '            Try
-
+                '                r.Item("PP_Privat") = rr.Item("PP_Privat")
-            MsgBox("Update Dentotar ist abgeschossen.", vbInformation)
+                '            Catch
-        Catch ex As Exception
+                '            End Try
-            MsgBox("Update Dentotar: Fehler: " + ex.Message)
+
-        End Try
+                '            Exit For
-
+                '        End If
-    End Sub
+                '    Catch
-
+                '    End Try
-    Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs)
+
-        Me.Close()
+                'Next
-    End Sub
+            Next
-
+            f.Close()
-    Private Sub TreeView1_Click(sender As Object, e As EventArgs) Handles TreeView1.Click
+            db.daten.Tables.Clear()
-        'Refresh_Details()
+            db.daten.Tables.Add(dt.Copy)
-    End Sub
+            db.Update_Tabeldata()
-
+            Try
-    Private Sub ClsStammdaten_flat1_Load(sender As Object, e As EventArgs) Handles ClsStammdaten_flat1.Load
+                IntTables.Inttables.Tables.Remove("Dentotar")
-
+            Catch
-    End Sub
+            End Try
-
+
-    Private Sub frmStammdaten_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing
+            MsgBox("Update Dentotar ist abgeschossen.", vbInformation)
-        IntTables.Inttables.Tables.Clear()
+        Catch ex As Exception
-    End Sub
+            MsgBox("Update Dentotar: Fehler: " + ex.Message)
+        End Try
+
+    End Sub
+
+    Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs)
+        Me.Close()
+    End Sub
+
+    Private Sub TreeView1_Click(sender As Object, e As EventArgs) Handles TreeView1.Click
+        'Refresh_Details()
+    End Sub
+
+    Private Sub ClsStammdaten_flat1_Load(sender As Object, e As EventArgs) Handles ClsStammdaten_flat1.Load
+
+    End Sub
+
+    Private Sub frmStammdaten_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing
+        IntTables.Inttables.Tables.Clear()
+    End Sub
 End Class

DPM2016/Utils/Globals.vb

@@ -10,7 +10,7 @@ Module Globals
     Public Productname As String = "Dental Practice Manager"
     Public Lizenzgeber As String = "Stefan Hutter Unternehmensberatung, 8808 Pfäffikon"
     Public Version As String = "1.4.0.2215"
-    Public Versionastaum As String = "20.06.2022"
+    Public Versionastaum As String = "15.12.2023"
 
     Public RGCollection As New Collection
     Public Spaltendaten As New DataTable

DPM2016/Utils/SplashForm.Designer.vb

@@ -1,163 +1,163 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class SplashForm
+Partial Class SplashForm
-    Inherits System.Windows.Forms.Form
+    Inherits System.Windows.Forms.Form
-
+
-    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()> _
-    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
-        Try
+        Try
-            If disposing AndAlso components IsNot Nothing Then
+            If disposing AndAlso components IsNot Nothing Then
-                components.Dispose()
+                components.Dispose()
-            End If
+            End If
-        Finally
+        Finally
-            MyBase.Dispose(disposing)
+            MyBase.Dispose(disposing)
-        End Try
+        End Try
-    End Sub
+    End Sub
-
+
-    'Wird vom Windows Form-Designer benötigt.
+    'Wird vom Windows Form-Designer benötigt.
-    Private components As System.ComponentModel.IContainer
+    Private components As System.ComponentModel.IContainer
-
+
-    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
-    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
-    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()> _
-    Private Sub InitializeComponent()
+    Private Sub InitializeComponent()
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(SplashForm))
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(SplashForm))
-        Me.Label1 = New System.Windows.Forms.Label()
+        Me.Label1 = New System.Windows.Forms.Label()
-        Me.Label2 = New System.Windows.Forms.Label()
+        Me.Label2 = New System.Windows.Forms.Label()
-        Me.Label3 = New System.Windows.Forms.Label()
+        Me.Label3 = New System.Windows.Forms.Label()
-        Me.Label4 = New System.Windows.Forms.Label()
+        Me.Label4 = New System.Windows.Forms.Label()
-        Me.Label5 = New System.Windows.Forms.Label()
+        Me.Label5 = New System.Windows.Forms.Label()
-        Me.C1PictureBox1 = New C1.Win.C1Input.C1PictureBox()
+        Me.C1PictureBox1 = New C1.Win.C1Input.C1PictureBox()
-        Me.Label6 = New System.Windows.Forms.Label()
+        Me.Label6 = New System.Windows.Forms.Label()
-        Me.Label7 = New System.Windows.Forms.Label()
+        Me.Label7 = New System.Windows.Forms.Label()
-        Me.C1PictureBox2 = New C1.Win.C1Input.C1PictureBox()
+        Me.C1PictureBox2 = New C1.Win.C1Input.C1PictureBox()
-        CType(Me.C1PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.C1PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.C1PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.C1PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.SuspendLayout()
+        Me.SuspendLayout()
-        '
+        '
-        'Label1
+        'Label1
-        '
+        '
-        Me.Label1.AutoSize = True
+        Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(12, 188)
+        Me.Label1.Location = New System.Drawing.Point(12, 188)
-        Me.Label1.Name = "Label1"
+        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(39, 13)
+        Me.Label1.Size = New System.Drawing.Size(39, 13)
-        Me.Label1.TabIndex = 0
+        Me.Label1.TabIndex = 0
-        Me.Label1.Text = "Label1"
+        Me.Label1.Text = "Label1"
-        '
+        '
-        'Label2
+        'Label2
-        '
+        '
-        Me.Label2.AutoSize = True
+        Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(12, 210)
+        Me.Label2.Location = New System.Drawing.Point(12, 210)
-        Me.Label2.Name = "Label2"
+        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(39, 13)
+        Me.Label2.Size = New System.Drawing.Size(39, 13)
-        Me.Label2.TabIndex = 1
+        Me.Label2.TabIndex = 1
-        Me.Label2.Text = "Label2"
+        Me.Label2.Text = "Label2"
-        '
+        '
-        'Label3
+        'Label3
-        '
+        '
-        Me.Label3.AutoSize = True
+        Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(78, 210)
+        Me.Label3.Location = New System.Drawing.Point(78, 210)
-        Me.Label3.Name = "Label3"
+        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(39, 13)
+        Me.Label3.Size = New System.Drawing.Size(39, 13)
-        Me.Label3.TabIndex = 3
+        Me.Label3.TabIndex = 3
-        Me.Label3.Text = "Label3"
+        Me.Label3.Text = "Label3"
-        '
+        '
-        'Label4
+        'Label4
-        '
+        '
-        Me.Label4.AutoSize = True
+        Me.Label4.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(78, 188)
+        Me.Label4.Location = New System.Drawing.Point(78, 188)
-        Me.Label4.Name = "Label4"
+        Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(39, 13)
+        Me.Label4.Size = New System.Drawing.Size(39, 13)
-        Me.Label4.TabIndex = 2
+        Me.Label4.TabIndex = 2
-        Me.Label4.Text = "Label4"
+        Me.Label4.Text = "Label4"
-        '
+        '
-        'Label5
+        'Label5
-        '
+        '
-        Me.Label5.AutoSize = True
+        Me.Label5.AutoSize = True
-        Me.Label5.Location = New System.Drawing.Point(12, 283)
+        Me.Label5.Location = New System.Drawing.Point(12, 283)
-        Me.Label5.Name = "Label5"
+        Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(39, 13)
+        Me.Label5.Size = New System.Drawing.Size(39, 13)
-        Me.Label5.TabIndex = 5
+        Me.Label5.TabIndex = 5
-        Me.Label5.Text = "Label5"
+        Me.Label5.Text = "Label5"
-        '
+        '
-        'C1PictureBox1
+        'C1PictureBox1
-        '
+        '
-        Me.C1PictureBox1.Image = CType(resources.GetObject("C1PictureBox1.Image"), System.Drawing.Image)
+        Me.C1PictureBox1.Image = CType(resources.GetObject("C1PictureBox1.Image"), System.Drawing.Image)
-        Me.C1PictureBox1.InitialImage = CType(resources.GetObject("C1PictureBox1.InitialImage"), System.Drawing.Image)
+        Me.C1PictureBox1.InitialImage = CType(resources.GetObject("C1PictureBox1.InitialImage"), System.Drawing.Image)
-        Me.C1PictureBox1.Location = New System.Drawing.Point(12, 12)
+        Me.C1PictureBox1.Location = New System.Drawing.Point(12, 12)
-        Me.C1PictureBox1.Name = "C1PictureBox1"
+        Me.C1PictureBox1.Name = "C1PictureBox1"
-        Me.C1PictureBox1.Size = New System.Drawing.Size(343, 158)
+        Me.C1PictureBox1.Size = New System.Drawing.Size(343, 158)
-        Me.C1PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
+        Me.C1PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
-        Me.C1PictureBox1.TabIndex = 6
+        Me.C1PictureBox1.TabIndex = 6
-        Me.C1PictureBox1.TabStop = False
+        Me.C1PictureBox1.TabStop = False
-        '
+        '
-        'Label6
+        'Label6
-        '
+        '
-        Me.Label6.AutoSize = True
+        Me.Label6.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(12, 296)
+        Me.Label6.Location = New System.Drawing.Point(12, 296)
-        Me.Label6.Name = "Label6"
+        Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(39, 13)
+        Me.Label6.Size = New System.Drawing.Size(39, 13)
-        Me.Label6.TabIndex = 7
+        Me.Label6.TabIndex = 7
-        Me.Label6.Text = "Label6"
+        Me.Label6.Text = "Label6"
-        '
+        '
-        'Label7
+        'Label7
-        '
+        '
-        Me.Label7.AutoSize = True
+        Me.Label7.AutoSize = True
-        Me.Label7.Location = New System.Drawing.Point(12, 309)
+        Me.Label7.Location = New System.Drawing.Point(12, 309)
-        Me.Label7.Name = "Label7"
+        Me.Label7.Name = "Label7"
-        Me.Label7.Size = New System.Drawing.Size(39, 13)
+        Me.Label7.Size = New System.Drawing.Size(39, 13)
-        Me.Label7.TabIndex = 8
+        Me.Label7.TabIndex = 8
-        Me.Label7.Text = "Label7"
+        Me.Label7.Text = "Label7"
-        '
+        '
-        'C1PictureBox2
+        'C1PictureBox2
-        '
+        '
-        Me.C1PictureBox2.Image = CType(resources.GetObject("C1PictureBox2.Image"), System.Drawing.Image)
+        Me.C1PictureBox2.Image = CType(resources.GetObject("C1PictureBox2.Image"), System.Drawing.Image)
-        Me.C1PictureBox2.InitialImage = CType(resources.GetObject("C1PictureBox2.InitialImage"), System.Drawing.Image)
+        Me.C1PictureBox2.InitialImage = CType(resources.GetObject("C1PictureBox2.InitialImage"), System.Drawing.Image)
-        Me.C1PictureBox2.Location = New System.Drawing.Point(12, 12)
+        Me.C1PictureBox2.Location = New System.Drawing.Point(12, 12)
-        Me.C1PictureBox2.Name = "C1PictureBox2"
+        Me.C1PictureBox2.Name = "C1PictureBox2"
-        Me.C1PictureBox2.Size = New System.Drawing.Size(343, 158)
+        Me.C1PictureBox2.Size = New System.Drawing.Size(274, 158)
-        Me.C1PictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
+        Me.C1PictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
-        Me.C1PictureBox2.TabIndex = 9
+        Me.C1PictureBox2.TabIndex = 9
-        Me.C1PictureBox2.TabStop = False
+        Me.C1PictureBox2.TabStop = False
-        '
+        '
-        'SplashForm
+        'SplashForm
-        '
+        '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.BackColor = System.Drawing.Color.White
+        Me.BackColor = System.Drawing.Color.White
-        Me.ClientSize = New System.Drawing.Size(368, 339)
+        Me.ClientSize = New System.Drawing.Size(368, 339)
-        Me.Controls.Add(Me.C1PictureBox2)
+        Me.Controls.Add(Me.C1PictureBox2)
-        Me.Controls.Add(Me.Label7)
+        Me.Controls.Add(Me.Label7)
-        Me.Controls.Add(Me.Label6)
+        Me.Controls.Add(Me.Label6)
-        Me.Controls.Add(Me.C1PictureBox1)
+        Me.Controls.Add(Me.C1PictureBox1)
-        Me.Controls.Add(Me.Label5)
+        Me.Controls.Add(Me.Label5)
-        Me.Controls.Add(Me.Label3)
+        Me.Controls.Add(Me.Label3)
-        Me.Controls.Add(Me.Label4)
+        Me.Controls.Add(Me.Label4)
-        Me.Controls.Add(Me.Label2)
+        Me.Controls.Add(Me.Label2)
-        Me.Controls.Add(Me.Label1)
+        Me.Controls.Add(Me.Label1)
-        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
+        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
-        Me.MaximizeBox = False
+        Me.MaximizeBox = False
-        Me.MinimizeBox = False
+        Me.MinimizeBox = False
-        Me.Name = "SplashForm"
+        Me.Name = "SplashForm"
-        Me.ShowIcon = False
+        Me.ShowIcon = False
-        Me.ShowInTaskbar = False
+        Me.ShowInTaskbar = False
-        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
-        Me.Text = "SplashForm"
+        Me.Text = "SplashForm"
-        CType(Me.C1PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.C1PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.C1PictureBox2, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.C1PictureBox2, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.ResumeLayout(False)
+        Me.ResumeLayout(False)
-        Me.PerformLayout()
+        Me.PerformLayout()
-
+
-    End Sub
+    End Sub
-
+
-    Friend WithEvents Label1 As Label
+    Friend WithEvents Label1 As Label
-    Friend WithEvents Label2 As Label
+    Friend WithEvents Label2 As Label
-    Friend WithEvents Label3 As Label
+    Friend WithEvents Label3 As Label
-    Friend WithEvents Label4 As Label
+    Friend WithEvents Label4 As Label
-    Friend WithEvents Label5 As Label
+    Friend WithEvents Label5 As Label
-    Friend WithEvents C1PictureBox1 As C1.Win.C1Input.C1PictureBox
+    Friend WithEvents C1PictureBox1 As C1.Win.C1Input.C1PictureBox
-    Friend WithEvents Label6 As Label
+    Friend WithEvents Label6 As Label
-    Friend WithEvents Label7 As Label
+    Friend WithEvents Label7 As Label
-    Friend WithEvents C1PictureBox2 As C1.Win.C1Input.C1PictureBox
+    Friend WithEvents C1PictureBox2 As C1.Win.C1Input.C1PictureBox
-End Class
+End Class

DPM2016/Utils/SplashForm.vb

@@ -1,18 +1,18 @@
-Public Class SplashForm
+Public Class SplashForm
-    Private Sub SplashForm_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+    Private Sub SplashForm_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        If My.Settings.SoftwareType = "PADM" Then
+        If My.Settings.SoftwareType = "PADM" Then
-            Me.C1PictureBox1.Visible = False
+            Me.C1PictureBox1.Visible = False
-            Me.C1PictureBox2.Visible = True
+            Me.C1PictureBox2.Visible = True
-        Else
+        Else
-            Me.C1PictureBox1.Visible = True
+            Me.C1PictureBox1.Visible = True
-            Me.C1PictureBox2.Visible = False
+            Me.C1PictureBox2.Visible = False
-        End If
+        End If
-        Me.Label1.Text = "Version: "
+        Me.Label1.Text = "Version: "
-        Label4.Text = Globals.Version
+        Label4.Text = Globals.Version
-        Me.Label2.Text = "Datum:"
+        Me.Label2.Text = "Datum:"
-        Label3.Text = Globals.Versionastaum
+        Label3.Text = Globals.Versionastaum
-        Label5.Text = "Stefan Hutter Unternehmensberatung"
+        Label5.Text = "Stefan Hutter Unternehmensberatung"
-        Label6.Text = "Staldenbachstrasse 13"
+        Label6.Text = "Staldenbachstrasse 13"
-        Label7.Text = "8808 Pfäffikon SZ"
+        Label7.Text = "8808 Pfäffikon SZ"
-    End Sub
+    End Sub
 End Class

DPM2016/app.config

@@ -58,7 +58,7 @@
         <value>http://192.168.111.67</value>
       </setting>
       <setting name="SoftwareType" serializeAs="String">
-        <value>DPM</value>
+        <value>PADM</value>
       </setting>
     </DPM2016.My.MySettings>
   </userSettings>

DPM2016/bin/Debug/PADM.application

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>JlgtP6mQAK0P7LHketwjYJOoiMV/bDmCbeUOo603a3E=</dsig:DigestValue>
+        <dsig:DigestValue>dj+yWlykiBNw2KLjnKoOrZi/3OtC6mKwbKpubyoP2HI=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

DPM2016/bin/Debug/PADM.exe.config

@@ -58,7 +58,7 @@
         <value>http://192.168.111.67</value>
       </setting>
       <setting name="SoftwareType" serializeAs="String">
-        <value>DPM</value>
+        <value>PADM</value>
       </setting>
     </DPM2016.My.MySettings>
   </userSettings>

DPM2016/bin/Debug/PADM.exe.manifest

@@ -451,14 +451,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PADM.exe" size="7470080">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PADM.exe" size="7488000">
       <assemblyIdentity name="PADM" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>1AbkfoRrGX8+CGFOn2Jd6Y65KlNysG5zAjlxz2QW3Ss=</dsig:DigestValue>
+        <dsig:DigestValue>2nTFOKOc+AY4ZMetArMXgLjSnqhML745qUWWL6YTEK4=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -1509,13 +1509,13 @@
       <dsig:DigestValue>NLnqVMsy3w9jN63XtqsXl3zuDEd+8S6tWSYv9gZKS4Q=</dsig:DigestValue>
     </hash>
   </file>
-  <file name="PADM.exe.config" size="4181">
+  <file name="PADM.exe.config" size="4182">
     <hash>
       <dsig:Transforms>
         <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
       </dsig:Transforms>
       <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-      <dsig:DigestValue>0prST3unFNQNU2HVldsrddDuCgCJokfAhMVNgXbX/v4=</dsig:DigestValue>
+      <dsig:DigestValue>STmpXFGnPRHc8/WWOyL6WhkVtZX2oFmfXuChzNeCQs4=</dsig:DigestValue>
     </hash>
   </file>
   <file name="PADM.ico" size="96694">

DPM2016/bin/Release/PADM.application

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>lVD2J8hHF6AQyj5WC1t60M4jQ+ENORpJQ/uNzTQ74HM=</dsig:DigestValue>
+        <dsig:DigestValue>dbZSv0iNqkYwG8cdQOHNSKAbRZrARNU+85AkiGksRW0=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

DPM2016/bin/Release/PADM.exe.manifest

@@ -307,14 +307,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Microsoft.mshtml.dll" size="8027528">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Microsoft.mshtml.dll" size="8027720">
       <assemblyIdentity name="Microsoft.mshtml" version="7.0.3300.0" publicKeyToken="B03F5F7F11D50A3A" language="neutral" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>iImaEsY4Ajoi2RrsoJYZA8vV2qeezV/nnmEYjymY4C4=</dsig:DigestValue>
+        <dsig:DigestValue>3HNTFd4pFJcavyse0nYGUjKtZ3dln6OJVA1LUa8WgeY=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -458,7 +458,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>4x0BYHqOwZNPC5IiyUUIcPd8CzM82d8zW6OQEUog9ag=</dsig:DigestValue>
+        <dsig:DigestValue>HJ91RS9OKmsHCoWO8mzNUXlUIlRhLyjIF9lvMQ9zjB4=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

DPM2016/obj/Debug/DPM2016.vbproj.CoreCompileInputs.cache

@@ -1 +1 @@
-c883852ff6ea95fb8e472eae15f5aafa740b6047
+7160819cd71b6200ce0e841b0906409d41ff7976

DPM2016/obj/Debug/DPM2016.vbproj.FileListAbsolute.txt

@@ -1,4 +1,3 @@
-E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.vbproj.AssemblyReference.cache
 E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmAuswertung.resources
 E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmreport.resources
 E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.FrmSearchDialog.resources
@@ -278,3 +277,4 @@ E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.vbproj.CopyComplete
 E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\PADM.exe
 E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\PADM.xml
 E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\PADM.pdb
+E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmPrivatAnsprechpartner.resources

DPM2016/obj/Debug/PADM.application

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>JlgtP6mQAK0P7LHketwjYJOoiMV/bDmCbeUOo603a3E=</dsig:DigestValue>
+        <dsig:DigestValue>dj+yWlykiBNw2KLjnKoOrZi/3OtC6mKwbKpubyoP2HI=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

DPM2016/obj/Debug/PADM.exe.manifest

@@ -451,14 +451,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PADM.exe" size="7470080">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PADM.exe" size="7488000">
       <assemblyIdentity name="PADM" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>1AbkfoRrGX8+CGFOn2Jd6Y65KlNysG5zAjlxz2QW3Ss=</dsig:DigestValue>
+        <dsig:DigestValue>2nTFOKOc+AY4ZMetArMXgLjSnqhML745qUWWL6YTEK4=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -1509,13 +1509,13 @@
       <dsig:DigestValue>NLnqVMsy3w9jN63XtqsXl3zuDEd+8S6tWSYv9gZKS4Q=</dsig:DigestValue>
     </hash>
   </file>
-  <file name="PADM.exe.config" size="4181">
+  <file name="PADM.exe.config" size="4182">
     <hash>
       <dsig:Transforms>
         <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
       </dsig:Transforms>
       <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-      <dsig:DigestValue>0prST3unFNQNU2HVldsrddDuCgCJokfAhMVNgXbX/v4=</dsig:DigestValue>
+      <dsig:DigestValue>STmpXFGnPRHc8/WWOyL6WhkVtZX2oFmfXuChzNeCQs4=</dsig:DigestValue>
     </hash>
   </file>
   <file name="PADM.ico" size="96694">