Update 2024-01-10

DPM2016/Patient/Patient.Designer.vb

@@ -42,6 +42,10 @@ Partial Class Patient
         Me.tsrbunternehmen = New Syncfusion.Windows.Forms.Tools.ToolStripRadioButton()
         Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
         Me.SuperTabControl1 = New DevComponents.DotNetBar.SuperTabControl()
+        Me.SuperTabControlPanel1 = New DevComponents.DotNetBar.SuperTabControlPanel()
+        Me.btnVTX = New System.Windows.Forms.Button()
+        Me.PatientDetails1 = New DPM2016.PatientDetails()
+        Me.Stammdaten = New DevComponents.DotNetBar.SuperTabItem()
         Me.SuperTabControlPanel7 = New DevComponents.DotNetBar.SuperTabControlPanel()
         Me.ClsDokumente1 = New DPM2016.clsDokumente()
         Me.Dokumente = New DevComponents.DotNetBar.SuperTabItem()
@@ -60,10 +64,6 @@ Partial Class Patient
         Me.SuperTabControlPanel8 = New DevComponents.DotNetBar.SuperTabControlPanel()
         Me.PatientDetailsFirma1 = New DPM2016.PatientDetailsFirma()
         Me.Stammdaten_Firma = New DevComponents.DotNetBar.SuperTabItem()
-        Me.SuperTabControlPanel1 = New DevComponents.DotNetBar.SuperTabControlPanel()
-        Me.btnVTX = New System.Windows.Forms.Button()
-        Me.PatientDetails1 = New DPM2016.PatientDetails()
-        Me.Stammdaten = New DevComponents.DotNetBar.SuperTabItem()
         Me.SuperTabControlPanel4 = New DevComponents.DotNetBar.SuperTabControlPanel()
         Me.Krankengeschichte1 = New DPM2016.Krankengeschichte()
         Me.Krankengeschichte = New DevComponents.DotNetBar.SuperTabItem()
@@ -74,13 +74,13 @@ Partial Class Patient
         Me.ToolStrip1.SuspendLayout()
         CType(Me.SuperTabControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuperTabControl1.SuspendLayout()
+        Me.SuperTabControlPanel1.SuspendLayout()
         Me.SuperTabControlPanel7.SuspendLayout()
         Me.SuperTabControlPanel6.SuspendLayout()
         Me.SuperTabControlPanel5.SuspendLayout()
         Me.SuperTabControlPanel3.SuspendLayout()
         Me.SuperTabControlPanel2.SuspendLayout()
         Me.SuperTabControlPanel8.SuspendLayout()
-        Me.SuperTabControlPanel1.SuspendLayout()
         Me.SuperTabControlPanel4.SuspendLayout()
         Me.MenuStrip1.SuspendLayout()
         Me.SuspendLayout()
@@ -274,6 +274,45 @@ Partial Class Patient
         Me.SuperTabControl1.Tabs.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.Stammdaten, Me.Stammdaten_Firma, Me.Abrechnung, Me.Behandlungen, Me.Finanzen, Me.Recall, Me.Dokumente, Me.Krankengeschichte})
         Me.SuperTabControl1.Text = "SuperTabControl1"
         '
+        'SuperTabControlPanel1
+        '
+        Me.SuperTabControlPanel1.Controls.Add(Me.btnVTX)
+        Me.SuperTabControlPanel1.Controls.Add(Me.PatientDetails1)
+        Me.SuperTabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.SuperTabControlPanel1.Location = New System.Drawing.Point(0, 25)
+        Me.SuperTabControlPanel1.Name = "SuperTabControlPanel1"
+        Me.SuperTabControlPanel1.Size = New System.Drawing.Size(1278, 610)
+        Me.SuperTabControlPanel1.TabIndex = 1
+        Me.SuperTabControlPanel1.TabItem = Me.Stammdaten
+        '
+        'btnVTX
+        '
+        Me.btnVTX.Image = CType(resources.GetObject("btnVTX.Image"), System.Drawing.Image)
+        Me.btnVTX.Location = New System.Drawing.Point(739, 38)
+        Me.btnVTX.Name = "btnVTX"
+        Me.btnVTX.Size = New System.Drawing.Size(75, 41)
+        Me.btnVTX.TabIndex = 18
+        Me.btnVTX.UseVisualStyleBackColor = True
+        '
+        'PatientDetails1
+        '
+        Me.PatientDetails1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.PatientDetails1.HasChanges = False
+        Me.PatientDetails1.Location = New System.Drawing.Point(0, 0)
+        Me.PatientDetails1.Margin = New System.Windows.Forms.Padding(4)
+        Me.PatientDetails1.Name = "PatientDetails1"
+        Me.PatientDetails1.Patientname = "0 Hutter Stefan Pfäffikon SZ"
+        Me.PatientDetails1.PatientNr = 0
+        Me.PatientDetails1.Size = New System.Drawing.Size(1278, 610)
+        Me.PatientDetails1.TabIndex = 17
+        '
+        'Stammdaten
+        '
+        Me.Stammdaten.AttachedControl = Me.SuperTabControlPanel1
+        Me.Stammdaten.GlobalItem = False
+        Me.Stammdaten.Name = "Stammdaten"
+        Me.Stammdaten.Text = "Stammdaten"
+        '
         'SuperTabControlPanel7
         '
         Me.SuperTabControlPanel7.Controls.Add(Me.ClsDokumente1)
@@ -448,45 +487,6 @@ Partial Class Patient
         Me.Stammdaten_Firma.Name = "Stammdaten_Firma"
         Me.Stammdaten_Firma.Text = "Stammdaten"
         '
-        'SuperTabControlPanel1
-        '
-        Me.SuperTabControlPanel1.Controls.Add(Me.btnVTX)
-        Me.SuperTabControlPanel1.Controls.Add(Me.PatientDetails1)
-        Me.SuperTabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.SuperTabControlPanel1.Location = New System.Drawing.Point(0, 25)
-        Me.SuperTabControlPanel1.Name = "SuperTabControlPanel1"
-        Me.SuperTabControlPanel1.Size = New System.Drawing.Size(1278, 610)
-        Me.SuperTabControlPanel1.TabIndex = 1
-        Me.SuperTabControlPanel1.TabItem = Me.Stammdaten
-        '
-        'btnVTX
-        '
-        Me.btnVTX.Image = CType(resources.GetObject("btnVTX.Image"), System.Drawing.Image)
-        Me.btnVTX.Location = New System.Drawing.Point(739, 38)
-        Me.btnVTX.Name = "btnVTX"
-        Me.btnVTX.Size = New System.Drawing.Size(75, 41)
-        Me.btnVTX.TabIndex = 18
-        Me.btnVTX.UseVisualStyleBackColor = True
-        '
-        'PatientDetails1
-        '
-        Me.PatientDetails1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.PatientDetails1.HasChanges = False
-        Me.PatientDetails1.Location = New System.Drawing.Point(0, 0)
-        Me.PatientDetails1.Margin = New System.Windows.Forms.Padding(4)
-        Me.PatientDetails1.Name = "PatientDetails1"
-        Me.PatientDetails1.Patientname = "0 Hutter Stefan Pfäffikon SZ"
-        Me.PatientDetails1.PatientNr = 0
-        Me.PatientDetails1.Size = New System.Drawing.Size(1278, 610)
-        Me.PatientDetails1.TabIndex = 17
-        '
-        'Stammdaten
-        '
-        Me.Stammdaten.AttachedControl = Me.SuperTabControlPanel1
-        Me.Stammdaten.GlobalItem = False
-        Me.Stammdaten.Name = "Stammdaten"
-        Me.Stammdaten.Text = "Stammdaten"
-        '
         'SuperTabControlPanel4
         '
         Me.SuperTabControlPanel4.Controls.Add(Me.Krankengeschichte1)
@@ -569,13 +569,13 @@ Partial Class Patient
         Me.ToolStrip1.PerformLayout()
         CType(Me.SuperTabControl1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.SuperTabControl1.ResumeLayout(False)
+        Me.SuperTabControlPanel1.ResumeLayout(False)
         Me.SuperTabControlPanel7.ResumeLayout(False)
         Me.SuperTabControlPanel6.ResumeLayout(False)
         Me.SuperTabControlPanel5.ResumeLayout(False)
         Me.SuperTabControlPanel3.ResumeLayout(False)
         Me.SuperTabControlPanel2.ResumeLayout(False)
         Me.SuperTabControlPanel8.ResumeLayout(False)
-        Me.SuperTabControlPanel1.ResumeLayout(False)
         Me.SuperTabControlPanel4.ResumeLayout(False)
         Me.MenuStrip1.ResumeLayout(False)
         Me.MenuStrip1.PerformLayout()

DPM2016/Patient/Patient.vb

@@ -1,4 +1,7 @@
-Public Class Patient
+Imports DevComponents.DotNetBar
+Imports FlexCel.Core
+
+Public Class Patient
 
     Dim m_nrpatient As Integer
     Property PatientNr As Integer
@@ -132,7 +135,18 @@
         Try
             '    Globals.sec.Set_Form_Security(Me)
         Catch
+
         End Try
+        If Globals.DruckBranche Then
+            tsrbprivat.Visible = True
+            tsrbunternehmen.Visible = True
+        Else
+            tsrbunternehmen.Visible = False
+            tsrbprivat.Visible = False
+        End If
+
+
+
     End Sub
 
     Private Sub ToolStripButton6_Click(sender As Object, e As EventArgs) Handles tsbtnSave.Click
@@ -147,8 +161,12 @@
     Private Sub tstxtsuche_KeyDown(sender As Object, e As KeyEventArgs) Handles tstxtsuche.KeyDown
         If e.KeyCode = Keys.Enter Then
             Dim db As New clsDB
-            'Dim nrprivat As Integer = db.Search("Patient", Me.tstxtsuche.Text)
-            Dim nrprivat As Integer = db.Search("Behandlungsgrund", Me.tstxtsuche.Text)
+            Dim nrprivat As Integer
+            If Globals.DruckBranche Then
+                nrprivat = db.Search("Behandlungsgrund", Me.tstxtsuche.Text)
+            Else
+                nrprivat = db.Search("Patient", Me.tstxtsuche.Text)
+            End If
 
             If nrprivat <> -1 Then Me.PatientNr = nrprivat
             If Me.SuperTabControl1.SelectedTab.Name = "Dokumente" Then

DPM2016/Patient/PatientDetails.vb

@@ -28,6 +28,23 @@ Public Class PatientDetails
                 Me.Label13.Visible = False
                 Me.chklbAdresstyp.Visible = False
             End If
+            If Globals.DruckBranche Then
+                Me.lblStatus.Visible = False
+                Me.cbboxStatus.Visible = False
+                Me.lblSprache.Visible = False
+                Me.cbboxSprache.Visible = False
+                Me.lblArbeitgeber.Visible = False
+                Me.cbboxNRArbeitgeber.Visible = False
+                Me.lblBeruf.Visible = False
+                Me.txtBeruf.Visible = False
+                Me.lblahv.Visible = False
+                Me.txtahvnr.Visible = False
+                Me.lblGLN.Visible = False
+                Me.txtGLN.Visible = False
+                Me.txtZSR.Visible = False
+                Me.Label13.Visible = False
+                Me.chklbAdresstyp.Visible = False
+            End If
             Me.ResumeLayout()
         End Set
     End Property
@@ -553,7 +570,7 @@ Public Class PatientDetails
     End Sub
 
     Private Sub cbboxNrAnrede_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbboxNrAnrede.SelectedIndexChanged
-        If Me.cbboxNrAnrede.Text = "Herr" Then Me.cbboxGeschlecht.SelectedValue = 2 Else Me.cbboxGeschlecht.SelectedValue = 1
+        If Globals.DruckBranche = False Then If Me.cbboxNrAnrede.Text = "Herr" Then Me.cbboxGeschlecht.SelectedValue = 2 Else Me.cbboxGeschlecht.SelectedValue = 1
     End Sub
 
 

DPM2016/Patient/subclasses/PatientDetailsFirma.Designer.vb

@@ -90,6 +90,7 @@ Partial Class PatientDetailsFirma
         Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.NeuerAnsprechpartnerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.BearbeitenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.LöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ClsStammdaten_flat1 = New DPM2016.clsStammdaten_flat()
         Me.cbboxNRArbeitgeber = New DPM2016.MyCombobox()
         Me.cbboxGeschlecht = New DPM2016.MyCombobox()
@@ -97,7 +98,6 @@ Partial Class PatientDetailsFirma
         Me.cbboxStatus = New DPM2016.MyCombobox()
         Me.cbboxNRTitel = New DPM2016.MyCombobox()
         Me.cbboxNrAnrede = New DPM2016.MyCombobox()
-        Me.LöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ContextMenuStrip1.SuspendLayout()
         Me.SuspendLayout()
         '
@@ -161,7 +161,7 @@ Partial Class PatientDetailsFirma
         Me.cbtxtboxKanton.Location = New System.Drawing.Point(79, 169)
         Me.cbtxtboxKanton.Name = "cbtxtboxKanton"
         Me.cbtxtboxKanton.Size = New System.Drawing.Size(228, 21)
-        Me.cbtxtboxKanton.TabIndex = 222
+        Me.cbtxtboxKanton.TabIndex = 7
         '
         'Label3
         '
@@ -179,7 +179,7 @@ Partial Class PatientDetailsFirma
         Me.dtgueltigbis.Location = New System.Drawing.Point(388, 62)
         Me.dtgueltigbis.Name = "dtgueltigbis"
         Me.dtgueltigbis.Size = New System.Drawing.Size(135, 20)
-        Me.dtgueltigbis.TabIndex = 241
+        Me.dtgueltigbis.TabIndex = 14
         '
         'dtGueltigab
         '
@@ -187,7 +187,7 @@ Partial Class PatientDetailsFirma
         Me.dtGueltigab.Location = New System.Drawing.Point(388, 36)
         Me.dtGueltigab.Name = "dtGueltigab"
         Me.dtGueltigab.Size = New System.Drawing.Size(135, 20)
-        Me.dtGueltigab.TabIndex = 240
+        Me.dtGueltigab.TabIndex = 13
         '
         'dtgebdat
         '
@@ -206,7 +206,7 @@ Partial Class PatientDetailsFirma
         Me.txtMutierer.ReadOnly = True
         Me.txtMutierer.RightToLeft = System.Windows.Forms.RightToLeft.Yes
         Me.txtMutierer.Size = New System.Drawing.Size(135, 20)
-        Me.txtMutierer.TabIndex = 276
+        Me.txtMutierer.TabIndex = 18
         '
         'txtMutiert_am
         '
@@ -214,7 +214,7 @@ Partial Class PatientDetailsFirma
         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 = 275
+        Me.txtMutiert_am.TabIndex = 17
         '
         'txtErstellt_am
         '
@@ -222,7 +222,7 @@ Partial Class PatientDetailsFirma
         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 = 274
+        Me.txtErstellt_am.TabIndex = 16
         '
         'Label18
         '
@@ -291,7 +291,7 @@ Partial Class PatientDetailsFirma
         Me.chklbAdresstyp.Location = New System.Drawing.Point(595, 40)
         Me.chklbAdresstyp.Name = "chklbAdresstyp"
         Me.chklbAdresstyp.Size = New System.Drawing.Size(120, 49)
-        Me.chklbAdresstyp.TabIndex = 243
+        Me.chklbAdresstyp.TabIndex = 21
         '
         'txtBemerkung
         '
@@ -299,7 +299,7 @@ Partial Class PatientDetailsFirma
         Me.txtBemerkung.Multiline = True
         Me.txtBemerkung.Name = "txtBemerkung"
         Me.txtBemerkung.Size = New System.Drawing.Size(326, 101)
-        Me.txtBemerkung.TabIndex = 242
+        Me.txtBemerkung.TabIndex = 20
         '
         'Label2
         '
@@ -337,7 +337,7 @@ Partial Class PatientDetailsFirma
         Me.txtName.Location = New System.Drawing.Point(79, 39)
         Me.txtName.Name = "txtName"
         Me.txtName.Size = New System.Drawing.Size(228, 20)
-        Me.txtName.TabIndex = 216
+        Me.txtName.TabIndex = 1
         '
         'lbltelg
         '
@@ -363,19 +363,17 @@ Partial Class PatientDetailsFirma
         '
         'txtTelg
         '
-        Me.txtTelg.Enabled = False
-        Me.txtTelg.Location = New System.Drawing.Point(830, 296)
+        Me.txtTelg.Location = New System.Drawing.Point(79, 202)
         Me.txtTelg.Name = "txtTelg"
-        Me.txtTelg.Size = New System.Drawing.Size(38, 20)
-        Me.txtTelg.TabIndex = 238
-        Me.txtTelg.Visible = False
+        Me.txtTelg.Size = New System.Drawing.Size(228, 20)
+        Me.txtTelg.TabIndex = 8
         '
         'txtVorname
         '
         Me.txtVorname.Location = New System.Drawing.Point(79, 63)
         Me.txtVorname.Name = "txtVorname"
         Me.txtVorname.Size = New System.Drawing.Size(228, 20)
-        Me.txtVorname.TabIndex = 217
+        Me.txtVorname.TabIndex = 2
         '
         'lblahv
         '
@@ -434,7 +432,7 @@ Partial Class PatientDetailsFirma
         Me.txtCOAdresse.Location = New System.Drawing.Point(79, 91)
         Me.txtCOAdresse.Name = "txtCOAdresse"
         Me.txtCOAdresse.Size = New System.Drawing.Size(228, 20)
-        Me.txtCOAdresse.TabIndex = 218
+        Me.txtCOAdresse.TabIndex = 3
         '
         'lblArbeitgeber
         '
@@ -463,19 +461,18 @@ Partial Class PatientDetailsFirma
         Me.txtStrasse.Location = New System.Drawing.Point(79, 118)
         Me.txtStrasse.Name = "txtStrasse"
         Me.txtStrasse.Size = New System.Drawing.Size(228, 20)
-        Me.txtStrasse.TabIndex = 219
+        Me.txtStrasse.TabIndex = 4
         '
         'lblSprache
         '
         Me.lblSprache.AutoSize = True
         Me.lblSprache.BackColor = System.Drawing.Color.Transparent
         Me.lblSprache.Enabled = False
-        Me.lblSprache.Location = New System.Drawing.Point(754, 338)
+        Me.lblSprache.Location = New System.Drawing.Point(524, 175)
         Me.lblSprache.Name = "lblSprache"
         Me.lblSprache.Size = New System.Drawing.Size(47, 13)
         Me.lblSprache.TabIndex = 261
         Me.lblSprache.Text = "Sprache"
-        Me.lblSprache.Visible = False
         '
         'lblStrasse
         '
@@ -492,7 +489,7 @@ Partial Class PatientDetailsFirma
         Me.txtPLZ.Location = New System.Drawing.Point(79, 144)
         Me.txtPLZ.Name = "txtPLZ"
         Me.txtPLZ.Size = New System.Drawing.Size(48, 20)
-        Me.txtPLZ.TabIndex = 220
+        Me.txtPLZ.TabIndex = 5
         '
         'lblStatus
         '
@@ -503,6 +500,7 @@ Partial Class PatientDetailsFirma
         Me.lblStatus.Size = New System.Drawing.Size(37, 13)
         Me.lblStatus.TabIndex = 260
         Me.lblStatus.Text = "Status"
+        Me.lblStatus.Visible = False
         '
         'lblPLZOrt
         '
@@ -531,7 +529,7 @@ Partial Class PatientDetailsFirma
         Me.txtOrt.Location = New System.Drawing.Point(133, 144)
         Me.txtOrt.Name = "txtOrt"
         Me.txtOrt.Size = New System.Drawing.Size(174, 20)
-        Me.txtOrt.TabIndex = 221
+        Me.txtOrt.TabIndex = 6
         '
         'txtBriefanrede
         '
@@ -568,10 +566,11 @@ Partial Class PatientDetailsFirma
         '
         'txttelp
         '
-        Me.txttelp.Location = New System.Drawing.Point(79, 202)
+        Me.txttelp.Location = New System.Drawing.Point(388, 205)
         Me.txttelp.Name = "txttelp"
         Me.txttelp.Size = New System.Drawing.Size(228, 20)
-        Me.txttelp.TabIndex = 224
+        Me.txttelp.TabIndex = 19
+        Me.txttelp.Visible = False
         '
         'lblInternet
         '
@@ -598,14 +597,14 @@ Partial Class PatientDetailsFirma
         Me.txtWeb.Location = New System.Drawing.Point(79, 306)
         Me.txtWeb.Name = "txtWeb"
         Me.txtWeb.Size = New System.Drawing.Size(228, 20)
-        Me.txtWeb.TabIndex = 228
+        Me.txtWeb.TabIndex = 12
         '
         'txtFaxp
         '
         Me.txtFaxp.Location = New System.Drawing.Point(79, 228)
         Me.txtFaxp.Name = "txtFaxp"
         Me.txtFaxp.Size = New System.Drawing.Size(228, 20)
-        Me.txtFaxp.TabIndex = 225
+        Me.txtFaxp.TabIndex = 9
         '
         'lblemail
         '
@@ -632,14 +631,14 @@ Partial Class PatientDetailsFirma
         Me.txtE_Mail.Location = New System.Drawing.Point(79, 280)
         Me.txtE_Mail.Name = "txtE_Mail"
         Me.txtE_Mail.Size = New System.Drawing.Size(228, 20)
-        Me.txtE_Mail.TabIndex = 227
+        Me.txtE_Mail.TabIndex = 11
         '
         'txtNatel
         '
         Me.txtNatel.Location = New System.Drawing.Point(79, 254)
         Me.txtNatel.Name = "txtNatel"
         Me.txtNatel.Size = New System.Drawing.Size(228, 20)
-        Me.txtNatel.TabIndex = 226
+        Me.txtNatel.TabIndex = 10
         '
         'lblMobile
         '
@@ -659,7 +658,7 @@ Partial Class PatientDetailsFirma
         Me.txtnrprivat.ReadOnly = True
         Me.txtnrprivat.RightToLeft = System.Windows.Forms.RightToLeft.Yes
         Me.txtnrprivat.Size = New System.Drawing.Size(48, 20)
-        Me.txtnrprivat.TabIndex = 213
+        Me.txtnrprivat.TabIndex = 0
         '
         'lblNr
         '
@@ -717,7 +716,7 @@ Partial Class PatientDetailsFirma
         '
         Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeuerAnsprechpartnerToolStripMenuItem, Me.BearbeitenToolStripMenuItem, Me.LöschenToolStripMenuItem})
         Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
-        Me.ContextMenuStrip1.Size = New System.Drawing.Size(198, 92)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(198, 70)
         '
         'NeuerAnsprechpartnerToolStripMenuItem
         '
@@ -731,17 +730,23 @@ Partial Class PatientDetailsFirma
         Me.BearbeitenToolStripMenuItem.Size = New System.Drawing.Size(197, 22)
         Me.BearbeitenToolStripMenuItem.Text = "Bearbeiten"
         '
+        'LöschenToolStripMenuItem
+        '
+        Me.LöschenToolStripMenuItem.Name = "LöschenToolStripMenuItem"
+        Me.LöschenToolStripMenuItem.Size = New System.Drawing.Size(197, 22)
+        Me.LöschenToolStripMenuItem.Text = "Löschen"
+        '
         'ClsStammdaten_flat1
         '
         Me.ClsStammdaten_flat1.AllowAddNew = True
-        Me.ClsStammdaten_flat1.Connectionstring = "data source=shu01\shu00;initial catalog=SHUB_PADM;persist security info=false;workstati" &
-    "on id=;packet size=4096;user id=sa;password=*shu29"
+        Me.ClsStammdaten_flat1.Connectionstring = "data source=shu01\shu00;initial catalog=SHUB_PADM;persist security info=false;wor" &
+    "kstation 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, 178)
         Me.ClsStammdaten_flat1.SQL = ""
-        Me.ClsStammdaten_flat1.TabIndex = 281
+        Me.ClsStammdaten_flat1.TabIndex = 24
         Me.ClsStammdaten_flat1.Tablename = Nothing
         '
         'cbboxNRArbeitgeber
@@ -777,9 +782,9 @@ Partial Class PatientDetailsFirma
         Me.cbboxSprache.Dataselection = Nothing
         Me.cbboxSprache.Displaymember = Nothing
         Me.cbboxSprache.Enabled = False
-        Me.cbboxSprache.Location = New System.Drawing.Point(830, 333)
+        Me.cbboxSprache.Location = New System.Drawing.Point(600, 170)
         Me.cbboxSprache.Name = "cbboxSprache"
-        Me.cbboxSprache.Size = New System.Drawing.Size(38, 21)
+        Me.cbboxSprache.Size = New System.Drawing.Size(113, 21)
         Me.cbboxSprache.TabIndex = 232
         Me.cbboxSprache.Table = Nothing
         Me.cbboxSprache.TableAlias = ""
@@ -793,10 +798,11 @@ Partial Class PatientDetailsFirma
         Me.cbboxStatus.Location = New System.Drawing.Point(388, 88)
         Me.cbboxStatus.Name = "cbboxStatus"
         Me.cbboxStatus.Size = New System.Drawing.Size(135, 21)
-        Me.cbboxStatus.TabIndex = 231
+        Me.cbboxStatus.TabIndex = 15
         Me.cbboxStatus.Table = Nothing
         Me.cbboxStatus.TableAlias = ""
         Me.cbboxStatus.Valuemember = Nothing
+        Me.cbboxStatus.Visible = False
         '
         'cbboxNRTitel
         '
@@ -805,7 +811,7 @@ Partial Class PatientDetailsFirma
         Me.cbboxNRTitel.Location = New System.Drawing.Point(611, 142)
         Me.cbboxNRTitel.Name = "cbboxNRTitel"
         Me.cbboxNRTitel.Size = New System.Drawing.Size(103, 21)
-        Me.cbboxNRTitel.TabIndex = 215
+        Me.cbboxNRTitel.TabIndex = 23
         Me.cbboxNRTitel.Table = Nothing
         Me.cbboxNRTitel.TableAlias = ""
         Me.cbboxNRTitel.Valuemember = Nothing
@@ -818,18 +824,12 @@ Partial Class PatientDetailsFirma
         Me.cbboxNrAnrede.Location = New System.Drawing.Point(631, 114)
         Me.cbboxNrAnrede.Name = "cbboxNrAnrede"
         Me.cbboxNrAnrede.Size = New System.Drawing.Size(88, 21)
-        Me.cbboxNrAnrede.TabIndex = 214
+        Me.cbboxNrAnrede.TabIndex = 22
         Me.cbboxNrAnrede.Table = Nothing
         Me.cbboxNrAnrede.TableAlias = ""
         Me.cbboxNrAnrede.Valuemember = Nothing
         Me.cbboxNrAnrede.Visible = False
         '
-        'LöschenToolStripMenuItem
-        '
-        Me.LöschenToolStripMenuItem.Name = "LöschenToolStripMenuItem"
-        Me.LöschenToolStripMenuItem.Size = New System.Drawing.Size(197, 22)
-        Me.LöschenToolStripMenuItem.Text = "Löschen"
-        '
         'PatientDetailsFirma
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -907,7 +907,7 @@ Partial Class PatientDetailsFirma
         Me.Controls.Add(Me.lblTitel)
         Me.Margin = New System.Windows.Forms.Padding(2)
         Me.Name = "PatientDetailsFirma"
-        Me.Size = New System.Drawing.Size(729, 535)
+        Me.Size = New System.Drawing.Size(1116, 535)
         Me.ContextMenuStrip1.ResumeLayout(False)
         Me.ResumeLayout(False)
         Me.PerformLayout()

DPM2016/Patient/subclasses/PatientDetailsFirma.vb

@@ -208,7 +208,7 @@ Public Class PatientDetailsFirma
 #Region "Daten_Laden"
 
     Public Sub Fill_Stammdaten()
-        If Globals.Stammdaten_Geladen = True Then Exit Sub
+        ' If Globals.Stammdaten_Geladen = True Then Exit Sub
         If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then
             chklbAdresstyp.Items.Clear()
             chklbAdresstyp.Items.Add("Leistungserbringer")
@@ -280,6 +280,9 @@ Public Class PatientDetailsFirma
                     End If
                     If UCase(Ctl.Name) = "CBBOX" + UCase(c.ColumnName) Then
                         log.Writelog("--Partnerdtails: Get_Data: " + Ctl.Name + " " + c.ColumnName, clsLog.Logtype.Information)
+                        If (c.ColumnName) = "sprache" Then
+                            Dim a As Integer = 1
+                        End If
                         Dim ct As MyCombobox
                         Dim o As Object = Ctl
                         Try