Aktualisierung Git

CryptoEditor/obj/Debug/CryptoEditor.vbproj.CoreCompileInputs.cache

@@ -1 +1 @@
-c25b68a472794d78e09340ae6530aa05beafcb9a
+01b4dd61334a40eedcfe46ace7c98025c17fecc6

CryptoEditor/obj/Release/CryptoEditor.vbproj.CoreCompileInputs.cache

@@ -1 +1 @@
-c25b68a472794d78e09340ae6530aa05beafcb9a
+01b4dd61334a40eedcfe46ace7c98025c17fecc6

DPM2016.sln

@@ -11,6 +11,8 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DPMLizenzmanagement", "DPML
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SHUKeyGen", "DPMLizenzmanagement\SHUKeyGen\SHUKeyGen.vbproj", "{9C0E2055-23AC-4209-8C03-0364C5AF2BAB}"
 EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SHU_Imagegal", "..\..\_Demos\PictureViewer\SHU_Imagegal\SHU_Imagegal\SHU_Imagegal.vbproj", "{45F09566-A07D-49BE-B538-311D3B7A3539}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,6 +35,10 @@ Global
 		{9C0E2055-23AC-4209-8C03-0364C5AF2BAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9C0E2055-23AC-4209-8C03-0364C5AF2BAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9C0E2055-23AC-4209-8C03-0364C5AF2BAB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{45F09566-A07D-49BE-B538-311D3B7A3539}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{45F09566-A07D-49BE-B538-311D3B7A3539}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{45F09566-A07D-49BE-B538-311D3B7A3539}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{45F09566-A07D-49BE-B538-311D3B7A3539}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

DPM2016/Auswertungen/FremAuswertung.Designer.vb

@@ -42,12 +42,15 @@ Partial Class frmAuswertung
         Me.TreeReporting = New System.Windows.Forms.TreeView()
         Me.previewControl1 = New FastReport.Preview.PreviewControl()
         Me.DataGridView1 = New System.Windows.Forms.DataGridView()
+        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.PatientenAuswahlToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.MenuStrip1.SuspendLayout()
         Me.ToolStrip1.SuspendLayout()
         Me.GroupBox1.SuspendLayout()
         Me.GroupBox3.SuspendLayout()
         Me.GroupBox2.SuspendLayout()
         CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.ContextMenuStrip1.SuspendLayout()
         Me.SuspendLayout()
         '
         'MenuStrip1
@@ -275,6 +278,7 @@ Partial Class frmAuswertung
         Me.previewControl1.Name = "previewControl1"
         Me.previewControl1.PageOffset = New System.Drawing.Point(10, 10)
         Me.previewControl1.RightToLeft = System.Windows.Forms.RightToLeft.No
+        Me.previewControl1.SaveInitialDirectory = Nothing
         Me.previewControl1.Size = New System.Drawing.Size(780, 635)
         Me.previewControl1.TabIndex = 25
         Me.previewControl1.UIStyle = FastReport.Utils.UIStyle.VisualStudio2005
@@ -288,6 +292,18 @@ Partial Class frmAuswertung
         Me.DataGridView1.Size = New System.Drawing.Size(780, 635)
         Me.DataGridView1.TabIndex = 26
         '
+        'ContextMenuStrip1
+        '
+        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.PatientenAuswahlToolStripMenuItem})
+        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(181, 48)
+        '
+        'PatientenAuswahlToolStripMenuItem
+        '
+        Me.PatientenAuswahlToolStripMenuItem.Name = "PatientenAuswahlToolStripMenuItem"
+        Me.PatientenAuswahlToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.PatientenAuswahlToolStripMenuItem.Text = "Patienten-Auswahl"
+        '
         'frmAuswertung
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -311,6 +327,7 @@ Partial Class frmAuswertung
         Me.GroupBox3.ResumeLayout(False)
         Me.GroupBox2.ResumeLayout(False)
         CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ContextMenuStrip1.ResumeLayout(False)
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -334,4 +351,6 @@ Partial Class frmAuswertung
     Friend WithEvents Properties As PropertyGridEx.PropertyGridEx
     Private WithEvents previewControl1 As FastReport.Preview.PreviewControl
     Friend WithEvents DataGridView1 As DataGridView
+    Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
+    Friend WithEvents PatientenAuswahlToolStripMenuItem As ToolStripMenuItem
 End Class

DPM2016/Auswertungen/FremAuswertung.resx

@@ -145,24 +145,24 @@
   <data name="tsbtnSave.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        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
+        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
-        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
+        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
-        +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
+        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
-        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
+        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
-        +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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        Eqy12Wz3E+BWw//KBDymwAUV6wYpgQGweoAWXxpb97j17lkiCdd8Pq/DGELm6ynFipqamjsM/xJALI8V
+        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
-        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
+        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
-        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
+        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
-        T1GuBGDzSgB9JxYb/pdHVCgq8E9o2HwKeOsI8OphA0BydGt445scNp9UsSuooT+cxsRMtjwe1nUBvGCO
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        7qZIFlIL6SBd0LtAddL9G4sjkhb/DxY6N4wqNTW8AAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="Properties.DocCommentImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -329,8 +329,11 @@
         KACiiigAooooAKKKKACiiigAooooAKKKKAP/2Q==
 </value>
   </data>
+  <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>231, 17</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>25</value>
+    <value>91</value>
   </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

DPM2016/Auswertungen/FremAuswertung.vb

@@ -41,7 +41,6 @@ Public Class frmAuswertung
         '    End If
         'Next
 
-
         Dim s As String
         Me.TreeReporting.Nodes.Clear()
         FileOpen(1, intdb.Get_Option(100) + "Reports.txt", Mode:=OpenMode.Input)
@@ -109,7 +108,7 @@ Public Class frmAuswertung
         Properties.ShowCustomProperties = True
         Properties.Item.Clear()
         Dim defaultvalue As String
-
+        Me.Properties.ContextMenuStrip = Nothing
         If ParameterColleation.Count > 0 Then
             For i As Integer = 1 To ParameterColleation.Count
                 Dim param As Reportparameter = ParameterColleation(i)
@@ -162,7 +161,9 @@ Public Class frmAuswertung
                                 defaultvalue = param.ParameterDefault
                                 If IsNumeric(defaultvalue) Then
                                     Properties.Item.Add(param.Parameterbezeichnung, defaultvalue, False, "Parameter", "Ganzzahl", True)
-
+                                    If param.Parameterbezeichnung = "Nummern (Komma-Getrennt)" Then
+                                        Me.Properties.ContextMenuStrip = ContextMenuStrip1
+                                    End If
                                 Else
                                     Select Case defaultvalue
                                         Case "currentyear"
@@ -654,6 +655,23 @@ Public Class frmAuswertung
         '    f.Show()
         'End Sub
     End Sub
+
+    Private Sub Properties_DoubleClick(sender As Object, e As EventArgs) Handles Properties.DoubleClick
+
+    End Sub
+
+    Private Sub Properties_Click(sender As Object, e As EventArgs) Handles Properties.Click
+
+    End Sub
+
+    Private Sub PatientenAuswahlToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PatientenAuswahlToolStripMenuItem.Click
+        Dim f As New FrmSearchDialog
+        f.ShowDialog()
+        If f.DialogResult = DialogResult.OK Then
+            Me.Properties.Item(1).Value = f.TextBox1.Text
+            Me.Properties.Refresh()
+        End If
+    End Sub
 End Class
 
 Public Class Report

DPM2016/Behandlung/Behandlung.vb

@@ -453,6 +453,12 @@ Public Class Behandlung
             r.Item("nrbehandlungsart") = dbgesetz.dsDaten.Tables(0).Rows(0).Item("nrbehandlungsart")
         End If
 
+        Get_Standards(r.Item("nrbehandler"), "Behandler")
+        Get_Standards(r.Item("nrestyp"), "ESTyp")
+        Get_Standards(r.Item("nrrgtyp"), "RGTyp")
+        Get_Standards(r.Item("Nrabrechnungstyp"), "Abrechnungstyp")
+        Get_Standards(r.Item("nransatz"), "Ansatz")
+        Get_Standards(r.Item("taxpunktwert"), "Taxpunktwert")
 
         db.dsDaten.Tables(0).Rows.Add(r)
         db.Update_Data()
@@ -465,6 +471,71 @@ Public Class Behandlung
             Me.nodeselected()
         Catch ex As Exception
         End Try
+    End Sub
+
+    Sub Get_Standards(ByRef o As Object, feld As String)
+        Dim dbs As New clsDB
+        Try
+            Select Case UCase(feld)
+                Case "BEHANDLER"
+                    dbs.Get_Tabledata("Standards", "", "Select * from standards where eintragnr=1", "", False)
+                    If dbs.dsDaten.Tables(0).Rows.Count > 0 Then
+                        o = dbs.dsDaten.Tables(0).Rows(0).Item("Standardwert")
+                    End If
+                Case "ESTYP"
+                    dbs.Get_Tabledata("Standards", "", "Select * from standards where eintragnr=2", "", False)
+                    If dbs.dsDaten.Tables(0).Rows.Count > 0 Then
+                        o = dbs.dsDaten.Tables(0).Rows(0).Item("Standardwert")
+                    End If
+                Case "RGTYP"
+                    dbs.Get_Tabledata("Standards", "", "Select * from standards where eintragnr=3", "", False)
+                    If dbs.dsDaten.Tables(0).Rows.Count > 0 Then
+                        o = dbs.dsDaten.Tables(0).Rows(0).Item("Standardwert")
+                    End If
+                Case "ABRECHNUNGSTYP"
+                    dbs.Get_Tabledata("Standards", "", "Select * from standards where eintragnr=4", "", False)
+                    If dbs.dsDaten.Tables(0).Rows.Count > 0 Then
+                        o = dbs.dsDaten.Tables(0).Rows(0).Item("Standardwert")
+                    End If
+                Case "ANSATZ"
+                    dbs.Get_Tabledata("Standards", "", "Select * from standards where eintragnr=5", "", False)
+                    If dbs.dsDaten.Tables(0).Rows.Count > 0 Then
+                        o = dbs.dsDaten.Tables(0).Rows(0).Item("Standardwert")
+                    End If
+
+                Case "TAXPUNKTWERT"
+                    Dim s As String = ""
+                    dbs.Get_Tabledata("Standards", "", "Select * from standards where eintragnr=5", "", False)
+                    If dbs.dsDaten.Tables(0).Rows.Count > 0 Then
+                        s = dbs.dsDaten.Tables(0).Rows(0).Item("Standardwert")
+                    End If
+                    If s <> "" Then
+                        dbs.Get_Tabledata("Ansatz", "", "Select taxpunktwert from ansatz where nransatz=" & s, "", False)
+                        If dbs.dsDaten.Tables(0).Rows.Count > 0 Then
+                            o = dbs.dsDaten.Tables(0).Rows(0).Item(0)
+                        End If
+                    End If
+
+
+
+
+                Case Else
+            End Select
+        Catch ex As Exception
+            Dim i As Integer
+            i = 0
+        Finally
+            dbs.Dispose()
+
+
+
+        End Try
+
+
+
+
+
+
     End Sub
 
     Private Sub tsbtndeletebehandlung_Click(sender As Object, e As EventArgs) Handles tsbtndeletebehandlung.Click

DPM2016/Behandlung/Benhandungdetail.Designer.vb

@@ -24,7 +24,9 @@ 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.cbboxNRESTyp = New DPM2016.MyCombobox()
         Me.Label6 = New System.Windows.Forms.Label()
+        Me.cbboxnrbehandler = New DPM2016.MyCombobox()
         Me.Label7 = New System.Windows.Forms.Label()
         Me.grpZusammenfassugn = New System.Windows.Forms.GroupBox()
         Me.txtcTotal = New System.Windows.Forms.Label()
@@ -40,8 +42,12 @@ Partial Class Benhandungdetail
         Me.txtcKVTotal = New System.Windows.Forms.Label()
         Me.Label2 = New System.Windows.Forms.Label()
         Me.GrpGaramt = New System.Windows.Forms.GroupBox()
+        Me.lblahvnr = New System.Windows.Forms.Label()
+        Me.Label10 = New System.Windows.Forms.Label()
         Me.Button1 = New System.Windows.Forms.Button()
         Me.lblGesetz = New System.Windows.Forms.Label()
+        Me.cbboxNrGesetz = New DPM2016.MyCombobox()
+        Me.cbboxNrZuweiser = New DPM2016.MyCombobox()
         Me.Label5 = New System.Windows.Forms.Label()
         Me.btnDeleteKogudatum = New System.Windows.Forms.Button()
         Me.btnDeleteUnfalldatum = New System.Windows.Forms.Button()
@@ -52,8 +58,10 @@ Partial Class Benhandungdetail
         Me.DDTUnfalldatum = New DevComponents.Editors.DateTimeAdv.DateTimeInput()
         Me.lblUnfalldatum = New System.Windows.Forms.Label()
         Me.lblFallNummer = New System.Windows.Forms.Label()
+        Me.cbboxNrAnsprechpartner = New DPM2016.MyCombobox()
         Me.lblAnsprechpartner = New System.Windows.Forms.Label()
         Me.txtFallnummer = New System.Windows.Forms.TextBox()
+        Me.cbboxNrGarant = New DPM2016.MyCombobox()
         Me.lblgarant = New System.Windows.Forms.Label()
         Me.rbPrivatPersonen = New System.Windows.Forms.RadioButton()
         Me.rbkk = New System.Windows.Forms.RadioButton()
@@ -71,6 +79,8 @@ Partial Class Benhandungdetail
         Me.lblZuschlagRaten = New System.Windows.Forms.Label()
         Me.lblAnzahlRaten = New System.Windows.Forms.Label()
         Me.grpBehandlungsdaten = New System.Windows.Forms.GroupBox()
+        Me.DDTRGDatum = New DevComponents.Editors.DateTimeAdv.DateTimeInput()
+        Me.lblRGDatum = New System.Windows.Forms.Label()
         Me.DDTRGStellung = New DevComponents.Editors.DateTimeAdv.DateTimeInput()
         Me.DDTBehandlungsende = New DevComponents.Editors.DateTimeAdv.DateTimeInput()
         Me.DDTBehandlungsbeginn = New DevComponents.Editors.DateTimeAdv.DateTimeInput()
@@ -88,8 +98,12 @@ Partial Class Benhandungdetail
         Me.chkMitdatum = New System.Windows.Forms.CheckBox()
         Me.chkAndrucken_Taxpunkte = New System.Windows.Forms.CheckBox()
         Me.chkRabattGesamt = New System.Windows.Forms.CheckBox()
+        Me.cbboxNrtaxpunkt = New DPM2016.MyCombobox()
+        Me.cbboxNrAnsatz = New DPM2016.MyCombobox()
         Me.lblAnsatz = New System.Windows.Forms.Label()
+        Me.cbboxNrAbrechnungstyp = New DPM2016.MyCombobox()
         Me.lblAbrechnungstyp = New System.Windows.Forms.Label()
+        Me.cbboxNRRGtyp = New DPM2016.MyCombobox()
         Me.lblRechnungstyp = New System.Windows.Forms.Label()
         Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
         Me.tsbtnSave = New System.Windows.Forms.ToolStripButton()
@@ -98,7 +112,11 @@ Partial Class Benhandungdetail
         Me.DesignRechnungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
         Me.tsbtnGarantAnzeigen = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
+        Me.lblfakturanr = New System.Windows.Forms.ToolStripLabel()
+        Me.txtrgnummer = New System.Windows.Forms.ToolStripTextBox()
         Me.GrpRechnungstext = New System.Windows.Forms.GroupBox()
+        Me.cbboxrgtext = New DPM2016.MyCombobox()
         Me.txtRechnungsbemerkung = New System.Windows.Forms.TextBox()
         Me.lblDiagnose = New System.Windows.Forms.Label()
         Me.txtDiagnose = New System.Windows.Forms.TextBox()
@@ -107,6 +125,7 @@ Partial Class Benhandungdetail
         Me.grpglndiagnose = New System.Windows.Forms.GroupBox()
         Me.lblBehandlungsart = New System.Windows.Forms.Label()
         Me.txtBehandlungsgrund = New System.Windows.Forms.TextBox()
+        Me.cbboxNrBehandlungsart = New DPM2016.MyCombobox()
         Me.lblBehandlungsgrund = New System.Windows.Forms.Label()
         Me.grpEmpfaenger = New System.Windows.Forms.GroupBox()
         Me.btnSucheFirma = New System.Windows.Forms.Button()
@@ -116,18 +135,6 @@ Partial Class Benhandungdetail
         Me.Label8 = New System.Windows.Forms.Label()
         Me.txtSuchePrivat = New System.Windows.Forms.TextBox()
         Me.txtEmpfaenger = New System.Windows.Forms.TextBox()
-        Me.cbboxNrBehandlungsart = New DPM2016.MyCombobox()
-        Me.cbboxrgtext = New DPM2016.MyCombobox()
-        Me.cbboxNRESTyp = New DPM2016.MyCombobox()
-        Me.cbboxnrbehandler = New DPM2016.MyCombobox()
-        Me.cbboxNrGesetz = New DPM2016.MyCombobox()
-        Me.cbboxNrZuweiser = New DPM2016.MyCombobox()
-        Me.cbboxNrAnsprechpartner = New DPM2016.MyCombobox()
-        Me.cbboxNrGarant = New DPM2016.MyCombobox()
-        Me.cbboxNrtaxpunkt = New DPM2016.MyCombobox()
-        Me.cbboxNrAnsatz = New DPM2016.MyCombobox()
-        Me.cbboxNrAbrechnungstyp = New DPM2016.MyCombobox()
-        Me.cbboxNRRGtyp = New DPM2016.MyCombobox()
         Me.GrpPatient.SuspendLayout()
         Me.grpZusammenfassugn.SuspendLayout()
         Me.GrpGaramt.SuspendLayout()
@@ -138,6 +145,7 @@ Partial Class Benhandungdetail
         CType(Me.mtxtRatenzuschlag, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.xxtxtAnzahlraten, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.grpBehandlungsdaten.SuspendLayout()
+        CType(Me.DDTRGDatum, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DDTRGStellung, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DDTBehandlungsende, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DDTBehandlungsbeginn, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -163,6 +171,18 @@ Partial Class Benhandungdetail
         Me.GrpPatient.TabStop = False
         Me.GrpPatient.Text = "Patient / Behandler"
         '
+        'cbboxNRESTyp
+        '
+        Me.cbboxNRESTyp.Dataselection = Nothing
+        Me.cbboxNRESTyp.Displaymember = Nothing
+        Me.cbboxNRESTyp.Location = New System.Drawing.Point(72, 52)
+        Me.cbboxNRESTyp.Name = "cbboxNRESTyp"
+        Me.cbboxNRESTyp.Size = New System.Drawing.Size(216, 21)
+        Me.cbboxNRESTyp.TabIndex = 1
+        Me.cbboxNRESTyp.Table = Nothing
+        Me.cbboxNRESTyp.TableAlias = ""
+        Me.cbboxNRESTyp.Valuemember = Nothing
+        '
         'Label6
         '
         Me.Label6.AutoSize = True
@@ -172,6 +192,18 @@ Partial Class Benhandungdetail
         Me.Label6.TabIndex = 21
         Me.Label6.Text = "Formulartyp"
         '
+        'cbboxnrbehandler
+        '
+        Me.cbboxnrbehandler.Dataselection = Nothing
+        Me.cbboxnrbehandler.Displaymember = Nothing
+        Me.cbboxnrbehandler.Location = New System.Drawing.Point(72, 24)
+        Me.cbboxnrbehandler.Name = "cbboxnrbehandler"
+        Me.cbboxnrbehandler.Size = New System.Drawing.Size(216, 21)
+        Me.cbboxnrbehandler.TabIndex = 0
+        Me.cbboxnrbehandler.Table = Nothing
+        Me.cbboxnrbehandler.TableAlias = ""
+        Me.cbboxnrbehandler.Valuemember = Nothing
+        '
         'Label7
         '
         Me.Label7.AutoSize = True
@@ -320,6 +352,8 @@ Partial Class Benhandungdetail
         '
         'GrpGaramt
         '
+        Me.GrpGaramt.Controls.Add(Me.lblahvnr)
+        Me.GrpGaramt.Controls.Add(Me.Label10)
         Me.GrpGaramt.Controls.Add(Me.Button1)
         Me.GrpGaramt.Controls.Add(Me.lblGesetz)
         Me.GrpGaramt.Controls.Add(Me.cbboxNrGesetz)
@@ -352,6 +386,23 @@ Partial Class Benhandungdetail
         Me.GrpGaramt.TabStop = False
         Me.GrpGaramt.Text = "Garant"
         '
+        'lblahvnr
+        '
+        Me.lblahvnr.AutoSize = True
+        Me.lblahvnr.Location = New System.Drawing.Point(284, 116)
+        Me.lblahvnr.Name = "lblahvnr"
+        Me.lblahvnr.Size = New System.Drawing.Size(0, 13)
+        Me.lblahvnr.TabIndex = 226
+        '
+        'Label10
+        '
+        Me.Label10.AutoSize = True
+        Me.Label10.Location = New System.Drawing.Point(251, 116)
+        Me.Label10.Name = "Label10"
+        Me.Label10.Size = New System.Drawing.Size(32, 13)
+        Me.Label10.TabIndex = 225
+        Me.Label10.Text = "AHV:"
+        '
         'Button1
         '
         Me.Button1.Location = New System.Drawing.Point(373, 61)
@@ -370,6 +421,32 @@ Partial Class Benhandungdetail
         Me.lblGesetz.TabIndex = 223
         Me.lblGesetz.Text = "Gesetz"
         '
+        'cbboxNrGesetz
+        '
+        Me.cbboxNrGesetz.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest
+        Me.cbboxNrGesetz.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
+        Me.cbboxNrGesetz.Dataselection = Nothing
+        Me.cbboxNrGesetz.Displaymember = Nothing
+        Me.cbboxNrGesetz.Location = New System.Drawing.Point(94, 136)
+        Me.cbboxNrGesetz.Name = "cbboxNrGesetz"
+        Me.cbboxNrGesetz.Size = New System.Drawing.Size(151, 21)
+        Me.cbboxNrGesetz.TabIndex = 9
+        Me.cbboxNrGesetz.Table = Nothing
+        Me.cbboxNrGesetz.TableAlias = ""
+        Me.cbboxNrGesetz.Valuemember = Nothing
+        '
+        'cbboxNrZuweiser
+        '
+        Me.cbboxNrZuweiser.Dataselection = Nothing
+        Me.cbboxNrZuweiser.Displaymember = Nothing
+        Me.cbboxNrZuweiser.Location = New System.Drawing.Point(94, 239)
+        Me.cbboxNrZuweiser.Name = "cbboxNrZuweiser"
+        Me.cbboxNrZuweiser.Size = New System.Drawing.Size(169, 21)
+        Me.cbboxNrZuweiser.TabIndex = 13
+        Me.cbboxNrZuweiser.Table = Nothing
+        Me.cbboxNrZuweiser.TableAlias = ""
+        Me.cbboxNrZuweiser.Valuemember = Nothing
+        '
         'Label5
         '
         Me.Label5.AutoSize = True
@@ -530,6 +607,18 @@ Partial Class Benhandungdetail
         Me.lblFallNummer.TabIndex = 32
         Me.lblFallNummer.Text = "FallNummer"
         '
+        'cbboxNrAnsprechpartner
+        '
+        Me.cbboxNrAnsprechpartner.Dataselection = Nothing
+        Me.cbboxNrAnsprechpartner.Displaymember = Nothing
+        Me.cbboxNrAnsprechpartner.Location = New System.Drawing.Point(94, 84)
+        Me.cbboxNrAnsprechpartner.Name = "cbboxNrAnsprechpartner"
+        Me.cbboxNrAnsprechpartner.Size = New System.Drawing.Size(151, 21)
+        Me.cbboxNrAnsprechpartner.TabIndex = 7
+        Me.cbboxNrAnsprechpartner.Table = Nothing
+        Me.cbboxNrAnsprechpartner.TableAlias = ""
+        Me.cbboxNrAnsprechpartner.Valuemember = Nothing
+        '
         'lblAnsprechpartner
         '
         Me.lblAnsprechpartner.AutoSize = True
@@ -546,6 +635,18 @@ Partial Class Benhandungdetail
         Me.txtFallnummer.Size = New System.Drawing.Size(151, 20)
         Me.txtFallnummer.TabIndex = 8
         '
+        'cbboxNrGarant
+        '
+        Me.cbboxNrGarant.Dataselection = Nothing
+        Me.cbboxNrGarant.Displaymember = Nothing
+        Me.cbboxNrGarant.Location = New System.Drawing.Point(94, 61)
+        Me.cbboxNrGarant.Name = "cbboxNrGarant"
+        Me.cbboxNrGarant.Size = New System.Drawing.Size(277, 21)
+        Me.cbboxNrGarant.TabIndex = 6
+        Me.cbboxNrGarant.Table = Nothing
+        Me.cbboxNrGarant.TableAlias = ""
+        Me.cbboxNrGarant.Valuemember = Nothing
+        '
         'lblgarant
         '
         Me.lblgarant.AutoSize = True
@@ -727,6 +828,8 @@ Partial Class Benhandungdetail
         '
         'grpBehandlungsdaten
         '
+        Me.grpBehandlungsdaten.Controls.Add(Me.DDTRGDatum)
+        Me.grpBehandlungsdaten.Controls.Add(Me.lblRGDatum)
         Me.grpBehandlungsdaten.Controls.Add(Me.DDTRGStellung)
         Me.grpBehandlungsdaten.Controls.Add(Me.DDTBehandlungsende)
         Me.grpBehandlungsdaten.Controls.Add(Me.DDTBehandlungsbeginn)
@@ -742,6 +845,61 @@ Partial Class Benhandungdetail
         Me.grpBehandlungsdaten.TabStop = False
         Me.grpBehandlungsdaten.Text = "Behandlung"
         '
+        'DDTRGDatum
+        '
+        '
+        '
+        '
+        Me.DDTRGDatum.BackgroundStyle.Class = "DateTimeInputBackground"
+        Me.DDTRGDatum.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.DDTRGDatum.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown
+        Me.DDTRGDatum.ButtonDropDown.Visible = True
+        Me.DDTRGDatum.IsPopupCalendarOpen = False
+        Me.DDTRGDatum.Location = New System.Drawing.Point(129, 96)
+        '
+        '
+        '
+        '
+        '
+        '
+        Me.DDTRGDatum.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.DDTRGDatum.MonthCalendar.CalendarDimensions = New System.Drawing.Size(1, 1)
+        Me.DDTRGDatum.MonthCalendar.ClearButtonVisible = True
+        '
+        '
+        '
+        Me.DDTRGDatum.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2
+        Me.DDTRGDatum.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90
+        Me.DDTRGDatum.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground
+        Me.DDTRGDatum.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid
+        Me.DDTRGDatum.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder
+        Me.DDTRGDatum.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1
+        Me.DDTRGDatum.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.DDTRGDatum.MonthCalendar.DisplayMonth = New Date(2015, 5, 1, 0, 0, 0, 0)
+        Me.DDTRGDatum.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday
+        '
+        '
+        '
+        Me.DDTRGDatum.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2
+        Me.DDTRGDatum.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90
+        Me.DDTRGDatum.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground
+        Me.DDTRGDatum.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.DDTRGDatum.MonthCalendar.TodayButtonVisible = True
+        Me.DDTRGDatum.Name = "DDTRGDatum"
+        Me.DDTRGDatum.Size = New System.Drawing.Size(162, 20)
+        Me.DDTRGDatum.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled
+        Me.DDTRGDatum.TabIndex = 210
+        '
+        'lblRGDatum
+        '
+        Me.lblRGDatum.AutoSize = True
+        Me.lblRGDatum.BackColor = System.Drawing.Color.Transparent
+        Me.lblRGDatum.Location = New System.Drawing.Point(9, 102)
+        Me.lblRGDatum.Name = "lblRGDatum"
+        Me.lblRGDatum.Size = New System.Drawing.Size(91, 13)
+        Me.lblRGDatum.TabIndex = 211
+        Me.lblRGDatum.Text = "Rechnungsdatum"
+        '
         'DDTRGStellung
         '
         '
@@ -880,7 +1038,7 @@ Partial Class Benhandungdetail
         '
         'btnAbschliessen
         '
-        Me.btnAbschliessen.Location = New System.Drawing.Point(8, 100)
+        Me.btnAbschliessen.Location = New System.Drawing.Point(5, 117)
         Me.btnAbschliessen.Name = "btnAbschliessen"
         Me.btnAbschliessen.Size = New System.Drawing.Size(124, 23)
         Me.btnAbschliessen.TabIndex = 209
@@ -890,7 +1048,7 @@ Partial Class Benhandungdetail
         '
         'btnZuruecksetzen
         '
-        Me.btnZuruecksetzen.Location = New System.Drawing.Point(173, 100)
+        Me.btnZuruecksetzen.Location = New System.Drawing.Point(170, 117)
         Me.btnZuruecksetzen.Name = "btnZuruecksetzen"
         Me.btnZuruecksetzen.Size = New System.Drawing.Size(124, 23)
         Me.btnZuruecksetzen.TabIndex = 208
@@ -1041,6 +1199,30 @@ Partial Class Benhandungdetail
         Me.chkRabattGesamt.Text = "Rabatt auf Gesamtbetrag"
         Me.chkRabattGesamt.UseVisualStyleBackColor = True
         '
+        'cbboxNrtaxpunkt
+        '
+        Me.cbboxNrtaxpunkt.Dataselection = Nothing
+        Me.cbboxNrtaxpunkt.Displaymember = Nothing
+        Me.cbboxNrtaxpunkt.Location = New System.Drawing.Point(97, 138)
+        Me.cbboxNrtaxpunkt.Name = "cbboxNrtaxpunkt"
+        Me.cbboxNrtaxpunkt.Size = New System.Drawing.Size(196, 21)
+        Me.cbboxNrtaxpunkt.TabIndex = 4
+        Me.cbboxNrtaxpunkt.Table = Nothing
+        Me.cbboxNrtaxpunkt.TableAlias = ""
+        Me.cbboxNrtaxpunkt.Valuemember = Nothing
+        '
+        'cbboxNrAnsatz
+        '
+        Me.cbboxNrAnsatz.Dataselection = Nothing
+        Me.cbboxNrAnsatz.Displaymember = Nothing
+        Me.cbboxNrAnsatz.Location = New System.Drawing.Point(94, 81)
+        Me.cbboxNrAnsatz.Name = "cbboxNrAnsatz"
+        Me.cbboxNrAnsatz.Size = New System.Drawing.Size(196, 21)
+        Me.cbboxNrAnsatz.TabIndex = 2
+        Me.cbboxNrAnsatz.Table = Nothing
+        Me.cbboxNrAnsatz.TableAlias = ""
+        Me.cbboxNrAnsatz.Valuemember = Nothing
+        '
         'lblAnsatz
         '
         Me.lblAnsatz.AutoSize = True
@@ -1050,6 +1232,18 @@ Partial Class Benhandungdetail
         Me.lblAnsatz.TabIndex = 27
         Me.lblAnsatz.Text = "Ansatz"
         '
+        'cbboxNrAbrechnungstyp
+        '
+        Me.cbboxNrAbrechnungstyp.Dataselection = Nothing
+        Me.cbboxNrAbrechnungstyp.Displaymember = Nothing
+        Me.cbboxNrAbrechnungstyp.Location = New System.Drawing.Point(94, 53)
+        Me.cbboxNrAbrechnungstyp.Name = "cbboxNrAbrechnungstyp"
+        Me.cbboxNrAbrechnungstyp.Size = New System.Drawing.Size(196, 21)
+        Me.cbboxNrAbrechnungstyp.TabIndex = 1
+        Me.cbboxNrAbrechnungstyp.Table = Nothing
+        Me.cbboxNrAbrechnungstyp.TableAlias = ""
+        Me.cbboxNrAbrechnungstyp.Valuemember = Nothing
+        '
         'lblAbrechnungstyp
         '
         Me.lblAbrechnungstyp.AutoSize = True
@@ -1059,6 +1253,18 @@ Partial Class Benhandungdetail
         Me.lblAbrechnungstyp.TabIndex = 25
         Me.lblAbrechnungstyp.Text = "Abrechnungstyp"
         '
+        'cbboxNRRGtyp
+        '
+        Me.cbboxNRRGtyp.Dataselection = Nothing
+        Me.cbboxNRRGtyp.Displaymember = Nothing
+        Me.cbboxNRRGtyp.Location = New System.Drawing.Point(94, 25)
+        Me.cbboxNRRGtyp.Name = "cbboxNRRGtyp"
+        Me.cbboxNRRGtyp.Size = New System.Drawing.Size(196, 21)
+        Me.cbboxNRRGtyp.TabIndex = 0
+        Me.cbboxNRRGtyp.Table = Nothing
+        Me.cbboxNRRGtyp.TableAlias = ""
+        Me.cbboxNRRGtyp.Valuemember = Nothing
+        '
         'lblRechnungstyp
         '
         Me.lblRechnungstyp.AutoSize = True
@@ -1070,12 +1276,12 @@ Partial Class Benhandungdetail
         '
         'ToolStrip1
         '
-        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnSave, Me.ToolStripDropDownButton1, Me.ToolStripSeparator1, Me.tsbtnGarantAnzeigen})
+        Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(20, 20)
+        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnSave, Me.ToolStripDropDownButton1, Me.ToolStripSeparator1, Me.tsbtnGarantAnzeigen, Me.ToolStripSeparator2, Me.lblfakturanr, Me.txtrgnummer})
         Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
         Me.ToolStrip1.Name = "ToolStrip1"
-        Me.ToolStrip1.Size = New System.Drawing.Size(1062, 25)
+        Me.ToolStrip1.Size = New System.Drawing.Size(1062, 27)
         Me.ToolStrip1.TabIndex = 15
-        Me.ToolStrip1.Text = "ToolStrip1"
         '
         'tsbtnSave
         '
@@ -1083,7 +1289,7 @@ Partial Class Benhandungdetail
         Me.tsbtnSave.Image = CType(resources.GetObject("tsbtnSave.Image"), System.Drawing.Image)
         Me.tsbtnSave.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.tsbtnSave.Name = "tsbtnSave"
-        Me.tsbtnSave.Size = New System.Drawing.Size(23, 22)
+        Me.tsbtnSave.Size = New System.Drawing.Size(24, 24)
         Me.tsbtnSave.Text = "Speichern"
         '
         'ToolStripDropDownButton1
@@ -1093,7 +1299,7 @@ Partial Class Benhandungdetail
         Me.ToolStripDropDownButton1.Image = CType(resources.GetObject("ToolStripDropDownButton1.Image"), System.Drawing.Image)
         Me.ToolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripDropDownButton1.Name = "ToolStripDropDownButton1"
-        Me.ToolStripDropDownButton1.Size = New System.Drawing.Size(29, 22)
+        Me.ToolStripDropDownButton1.Size = New System.Drawing.Size(33, 24)
         Me.ToolStripDropDownButton1.Text = "Drucken / Vorschau / Design"
         Me.ToolStripDropDownButton1.Visible = False
         '
@@ -1112,7 +1318,7 @@ Partial Class Benhandungdetail
         'ToolStripSeparator1
         '
         Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25)
+        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 27)
         '
         'tsbtnGarantAnzeigen
         '
@@ -1120,11 +1326,29 @@ Partial Class Benhandungdetail
         Me.tsbtnGarantAnzeigen.Image = CType(resources.GetObject("tsbtnGarantAnzeigen.Image"), System.Drawing.Image)
         Me.tsbtnGarantAnzeigen.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.tsbtnGarantAnzeigen.Name = "tsbtnGarantAnzeigen"
-        Me.tsbtnGarantAnzeigen.Size = New System.Drawing.Size(96, 22)
+        Me.tsbtnGarantAnzeigen.Size = New System.Drawing.Size(96, 24)
         Me.tsbtnGarantAnzeigen.Text = "Garant anzeigen"
         Me.tsbtnGarantAnzeigen.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage
         Me.tsbtnGarantAnzeigen.ToolTipText = "Garant anzeigen"
         '
+        'ToolStripSeparator2
+        '
+        Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
+        Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 27)
+        '
+        'lblfakturanr
+        '
+        Me.lblfakturanr.Name = "lblfakturanr"
+        Me.lblfakturanr.Size = New System.Drawing.Size(25, 24)
+        Me.lblfakturanr.Text = "RG:"
+        '
+        'txtrgnummer
+        '
+        Me.txtrgnummer.Font = New System.Drawing.Font("Segoe UI", 9.0!)
+        Me.txtrgnummer.Name = "txtrgnummer"
+        Me.txtrgnummer.ReadOnly = True
+        Me.txtrgnummer.Size = New System.Drawing.Size(150, 27)
+        '
         'GrpRechnungstext
         '
         Me.GrpRechnungstext.Controls.Add(Me.cbboxrgtext)
@@ -1136,6 +1360,18 @@ Partial Class Benhandungdetail
         Me.GrpRechnungstext.TabStop = False
         Me.GrpRechnungstext.Text = "Rechnungstext / Bemerkung"
         '
+        'cbboxrgtext
+        '
+        Me.cbboxrgtext.Dataselection = Nothing
+        Me.cbboxrgtext.Displaymember = Nothing
+        Me.cbboxrgtext.Location = New System.Drawing.Point(3, 20)
+        Me.cbboxrgtext.Name = "cbboxrgtext"
+        Me.cbboxrgtext.Size = New System.Drawing.Size(424, 21)
+        Me.cbboxrgtext.TabIndex = 0
+        Me.cbboxrgtext.Table = Nothing
+        Me.cbboxrgtext.TableAlias = ""
+        Me.cbboxrgtext.Valuemember = Nothing
+        '
         'txtRechnungsbemerkung
         '
         Me.txtRechnungsbemerkung.Dock = System.Windows.Forms.DockStyle.Bottom
@@ -1210,6 +1446,20 @@ Partial Class Benhandungdetail
         Me.txtBehandlungsgrund.Size = New System.Drawing.Size(329, 20)
         Me.txtBehandlungsgrund.TabIndex = 222
         '
+        'cbboxNrBehandlungsart
+        '
+        Me.cbboxNrBehandlungsart.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
+        Me.cbboxNrBehandlungsart.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
+        Me.cbboxNrBehandlungsart.Dataselection = Nothing
+        Me.cbboxNrBehandlungsart.Displaymember = Nothing
+        Me.cbboxNrBehandlungsart.Location = New System.Drawing.Point(95, 77)
+        Me.cbboxNrBehandlungsart.Name = "cbboxNrBehandlungsart"
+        Me.cbboxNrBehandlungsart.Size = New System.Drawing.Size(151, 21)
+        Me.cbboxNrBehandlungsart.TabIndex = 225
+        Me.cbboxNrBehandlungsart.Table = Nothing
+        Me.cbboxNrBehandlungsart.TableAlias = ""
+        Me.cbboxNrBehandlungsart.Valuemember = Nothing
+        '
         'lblBehandlungsgrund
         '
         Me.lblBehandlungsgrund.AutoSize = True
@@ -1294,154 +1544,6 @@ Partial Class Benhandungdetail
         Me.txtEmpfaenger.Size = New System.Drawing.Size(326, 95)
         Me.txtEmpfaenger.TabIndex = 2
         '
-        'cbboxNrBehandlungsart
-        '
-        Me.cbboxNrBehandlungsart.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.cbboxNrBehandlungsart.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.cbboxNrBehandlungsart.Dataselection = Nothing
-        Me.cbboxNrBehandlungsart.Displaymember = Nothing
-        Me.cbboxNrBehandlungsart.Location = New System.Drawing.Point(95, 77)
-        Me.cbboxNrBehandlungsart.Name = "cbboxNrBehandlungsart"
-        Me.cbboxNrBehandlungsart.Size = New System.Drawing.Size(151, 21)
-        Me.cbboxNrBehandlungsart.TabIndex = 225
-        Me.cbboxNrBehandlungsart.Table = Nothing
-        Me.cbboxNrBehandlungsart.TableAlias = ""
-        Me.cbboxNrBehandlungsart.Valuemember = Nothing
-        '
-        'cbboxrgtext
-        '
-        Me.cbboxrgtext.Dataselection = Nothing
-        Me.cbboxrgtext.Displaymember = Nothing
-        Me.cbboxrgtext.Location = New System.Drawing.Point(3, 20)
-        Me.cbboxrgtext.Name = "cbboxrgtext"
-        Me.cbboxrgtext.Size = New System.Drawing.Size(424, 21)
-        Me.cbboxrgtext.TabIndex = 0
-        Me.cbboxrgtext.Table = Nothing
-        Me.cbboxrgtext.TableAlias = ""
-        Me.cbboxrgtext.Valuemember = Nothing
-        '
-        'cbboxNRESTyp
-        '
-        Me.cbboxNRESTyp.Dataselection = Nothing
-        Me.cbboxNRESTyp.Displaymember = Nothing
-        Me.cbboxNRESTyp.Location = New System.Drawing.Point(72, 52)
-        Me.cbboxNRESTyp.Name = "cbboxNRESTyp"
-        Me.cbboxNRESTyp.Size = New System.Drawing.Size(216, 21)
-        Me.cbboxNRESTyp.TabIndex = 1
-        Me.cbboxNRESTyp.Table = Nothing
-        Me.cbboxNRESTyp.TableAlias = ""
-        Me.cbboxNRESTyp.Valuemember = Nothing
-        '
-        'cbboxnrbehandler
-        '
-        Me.cbboxnrbehandler.Dataselection = Nothing
-        Me.cbboxnrbehandler.Displaymember = Nothing
-        Me.cbboxnrbehandler.Location = New System.Drawing.Point(72, 24)
-        Me.cbboxnrbehandler.Name = "cbboxnrbehandler"
-        Me.cbboxnrbehandler.Size = New System.Drawing.Size(216, 21)
-        Me.cbboxnrbehandler.TabIndex = 0
-        Me.cbboxnrbehandler.Table = Nothing
-        Me.cbboxnrbehandler.TableAlias = ""
-        Me.cbboxnrbehandler.Valuemember = Nothing
-        '
-        'cbboxNrGesetz
-        '
-        Me.cbboxNrGesetz.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest
-        Me.cbboxNrGesetz.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.cbboxNrGesetz.Dataselection = Nothing
-        Me.cbboxNrGesetz.Displaymember = Nothing
-        Me.cbboxNrGesetz.Location = New System.Drawing.Point(94, 136)
-        Me.cbboxNrGesetz.Name = "cbboxNrGesetz"
-        Me.cbboxNrGesetz.Size = New System.Drawing.Size(151, 21)
-        Me.cbboxNrGesetz.TabIndex = 9
-        Me.cbboxNrGesetz.Table = Nothing
-        Me.cbboxNrGesetz.TableAlias = ""
-        Me.cbboxNrGesetz.Valuemember = Nothing
-        '
-        'cbboxNrZuweiser
-        '
-        Me.cbboxNrZuweiser.Dataselection = Nothing
-        Me.cbboxNrZuweiser.Displaymember = Nothing
-        Me.cbboxNrZuweiser.Location = New System.Drawing.Point(94, 239)
-        Me.cbboxNrZuweiser.Name = "cbboxNrZuweiser"
-        Me.cbboxNrZuweiser.Size = New System.Drawing.Size(169, 21)
-        Me.cbboxNrZuweiser.TabIndex = 13
-        Me.cbboxNrZuweiser.Table = Nothing
-        Me.cbboxNrZuweiser.TableAlias = ""
-        Me.cbboxNrZuweiser.Valuemember = Nothing
-        '
-        'cbboxNrAnsprechpartner
-        '
-        Me.cbboxNrAnsprechpartner.Dataselection = Nothing
-        Me.cbboxNrAnsprechpartner.Displaymember = Nothing
-        Me.cbboxNrAnsprechpartner.Location = New System.Drawing.Point(94, 84)
-        Me.cbboxNrAnsprechpartner.Name = "cbboxNrAnsprechpartner"
-        Me.cbboxNrAnsprechpartner.Size = New System.Drawing.Size(151, 21)
-        Me.cbboxNrAnsprechpartner.TabIndex = 7
-        Me.cbboxNrAnsprechpartner.Table = Nothing
-        Me.cbboxNrAnsprechpartner.TableAlias = ""
-        Me.cbboxNrAnsprechpartner.Valuemember = Nothing
-        '
-        'cbboxNrGarant
-        '
-        Me.cbboxNrGarant.Dataselection = Nothing
-        Me.cbboxNrGarant.Displaymember = Nothing
-        Me.cbboxNrGarant.Location = New System.Drawing.Point(94, 61)
-        Me.cbboxNrGarant.Name = "cbboxNrGarant"
-        Me.cbboxNrGarant.Size = New System.Drawing.Size(277, 21)
-        Me.cbboxNrGarant.TabIndex = 6
-        Me.cbboxNrGarant.Table = Nothing
-        Me.cbboxNrGarant.TableAlias = ""
-        Me.cbboxNrGarant.Valuemember = Nothing
-        '
-        'cbboxNrtaxpunkt
-        '
-        Me.cbboxNrtaxpunkt.Dataselection = Nothing
-        Me.cbboxNrtaxpunkt.Displaymember = Nothing
-        Me.cbboxNrtaxpunkt.Location = New System.Drawing.Point(97, 138)
-        Me.cbboxNrtaxpunkt.Name = "cbboxNrtaxpunkt"
-        Me.cbboxNrtaxpunkt.Size = New System.Drawing.Size(196, 21)
-        Me.cbboxNrtaxpunkt.TabIndex = 4
-        Me.cbboxNrtaxpunkt.Table = Nothing
-        Me.cbboxNrtaxpunkt.TableAlias = ""
-        Me.cbboxNrtaxpunkt.Valuemember = Nothing
-        '
-        'cbboxNrAnsatz
-        '
-        Me.cbboxNrAnsatz.Dataselection = Nothing
-        Me.cbboxNrAnsatz.Displaymember = Nothing
-        Me.cbboxNrAnsatz.Location = New System.Drawing.Point(94, 81)
-        Me.cbboxNrAnsatz.Name = "cbboxNrAnsatz"
-        Me.cbboxNrAnsatz.Size = New System.Drawing.Size(196, 21)
-        Me.cbboxNrAnsatz.TabIndex = 2
-        Me.cbboxNrAnsatz.Table = Nothing
-        Me.cbboxNrAnsatz.TableAlias = ""
-        Me.cbboxNrAnsatz.Valuemember = Nothing
-        '
-        'cbboxNrAbrechnungstyp
-        '
-        Me.cbboxNrAbrechnungstyp.Dataselection = Nothing
-        Me.cbboxNrAbrechnungstyp.Displaymember = Nothing
-        Me.cbboxNrAbrechnungstyp.Location = New System.Drawing.Point(94, 53)
-        Me.cbboxNrAbrechnungstyp.Name = "cbboxNrAbrechnungstyp"
-        Me.cbboxNrAbrechnungstyp.Size = New System.Drawing.Size(196, 21)
-        Me.cbboxNrAbrechnungstyp.TabIndex = 1
-        Me.cbboxNrAbrechnungstyp.Table = Nothing
-        Me.cbboxNrAbrechnungstyp.TableAlias = ""
-        Me.cbboxNrAbrechnungstyp.Valuemember = Nothing
-        '
-        'cbboxNRRGtyp
-        '
-        Me.cbboxNRRGtyp.Dataselection = Nothing
-        Me.cbboxNRRGtyp.Displaymember = Nothing
-        Me.cbboxNRRGtyp.Location = New System.Drawing.Point(94, 25)
-        Me.cbboxNRRGtyp.Name = "cbboxNRRGtyp"
-        Me.cbboxNRRGtyp.Size = New System.Drawing.Size(196, 21)
-        Me.cbboxNRRGtyp.TabIndex = 0
-        Me.cbboxNRRGtyp.Table = Nothing
-        Me.cbboxNRRGtyp.TableAlias = ""
-        Me.cbboxNRRGtyp.Valuemember = Nothing
-        '
         'Benhandungdetail
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1473,6 +1575,7 @@ Partial Class Benhandungdetail
         CType(Me.xxtxtAnzahlraten, System.ComponentModel.ISupportInitialize).EndInit()
         Me.grpBehandlungsdaten.ResumeLayout(False)
         Me.grpBehandlungsdaten.PerformLayout()
+        CType(Me.DDTRGDatum, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.DDTRGStellung, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.DDTBehandlungsende, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.DDTBehandlungsbeginn, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1597,4 +1700,11 @@ Partial Class Benhandungdetail
     Friend WithEvents Label8 As Label
     Friend WithEvents txtSuchePrivat As TextBox
     Friend WithEvents txtEmpfaenger As TextBox
+    Friend WithEvents lblfakturanr As ToolStripLabel
+    Friend WithEvents txtrgnummer As ToolStripTextBox
+    Friend WithEvents ToolStripSeparator2 As ToolStripSeparator
+    Friend WithEvents DDTRGDatum As DevComponents.Editors.DateTimeAdv.DateTimeInput
+    Friend WithEvents lblRGDatum As Label
+    Friend WithEvents lblahvnr As Label
+    Friend WithEvents Label10 As Label
 End Class

DPM2016/Behandlung/Benhandungdetail.vb

@@ -241,6 +241,30 @@
         Catch ex As Exception
 
         End Try
+
+        Try
+            If db.dsDaten.Tables(0).Rows(0).Item("Status") = 3 Then
+                Me.lblfakturanr.Visible = True
+                Me.txtrgnummer.Visible = True
+                Dim dbf As New clsDB
+                dbf.Get_Tabledata("Faktua", "", "Select nrfaktura, datum From faktura where nrbehandlung=" + db.dsDaten.Tables(0).Rows(0).Item("nrbehandlung").ToString + " and status<>9 and nrfaktura=nrhauptfaktura")
+                Me.txtrgnummer.Text = ""
+                Dim d As Date
+                d = dbf.dsDaten.Tables(0).Rows(0).Item(1)
+                Me.txtrgnummer.Text = dbf.dsDaten.Tables(0).Rows(0).Item(0).ToString + " / " + d.ToString("dd.MM.yyyy")
+                dbf.Dispose()
+
+            Else
+                Me.lblfakturanr.Visible = False
+                Me.txtrgnummer.Visible = False
+            End If
+        Catch
+            Me.lblfakturanr.Visible = False
+            Me.txtrgnummer.Visible = False
+
+        End Try
+
+
         AddChanges(Me)
         Me.HasChanges = False
     End Sub
@@ -345,7 +369,7 @@
         Dim db1 As New clsDB
         Dim garantdatan As New DataTable
         If Key > 49999 Then
-            db1.Get_Tabledata("Firma", "", "Select nrfirma,name1+', '+ort +' ('+ltrim(rtrim(str(nrfirma)))+')' as Name1 from firma where aktiv=1 and nrfirma=" + Key.ToString + " order by name1")
+            db1.Get_Tabledata("Firma", "", "Select nrfirma, name1 +', '+ort +' ('+ltrim(rtrim(str(nrfirma)))+')' as Name1 from firma where aktiv=1 and nrfirma=" + Key.ToString + " order by name1")
             'Me.lblGarantText.Text = db.dsDaten.Tables(0).Rows(0).Item("nrfirma").ToString + " - " + db.dsDaten.Tables(0).Rows(0).Item("name1")
 
 
@@ -522,6 +546,17 @@
         Me.cbboxrgtext.Valuemember = "Nrrechnungstext"
         ' Me.OnLoad = False
 
+        Dim dbx As New clsDB
+        Try
+
+            Me.lblahvnr.Text = dbx.Get_Datavalue("Select ahvnr from privat where nrprivat=" + Me.Patientnr.ToString)
+        Catch
+            Me.lblahvnr.Text = ""
+        End Try
+        dbx.Dispose()
+
+
+
     End Sub
 
     Public Sub Recalc_Totale()
@@ -556,7 +591,6 @@
             If r("aktiv") = True Then
                 If r("SSO_Nummer").ToString.Substring(0, 1) = "4" Then ssototal = ssototal + r("total")
                 If r("SSO_Nummer").ToString.Substring(0, 1) = "9" Then ssototal = ssototal + r("total")
-
                 'If r("sso_Nummer") > 3999 And r("sso_nummer") < 5000 Then ssototal = ssototal + r("total")
                 total = total + r("Total")
             End If
@@ -580,10 +614,27 @@
             If chkRabattGesamt.Checked Then
                 total = (100 - mtxtRabatt.Text) * total / 100
             Else
-                total = stotal - (ssototal / 100 * Me.mtxtRabatt.Text)
+                Dim xxtotal As Double
+                Dim xabs As String = db.Get_Option(10000)
+                If UCase(xabs) <> "TRUE" Then
+                    total = stotal - (ssototal / 100 * Me.mtxtRabatt.Text)
+                Else
+                    Dim xldb As New clsDB
+                    xldb.Get_Tabledata("Leistung", "where absolut=0 and nrbehandlung=" + Me.Behandlungsnr.ToString + " And aktiv=1")
+
+                    For Each r As DataRow In xldb.dsDaten.Tables(0).Rows
+                        If r("aktiv") = True Then
+                            If r("SSO_Nummer").ToString.Substring(0, 1) = "4" Then xxtotal = xxtotal + r("total")
+                            If r("SSO_Nummer").ToString.Substring(0, 1) = "9" Then xxtotal = xxtotal + r("total")
+                            'If r("sso_Nummer") > 3999 And r("sso_nummer") < 5000 Then ssototal = ssototal + r("total")
+                        End If
+                    Next
+                    xldb.Dispose()
+                End If
+                total = stotal - (xxtotal / 100 * Me.mtxtRabatt.Text)
 
             End If
-            Me.txtcRabatt.Text = ((stotal - total) * -1).ToString
+                Me.txtcRabatt.Text = ((stotal - total) * -1).ToString
             Me.txtcRabatt.Text = Globals.Round5(Me.txtcRabatt.Text)
         Catch ex As Exception
             total = 0
@@ -824,7 +875,7 @@
     Private Sub rbPrivatPersonen_CheckedChanged(sender As Object, e As EventArgs) Handles rbPrivatPersonen.CheckedChanged
         If rbPrivatPersonen.Checked Then
             Dim garantdatan As New DataTable
-            db.Get_Tabledata("Privat", "", "Select nrprivat,name+' '+vorname+', '+plz+' '+ort +' ('+ltrim(rtrim(str(nrprivat)))+')' as Name1 from privat where aktiv=1 and (garant=1 or gesvertreter=1) order by name, vorname")
+            db.Get_Tabledata("Privat", "", "Select nrprivat,name+' '+vorname+', '+plz+' '+ort +' ('+ltrim(rtrim(str(nrprivat)))+')' as Name1 from privat where ltrim(name)<>'' and aktiv=1 and (garant=1 or gesvertreter=1) order by name, vorname")
             Me.cbboxNrGarant.DataSource = Nothing
             garantdatan = db.dsDaten.Tables(0).Copy
             Me.cbboxNrGarant.DataSource = garantdatan

DPM2016/Behandlung/Leistungen.Designer.vb

@@ -101,6 +101,7 @@ Partial Class Leistungen
         '
         'ToolStrip1
         '
+        Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(20, 20)
         Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslabelbhtotal})
         Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
         Me.ToolStrip1.Name = "ToolStrip1"
@@ -111,7 +112,7 @@ Partial Class Leistungen
         'tslabelbhtotal
         '
         Me.tslabelbhtotal.Name = "tslabelbhtotal"
-        Me.tslabelbhtotal.Size = New System.Drawing.Size(88, 22)
+        Me.tslabelbhtotal.Size = New System.Drawing.Size(87, 22)
         Me.tslabelbhtotal.Text = "ToolStripLabel1"
         '
         'GrpTarif
@@ -172,18 +173,20 @@ Partial Class Leistungen
         '
         'ContextMenuStrip1
         '
+        Me.ContextMenuStrip1.ImageScalingSize = New System.Drawing.Size(20, 20)
         Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TarifdetailsToolStripMenuItem})
         Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
-        Me.ContextMenuStrip1.Size = New System.Drawing.Size(132, 26)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(131, 26)
         '
         'TarifdetailsToolStripMenuItem
         '
         Me.TarifdetailsToolStripMenuItem.Name = "TarifdetailsToolStripMenuItem"
-        Me.TarifdetailsToolStripMenuItem.Size = New System.Drawing.Size(131, 22)
+        Me.TarifdetailsToolStripMenuItem.Size = New System.Drawing.Size(130, 22)
         Me.TarifdetailsToolStripMenuItem.Text = "Tarifdetails"
         '
         'ToolStrip2
         '
+        Me.ToolStrip2.ImageScalingSize = New System.Drawing.Size(20, 20)
         Me.ToolStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsDown, Me.tsUp, Me.ToolStripLabel1, Me.txtfilter})
         Me.ToolStrip2.Location = New System.Drawing.Point(196, 3)
         Me.ToolStrip2.Name = "ToolStrip2"
@@ -197,7 +200,7 @@ Partial Class Leistungen
         Me.tsDown.Image = CType(resources.GetObject("tsDown.Image"), System.Drawing.Image)
         Me.tsDown.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.tsDown.Name = "tsDown"
-        Me.tsDown.Size = New System.Drawing.Size(23, 22)
+        Me.tsDown.Size = New System.Drawing.Size(24, 24)
         Me.tsDown.Text = "ToolStripButton2"
         Me.tsDown.Visible = False
         '
@@ -207,7 +210,7 @@ Partial Class Leistungen
         Me.tsUp.Image = CType(resources.GetObject("tsUp.Image"), System.Drawing.Image)
         Me.tsUp.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.tsUp.Name = "tsUp"
-        Me.tsUp.Size = New System.Drawing.Size(23, 22)
+        Me.tsUp.Size = New System.Drawing.Size(24, 24)
         Me.tsUp.Text = "ToolStripButton1"
         Me.tsUp.Visible = False
         '
@@ -219,6 +222,7 @@ Partial Class Leistungen
         '
         'txtfilter
         '
+        Me.txtfilter.Font = New System.Drawing.Font("Segoe UI", 9.0!)
         Me.txtfilter.Name = "txtfilter"
         Me.txtfilter.Size = New System.Drawing.Size(100, 25)
         '
@@ -630,6 +634,7 @@ Partial Class Leistungen
         '
         'ctxMenuLeistung
         '
+        Me.ctxMenuLeistung.ImageScalingSize = New System.Drawing.Size(20, 20)
         Me.ctxMenuLeistung.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BearbeitenToolStripMenuItem, Me.LöschenToolStripMenuItem, Me.AnzeigenToolStripMenuItem, Me.LeistungsdatumÄndernToolStripMenuItem})
         Me.ctxMenuLeistung.Name = "ctxMenuLeistung"
         Me.ctxMenuLeistung.Size = New System.Drawing.Size(200, 92)

DPM2016/Behandlung/Leistungen.resx

@@ -120,9 +120,6 @@
   <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="ToolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>124, 17</value>
-  </metadata>
   <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>524, 17</value>
   </metadata>
@@ -200,6 +197,6 @@
 </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;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}Heading{Wrap:True;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;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{}FilterBar{BackColor:Info;}&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, 1071, 137&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, 1071, 137&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;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}Heading{ForeColor:ControlText;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;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{}FilterBar{BackColor:Info;}&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, 1071, 137&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, 1071, 137&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
   </data>
 </root>

DPM2016/Behandlung/Leistungen.vb

@@ -103,6 +103,7 @@ Public Class Leistungen
                     Select Case True
                         Case Trim(r("Bezeichnung")).Contains("UV_MV_IV") Or Trim(r("Bezeichnung")).Contains("Dentotar")
                             Dim tn As New DevComponents.AdvTree.Node
+                            tn.DataKey = 222
                             tn.Text = r("Bezeichnung")
                             Me.TreeTarifGruppen.Nodes.Add(tn)
                             Dim sortstring As String = "KapitelNrNeu"
@@ -115,7 +116,21 @@ Public Class Leistungen
                                 tn1.Tag = r2("KapitelLeistung")
                                 tn.Nodes.Add(tn1)
                             Next
-
+                        Case Trim(r("Bezeichnung")).Contains("Zahntechnik (VZLS)")
+                            Dim tn As New DevComponents.AdvTree.Node
+                            tn.Text = r("Bezeichnung")
+                            tn.DataKey = 223
+                            Me.TreeTarifGruppen.Nodes.Add(tn)
+                            Dim sortstring As String = "KapitelNrNeu"
+                            Dim dv As New DataView(IntTables.Inttables.Tables("dentotar_223"), "Level=1 and KapitelNrNeu<>'00' and KapitelNrNeu<>'000' ", sortstring, DataViewRowState.CurrentRows)
+                            For Each rowView As DataRowView In dv
+                                Dim r2 As DataRow = rowView.Row
+                                Dim tn1 As New DevComponents.AdvTree.Node
+                                tn1.Text = r2("Leistungd")
+                                tn1.DataKey = r2("KapitelnrNeu")
+                                tn1.Tag = r2("KapitelLeistung")
+                                tn.Nodes.Add(tn1)
+                            Next
                         Case Trim(r("Bezeichnung")).Contains("SSO")
                         Case Else
                             If UCase(r("bezeichnung")).ToString.IndexOf("DH") < 0 And UCase(r("bezeichnung")).ToString.IndexOf("9000") < 0 Then
@@ -190,21 +205,40 @@ Public Class Leistungen
             Me.cbboxnrbehandler.Valuemember = "nrprivat"
             Load_Tarif()
         Catch ex As Exception
-            'MsgBox(ex.Message)
+            MsgBox(ex.Message)
         End Try
 
 
     End Sub
 
     Sub Load_Tarif()
+        Dim isdentotar As Boolean = False
+        Dim isZahntechnik As Boolean = False
         Dim dv As DataView
         Dim dv1 As DataView
-        If Dentotar = True And Len(Me.TreeTarifGruppen.SelectedNode.DataKeyString) < 3 Then
+        If Dentotar = True And Me.TreeTarifGruppen.SelectedNode.DataKey = 222 Then
+            isdentotar = True
+        End If
+        If Dentotar = True And Len(TreeTarifGruppen.SelectedNode.DataKeyString < 3) Then
+            Try
+                If TreeTarifGruppen.SelectedNode.Parent.DataKey = 222 Then
+                    isdentotar = True
+                End If
+            Catch
+            End Try
 
+        End If
+        If isdentotar Then
             Try
+                Dim Wherestring As String
                 Dim db As New DataView(IntTables.Inttables.Tables("Dentotar"))
                 Dim sortstring As String = "leistungnrneu, leistungd"
-                Dim Wherestring As String = "Kapitelleistung='Lei' and KapitelNrNeu like '" + Me.TreeTarifGruppen.SelectedNode.DataKeyString + "%'"
+                If Me.TreeTarifGruppen.SelectedNode.DataKeyString = "222" Then
+                    Wherestring = "Kapitelleistung='Lei' and KapitelNrNeu like '" + "" + "%'"
+                Else
+                    wherestring = "Kapitelleistung='Lei' and KapitelNrNeu like '" + Me.TreeTarifGruppen.SelectedNode.DataKeyString + "%'"
+
+                End If
                 dv = New DataView(IntTables.Inttables.Tables("dentotar"), Wherestring, sortstring, DataViewRowState.CurrentRows)
                 Me.lbtarif1.DataSource = Nothing
                 Me.lbtarif1.DataSource = dv
@@ -215,8 +249,44 @@ Public Class Leistungen
             Catch ex As Exception
                 MsgBox(ex.Message)
             End Try
+        End If
+        If Dentotar = True And Me.TreeTarifGruppen.SelectedNode.DataKey = 223 Then
+            isZahntechnik = True
+        End If
+        If Dentotar = True And Len(TreeTarifGruppen.SelectedNode.DataKeyString < 3) Then
+            Try
+                If TreeTarifGruppen.SelectedNode.Parent.DataKey = 223 Then
+                    isZahntechnik = True
+                End If
+            Catch
+            End Try
 
         End If
+
+        If isZahntechnik Then
+            Try
+                Dim wherestring As String
+                Dim db As New DataView(IntTables.Inttables.Tables("Dentotar_223"))
+                Dim sortstring As String = "leistungnrneu, leistungd"
+                If Me.TreeTarifGruppen.SelectedNode.DataKeyString = "223" Then
+                    wherestring = "Kapitelleistung='Lei' and KapitelNrNeu like '" + "" + "%'"
+                Else
+                    wherestring = "Kapitelleistung='Lei' and KapitelNrNeu like '" + Me.TreeTarifGruppen.SelectedNode.DataKeyString + "%'"
+
+                End If
+
+                dv = New DataView(IntTables.Inttables.Tables("dentotar_223"), Wherestring, sortstring, DataViewRowState.CurrentRows)
+                Me.lbtarif1.DataSource = Nothing
+                Me.lbtarif1.DataSource = dv
+                Me.lbtarif1.DisplayMember = "nr_bez"
+                Me.lbtarif1.ValueMember = "LeistungNrNeu"
+                Exit Sub
+
+            Catch ex As Exception
+                MsgBox(ex.Message)
+            End Try
+        End If
+
         db.Get_Tarif()
         Try
             Dim SortString As String = ""
@@ -394,16 +464,35 @@ Public Class Leistungen
     End Sub
 
     Private Function Get_Tarifposition(ByVal value As String) As String
+
+        Dim wherestring As String = ""
         Dim sortstring As String = ""
-        Dim wherestring As String = "Leistungnrneu='" + value + "'"
-        Dim db As New DataView(IntTables.Inttables.Tables("Dentotar"), wherestring, sortstring, DataViewRowState.CurrentRows)
-        If db.Count > 0 Then
-            For Each drv As DataRowView In db
-                Return drv.Item("Leistungnrneu").ToString
-            Next
 
-            Exit Function
+        Try
-        End If
+            wherestring = "Leistungnrneu='" + value + "'"
+            Dim db As New DataView(IntTables.Inttables.Tables("Dentotar"), wherestring, sortstring, DataViewRowState.CurrentRows)
+            If db.Count > 0 Then
+                For Each drv As DataRowView In db
+                    Return drv.Item("Leistungnrneu").ToString
+                Next
+
+                Exit Function
+            End If
+        Catch
+        End Try
+
+        Try
+            Dim db223 As New DataView(IntTables.Inttables.Tables("Dentotar_223"), wherestring, sortstring, DataViewRowState.CurrentRows)
+            If db223.Count > 0 Then
+                For Each drv As DataRowView In db223
+                    Return drv.Item("Leistungnrneu").ToString
+                Next
+
+                Exit Function
+            End If
+        Catch
+        End Try
+
         Dim dv As New DataView(IntTables.Inttables.Tables("Tarif"), "nrtarif=" + value, "", DataViewRowState.CurrentRows)
         For Each drv As DataRowView In dv
             Return drv.Item("sso_nummer").ToString
@@ -434,18 +523,31 @@ Public Class Leistungen
     End Sub
 
     Private Sub lbtarif1_ItemDoubleClick(sender As Object, e As EventArgs) Handles lbtarif1.ItemDoubleClick
-        If Dentotar = True And Me.txtPosition.Text.Substring(0, 1) = 4 Then
+        If Dentotar = True Then
-            Dim dv1 As New DataView(IntTables.Inttables.Tables("Dentotar"), "Leistungnrneu='" + Me.lbtarif1.SelectedValue.ToString + "'", "", DataViewRowState.CurrentRows)
+            If Me.txtPosition.Text.Substring(0, 1) = 4 Then
-            For Each drv As DataRowView In dv1
+                Dim dv1 As New DataView(IntTables.Inttables.Tables("Dentotar"), "Leistungnrneu='" + Me.lbtarif1.SelectedValue.ToString + "'", "", DataViewRowState.CurrentRows)
-                Me.txtPosition.Text = drv.Item("Leistungnrneu").ToString
+                For Each drv As DataRowView In dv1
-                txtPosition_TextChanged(sender, e)
+                    Me.txtPosition.Text = drv.Item("Leistungnrneu").ToString
-                Me.BtnInsertLeistung_Click(sender, e)
+                    txtPosition_TextChanged(sender, e)
+                    Me.BtnInsertLeistung_Click(sender, e)
+                    Exit Sub
+                Next
+
                 Exit Sub
-            Next
+            Else
+                Dim dv1 As New DataView(IntTables.Inttables.Tables("Dentotar_223"), "Leistungnrneu='" + Me.lbtarif1.SelectedValue.ToString + "'", "", DataViewRowState.CurrentRows)
+                For Each drv As DataRowView In dv1
+                    Me.txtPosition.Text = drv.Item("Leistungnrneu").ToString
+                    txtPosition_TextChanged(sender, e)
+                    Me.BtnInsertLeistung_Click(sender, e)
+                    Exit Sub
+                Next
 
-            Exit Sub
+                Exit Sub
 
+            End If
         End If
+
         Dim dv As New DataView(IntTables.Inttables.Tables("Tarif"), "nrtarif=" + Me.lbtarif1.SelectedValue.ToString, "", DataViewRowState.CurrentRows)
         For Each drv As DataRowView In dv
             Me.txtPosition.Text = drv.Item("sso_nummer").ToString
@@ -499,10 +601,14 @@ Public Class Leistungen
                         Case Else
 
                     End Select
+                    Me.diwert.Text = Me.Frankenwert
+                    Me.DIPunkte.Enabled = True
+
+                Else
+                    Me.diwert.Text = dr.Item("betraginchf")
+                    Me.DIPunkte.Enabled = False
                 End If
                 Me.DIMenge.Text = 1
-                Me.diwert.Text = Me.Frankenwert
-                Me.DIPunkte.Enabled = True
                 Me.txtBezD.Text = dr.Item("LeistungD")
                 Exit Sub
             Catch
@@ -518,38 +624,89 @@ Public Class Leistungen
         End If
 
         Dim dv As New DataView(IntTables.Inttables.Tables("Tarif"), "sso_nummer='" + Me.txtPosition.Text.ToString + "'", "", DataViewRowState.CurrentRows)
-        For Each drv As DataRowView In dv
+        If dv.Count > 0 Then
-            If drv.Item("Frankenbetrag") < 0.1 Then
+            For Each drv As DataRowView In dv
-                Select Case Me.TaxPunkte
+                If drv.Item("Frankenbetrag") < 0.1 Then
-                    Case Taxpunkttyp.Maximal
+                    Select Case Me.TaxPunkte
-                        Me.DIPunkte.Value = drv.Item("maximaltarif")
+                        Case Taxpunkttyp.Maximal
-                    Case Taxpunkttyp.Minmal
+                            Me.DIPunkte.Value = drv.Item("maximaltarif")
-                        Me.DIPunkte.Value = drv.Item("minimaltarif")
+                        Case Taxpunkttyp.Minmal
-                    Case Taxpunkttyp.Privat
+                            Me.DIPunkte.Value = drv.Item("minimaltarif")
-                        Me.DIPunkte.Value = drv.Item("privattarif")
+                        Case Taxpunkttyp.Privat
-                    Case Taxpunkttyp.Suva
+                            Me.DIPunkte.Value = drv.Item("privattarif")
-                        Me.DIPunkte.Value = drv.Item("suvatarif")
+                        Case Taxpunkttyp.Suva
-                    Case Taxpunkttyp.Dentotar
+                            Me.DIPunkte.Value = drv.Item("suvatarif")
-                        Me.DIPunkte.Value = drv.Item("Taxpunkte_UV_MV_IV")
+                        Case Taxpunkttyp.Dentotar
-                    Case Else
+                            Me.DIPunkte.Value = drv.Item("Taxpunkte_UV_MV_IV")
+                        Case Else
 
-                End Select
+                    End Select
+                    Me.DIMenge.Text = 1
+                    Me.diwert.Text = Me.Frankenwert
+                    Me.DIPunkte.Enabled = True
+                    Me.txtBezD.Text = drv.Item("BezD")
+                Else
+                    Me.DIPunkte.Value = 0
+                    Me.DIPunkte.Enabled = False
+                    Me.DIMenge.Value = 1
+                    Dim b As Double
+
+                    b = drv.Item("Frankenbetrag")
+                    Me.diwert.Value = b
+                    Me.txtBezD.Text = drv.Item("BezD")
+                End If
+                Try
+                    If drv.Item("Frankenbetrag") = 0 And drv.Item("maximaltarif") = 0 And +drv.Item("minimaltarif") = 0 And drv.Item("privattarif") = 0 And drv.Item("suvatarif") = 0 Then
+                        diwert.Text = 0
+
+                    End If
+                Catch
+                End Try
+
+
+                Exit Sub
+            Next
+        End If
+
+        sortstring = ""
+        wherestring = "LeistungnrNeu='" + Me.txtPosition.Text + "'"
+        Dim dvx As New DataView(IntTables.Inttables.Tables("Dentotar_223"), wherestring, sortstring, DataViewRowState.CurrentRows)
+        If dvx.Count > 0 Then
+            Dim dr As DataRowView
+            Try
+                dr = dvx(0)
+                If dr.Item("Abrechnungseinheit") = "TP" Then
+                    Select Case Me.TaxPunkte
+                        Case Taxpunkttyp.Maximal
+                            Me.DIPunkte.Value = dr.Item("TP_Vertrag_mit_MwSt")
+                        Case Taxpunkttyp.Minmal
+                            Me.DIPunkte.Value = dr.Item("TP_Vertrag_mit_MwSt")
+                        Case Taxpunkttyp.Privat
+                            Me.DIPunkte.Value = dr.Item("TP_Vertrag_mit_MwSt")
+                        Case Taxpunkttyp.Suva
+                            Me.DIPunkte.Value = dr.Item("TP_Vertrag_mit_MwSt")
+                        Case Taxpunkttyp.Dentotar
+                            Me.DIPunkte.Value = dr.Item("TP_Vertrag_mit_MwSt")
+                        Case Else
+                    End Select
+                End If
                 Me.DIMenge.Text = 1
                 Me.diwert.Text = Me.Frankenwert
                 Me.DIPunkte.Enabled = True
-                Me.txtBezD.Text = drv.Item("BezD")
+                Me.txtBezD.Text = dr.Item("LeistungD")
-            Else
+                Exit Sub
-                Me.DIPunkte.Value = 0
+            Catch
-                Me.DIPunkte.Enabled = False
+                interror = 1
-                Me.DIMenge.Value = 1
+                MsgBox("Eingegebene Position ist nicht vorhanden.", vbExclamation)
-                Dim b As Double
+                Me.txtPosition.Focus()
-
+                Me.txtPosition.SelectAll()
-                b = drv.Item("Frankenbetrag")
+                Exit Sub
-                Me.diwert.Value = b
+            End Try
-                Me.txtBezD.Text = drv.Item("BezD")
+
-            End If
             Exit Sub
-        Next
+
+        End If
+
     End Sub
 
     Private Sub DIPunkte_ValueChanged(sender As Object, e As EventArgs) Handles DIPunkte.ValueChanged, DIMenge.ValueChanged, diwert.ValueChanged
@@ -582,7 +739,12 @@ Public Class Leistungen
     End Sub
 
     Sub Leistung_Einfuegen_Dentotar(ByVal SSONummer As String, ByVal anzahl As Integer, Optional DentotarNr As String = "")
+        Dim LeistungOverwrite As Boolean = False
         Dim dv As DataView
+        Dim isdentotar As Boolean = False
+        Dim iszahntechik As Boolean = False
+        Dim nrtarifgruppe As Integer
+
         Dim sortstring As String = ""
         Dim wherestring As String = "LeistungNrNeu='" + Me.txtPosition.Text.ToString + "'"
         If DentotarNr <> "" Then
@@ -590,17 +752,43 @@ Public Class Leistungen
         End If
         If SSONummer = "" Then
             dv = New DataView(IntTables.Inttables.Tables("Dentotar"), wherestring, sortstring, DataViewRowState.CurrentRows)
+            If dv.Count < 1 Then
+                dv = New DataView(IntTables.Inttables.Tables("Dentotar_223"), wherestring, sortstring, DataViewRowState.CurrentRows)
+                iszahntechik = True
+            Else
+                isdentotar = True
+            End If
         Else
             wherestring = SSONummer
             dv = New DataView(IntTables.Inttables.Tables("Dentotar"), wherestring, sortstring, DataViewRowState.CurrentRows)
-
+            If dv.Count < 1 Then
+                dv = New DataView(IntTables.Inttables.Tables("Dentotar_223"), wherestring, sortstring, DataViewRowState.CurrentRows)
+                iszahntechik = True
+            Else
+                isdentotar = True
+            End If
         End If
         Dim drv As DataRowView
         Try
             drv = dv(0)
         Catch
-            MsgBox("Leistungsposition nicht vorhanden.")
+            Dim f As New frmPosition
-            Exit Sub
+            f.TextBox1.Text = Me.txtPosition.Text.ToString
+            f.textbox2.text = Me.txtBezD.Text.ToString
+            f.textbox3.text = Me.txtErgänzung.Text.ToString
+            f.ShowDialog()
+
+            If f.DialogResult <> DialogResult.OK Then Exit Sub
+            If f.DialogResult = DialogResult.OK Then
+                Me.txtPosition.Text = f.TextBox1.Text
+                Me.txtBezD.Text = f.textbox2.text
+                Me.txtErgänzung.Text = f.textbox3.Text
+                LeistungOverwrite = True
+                isdentotar = True
+            Else
+                MsgBox("Leistungsposition nicht vorhanden.")
+                Exit Sub
+            End If
         End Try
 
         Dim db As New clsDB
@@ -621,8 +809,17 @@ Public Class Leistungen
         r.Item("nrbehandlung") = Me.Behandlungnr
         r.Item("mandant") = 1
         r.Item("nrtarifgruppe") = 0
-        r.Item("nrtarif") = 0
+        If isdentotar Then
-        r.Item("sso_nummer") = drv("LeistungNrNeu")
+            r.Item("nrtarif") = 5
+        Else
+            If iszahntechik Then r.Item("nrtarif") = 7
+        End If
+        If LeistungOverwrite Then
+            r.Item("sso_nummer") = Me.txtPosition.Text.ToString
+        Else
+            r.Item("sso_nummer") = drv("LeistungNrNeu")
+
+        End If
         If SSONummer = "" Then
             r.Item("bezd") = Me.txtBezD.Text + " " + Me.txtErgänzung.Text
         Else
@@ -646,21 +843,40 @@ Public Class Leistungen
         Else
             Try
                 If betraginchf = 0 Then
-                    Select Case Me.TaxPunkte
+                    If isdentotar Then
-                        Case Taxpunkttyp.Maximal
+                        Select Case Me.TaxPunkte
-                            r.Item("taxpunkte") = drv.Item("pp_amx")
+                            Case Taxpunkttyp.Maximal
-                        Case Taxpunkttyp.Minmal
+                                r.Item("taxpunkte") = drv.Item("pp_amx")
-                            r.Item("taxpunkte") = drv.Item("pp_min")
+                            Case Taxpunkttyp.Minmal
-                        Case Taxpunkttyp.Privat
+                                r.Item("taxpunkte") = drv.Item("pp_min")
-                            r.Item("taxpunkte") = drv.Item("pp_privat")
+                            Case Taxpunkttyp.Privat
-                        Case Taxpunkttyp.Suva
+                                r.Item("taxpunkte") = drv.Item("pp_privat")
-                            r.Item("taxpunkte") = drv.Item("Taxpunkte_UV_MV_IV")
+                            Case Taxpunkttyp.Suva
-                        Case Taxpunkttyp.Dentotar
+                                r.Item("taxpunkte") = drv.Item("Taxpunkte_UV_MV_IV")
-                            Me.DIPunkte.Value = drv.Item("Taxpunkte_UV_MV_IV")
+                            Case Taxpunkttyp.Dentotar
-                        Case Else
+                                Me.DIPunkte.Value = drv.Item("Taxpunkte_UV_MV_IV")
-
+                            Case Else
-                    End Select
+
+                        End Select
+                    Else
+                        Select Case Me.TaxPunkte
+                            Case Taxpunkttyp.Maximal
+                                r.Item("taxpunkte") = drv.Item("TP_Vertrag_mit_MwSt")
+                            Case Taxpunkttyp.Minmal
+                                r.Item("taxpunkte") = drv.Item("TP_Vertrag_mit_MwSt")
+                            Case Taxpunkttyp.Privat
+                                r.Item("taxpunkte") = drv.Item("TP_Vertrag_mit_MwSt")
+                            Case Taxpunkttyp.Suva
+                                r.Item("taxpunkte") = drv.Item("TP_Vertrag_mit_MwSt")
+                            Case Taxpunkttyp.Dentotar
+                                Me.DIPunkte.Value = drv.Item("TP_Vertrag_mit_MwSt")
+                            Case Else
+
+                        End Select
+
+                    End If
                 End If
+
             Catch
             End Try
 
@@ -702,15 +918,15 @@ Public Class Leistungen
 
     Sub Leistung_Einfuegen(Optional ssonummer As String = "", Optional anzahl As Integer = 1)
         ' If ssonummer = "" Then Exit Sub
-        If ssonummer = "7006" Then
+        'If ssonummer = "7006" Then
-            MsgBox("Hallo")
+        '    MsgBox("Hallo")
-        End If
+        'End If
         If interror > 0 Then
             interror = 0
             Exit Sub
         End If
         If Dentotar = True Then
-            If Me.txtPosition.Text.Substring(0, 1) = "4" Then
+            If Me.txtPosition.Text.Substring(0, 1) = "4" Or Me.txtPosition.Text.Substring(0, 1) = "0" Or Me.txtPosition.Text.Substring(0, 1) = "1" Or Me.txtPosition.Text.Substring(0, 1) = "2" Or Me.txtPosition.Text.Substring(0, 1) = "3" Then
                 Leistung_Einfuegen_Dentotar(ssonummer, anzahl)
                 Exit Sub
             End If
@@ -720,6 +936,8 @@ Public Class Leistungen
 
         Dim dv As DataView
         If ssonummer = "" Then
+            'IntTables.Inttables.Tables("tarif").WriteXml("o:\tarif.xml")
+
             dv = New DataView(IntTables.Inttables.Tables("Tarif"), "sso_nummer='" + Me.txtPosition.Text.ToString + "'", "", DataViewRowState.CurrentRows)
         Else
             dv = New DataView(IntTables.Inttables.Tables("Tarif"), "sso_nummer='" + ssonummer.ToString + "'", "", DataViewRowState.CurrentRows)
@@ -816,7 +1034,7 @@ Public Class Leistungen
     Sub refresh_leistungen()
         Me.C1Leistungen.DataSource = Nothing
         ldb.dsDaten.Tables.Clear()
-        ldb.Get_Tabledata("Leistung", " where aktiv=1 and nrbehandlung=" + Me.Behandlungnr.ToString + " and aktiv=1 order by datum desc, sso_nummer asc")
+        ldb.Get_Tabledata("Leistung", " where aktiv=1 and nrbehandlung=" + Me.Behandlungnr.ToString + " and aktiv=1 order by datum desc, nrtarif asc, sso_nummer asc")
         Me.C1Leistungen.DataSource = ldb.dsDaten.Tables(0)
         Me.C1Leistungen.DataMember = ldb.dsDaten.Tables(0).TableName
         spalten.Spaltentitel_aktualisieren(Me.C1Leistungen, ldb.dsDaten.Tables(0).TableName, ldb.dsDaten.Tables(0))
@@ -1014,9 +1232,7 @@ Public Class Leistungen
 
     End Sub
 
-    Private Sub TreeTarifGruppen_Click(sender As Object, e As EventArgs) Handles TreeTarifGruppen.Click
 
-    End Sub
 
     Private Sub LeistungsdatumÄndernToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles LeistungsdatumÄndernToolStripMenuItem.Click
         Dim f As New frmKalender

DPM2016/DPM2016.vbproj

@@ -80,16 +80,29 @@
     <GenerateManifests>true</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <SignManifests>true</SignManifests>
+    <SignManifests>false</SignManifests>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Aga.Controls">
       <HintPath>..\..\..\Klassen\TreeViewAdv\Aga.Controls\bin\Debug\Aga.Controls.dll</HintPath>
     </Reference>
-    <Reference Include="C1.Data.2, Version=2.0.20141.273, Culture=neutral, PublicKeyToken=900b028620cd3a1b, processorArchitecture=MSIL" />
+    <Reference Include="BetterThumbnailBrowser-net35, Version=3.15.0.0, Culture=neutral, PublicKeyToken=e6c91a3add447be2, processorArchitecture=MSIL" />
-    <Reference Include="C1.Win.C1Command.4, Version=4.0.20153.110, Culture=neutral, PublicKeyToken=e808566f358766d8" />
+    <Reference Include="C1.Data.2, Version=2.0.20141.273, Culture=neutral, PublicKeyToken=900b028620cd3a1b, processorArchitecture=MSIL">
-    <Reference Include="C1.Win.C1Input.4, Version=4.0.20153.110, Culture=neutral, PublicKeyToken=7e7ff60f0c214f9a, processorArchitecture=MSIL" />
+      <SpecificVersion>False</SpecificVersion>
-    <Reference Include="C1.Win.C1TrueDBGrid.2, Version=2.0.20153.110, Culture=neutral, PublicKeyToken=75ae3fb0e2b1e0da, processorArchitecture=MSIL" />
+      <HintPath>bin\Debug\C1.Data.2.dll</HintPath>
+    </Reference>
+    <Reference Include="C1.Win.C1Command.4, Version=4.0.20153.110, Culture=neutral, PublicKeyToken=e808566f358766d8, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>bin\Debug\C1.Win.C1Command.4.dll</HintPath>
+    </Reference>
+    <Reference Include="C1.Win.C1Input.4, Version=4.0.20153.110, Culture=neutral, PublicKeyToken=7e7ff60f0c214f9a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>bin\Debug\C1.Win.C1Input.4.dll</HintPath>
+    </Reference>
+    <Reference Include="C1.Win.C1TrueDBGrid.2, Version=2.0.20153.110, Culture=neutral, PublicKeyToken=75ae3fb0e2b1e0da, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>bin\Debug\C1.Win.C1TrueDBGrid.2.dll</HintPath>
+    </Reference>
     <Reference Include="DevComponents.DotNetBar.Charts, Version=12.7.0.8, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL" />
     <Reference Include="DevComponents.DotNetBar.Schedule, Version=12.7.0.8, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -137,6 +150,12 @@
     <Reference Include="Ionic.Zlib">
       <HintPath>C:\Program Files (x86)\Gnostice\XtremeDevSystem .NET 2018 R1\XtremeDocumentStudio Free\Bin\Ionic.Zlib.dll</HintPath>
     </Reference>
+    <Reference Include="KP-ImageViewerV2">
+      <HintPath>..\..\..\_Demos\PictureViewer\SHU_Imagegal\SHU_Imagegal\bin\Debug\KP-ImageViewerV2.dll</HintPath>
+    </Reference>
+    <Reference Include="MsgReader">
+      <HintPath>..\..\ThirtPartyKlassen\MsgViewer\bin\Debug\MsgReader.dll</HintPath>
+    </Reference>
     <Reference Include="MySql.Data, Version=6.7.4.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Archiv\DPM_Reporting\DPM_Reporting\bin\Debug\MySql.Data.dll</HintPath>
@@ -145,18 +164,28 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Archiv\DPM_Reporting\DPM_Reporting\bin\Debug\MySql.Data.Entity.dll</HintPath>
     </Reference>
+    <Reference Include="OpenMcdf">
+      <HintPath>..\..\ThirtPartyKlassen\MsgViewer\bin\Debug\OpenMcdf.dll</HintPath>
+    </Reference>
     <Reference Include="PropertyGridEx">
       <HintPath>..\..\DPM_Reporting\_PropertyGrid\Source\PropertyGridEx\bin\Debug\PropertyGridEx.dll</HintPath>
     </Reference>
+    <Reference Include="RtfPipe">
+      <HintPath>..\..\ThirtPartyKlassen\MsgViewer\bin\Debug\RtfPipe.dll</HintPath>
+    </Reference>
     <Reference Include="SHUKeyGen, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\DPMLizenzmanagement\SHUKeyGen\bin\Debug\SHUKeyGen.dll</HintPath>
     </Reference>
     <Reference Include="Syncfusion.Compression.Base, Version=16.2350.0.41, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" />
+    <Reference Include="Syncfusion.Core.WinForms, Version=16.3460.0.21, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89" />
+    <Reference Include="Syncfusion.DataSource.WinForms, Version=16.3460.0.21, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89" />
+    <Reference Include="Syncfusion.GridCommon.WinForms, Version=16.3460.0.21, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89" />
     <Reference Include="Syncfusion.Pdf.Base, Version=16.2350.0.41, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89" />
     <Reference Include="Syncfusion.PdfViewer.Windows, Version=16.2350.0.41, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
       <Private>True</Private>
     </Reference>
+    <Reference Include="Syncfusion.SfListView.WinForms, Version=16.3460.0.21, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" />
     <Reference Include="Syncfusion.Shared.Base, Version=16.2350.0.41, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" />
     <Reference Include="Syncfusion.Shared.Windows, Version=16.2350.0.41, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" />
     <Reference Include="System" />
@@ -167,6 +196,7 @@
     <Reference Include="System.Drawing.Design" />
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.Management" />
     <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Runtime.Serialization.Formatters.Soap" />
     <Reference Include="System.Web" />
@@ -209,6 +239,12 @@
     <Compile Include="Auswertungen\frmreport.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="Auswertungen\FrmSearchDialog.Designer.vb">
+      <DependentUpon>FrmSearchDialog.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Auswertungen\FrmSearchDialog.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Behandlung\Behandlung.Designer.vb">
       <DependentUpon>Behandlung.vb</DependentUpon>
     </Compile>
@@ -234,6 +270,12 @@
     <Compile Include="Behandlung\frmLeistungDetail.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="Behandlung\frmPosition.Designer.vb">
+      <DependentUpon>frmPosition.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Behandlung\frmPosition.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Behandlung\Leistungen.Designer.vb">
       <DependentUpon>Leistungen.vb</DependentUpon>
     </Compile>
@@ -293,6 +335,12 @@
     <Compile Include="Dokumente\frmImportVorlage.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="Dokumente\Thumbviewer\ThumbViewer.designer.vb">
+      <DependentUpon>ThumbViewer.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Dokumente\Thumbviewer\ThumbViewer.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="EventHandler\Generic_Event_Handler.vb" />
     <Compile Include="Fakturierung\clsFakturierung.vb" />
     <Compile Include="Fakturierung\frmFakturierung.Designer.vb">
@@ -408,6 +456,12 @@
     <Compile Include="Sysadmin\frmAuswertungen.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="Sysadmin\frmDentotarDetail.Designer.vb">
+      <DependentUpon>frmDentotarDetail.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Sysadmin\frmDentotarDetail.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Sysadmin\frmPrinterselect.Designer.vb">
       <DependentUpon>frmPrinterselect.vb</DependentUpon>
     </Compile>
@@ -507,6 +561,12 @@
     <Compile Include="Utils\frmSplash.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="Utils\frmSQLCript.Designer.vb">
+      <DependentUpon>frmSQLCript.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Utils\frmSQLCript.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Utils\frmSuche.Designer.vb">
       <DependentUpon>frmSuche.vb</DependentUpon>
     </Compile>
@@ -536,6 +596,11 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Auswertungen\frmreport.resx">
       <DependentUpon>frmreport.vb</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Auswertungen\FrmSearchDialog.resx">
+      <DependentUpon>FrmSearchDialog.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Behandlung\Behandlung.resx">
       <DependentUpon>Behandlung.vb</DependentUpon>
@@ -549,6 +614,9 @@
     <EmbeddedResource Include="Behandlung\frmLeistungDetail.resx">
       <DependentUpon>frmLeistungDetail.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Behandlung\frmPosition.resx">
+      <DependentUpon>frmPosition.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Behandlung\Leistungen.resx">
       <DependentUpon>Leistungen.vb</DependentUpon>
     </EmbeddedResource>
@@ -576,6 +644,9 @@
     <EmbeddedResource Include="Dokumente\frmImportVorlage.resx">
       <DependentUpon>frmImportVorlage.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Dokumente\Thumbviewer\ThumbViewer.resx">
+      <DependentUpon>ThumbViewer.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Fakturierung\frmFakturierung.resx">
       <DependentUpon>frmFakturierung.vb</DependentUpon>
     </EmbeddedResource>
@@ -627,6 +698,9 @@
     <EmbeddedResource Include="Sysadmin\frmAuswertungen.resx">
       <DependentUpon>frmAuswertungen.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Sysadmin\frmDentotarDetail.resx">
+      <DependentUpon>frmDentotarDetail.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Sysadmin\frmPrinterselect.resx">
       <DependentUpon>frmPrinterselect.vb</DependentUpon>
     </EmbeddedResource>
@@ -674,6 +748,9 @@
     <EmbeddedResource Include="Utils\frmSplash.resx">
       <DependentUpon>frmSplash.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Utils\frmSQLCript.resx">
+      <DependentUpon>frmSQLCript.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Utils\frmSuche.resx">
       <DependentUpon>frmSuche.vb</DependentUpon>
     </EmbeddedResource>
@@ -724,7 +801,9 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <WCFMetadata Include="Connected Services\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

DPM2016/Database/clsDB.vb

@@ -363,7 +363,7 @@ Public Class clsDB
             dadaten = New SqlDataAdapter("select * from Spalten where aktiv=1", Me.Connectionstring)
             dadaten.Fill(dsDaten, "Daten")
         Catch ex As Exception
-
+            MsgBox(ex.Message)
         End Try
     End Function
 
@@ -592,17 +592,32 @@ Public Class clsDB
             Me.Get_Tabledata("paketpos", "order by nrpaket")
             IntTables.Inttables.Tables.Add(dsDaten.Tables(0).Copy)
         End If
-
+        Try
-        found = False
+            found = False
-        For Each t As DataTable In IntTables.Inttables.Tables
+            For Each t As DataTable In IntTables.Inttables.Tables
-            If t.TableName = "Dentotar" Then
+                If t.TableName = "Dentotar" Then
-                found = True
+                    found = True
+                End If
+            Next
+            If Not found Then
+                Me.Get_Tabledata("Dentotar", "", Get_SQL(23))
+                IntTables.Inttables.Tables.Add(dsDaten.Tables(0).Copy)
             End If
-        Next
+        Catch
-        If Not found Then
+        End Try
-            Me.Get_Tabledata("Dentotar", "", Get_SQL(23))
+        Try
-            IntTables.Inttables.Tables.Add(dsDaten.Tables(0).Copy)
+            found = False
-        End If
+            For Each t As DataTable In IntTables.Inttables.Tables
+                If t.TableName = "Zahntechnik" Then
+                    found = True
+                End If
+            Next
+            If Not found Then
+                Me.Get_Tabledata("Dentotar_223", "", Get_SQL(39))
+                IntTables.Inttables.Tables.Add(dsDaten.Tables(0).Copy)
+            End If
+        Catch
+        End Try
 
     End Function
 

DPM2016/Dokumente/clsDok.vb

@@ -364,7 +364,7 @@ Public Class clsDok
             Hauptfaktura = db.dsDaten.Tables(0).Rows(0).Item(0)
             db.Get_Tabledata("Doks", "", "Select * from dms_dokument where nrfaktura=" + Hauptfaktura.ToString + " and aktiv=1")
             If db.dsDaten.Tables(0).Rows.Count > 0 Then
-                If MsgBox("Möchten Sie die vorhandnen Dokumente löschen?", vbYesNo + vbQuestion) = vbNo Then Exit Sub
+                If MsgBox("Möchten Sie die vorhandenen Dokumente löschen?", vbYesNo + vbQuestion) = vbNo Then Exit Sub
                 For Each r As DataRow In db.dsDaten.Tables(0).Rows
                     Delete_Dok(r.Item(0))
                 Next

DPM2016/Dokumente/clsDokumente.Designer.vb

@@ -24,21 +24,21 @@ Partial Class clsDokumente
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(clsDokumente))
-        Dim FormatterSettings2 As Gnostice.Documents.FormatterSettings = New Gnostice.Documents.FormatterSettings()
+        Dim PdfViewerPrinterSettings1 As Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings = New Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings()
-        Dim SpreadSheetFormatterSettings2 As Gnostice.Documents.Spreadsheet.SpreadSheetFormatterSettings = New Gnostice.Documents.Spreadsheet.SpreadSheetFormatterSettings()
+        Dim FormatterSettings1 As Gnostice.Documents.FormatterSettings = New Gnostice.Documents.FormatterSettings()
-        Dim PageSettings3 As Gnostice.Documents.PageSettings = New Gnostice.Documents.PageSettings()
+        Dim SpreadSheetFormatterSettings1 As Gnostice.Documents.Spreadsheet.SpreadSheetFormatterSettings = New Gnostice.Documents.Spreadsheet.SpreadSheetFormatterSettings()
-        Dim Margins3 As Gnostice.Documents.Margins = New Gnostice.Documents.Margins()
+        Dim PageSettings1 As Gnostice.Documents.PageSettings = New Gnostice.Documents.PageSettings()
-        Dim SheetOptions3 As Gnostice.Documents.Spreadsheet.SheetOptions = New Gnostice.Documents.Spreadsheet.SheetOptions()
+        Dim Margins1 As Gnostice.Documents.Margins = New Gnostice.Documents.Margins()
-        Dim SheetOptions4 As Gnostice.Documents.Spreadsheet.SheetOptions = New Gnostice.Documents.Spreadsheet.SheetOptions()
+        Dim SheetOptions1 As Gnostice.Documents.Spreadsheet.SheetOptions = New Gnostice.Documents.Spreadsheet.SheetOptions()
-        Dim TxtFormatterSettings2 As Gnostice.Documents.TXTFormatterSettings = New Gnostice.Documents.TXTFormatterSettings()
+        Dim SheetOptions2 As Gnostice.Documents.Spreadsheet.SheetOptions = New Gnostice.Documents.Spreadsheet.SheetOptions()
-        Dim PageSettings4 As Gnostice.Documents.PageSettings = New Gnostice.Documents.PageSettings()
+        Dim TxtFormatterSettings1 As Gnostice.Documents.TXTFormatterSettings = New Gnostice.Documents.TXTFormatterSettings()
-        Dim Margins4 As Gnostice.Documents.Margins = New Gnostice.Documents.Margins()
+        Dim PageSettings2 As Gnostice.Documents.PageSettings = New Gnostice.Documents.PageSettings()
-        Dim RenderingSettings2 As Gnostice.Graphics.RenderingSettings = New Gnostice.Graphics.RenderingSettings()
+        Dim Margins2 As Gnostice.Documents.Margins = New Gnostice.Documents.Margins()
-        Dim ImageRenderingSettings2 As Gnostice.Graphics.ImageRenderingSettings = New Gnostice.Graphics.ImageRenderingSettings()
+        Dim RenderingSettings1 As Gnostice.Graphics.RenderingSettings = New Gnostice.Graphics.RenderingSettings()
-        Dim LineArtRenderingSettings2 As Gnostice.Graphics.LineArtRenderingSettings = New Gnostice.Graphics.LineArtRenderingSettings()
+        Dim ImageRenderingSettings1 As Gnostice.Graphics.ImageRenderingSettings = New Gnostice.Graphics.ImageRenderingSettings()
-        Dim ResolutionSettings2 As Gnostice.Graphics.ResolutionSettings = New Gnostice.Graphics.ResolutionSettings()
+        Dim LineArtRenderingSettings1 As Gnostice.Graphics.LineArtRenderingSettings = New Gnostice.Graphics.LineArtRenderingSettings()
-        Dim TextRenderingSettings2 As Gnostice.Graphics.TextRenderingSettings = New Gnostice.Graphics.TextRenderingSettings()
+        Dim ResolutionSettings1 As Gnostice.Graphics.ResolutionSettings = New Gnostice.Graphics.ResolutionSettings()
-        Dim PdfViewerPrinterSettings2 As Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings = New Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings()
+        Dim TextRenderingSettings1 As Gnostice.Graphics.TextRenderingSettings = New Gnostice.Graphics.TextRenderingSettings()
         Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
         Me.tsbtnnew = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripButton4 = New System.Windows.Forms.ToolStripButton()
@@ -52,6 +52,16 @@ Partial Class clsDokumente
         Me.ElementStyle1 = New DevComponents.DotNetBar.ElementStyle()
         Me.ElementStyle2 = New DevComponents.DotNetBar.ElementStyle()
         Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+        Me.ThumbViewer1 = New DPM2016.ThumbViewer()
+        Me.GrpDokumentvorschauMail = New System.Windows.Forms.GroupBox()
+        Me.webBrowser1 = New System.Windows.Forms.WebBrowser()
+        Me.ToolStrip3 = New System.Windows.Forms.ToolStrip()
+        Me.PrintButton = New System.Windows.Forms.ToolStripButton()
+        Me.ForwardButton = New System.Windows.Forms.ToolStripButton()
+        Me.BackButton = New System.Windows.Forms.ToolStripButton()
+        Me.SaveAsTextButton = New System.Windows.Forms.ToolStripButton()
+        Me.grpdokumentvorschaupdf = New System.Windows.Forms.GroupBox()
+        Me.pdfViewerControl1 = New Syncfusion.Windows.Forms.PdfViewer.PdfViewerControl()
         Me.grpdokumentvorschau = New System.Windows.Forms.GroupBox()
         Me.DocumentViewer1 = New Gnostice.Documents.Controls.WinForms.DocumentViewer()
         Me.ToolStrip2 = New System.Windows.Forms.ToolStrip()
@@ -85,17 +95,17 @@ Partial Class clsDokumente
         Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripSeparator()
         Me.NeuesDokumentAusVorlageErstellenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog()
-        Me.grpdokumentvorschaupdf = New System.Windows.Forms.GroupBox()
-        Me.pdfViewerControl1 = New Syncfusion.Windows.Forms.PdfViewer.PdfViewerControl()
         Me.ToolStrip1.SuspendLayout()
         Me.GroupBox1.SuspendLayout()
         CType(Me.treestruktur, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.GroupBox2.SuspendLayout()
+        Me.GrpDokumentvorschauMail.SuspendLayout()
+        Me.ToolStrip3.SuspendLayout()
+        Me.grpdokumentvorschaupdf.SuspendLayout()
         Me.grpdokumentvorschau.SuspendLayout()
         Me.ToolStrip2.SuspendLayout()
         CType(Me.C1Dokumente, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.ContextMenuStrip1.SuspendLayout()
-        Me.grpdokumentvorschaupdf.SuspendLayout()
         Me.SuspendLayout()
         '
         'ToolStrip1
@@ -103,7 +113,7 @@ Partial Class clsDokumente
         Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnnew, Me.ToolStripButton4, Me.tsbtnSave, Me.ToolStripButton2, Me.tsbtnvorlagen})
         Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
         Me.ToolStrip1.Name = "ToolStrip1"
-        Me.ToolStrip1.Size = New System.Drawing.Size(1007, 25)
+        Me.ToolStrip1.Size = New System.Drawing.Size(1181, 25)
         Me.ToolStrip1.TabIndex = 0
         Me.ToolStrip1.Text = "ToolStrip1"
         '
@@ -162,7 +172,7 @@ Partial Class clsDokumente
         Me.GroupBox1.Dock = System.Windows.Forms.DockStyle.Left
         Me.GroupBox1.Location = New System.Drawing.Point(0, 25)
         Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(278, 465)
+        Me.GroupBox1.Size = New System.Drawing.Size(278, 621)
         Me.GroupBox1.TabIndex = 1
         Me.GroupBox1.TabStop = False
         Me.GroupBox1.Text = "Struktur"
@@ -190,7 +200,7 @@ Partial Class clsDokumente
         Me.treestruktur.NodeStyle = Me.ElementStyle1
         Me.treestruktur.NodeStyleSelected = Me.ElementStyle2
         Me.treestruktur.PathSeparator = ";"
-        Me.treestruktur.Size = New System.Drawing.Size(272, 446)
+        Me.treestruktur.Size = New System.Drawing.Size(272, 602)
         Me.treestruktur.Styles.Add(Me.ElementStyle1)
         Me.treestruktur.Styles.Add(Me.ElementStyle2)
         Me.treestruktur.TabIndex = 1
@@ -240,17 +250,133 @@ Partial Class clsDokumente
         '
         'GroupBox2
         '
+        Me.GroupBox2.Controls.Add(Me.ThumbViewer1)
+        Me.GroupBox2.Controls.Add(Me.GrpDokumentvorschauMail)
         Me.GroupBox2.Controls.Add(Me.grpdokumentvorschaupdf)
         Me.GroupBox2.Controls.Add(Me.grpdokumentvorschau)
         Me.GroupBox2.Controls.Add(Me.C1Dokumente)
         Me.GroupBox2.Dock = System.Windows.Forms.DockStyle.Fill
         Me.GroupBox2.Location = New System.Drawing.Point(278, 25)
         Me.GroupBox2.Name = "GroupBox2"
-        Me.GroupBox2.Size = New System.Drawing.Size(729, 465)
+        Me.GroupBox2.Size = New System.Drawing.Size(903, 621)
         Me.GroupBox2.TabIndex = 2
         Me.GroupBox2.TabStop = False
         Me.GroupBox2.Text = "Dokumente"
         '
+        'ThumbViewer1
+        '
+        Me.ThumbViewer1.Data = Nothing
+        Me.ThumbViewer1.Location = New System.Drawing.Point(9, 468)
+        Me.ThumbViewer1.Name = "ThumbViewer1"
+        Me.ThumbViewer1.PreviewFilename = Nothing
+        Me.ThumbViewer1.Size = New System.Drawing.Size(971, 596)
+        Me.ThumbViewer1.TabIndex = 12
+        Me.ThumbViewer1.Visible = False
+        '
+        'GrpDokumentvorschauMail
+        '
+        Me.GrpDokumentvorschauMail.Controls.Add(Me.webBrowser1)
+        Me.GrpDokumentvorschauMail.Controls.Add(Me.ToolStrip3)
+        Me.GrpDokumentvorschauMail.Location = New System.Drawing.Point(84, 444)
+        Me.GrpDokumentvorschauMail.Name = "GrpDokumentvorschauMail"
+        Me.GrpDokumentvorschauMail.Size = New System.Drawing.Size(519, 242)
+        Me.GrpDokumentvorschauMail.TabIndex = 11
+        Me.GrpDokumentvorschauMail.TabStop = False
+        Me.GrpDokumentvorschauMail.Text = "Dokumentvorschau E-Mail"
+        '
+        'webBrowser1
+        '
+        Me.webBrowser1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.webBrowser1.Location = New System.Drawing.Point(3, 41)
+        Me.webBrowser1.Margin = New System.Windows.Forms.Padding(2)
+        Me.webBrowser1.MinimumSize = New System.Drawing.Size(10, 10)
+        Me.webBrowser1.Name = "webBrowser1"
+        Me.webBrowser1.Size = New System.Drawing.Size(513, 198)
+        Me.webBrowser1.TabIndex = 13
+        '
+        'ToolStrip3
+        '
+        Me.ToolStrip3.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.PrintButton, Me.ForwardButton, Me.BackButton, Me.SaveAsTextButton})
+        Me.ToolStrip3.Location = New System.Drawing.Point(3, 16)
+        Me.ToolStrip3.Name = "ToolStrip3"
+        Me.ToolStrip3.Padding = New System.Windows.Forms.Padding(0)
+        Me.ToolStrip3.Size = New System.Drawing.Size(513, 25)
+        Me.ToolStrip3.TabIndex = 1
+        Me.ToolStrip3.Text = "ToolStrip3"
+        '
+        'PrintButton
+        '
+        Me.PrintButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.PrintButton.Image = CType(resources.GetObject("PrintButton.Image"), System.Drawing.Image)
+        Me.PrintButton.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.PrintButton.Name = "PrintButton"
+        Me.PrintButton.Size = New System.Drawing.Size(23, 22)
+        Me.PrintButton.Text = "&Print"
+        '
+        'ForwardButton
+        '
+        Me.ForwardButton.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
+        Me.ForwardButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.ForwardButton.Enabled = False
+        Me.ForwardButton.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ForwardButton.Name = "ForwardButton"
+        Me.ForwardButton.Size = New System.Drawing.Size(23, 22)
+        Me.ForwardButton.Text = "Go &forward"
+        '
+        'BackButton
+        '
+        Me.BackButton.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
+        Me.BackButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.BackButton.Enabled = False
+        Me.BackButton.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.BackButton.Name = "BackButton"
+        Me.BackButton.Size = New System.Drawing.Size(23, 22)
+        Me.BackButton.Text = "Go &back"
+        '
+        'SaveAsTextButton
+        '
+        Me.SaveAsTextButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.SaveAsTextButton.Image = CType(resources.GetObject("SaveAsTextButton.Image"), System.Drawing.Image)
+        Me.SaveAsTextButton.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.SaveAsTextButton.Name = "SaveAsTextButton"
+        Me.SaveAsTextButton.Size = New System.Drawing.Size(23, 22)
+        Me.SaveAsTextButton.Text = "Save as text"
+        Me.SaveAsTextButton.Visible = False
+        '
+        'grpdokumentvorschaupdf
+        '
+        Me.grpdokumentvorschaupdf.Controls.Add(Me.pdfViewerControl1)
+        Me.grpdokumentvorschaupdf.Location = New System.Drawing.Point(6, 196)
+        Me.grpdokumentvorschaupdf.Name = "grpdokumentvorschaupdf"
+        Me.grpdokumentvorschaupdf.Size = New System.Drawing.Size(319, 242)
+        Me.grpdokumentvorschaupdf.TabIndex = 10
+        Me.grpdokumentvorschaupdf.TabStop = False
+        Me.grpdokumentvorschaupdf.Text = "Dokumentvorschau"
+        '
+        'pdfViewerControl1
+        '
+        Me.pdfViewerControl1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.pdfViewerControl1.EnableContextMenu = True
+        Me.pdfViewerControl1.EnableNotificationBar = True
+        Me.pdfViewerControl1.IsBookmarkEnabled = True
+        Me.pdfViewerControl1.Location = New System.Drawing.Point(3, 16)
+        Me.pdfViewerControl1.Name = "pdfViewerControl1"
+        Me.pdfViewerControl1.PageBorderThickness = 1
+        PdfViewerPrinterSettings1.PrintLocation = CType(resources.GetObject("PdfViewerPrinterSettings1.PrintLocation"), System.Drawing.PointF)
+        Me.pdfViewerControl1.PrinterSettings = PdfViewerPrinterSettings1
+        Me.pdfViewerControl1.ReferencePath = Nothing
+        Me.pdfViewerControl1.RenderingEngine = Syncfusion.Windows.Forms.PdfViewer.PdfRenderingEngine.SfPdf
+        Me.pdfViewerControl1.ScrollDisplacementValue = 0
+        Me.pdfViewerControl1.ShowHorizontalScrollBar = True
+        Me.pdfViewerControl1.ShowToolBar = True
+        Me.pdfViewerControl1.ShowVerticalScrollBar = True
+        Me.pdfViewerControl1.Size = New System.Drawing.Size(313, 223)
+        Me.pdfViewerControl1.SpaceBetweenPages = 8
+        Me.pdfViewerControl1.TabIndex = 4
+        Me.pdfViewerControl1.Text = "pdfViewerControl1"
+        Me.pdfViewerControl1.VisualStyle = Syncfusion.Windows.Forms.PdfViewer.VisualStyle.[Default]
+        Me.pdfViewerControl1.ZoomMode = Syncfusion.Windows.Forms.PdfViewer.ZoomMode.[Default]
+        '
         'grpdokumentvorschau
         '
         Me.grpdokumentvorschau.Controls.Add(Me.DocumentViewer1)
@@ -287,58 +413,58 @@ Partial Class clsDokumente
         Me.DocumentViewer1.PageLayout = Nothing
         Me.DocumentViewer1.PageRotation = Gnostice.Documents.Controls.WinForms.RotationAngle.Zero
         Me.DocumentViewer1.Preferences.Cursor = Gnostice.DOM.CursorPreferences.Pan
-        SpreadSheetFormatterSettings2.FormattingMode = Gnostice.DOM.FormattingMode.PreferDocumentSettings
+        SpreadSheetFormatterSettings1.FormattingMode = Gnostice.DOM.FormattingMode.PreferDocumentSettings
-        SpreadSheetFormatterSettings2.PageOrder = Gnostice.Documents.Spreadsheet.LayoutDirection.BackwardN
+        SpreadSheetFormatterSettings1.PageOrder = Gnostice.Documents.Spreadsheet.LayoutDirection.BackwardN
-        PageSettings3.Height = 11.6929!
+        PageSettings1.Height = 11.6929!
-        Margins3.Bottom = 1.0!
+        Margins1.Bottom = 1.0!
-        Margins3.Footer = 0!
+        Margins1.Footer = 0!
-        Margins3.Header = 0!
+        Margins1.Header = 0!
-        Margins3.Left = 1.0!
+        Margins1.Left = 1.0!
-        Margins3.Right = 1.0!
+        Margins1.Right = 1.0!
-        Margins3.Top = 1.0!
+        Margins1.Top = 1.0!
-        PageSettings3.Margin = Margins3
+        PageSettings1.Margin = Margins1
-        PageSettings3.Orientation = Gnostice.Graphics.Orientation.Portrait
+        PageSettings1.Orientation = Gnostice.Graphics.Orientation.Portrait
-        PageSettings3.PageSize = Gnostice.Documents.PageSize.A4
+        PageSettings1.PageSize = Gnostice.Documents.PageSize.A4
-        PageSettings3.Width = 8.2677!
+        PageSettings1.Width = 8.2677!
-        SpreadSheetFormatterSettings2.PageSettings = PageSettings3
+        SpreadSheetFormatterSettings1.PageSettings = PageSettings1
-        SheetOptions3.Print = False
+        SheetOptions1.Print = False
-        SheetOptions3.View = False
+        SheetOptions1.View = False
-        SpreadSheetFormatterSettings2.ShowGridlines = SheetOptions3
+        SpreadSheetFormatterSettings1.ShowGridlines = SheetOptions1
-        SheetOptions4.Print = False
+        SheetOptions2.Print = False
-        SheetOptions4.View = False
+        SheetOptions2.View = False
-        SpreadSheetFormatterSettings2.ShowHeadings = SheetOptions4
+        SpreadSheetFormatterSettings1.ShowHeadings = SheetOptions2
-        FormatterSettings2.SpreadSheet = SpreadSheetFormatterSettings2
+        FormatterSettings1.SpreadSheet = SpreadSheetFormatterSettings1
-        TxtFormatterSettings2.Font = New System.Drawing.Font("Calibri", 12.0!)
+        TxtFormatterSettings1.Font = New System.Drawing.Font("Calibri", 12.0!)
-        PageSettings4.Height = 11.6929!
+        PageSettings2.Height = 11.6929!
-        Margins4.Bottom = 1.0!
+        Margins2.Bottom = 1.0!
-        Margins4.Footer = 0!
+        Margins2.Footer = 0!
-        Margins4.Header = 0!
+        Margins2.Header = 0!
-        Margins4.Left = 1.0!
+        Margins2.Left = 1.0!
-        Margins4.Right = 1.0!
+        Margins2.Right = 1.0!
-        Margins4.Top = 1.0!
+        Margins2.Top = 1.0!
-        PageSettings4.Margin = Margins4
+        PageSettings2.Margin = Margins2
-        PageSettings4.Orientation = Gnostice.Graphics.Orientation.Portrait
+        PageSettings2.Orientation = Gnostice.Graphics.Orientation.Portrait
-        PageSettings4.PageSize = Gnostice.Documents.PageSize.A4
+        PageSettings2.PageSize = Gnostice.Documents.PageSize.A4
-        PageSettings4.Width = 8.2677!
+        PageSettings2.Width = 8.2677!
-        TxtFormatterSettings2.PageSettings = PageSettings4
+        TxtFormatterSettings1.PageSettings = PageSettings2
-        FormatterSettings2.TXT = TxtFormatterSettings2
+        FormatterSettings1.TXT = TxtFormatterSettings1
-        Me.DocumentViewer1.Preferences.FormatterSettings = FormatterSettings2
+        Me.DocumentViewer1.Preferences.FormatterSettings = FormatterSettings1
         Me.DocumentViewer1.Preferences.KeyNavigation = True
-        ImageRenderingSettings2.CompositingMode = Gnostice.Graphics.CompositingMode.SourceOver
+        ImageRenderingSettings1.CompositingMode = Gnostice.Graphics.CompositingMode.SourceOver
-        ImageRenderingSettings2.CompositingQuality = Gnostice.Graphics.CompositingQuality.[Default]
+        ImageRenderingSettings1.CompositingQuality = Gnostice.Graphics.CompositingQuality.[Default]
-        ImageRenderingSettings2.InterpolationMode = Gnostice.Graphics.InterpolationMode.Bilinear
+        ImageRenderingSettings1.InterpolationMode = Gnostice.Graphics.InterpolationMode.Bilinear
-        ImageRenderingSettings2.PixelOffsetMode = Gnostice.Graphics.PixelOffsetMode.[Default]
+        ImageRenderingSettings1.PixelOffsetMode = Gnostice.Graphics.PixelOffsetMode.[Default]
-        RenderingSettings2.Image = ImageRenderingSettings2
+        RenderingSettings1.Image = ImageRenderingSettings1
-        LineArtRenderingSettings2.SmoothingMode = Gnostice.Graphics.SmoothingMode.AntiAlias
+        LineArtRenderingSettings1.SmoothingMode = Gnostice.Graphics.SmoothingMode.AntiAlias
-        RenderingSettings2.LineArt = LineArtRenderingSettings2
+        RenderingSettings1.LineArt = LineArtRenderingSettings1
-        ResolutionSettings2.DpiX = 96.0!
+        ResolutionSettings1.DpiX = 96.0!
-        ResolutionSettings2.DpiY = 96.0!
+        ResolutionSettings1.DpiY = 96.0!
-        ResolutionSettings2.ResolutionMode = Gnostice.Graphics.ResolutionMode.UseSource
+        ResolutionSettings1.ResolutionMode = Gnostice.Graphics.ResolutionMode.UseSource
-        RenderingSettings2.Resolution = ResolutionSettings2
+        RenderingSettings1.Resolution = ResolutionSettings1
-        TextRenderingSettings2.TextContrast = 3
+        TextRenderingSettings1.TextContrast = 3
-        TextRenderingSettings2.TextRenderingHint = Gnostice.Graphics.TextRenderingHint.AntiAlias
+        TextRenderingSettings1.TextRenderingHint = Gnostice.Graphics.TextRenderingHint.AntiAlias
-        RenderingSettings2.Text = TextRenderingSettings2
+        RenderingSettings1.Text = TextRenderingSettings1
-        Me.DocumentViewer1.Preferences.RenderingSettings = RenderingSettings2
+        Me.DocumentViewer1.Preferences.RenderingSettings = RenderingSettings1
         Me.DocumentViewer1.Preferences.Units = Gnostice.Graphics.MeasurementUnit.Inches
         Me.DocumentViewer1.Size = New System.Drawing.Size(365, 228)
         Me.DocumentViewer1.TabIndex = 7
@@ -489,6 +615,7 @@ Partial Class clsDokumente
         'C1Dokumente
         '
         Me.C1Dokumente.AllowDrop = True
+        Me.C1Dokumente.AllowUpdate = False
         Me.C1Dokumente.AlternatingRows = True
         Me.C1Dokumente.ContextMenuStrip = Me.ContextMenuStrip1
         Me.C1Dokumente.Dock = System.Windows.Forms.DockStyle.Top
@@ -501,7 +628,7 @@ Partial Class clsDokumente
         Me.C1Dokumente.PreviewInfo.Size = New System.Drawing.Size(0, 0)
         Me.C1Dokumente.PreviewInfo.ZoomFactor = 75.0R
         Me.C1Dokumente.PrintInfo.PageSettings = CType(resources.GetObject("C1Dokumente.PrintInfo.PageSettings"), System.Drawing.Printing.PageSettings)
-        Me.C1Dokumente.Size = New System.Drawing.Size(723, 174)
+        Me.C1Dokumente.Size = New System.Drawing.Size(897, 174)
         Me.C1Dokumente.TabIndex = 5
         Me.C1Dokumente.Text = "C1TrueDBGrid1"
         Me.C1Dokumente.PropBag = resources.GetString("C1Dokumente.PropBag")
@@ -577,40 +704,6 @@ Partial Class clsDokumente
         Me.NeuesDokumentAusVorlageErstellenToolStripMenuItem.Size = New System.Drawing.Size(306, 22)
         Me.NeuesDokumentAusVorlageErstellenToolStripMenuItem.Text = "Neues Dokument aus Vorlage erstellen"
         '
-        'grpdokumentvorschaupdf
-        '
-        Me.grpdokumentvorschaupdf.Controls.Add(Me.pdfViewerControl1)
-        Me.grpdokumentvorschaupdf.Location = New System.Drawing.Point(6, 196)
-        Me.grpdokumentvorschaupdf.Name = "grpdokumentvorschaupdf"
-        Me.grpdokumentvorschaupdf.Size = New System.Drawing.Size(319, 242)
-        Me.grpdokumentvorschaupdf.TabIndex = 10
-        Me.grpdokumentvorschaupdf.TabStop = False
-        Me.grpdokumentvorschaupdf.Text = "Dokumentvorschau"
-        '
-        'pdfViewerControl1
-        '
-        Me.pdfViewerControl1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.pdfViewerControl1.EnableContextMenu = True
-        Me.pdfViewerControl1.EnableNotificationBar = True
-        Me.pdfViewerControl1.IsBookmarkEnabled = True
-        Me.pdfViewerControl1.Location = New System.Drawing.Point(3, 16)
-        Me.pdfViewerControl1.Name = "pdfViewerControl1"
-        Me.pdfViewerControl1.PageBorderThickness = 1
-        PdfViewerPrinterSettings2.PrintLocation = CType(resources.GetObject("PdfViewerPrinterSettings2.PrintLocation"), System.Drawing.PointF)
-        Me.pdfViewerControl1.PrinterSettings = PdfViewerPrinterSettings2
-        Me.pdfViewerControl1.ReferencePath = Nothing
-        Me.pdfViewerControl1.RenderingEngine = Syncfusion.Windows.Forms.PdfViewer.PdfRenderingEngine.SfPdf
-        Me.pdfViewerControl1.ScrollDisplacementValue = 0
-        Me.pdfViewerControl1.ShowHorizontalScrollBar = True
-        Me.pdfViewerControl1.ShowToolBar = True
-        Me.pdfViewerControl1.ShowVerticalScrollBar = True
-        Me.pdfViewerControl1.Size = New System.Drawing.Size(313, 223)
-        Me.pdfViewerControl1.SpaceBetweenPages = 8
-        Me.pdfViewerControl1.TabIndex = 4
-        Me.pdfViewerControl1.Text = "pdfViewerControl1"
-        Me.pdfViewerControl1.VisualStyle = Syncfusion.Windows.Forms.PdfViewer.VisualStyle.[Default]
-        Me.pdfViewerControl1.ZoomMode = Syncfusion.Windows.Forms.PdfViewer.ZoomMode.[Default]
-        '
         'clsDokumente
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -619,19 +712,23 @@ Partial Class clsDokumente
         Me.Controls.Add(Me.GroupBox1)
         Me.Controls.Add(Me.ToolStrip1)
         Me.Name = "clsDokumente"
-        Me.Size = New System.Drawing.Size(1007, 490)
+        Me.Size = New System.Drawing.Size(1181, 646)
         Me.ToolStrip1.ResumeLayout(False)
         Me.ToolStrip1.PerformLayout()
         Me.GroupBox1.ResumeLayout(False)
         CType(Me.treestruktur, System.ComponentModel.ISupportInitialize).EndInit()
         Me.GroupBox2.ResumeLayout(False)
+        Me.GrpDokumentvorschauMail.ResumeLayout(False)
+        Me.GrpDokumentvorschauMail.PerformLayout()
+        Me.ToolStrip3.ResumeLayout(False)
+        Me.ToolStrip3.PerformLayout()
+        Me.grpdokumentvorschaupdf.ResumeLayout(False)
         Me.grpdokumentvorschau.ResumeLayout(False)
         Me.grpdokumentvorschau.PerformLayout()
         Me.ToolStrip2.ResumeLayout(False)
         Me.ToolStrip2.PerformLayout()
         CType(Me.C1Dokumente, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ContextMenuStrip1.ResumeLayout(False)
-        Me.grpdokumentvorschaupdf.ResumeLayout(False)
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -685,4 +782,12 @@ Partial Class clsDokumente
     Friend WithEvents NeuesDokumentAusVorlageErstellenToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents grpdokumentvorschaupdf As GroupBox
     Private WithEvents pdfViewerControl1 As Syncfusion.Windows.Forms.PdfViewer.PdfViewerControl
+    Friend WithEvents GrpDokumentvorschauMail As GroupBox
+    Private WithEvents webBrowser1 As WebBrowser
+    Private WithEvents ToolStrip3 As ToolStrip
+    Private WithEvents PrintButton As ToolStripButton
+    Private WithEvents ForwardButton As ToolStripButton
+    Private WithEvents BackButton As ToolStripButton
+    Private WithEvents SaveAsTextButton As ToolStripButton
+    Friend WithEvents ThumbViewer1 As ThumbViewer
 End Class

DPM2016/Dokumente/clsDokumente.resx

@@ -198,7 +198,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACU
-        CgAAAk1TRnQBSQFMAgEBAwEAAYgBAAGIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CgAAAk1TRnQBSQFMAgEBAwEAAdgBAAHYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -246,9 +246,54 @@
         Ad8B/wHfAcABPwIACw==
 </value>
   </data>
-  <metadata name="ToolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="ToolStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>391, 17</value>
+    <value>635, 17</value>
   </metadata>
+  <data name="PrintButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIpSURBVDhPtZL/T1JRGMb5p1itrVZbbRpqZbawnBENV1I0
+        jGlByTSyJTXJwq2oKZQb1KAv6JCYWSxvBrkkZUq4CeQEiRABFeLL072Xa0zRra31bO8v57zP5znnPYf1
+        X+TxhWF6O7VtGYcnwbSWijKPOLzYrPSvLPwLS3huGUMlT7o9wGD9grVUBj+icdid03S9tDmgNxNwTgVQ
+        J+rA8XNtWwM+uuZATMwxmQVRycuJFNyzIRitDlScugKzjSgFRGJJaIwEsrk8AsHIhnSL/Ssck37UNipQ
+        I5DjtuYV7uksRYhr2kebhx2eP6nrycFIEh5fBA/1Nvru8q5+PDaOovK0rABwfwugWzcErfkzHhjsePL6
+        E7q1VrTdNUDcrgGvSYlDZHN5XTNOnL8BVe8AJAoNDtZfLgDu9L1BPJmikzcrk81hlRwodZJwdBXziwnI
+        OrVoaOkiT8C8hKLHBPO7CbywOaE1jeC+bhAd6meQdvZC1KoG/5IS3MZ2HObLUHZSggvkWq3wOvbWiAqA
+        VpWeyStVfCUNf3AZ4zNhfHCFMEDMgye+hYr6FrDLzxQAUuVTpr0ocn74mchg5vsKRt1RcHp2Qv9+kZ78
+        UcE17KkWFgHNN/uQzgBkGKLJPBZiecyGchjzrmFwPIF++xJUbDbUQzEacIArLpopSRSP4CUN1Obf1Abz
+        uqob5KjiXwWH/GVl5HPt5zZh37GL2H1EiF1VZ7GDI6CNW5r/TSzWbwHYL0mKJ5czAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="SaveAsTextButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAPVSURBVFhHzZbfS5NhFMe9jYq6MaKroPt+XEXRH9BlUkEE
+        UVCB0E0UdBVlhGARFJVoZmr4e6am5tTlmNZ0zmzpnLrJnLpMl1l40f2p79POw9mz9323oIsOfDjvxrt9
+        v9/znsdZkKsa/cVU7z+tqBk6RZX9RYq6vluUvuXf1ebmT2LiyQiVvtpPT7vO0YWn2+nMg610onQLFd3d
+        RuWNt2gt9V3fy6x/28y6Tn39oa7RmbRcdvGHIf5k4CBVuE+SL1JOJa1H6PyjHcpEleu2+hJTSHbGShzG
+        03LZxeIV3kP0wnecvNP36aarkPAYiit3anEWk/B73HEfdym+urphb4CTu0YvUl3gKM2sdJJ76oYyYSaX
+        YrJLpDiAuK2BcHyUyjoPqAULzteRK3iW+sPXqay3kOq7SxzFzWtTGLC4rYF7rsNU7b5CLYFihT/6mB56
+        9tLzzssUSfRR9PNbiq0MZnQws+xRTC0MZDA+169BuJwGSjp20dWafdQRKKGHfccIrxt67ij3+aRmnJKD
+        xaU1ewPYchy5a3W76VnbVZ1cwollcvRP8QGFTA4+RN3qfWkiLZlZEMUZx3HDwi2vLtDKelSTTM1lgIW1
+        IrYU1kQXwxSOTVI0lsg9ATZQ2fxn21MbSxkGpAkIWZmAKPdIPKLE0fGaxe0nULNH/YWDOJ5tYm1Cj5w7
+        jxudR44R86jBu6luzVCoRzE27dcGbCfwqPmSEuflslo6E76frxkeN8PJHQ3AMQuDWHI8Izkjk1ulZji9
+        L/SGxmbd2kQ88cXaAApJciWXSSUy8VIypbvEcQIocwIyMZBHyyo90oKBYJemP9BF70M+ZQDp854AjqG5
+        5QBbzcfLisloiD7OfMxgYvr36UiLOxpgcXRpgM81xCX5iP+VATkBPAIeOZYIYMzoPGoGY+Zxdw13qPfQ
+        GW/Qq8Vj80lnA07IRbNDLp1MLUnLZZcUwy8YJzaXjHGPvM5KK2n3vlJ4Rge1eGQ2kZ8BecT4Pxkr+HzL
+        c26CsaNDHD0tl11SPBQdsUwNkFxiJjbp83uUCRCOzDsb4NSxxZjedmw3wDabmx6YHNedGR4fVfA1OotP
+        hGbsDbA4wE+oPF4sDBOmARM2gB8hBMBn8HgCwUl7cRSL45njw/zXDGPmLkcOOofaM8bd6mlTVLVW6x3A
+        fuQUR7E4L5hELpvTwjG+oYAaOe7LSxyVSxxfbF5LUbntMIDHmLc4SooyUpBfS1ETPmqD3hHyDY/lL46S
+        whJpwgrznGP0b3q9fyeO6u7uoba2dkVzSys1NbVQQ2OTI7W1L7Ou0dNf+b9XQcEvSVdalbWccXkAAAAA
+        SUVORK5CYII=
+</value>
+  </data>
+  <data name="PdfViewerPrinterSettings1.PrintLocation" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0
+        dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh
+        d2luZy5Qb2ludEYCAAAAAXgBeQAACwsCAAAAAAAAAAAAAAAL
+</value>
+  </data>
   <metadata name="ToolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>391, 17</value>
   </metadata>
@@ -256,14 +301,14 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHGSURBVDhPYxhcoGH1q/8gXLfyxf/SpU/3Q4XhILj3ZntA
-        /c0vUC4maFj94v+Wc5/+Lzr47n/BgocoBnh3Xm/3ql/8z7Xlxn+oECYoX/bs/4bTH/7P3ffmf+pMhAGe
+        /c0vUC4maFj94v+Wc5/+Lzr47n/BgocoBnh3Xm/3qp/5z7Xlxn+oECYoX/bs/4bTH/7P3ffmf+pMhAGe
         LVf7Mufe/z9hy/P/ltWXcBtQsODR/9Un3v+ftvPV/5iJd8EGuLdcm5c26/7//q3P//duevZfp+Q8bgNS
         Zz/8v/TI2//9W178D+y8ud+x/vKSlOl3/0/Y+gwYLo/+t6598l8u+yxuA2Im3f8/78Dr/zN2v/xvVn/i
         R/Gih//7Nj/7X7n84f/sOXf/1614+F8q6QRuA4K6b4I1gzRZVl94kzvv3v+2dU/+Fy68/z9p+u3/ZYvv
         /5eIPIbbAFAIT9z24n/5kof/tYrPH5DNPL3GpfHy/6rlD/4nT7/1v2D+vf/iQQdwGwAK4a6NT//nzr33
         XzbzLDgQJaOOrLQtv/A/b/7d/1mz7/wX89qL2wBQCDevefw/FehcycQT8GgU89i9yCL7FNgVIo67cRsA
         CuFqYEDFTbwB9OtRlIQkYrd1gXHKsf/CNttxGwAKYcmYY/8lQo/8Fw08gGIACAgZbpwtZLkNtwEDABgY
-        AAGxDIsu6kURAAAAAElFTkSuQmCC
+        AOJ2DIFMpaCHAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="btnPrvPage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -293,15 +338,15 @@
   <data name="btnLastPage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHJSURBVDhPzZDdS1phHMfP31C2rIv+gLF/wIhBowZrLKgx
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHHSURBVDhPzZBRL1thGMfPZ6CsXPgAiy/QRSSEJbZYgsjS
-        QgqJ3qCC6I1GCVpb5kwaS2q9SCZWYjsVZZD0+hyYhTexrQ3RmDo9aifX2k0XXfXtPHEIxniu6wvPxe8L
+        EBFFwpKFTUjXRBVdVUNoDNUoKWvKQbBEg9l7kiG9kW1I04qq9rR1dMPNLnbl77zLiUTkveafvBfPP3l/
-        z+f348Pdrxh56cLgkczKeJvGqTipHY9B+yGCSmsYSv1/+nkJeqP3qsOV+AdSMxoh1vUTTO9kUDoYYgNe
+        z5Mf97hi5KW/nV7Jooy3aXBESe2nCLRDYZTbQlDq++niJRiM3utWd+wOpHo4TGxfzjDxNYXi3iAb0OFJ
-        u9NYDvzFu1UJdR+j75Waq7CEyeBKEmM+CRr9ERvQ7kyAlwHuz+foc6fwwhJy0F7eSvQeESPeNB51f2ED
+        YtF/hb5lCXWjJ4NKzZVZQ6R3KY4RnwSNYZ8NaJmOgZcBnu+X+OBJoNQadNFe3koMXhEDq0nktv1gAxqc
-        Gu1xLPj/YGIrA8deBs0zMWh6v85rer+RLtcvmJaTKGg9ZANqbDE4hN8wr6ZhWUvDJp/cJkMedgYuB/gE
+        UXzevsDYRgqubyk0TUag0f+c1eh/kffuU5gX48h5s8cGVNsjcAm/YVlOwrqShF0++a0MefrO/8/Ex9Dp
-        DJ448usCbAA1PLl9CuMnEW94EVZvCk1TERQ0HJ51z8XQIz+19oANoIZHNyQYF0X5giSem4PIrw8syVsF
+        jSK7zs8GUMPjm+cwzovo5kXYVhNodISRU7/3p20mgnb5qbW7bAA1PLwmwTgnyhfE8dISQLbOvyBvFWrs
-        nS2M9tkocisFNoAaHl5LYUg2/tQURF7t/iLt1dp9UmUNosX+Ew/KdtkAavjtkoiSge/Iqz5wKTWXUyGQ
+        IbRMneBJucAGUMP9Kwl8lI0/NweQVbszR3u1doe8tgXQ7DxG5ostNoAa7lkQUWQ6QFbVrlupuYwygVSY
-        l6YfqJ84hqp4mw2ghp/Qz1q/U6lukvNsl5T3H0E3FkJ2kY8NoIbVrwS7Mt5GVbxJVI83kV3oQ5Zmgw24
+        D6EbO4KqYJMNoIYL6Wft9rRS/U9GyRZ51bWPmpEg0vN8bAA1rK4UnMp4G1XBOlHlryP9mQ9pmjU24AHC
-        g3DcNd2nC/FvSQWXAAAAAElFTkSuQmCC
+        cTe9YwvnHM3wAwAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="tsActSize.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -449,16 +494,9 @@
 </value>
   </data>
   <data name="C1Dokumente.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;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}Heading{Wrap:True;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;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{}FilterBar{BackColor:Info;}&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, 721, 172&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, 721, 172&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;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}Heading{ForeColor:ControlText;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;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{}FilterBar{BackColor:Info;}&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, 895, 172&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, 895, 172&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
   </data>
   <metadata name="SaveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>498, 17</value>
   </metadata>
-  <data name="PdfViewerPrinterSettings2.PrintLocation" mimetype="application/x-microsoft.net.object.binary.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0
-        dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh
-        d2luZy5Qb2ludEYCAAAAAXgBeQAACwsCAAAAAAAAAAAAAAAL
-</value>
-  </data>
 </root>

DPM2016/Dokumente/clsDokumente.vb

@@ -9,18 +9,35 @@ Imports System.Threading
 Public Class clsDokumente
     Dim licenseKey As String = "6F09-41FA-5E5E-101F-E577-BDD0-1BB8-3EFB-3081-2E1F-5264-3475"
 
+    Dim DMS_Thumbnail As Boolean = False
     Dim dbDokumente As New clsDB
     Dim Dokumente As New clsDok
     Dim m_patientnr As Integer
     Property Patientnr As Integer
         Get
             Return m_patientnr
-
-
         End Get
         Set(value As Integer)
+            Dim sn As Integer
+            Try
+                sn = Me.treestruktur.SelectedIndex
+            Catch ex As Exception
+                sn = 0
+            End Try
             m_patientnr = value
+            refreshdata()
+            Try
+                Try
+                    Me.treestruktur.SelectedNode = Me.treestruktur.Nodes(sn)
+                    Update_Grid()
+                Catch ex As Exception
+                    Me.treestruktur.SelectedNode = Me.treestruktur.Nodes(0)
+                    Update_Grid()
+                End Try
+
+            Catch ex As Exception
 
+            End Try
         End Set
     End Property
     Private Sub ToolStrip1_ItemClicked(sender As Object, e As ToolStripItemClickedEventArgs) Handles ToolStrip1.ItemClicked
@@ -34,6 +51,19 @@ Public Class clsDokumente
         ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
         Me.grpdokumentvorschau.Dock = DockStyle.Fill
         Me.grpdokumentvorschaupdf.Dock = DockStyle.Fill
+        Me.GrpDokumentvorschauMail.Dock = DockStyle.Fill
+
+        ' Me.BetterThumbnailBrowser1.Items.Add("Hallo")
+        ' Me.BetterThumbnailBrowser1.View = ComponentOwl.BetterThumbnailBrowser.BetterListViewView.List
+        Dim db As New clsDB
+        db.Get_Tabledata("dms", "", "Select * from dms_Settings where nreintrag=11")
+        If db.dsDaten.Tables(0).Rows.Count = 0 Then
+            Me.DMS_Thumbnail = False
+        Else
+            If db.dsDaten.Tables(0).Rows(0).Item("Wert") = "True" Then DMS_Thumbnail = True
+
+        End If
+        db.Dispose()
     End Sub
 
     Public Sub refreshdata()
@@ -47,6 +77,7 @@ Public Class clsDokumente
     End Sub
     Sub Refresh_Grid()
         Update_Grid()
+
     End Sub
     Sub Get_tree()
         Dokumente.LoadTree(Me.treestruktur)
@@ -63,13 +94,29 @@ Public Class clsDokumente
         Update_Grid()
     End Sub
 
+    Dim onUpdate As Boolean = False
     Sub Update_Grid()
-        Dokumente.Update_Grid(Me.treestruktur.SelectedNode.Tag.ToString, Me.Patientnr.ToString, Me.C1Dokumente)
+        onUpdate = True
-        If Me.C1Dokumente.Splits(0).Rows.Count = 0 Then
+        Try
-            Me.DocumentViewer1.Visible = False
+            Dokumente.Update_Grid(Me.treestruktur.SelectedNode.Tag.ToString, Me.Patientnr.ToString, Me.C1Dokumente)
-        Else
+            If Me.C1Dokumente.Splits(0).Rows.Count = 0 Then
-            Me.DocumentViewer1.Visible = True
+                Me.DocumentViewer1.Visible = False
-        End If
+
+            Else
+                If DMS_Thumbnail = True Then
+                    Me.ThumbViewer1.Visible = True
+                    Me.ThumbViewer1.Data = Me.C1Dokumente.DataSource
+                Else
+                    Me.DocumentViewer1.Visible = True
+                End If
+
+            End If
+        Catch
+        Finally
+            onUpdate = False
+            Update_View()
+        End Try
+
     End Sub
 
 
@@ -176,44 +223,64 @@ Public Class clsDokumente
     End Sub
 
     Private Sub C1Dokumente_RowColChange(sender As Object, e As RowColChangeEventArgs) Handles C1Dokumente.RowColChange
+        If onUpdate Then Exit Sub
         Try
+            update_view
+        Catch
+            Show_Doc("")
+        End Try
+    End Sub
 
-            Dim Previewfilename As String = ""
+    Sub Update_View()
-            If Globals.PreViewDir = "" Then
+
-                Dim db As New clsDB
+        Dim Previewfilename As String = ""
-                db.Get_Tabledata("dms", "", "Select * from dms_Settings where nreintrag=6")
+        If Globals.PreViewDir = "" Then
-                Globals.PreViewDir = db.dsDaten.Tables(0).Rows(0).Item(2)
+            Dim db As New clsDB
-                If Not System.IO.Directory.Exists(Globals.PreViewDir) Then
+            db.Get_Tabledata("dms", "", "Select * from dms_Settings where nreintrag=6")
-                    System.IO.Directory.CreateDirectory(Globals.PreViewDir)
+            Globals.PreViewDir = db.dsDaten.Tables(0).Rows(0).Item(2)
-                End If
+            If Not System.IO.Directory.Exists(Globals.PreViewDir) Then
+                System.IO.Directory.CreateDirectory(Globals.PreViewDir)
             End If
-            If C1Dokumente.Columns("InDB").Value = "False" Then
+        End If
-                Try
+        If C1Dokumente.Columns("InDB").Value = "False" Then
-                    Previewfilename = Globals.PreViewDir + "\" + System.IO.Path.GetFileName(C1Dokumente.Columns("Pfad").Value)
+            Try
-                    If System.IO.File.Exists(Previewfilename) Then
+                Previewfilename = Globals.PreViewDir + "\" + System.IO.Path.GetFileName(C1Dokumente.Columns("Pfad").Value)
-                        System.IO.File.Delete(Previewfilename)
+                If System.IO.File.Exists(Previewfilename) Then
-                    End If
+                    System.IO.File.Delete(Previewfilename)
-                    FileCopy(C1Dokumente.Columns("Pfad").Value, Previewfilename)
+                End If
-                Catch
+                FileCopy(C1Dokumente.Columns("Pfad").Value, Previewfilename)
-                    MsgBox("Das Dokument kann aktuell in der Vorschau nicht angezeigt werden, da es blockiert ist.", vbInformation)
+            Catch
-                    Previewfilename = ""
+                MsgBox("Das Dokument kann aktuell in der Vorschau nicht angezeigt werden, da es blockiert ist.", vbInformation)
-                End Try
+                Previewfilename = ""
-            Else
+            End Try
-                Try
+        Else
+            Try
+                If DMS_Thumbnail = True Then
+                    Me.ThumbViewer1.Visible = True
+                    Me.ThumbViewer1.Dock = DockStyle.Fill
+                    Application.DoEvents()
+                    Me.ThumbViewer1.SearchItem(C1Dokumente.Columns("nreintrag").Value)
+                    Application.DoEvents()
+                    'Me.ThumbViewer1.Select()
+                Else
                     Dim d As New clsDok
                     Previewfilename = d.Get_Dokument(Me.C1Dokumente.Columns("nreintrag").Value, Globals.PreViewDir, True, True)
                     Show_Doc(Previewfilename)
-                Catch
+                End If
-                    Previewfilename = ""
+            Catch
-                End Try
+                Me.ThumbViewer1.Visible = False
-            End If
+                Me.grpdokumentvorschau.Visible = False
-            'Show_Doc(Previewfilename)
+                Me.GrpDokumentvorschauMail.Visible = False
-        Catch
+                Me.grpdokumentvorschaupdf.Visible = False
-            Show_Doc("")
+                Previewfilename = ""
-        End Try
+                Show_Doc(Previewfilename)
-    End Sub
+            End Try
+        End If
+        'Show_Doc(Previewfilename)
 
+    End Sub
     Private Sub Show_Doc(ByVal PreviewFilename As String)
+
         If Not PreviewOK(PreviewFilename) Or PreviewFilename = "" Then
             Me.grpdokumentvorschau.Visible = False
             Me.grpdokumentvorschaupdf.Visible = False
@@ -221,30 +288,48 @@ Public Class clsDokumente
         End If
         Me.grpdokumentvorschau.SuspendLayout()
         Me.grpdokumentvorschaupdf.SuspendLayout()
+        Me.GrpDokumentvorschauMail.SuspendLayout()
 
-        If UCase(System.IO.Path.GetExtension(PreviewFilename)) = ".PDF" Then
+
-            Me.grpdokumentvorschau.Visible = False
+        Select Case UCase(System.IO.Path.GetExtension(PreviewFilename))
-            Me.grpdokumentvorschaupdf.Visible = True
+            Case ".PDF"
-            Me.pdfViewerControl1.RenderingEngine = Syncfusion.Windows.Forms.PdfViewer.PdfRenderingEngine.Pdfium
+                Me.grpdokumentvorschau.Visible = False
-            Me.pdfViewerControl1.ReferencePath = Application.StartupPath + ""
+                Me.grpdokumentvorschaupdf.Visible = True
-            Me.pdfViewerControl1.Load(PreviewFilename)
+                Me.GrpDokumentvorschauMail.Visible = False
-        Else
+                Me.pdfViewerControl1.RenderingEngine = Syncfusion.Windows.Forms.PdfViewer.PdfRenderingEngine.Pdfium
-            Me.grpdokumentvorschaupdf.Visible = False
+                Me.pdfViewerControl1.ReferencePath = Application.StartupPath + ""
-            Me.grpdokumentvorschau.Visible = True
+                Me.pdfViewerControl1.Load(PreviewFilename)
-            Try
+            Case ".MSG"
-                'Threading.Thread.CurrentThread.Sleep(1000)
+                Me.grpdokumentvorschaupdf.Visible = False
+                Me.grpdokumentvorschau.Visible = False
+                Me.GrpDokumentvorschauMail.Visible = True
+
+                Dim msgreader As New MsgReader.Reader
+                Dim files = msgreader.ExtractToFolder(PreviewFilename, Globals.PreViewDir)
+                Dim err = msgreader.GetErrorMessage
+                webBrowser1.Navigate(files(0))
+
+
+
+            Case Else
+                Me.grpdokumentvorschaupdf.Visible = False
+                Me.grpdokumentvorschau.Visible = True
+                Me.GrpDokumentvorschauMail.Visible = False
                 Try
-                    DocumentViewer1.CloseDocument()
+                    'Threading.Thread.CurrentThread.Sleep(1000)
-                Catch
+                    Try
-                End Try
+                        DocumentViewer1.CloseDocument()
+                    Catch
+                    End Try
 
-                Me.DocumentViewer1.LoadDocument(PreviewFilename)
+                    Me.DocumentViewer1.LoadDocument(PreviewFilename)
                 Catch es As Gnostice.Core.XDocException
                 End Try
+        End Select
 
-        End If
         Me.grpdokumentvorschau.ResumeLayout()
         Me.grpdokumentvorschaupdf.ResumeLayout()
+        Me.GrpDokumentvorschauMail.ResumeLayout()
 
     End Sub
 
@@ -601,6 +686,10 @@ Public Class clsDokumente
     Private Sub treestruktur_Click(sender As Object, e As EventArgs) Handles treestruktur.Click
 
     End Sub
+
+    Private Sub PrintButton_Click(sender As Object, e As EventArgs) Handles PrintButton.Click
+        Me.webBrowser1.ShowPrintDialog()
+    End Sub
 End Class
 
 Public Class DocumentNotLoadedException

DPM2016/Fakturierung/frmFakturierung.Designer.vb

@@ -43,7 +43,9 @@ Partial Class frmFakturierung
         Me.tsbtnnext = New System.Windows.Forms.ToolStripButton()
         Me.tsbtnlast = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripButton7 = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
+        Me.lblTotal = New System.Windows.Forms.ToolStripLabel()
+        Me.lblbetrag = New System.Windows.Forms.ToolStripLabel()
         Me.grpOffeneRechnungen = New System.Windows.Forms.GroupBox()
         Me.C1Abgeschlossen = New C1.Win.C1TrueDBGrid.C1TrueDBGrid()
         Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
@@ -90,7 +92,7 @@ Partial Class frmFakturierung
         'ToolStrip1
         '
         Me.ToolStrip1.AllowDrop = True
-        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnquit, Me.tsbtnSave, Me.ToolStripButton5, Me.ToolStripButton6, Me.tsbtnnew, Me.ToolStripButton4, Me.ToolStripButton2, Me.ToolStripButton3, Me.ToolStripLabel1, Me.tstxtsuche, Me.tsbtnfirst, Me.tsbtprev, Me.tsbtnnext, Me.tsbtnlast, Me.ToolStripButton1, Me.ToolStripButton7})
+        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnquit, Me.tsbtnSave, Me.ToolStripButton5, Me.ToolStripButton6, Me.tsbtnnew, Me.ToolStripButton4, Me.ToolStripButton2, Me.ToolStripButton3, Me.ToolStripLabel1, Me.tstxtsuche, Me.tsbtnfirst, Me.tsbtprev, Me.tsbtnnext, Me.tsbtnlast, Me.ToolStripButton1, Me.ToolStripSeparator1, Me.lblTotal, Me.lblbetrag})
         Me.ToolStrip1.Location = New System.Drawing.Point(0, 24)
         Me.ToolStrip1.Name = "ToolStrip1"
         Me.ToolStrip1.Size = New System.Drawing.Size(773, 25)
@@ -127,11 +129,10 @@ Partial Class frmFakturierung
         '
         'ToolStripButton6
         '
-        Me.ToolStripButton6.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text
         Me.ToolStripButton6.Image = CType(resources.GetObject("ToolStripButton6.Image"), System.Drawing.Image)
         Me.ToolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton6.Name = "ToolStripButton6"
-        Me.ToolStripButton6.Size = New System.Drawing.Size(52, 22)
+        Me.ToolStripButton6.Size = New System.Drawing.Size(68, 22)
         Me.ToolStripButton6.Text = "Drucker"
         '
         'tsbtnnew
@@ -235,15 +236,24 @@ Partial Class frmFakturierung
         Me.ToolStripButton1.Size = New System.Drawing.Size(23, 22)
         Me.ToolStripButton1.Text = "ToolStripButton1"
         '
-        'ToolStripButton7
+        'ToolStripSeparator1
         '
-        Me.ToolStripButton7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripButton7.Image = CType(resources.GetObject("ToolStripButton7.Image"), System.Drawing.Image)
+        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25)
-        Me.ToolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta
+        '
-        Me.ToolStripButton7.Name = "ToolStripButton7"
+        'lblTotal
-        Me.ToolStripButton7.Size = New System.Drawing.Size(23, 22)
+        '
-        Me.ToolStripButton7.Text = "ToolStripButton7"
+        Me.lblTotal.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold)
-        Me.ToolStripButton7.Visible = False
+        Me.lblTotal.Name = "lblTotal"
+        Me.lblTotal.Size = New System.Drawing.Size(37, 22)
+        Me.lblTotal.Text = "Total:"
+        '
+        'lblbetrag
+        '
+        Me.lblbetrag.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold)
+        Me.lblbetrag.Name = "lblbetrag"
+        Me.lblbetrag.Size = New System.Drawing.Size(93, 22)
+        Me.lblbetrag.Text = "ToolStripLabel2"
         '
         'grpOffeneRechnungen
         '
@@ -391,11 +401,13 @@ Partial Class frmFakturierung
     Friend WithEvents ToolStripButton1 As ToolStripButton
     Friend WithEvents ToolStripButton5 As ToolStripButton
     Friend WithEvents ToolStripButton6 As ToolStripButton
-    Friend WithEvents ToolStripButton7 As ToolStripButton
     Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
     Friend WithEvents toolstripmenuAusschlussaufheben As ToolStripMenuItem
     Friend WithEvents ContextMenuStrip2 As ContextMenuStrip
     Friend WithEvents ToolStripMenuAusschliessen As ToolStripMenuItem
     Friend WithEvents ToolStripAbschlussVorschau As ToolStripMenuItem
     Friend WithEvents ToolstripAusschlussVorschau As ToolStripMenuItem
+    Friend WithEvents ToolStripSeparator1 As ToolStripSeparator
+    Friend WithEvents lblTotal As ToolStripLabel
+    Friend WithEvents lblbetrag As ToolStripLabel
 End Class

DPM2016/Fakturierung/frmFakturierung.resx

@@ -195,17 +195,17 @@
   </data>
   <data name="ToolStripButton6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIESURBVDhPrZI/bxNBEMXnI/BR+AiUlNdBeVVEeWXKaxLR
-        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+        RDoJRUKI4gQUqdBFKYgQSCslkYxsiU0IxMHG3iSYc/wnPkxD95iZ80JsE0RxI/3s9d695zezSz+mE1QJ
-        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+        Tb9PUCU0La5QJVRMRriJ45MuMmP/yaKGiqsh/sbxpy6Ojs6wVD8B1y+Q7VoEYYx2uzOno8l4gEXyb7kK
-        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+        pIqigKlZRfayzMA2HcIoxr2V9SUtjUd9LPKmfqop5oqTsTes+5Nu6+XrJS2Nh7y4Rsc5pJxCSkzn0vHM
-        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+        rOV0D2I1TB5nSNJsTk+jQQ7PXq2hZqbm1FBS+WSOPxynS7eMmsVJqu/K+roHDS97EPbr77Hx7BW/ZFUk
-        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+        30lqWJghilOeWaLiIIx0fpIsepjqnvcQaND/CkHEhSS6oeSZJJVDklHEbBauln/iPQS6zM8hxDwPvVs8
-        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+        K2lFEsieCKM40YR+dsH9qNzj33d47T0EynsOgrS2dLKzknTy7BZIoZRmI4hw+26oeg/1LjoQ1jZ39H4t
-        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+        lh4IH4ZplobZzDCQdEFp6D0EujhrQdjefYvNJzucZJZIjHht2SizfLqmUCOPtCpmK6vrqvfQefczhIOD
-        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+        PaxtvIDheybz+x/EsNGoq95D7ssJPPu1d9pKeT3KKyJJFG7Pt+h59PT5b62HOq2PqBJqn35AlVCreYjq
-        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+        OMQvjpZMWrGxmEkAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="tsbtnnew.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -395,21 +395,6 @@
         ykBy01dwSJJh1fZjmhVbXS3olDfCLShxyLegDVHyGUQpZnAkTQ5jG88BOrzE6h2u4PU/Qzh5D5gxmf99
         z9w5S8/K6106/MZE83NN3U7FDelb+b5ab2X1ysLWa3DbvgAjOrzE1oC47x0FYqwwd3jynrHdQXr77bEr
         QviZc3RGgMWe4BX01u/8xujp/R8+75YoB9R89wAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="ToolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
-        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
-        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
-        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
-        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
-        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
-        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
-        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
-        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
-        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
   </data>
   <metadata name="ContextMenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -452,7 +437,7 @@
 </value>
   </data>
   <data name="C1Abgeschlossen.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{}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;}Style6{}Style1{}Caption{AlignHorz:Center;}Style2{}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, 765, 140&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, 765, 140&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;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}Heading{ForeColor:ControlText;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;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{}FilterBar{BackColor:Info;}&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, 765, 140&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, 765, 140&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
   </data>
   <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>231, 17</value>
@@ -494,7 +479,7 @@
 </value>
   </data>
   <data name="C1Ausgeschlossen.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{}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;}Style6{}Style1{}Caption{AlignHorz:Center;}Style2{}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, 765, 140&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, 765, 140&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;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}Heading{ForeColor:ControlText;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;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{}FilterBar{BackColor:Info;}&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, 765, 140&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, 765, 140&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

DPM2016/Fakturierung/frmFakturierung.vb

@@ -3,6 +3,7 @@
     Dim db As New clsDB
     Dim abgeschlossen As New DataTable
     Dim ausgeschlossen As New DataTable
+    Dim spalten As New Tabellenspalte
 
     Private Sub frmFakturierung_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         db.Get_Tabledata("view_abgeschlossene_Behandlungen", "")
@@ -11,8 +12,27 @@
         ausgeschlossen.Rows.Clear()
         Me.C1Abgeschlossen.DataSource = abgeschlossen
         Me.C1Abgeschlossen.DataMember = abgeschlossen.TableName
+        spalten.Spaltentitel_aktualisieren(Me.C1Abgeschlossen, ausgeschlossen.TableName, ausgeschlossen)
+
         Me.C1Ausgeschlossen.DataSource = ausgeschlossen
         Me.C1Ausgeschlossen.DataMember = ausgeschlossen.TableName
+        spalten.Spaltentitel_aktualisieren(Me.C1Ausgeschlossen, ausgeschlossen.TableName, ausgeschlossen)
+
+        refresh_total()
+
+    End Sub
+
+    Sub refresh_total()
+        Try
+            Dim betrag As Double = 0
+            For Each r As DataRow In abgeschlossen.Rows
+                betrag = betrag + r.Item("total")
+            Next
+            Me.lblbetrag.Text = FormatNumber(CDbl(betrag), 2)
+        Catch
+            Me.lblbetrag.Text = "n.a."
+        End Try
+
     End Sub
 
     Private Sub ToolStripButton5_Click(sender As Object, e As EventArgs) Handles ToolStripButton5.Click

DPM2016/Fakturierung/frmRechnungskopien.Designer.vb

@@ -50,6 +50,9 @@ Partial Class frmRechnungskopien
         Me.VorschauToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.EintragLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMPDFKopie = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator()
+        Me.tstxtname = New System.Windows.Forms.ToolStripTextBox()
+        Me.ToolStripLabel3 = New System.Windows.Forms.ToolStripLabel()
         Me.MenuStrip1.SuspendLayout()
         Me.ToolStrip1.SuspendLayout()
         Me.grpOffeneRechnungen.SuspendLayout()
@@ -63,7 +66,7 @@ Partial Class frmRechnungskopien
         Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiToolStripMenuItem})
         Me.MenuStrip1.Location = New System.Drawing.Point(0, 0)
         Me.MenuStrip1.Name = "MenuStrip1"
-        Me.MenuStrip1.Size = New System.Drawing.Size(800, 24)
+        Me.MenuStrip1.Size = New System.Drawing.Size(829, 24)
         Me.MenuStrip1.TabIndex = 21
         Me.MenuStrip1.Text = "MenuStrip1"
         '
@@ -83,10 +86,10 @@ Partial Class frmRechnungskopien
         'ToolStrip1
         '
         Me.ToolStrip1.AllowDrop = True
-        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnquit, Me.tsbtnSave, Me.ToolStripButton5, Me.ToolStripSeparator3, Me.ToolStripButton6, Me.ToolStripSeparator1, Me.ToolStripLabel1, Me.tstxtRGNummer, Me.ToolStripSeparator2, Me.ToolStripButton1, Me.ToolStripLabel2, Me.tstxtDatum, Me.ToolStripButton3, Me.ToolStripButton2, Me.ToolStripSeparator4, Me.ToolStripButton4})
+        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnquit, Me.tsbtnSave, Me.ToolStripButton5, Me.ToolStripSeparator3, Me.ToolStripButton6, Me.ToolStripSeparator1, Me.ToolStripLabel1, Me.tstxtRGNummer, Me.ToolStripSeparator2, Me.ToolStripButton1, Me.ToolStripLabel2, Me.tstxtDatum, Me.ToolStripButton3, Me.ToolStripButton2, Me.ToolStripSeparator4, Me.ToolStripButton4, Me.ToolStripSeparator5, Me.ToolStripLabel3, Me.tstxtname})
         Me.ToolStrip1.Location = New System.Drawing.Point(0, 24)
         Me.ToolStrip1.Name = "ToolStrip1"
-        Me.ToolStrip1.Size = New System.Drawing.Size(800, 25)
+        Me.ToolStrip1.Size = New System.Drawing.Size(829, 25)
         Me.ToolStrip1.TabIndex = 22
         Me.ToolStrip1.Text = "ToolStrip1"
         '
@@ -211,7 +214,7 @@ Partial Class frmRechnungskopien
         Me.grpOffeneRechnungen.Dock = System.Windows.Forms.DockStyle.Top
         Me.grpOffeneRechnungen.Location = New System.Drawing.Point(0, 49)
         Me.grpOffeneRechnungen.Name = "grpOffeneRechnungen"
-        Me.grpOffeneRechnungen.Size = New System.Drawing.Size(800, 400)
+        Me.grpOffeneRechnungen.Size = New System.Drawing.Size(829, 400)
         Me.grpOffeneRechnungen.TabIndex = 23
         Me.grpOffeneRechnungen.TabStop = False
         Me.grpOffeneRechnungen.Text = "Rechnungen für Kopieerstellung"
@@ -230,7 +233,7 @@ Partial Class frmRechnungskopien
         Me.C1Rechnungen.PreviewInfo.Size = New System.Drawing.Size(0, 0)
         Me.C1Rechnungen.PreviewInfo.ZoomFactor = 75.0R
         Me.C1Rechnungen.PrintInfo.PageSettings = CType(resources.GetObject("C1Rechnungen.PrintInfo.PageSettings"), System.Drawing.Printing.PageSettings)
-        Me.C1Rechnungen.Size = New System.Drawing.Size(794, 381)
+        Me.C1Rechnungen.Size = New System.Drawing.Size(823, 381)
         Me.C1Rechnungen.TabIndex = 3
         Me.C1Rechnungen.Text = "C1TrueDBGrid1"
         Me.C1Rechnungen.PropBag = resources.GetString("C1Rechnungen.PropBag")
@@ -259,11 +262,30 @@ Partial Class frmRechnungskopien
         Me.ToolStripMPDFKopie.Size = New System.Drawing.Size(177, 22)
         Me.ToolStripMPDFKopie.Text = "PDF-Kopie erstellen"
         '
+        'ToolStripSeparator5
+        '
+        Me.ToolStripSeparator5.Name = "ToolStripSeparator5"
+        Me.ToolStripSeparator5.Size = New System.Drawing.Size(6, 25)
+        Me.ToolStripSeparator5.Visible = False
+        '
+        'tstxtname
+        '
+        Me.tstxtname.Name = "tstxtname"
+        Me.tstxtname.Size = New System.Drawing.Size(100, 25)
+        Me.tstxtname.Visible = False
+        '
+        'ToolStripLabel3
+        '
+        Me.ToolStripLabel3.Name = "ToolStripLabel3"
+        Me.ToolStripLabel3.Size = New System.Drawing.Size(39, 22)
+        Me.ToolStripLabel3.Text = "Name"
+        Me.ToolStripLabel3.Visible = False
+        '
         'frmRechnungskopien
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(800, 450)
+        Me.ClientSize = New System.Drawing.Size(829, 450)
         Me.Controls.Add(Me.grpOffeneRechnungen)
         Me.Controls.Add(Me.ToolStrip1)
         Me.Controls.Add(Me.MenuStrip1)
@@ -308,4 +330,7 @@ Partial Class frmRechnungskopien
     Friend WithEvents ToolStripSeparator3 As ToolStripSeparator
     Friend WithEvents ToolStripSeparator4 As ToolStripSeparator
     Friend WithEvents ToolStripMPDFKopie As ToolStripMenuItem
+    Friend WithEvents ToolStripSeparator5 As ToolStripSeparator
+    Friend WithEvents ToolStripLabel3 As ToolStripLabel
+    Friend WithEvents tstxtname As ToolStripTextBox
 End Class

DPM2016/Fakturierung/frmRechnungskopien.resx

@@ -220,19 +220,19 @@
   <data name="ToolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        AwKB/lANVNO3T/iSuW6nw9dUnHexpNnL582fPGMKvgAWQRbhJCKWFCTV5xqqU+9iWNipvhJPmndUbGMJ
-        +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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        +KC+ZRj/AAl60jwf5aZUAAAAAElFTkSuQmCC
+        xgf1LMP4B8c+0i9Q6MN+AAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="ToolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -352,7 +352,7 @@
 </value>
   </data>
   <data name="C1Rechnungen.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;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}Heading{Wrap:True;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;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{}FilterBar{BackColor:Info;}&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, 792, 379&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, 792, 379&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{}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;}Style6{}Style1{}Caption{AlignHorz:Center;}Style2{}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, 821, 379&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, 821, 379&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

DPM2016/Finanzaen/Finanzen.vb

@@ -233,6 +233,11 @@ Public Class Finanzen
                 Exit Sub
             End If
         Else
+            If Me.C1Zahlungen.Columns("Status").Value = 9 Then
+                ZahlungStornierenToolStripMenuItem.Enabled = False
+            Else
+                ZahlungStornierenToolStripMenuItem.Enabled = True
+            End If
             VorauszahlungAnBehandlungZuweisenToolStripMenuItem.Enabled = False
             VorauszahlungVonBehandlungLösenToolStripMenuItem.Enabled = False
         End If

DPM2016/Firmen/frmFirma.resx

@@ -391,7 +391,7 @@
 </value>
   </data>
   <data name="c1daten.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;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}Heading{ForeColor:ControlText;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;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{}FilterBar{BackColor:Info;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FetchRowStyles="True" 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, 908, 140&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, 908, 140&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{}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;}Style6{}Style1{}Caption{AlignHorz:Center;}Style2{}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" FetchRowStyles="True" 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, 908, 140&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, 908, 140&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>231, 17</value>

DPM2016/Firmen/frmFirma.vb

@@ -24,6 +24,7 @@ Public Class frmFirma
             Me.txtName1.Select()
             Me.Finanzen1.Patientnr = value
             Me.HasChanges = False
+            Me.ClsDokumente1.Patientnr = Me.Firmanr
         End Set
     End Property
 

DPM2016/Klassen/clsStammdaten_flat.Designer.vb

@@ -24,22 +24,22 @@ Partial Class clsStammdaten_flat
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(clsStammdaten_flat))
-        Dim Style1 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
+        Dim Style17 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
-        Dim Style2 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
+        Dim Style18 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
-        Dim Style3 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
+        Dim Style19 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
-        Dim Style4 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
+        Dim Style20 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
-        Dim Style5 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
+        Dim Style21 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
-        Dim Style6 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
+        Dim Style22 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
-        Dim Style7 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
+        Dim Style23 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
-        Dim Style8 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
+        Dim Style24 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
-        Dim Style9 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
+        Dim Style25 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
-        Dim Style10 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
+        Dim Style26 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
-        Dim Style11 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
+        Dim Style27 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
-        Dim Style12 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
+        Dim Style28 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
-        Dim Style13 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
+        Dim Style29 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
-        Dim Style14 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
+        Dim Style30 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
-        Dim Style15 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
+        Dim Style31 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
-        Dim Style16 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
+        Dim Style32 As C1.Win.C1TrueDBGrid.Style = New C1.Win.C1TrueDBGrid.Style()
         Me.c1daten = New C1.Win.C1TrueDBGrid.C1TrueDBGrid()
         Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
         Me.ToolStripButton5 = New System.Windows.Forms.ToolStripButton()
@@ -60,6 +60,7 @@ Partial Class clsStammdaten_flat
         Me.ctxmenuDentotar = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.TarifBearbeitenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.tsnewdentotar = New System.Windows.Forms.ToolStripButton()
         CType(Me.c1daten, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.ToolStrip1.SuspendLayout()
         CType(Me.C1TrueDBDropdown1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -94,7 +95,7 @@ Partial Class clsStammdaten_flat
         'ToolStrip1
         '
         Me.ToolStrip1.AllowDrop = True
-        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton5, Me.ToolStripButton1, Me.ToolStripButton4, Me.ToolStripButton2, Me.ToolStripButton3, Me.ToolStripButton6, Me.ToolStripButton7})
+        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton5, Me.ToolStripButton1, Me.ToolStripButton4, Me.ToolStripButton2, Me.ToolStripButton3, Me.ToolStripButton6, Me.ToolStripButton7, Me.tsnewdentotar})
         Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
         Me.ToolStrip1.Name = "ToolStrip1"
         Me.ToolStrip1.Size = New System.Drawing.Size(758, 25)
@@ -175,25 +176,25 @@ Partial Class clsStammdaten_flat
         Me.C1TrueDBDropdown1.AllowColSelect = True
         Me.C1TrueDBDropdown1.AllowRowSizing = C1.Win.C1TrueDBGrid.RowSizingEnum.AllRows
         Me.C1TrueDBDropdown1.AlternatingRows = False
-        Me.C1TrueDBDropdown1.CaptionStyle = Style1
+        Me.C1TrueDBDropdown1.CaptionStyle = Style17
         Me.C1TrueDBDropdown1.ColumnCaptionHeight = 17
         Me.C1TrueDBDropdown1.ColumnFooterHeight = 17
-        Me.C1TrueDBDropdown1.EvenRowStyle = Style2
+        Me.C1TrueDBDropdown1.EvenRowStyle = Style18
         Me.C1TrueDBDropdown1.FetchRowStyles = False
-        Me.C1TrueDBDropdown1.FooterStyle = Style3
+        Me.C1TrueDBDropdown1.FooterStyle = Style19
-        Me.C1TrueDBDropdown1.HeadingStyle = Style4
+        Me.C1TrueDBDropdown1.HeadingStyle = Style20
-        Me.C1TrueDBDropdown1.HighLightRowStyle = Style5
+        Me.C1TrueDBDropdown1.HighLightRowStyle = Style21
         Me.C1TrueDBDropdown1.Images.Add(CType(resources.GetObject("C1TrueDBDropdown1.Images"), System.Drawing.Image))
         Me.C1TrueDBDropdown1.Location = New System.Drawing.Point(16, 70)
         Me.C1TrueDBDropdown1.Name = "C1TrueDBDropdown1"
-        Me.C1TrueDBDropdown1.OddRowStyle = Style6
+        Me.C1TrueDBDropdown1.OddRowStyle = Style22
-        Me.C1TrueDBDropdown1.RecordSelectorStyle = Style7
+        Me.C1TrueDBDropdown1.RecordSelectorStyle = Style23
         Me.C1TrueDBDropdown1.RowDivider.Color = System.Drawing.Color.DarkGray
         Me.C1TrueDBDropdown1.RowDivider.Style = C1.Win.C1TrueDBGrid.LineStyleEnum.[Single]
         Me.C1TrueDBDropdown1.RowSubDividerColor = System.Drawing.Color.DarkGray
         Me.C1TrueDBDropdown1.ScrollTips = False
         Me.C1TrueDBDropdown1.Size = New System.Drawing.Size(215, 150)
-        Me.C1TrueDBDropdown1.Style = Style8
+        Me.C1TrueDBDropdown1.Style = Style24
         Me.C1TrueDBDropdown1.TabIndex = 14
         Me.C1TrueDBDropdown1.Visible = False
         Me.C1TrueDBDropdown1.PropBag = resources.GetString("C1TrueDBDropdown1.PropBag")
@@ -204,25 +205,25 @@ Partial Class clsStammdaten_flat
         Me.C1TrueDBDropdown2.AllowColSelect = True
         Me.C1TrueDBDropdown2.AllowRowSizing = C1.Win.C1TrueDBGrid.RowSizingEnum.AllRows
         Me.C1TrueDBDropdown2.AlternatingRows = False
-        Me.C1TrueDBDropdown2.CaptionStyle = Style9
+        Me.C1TrueDBDropdown2.CaptionStyle = Style25
         Me.C1TrueDBDropdown2.ColumnCaptionHeight = 17
         Me.C1TrueDBDropdown2.ColumnFooterHeight = 17
-        Me.C1TrueDBDropdown2.EvenRowStyle = Style10
+        Me.C1TrueDBDropdown2.EvenRowStyle = Style26
         Me.C1TrueDBDropdown2.FetchRowStyles = False
-        Me.C1TrueDBDropdown2.FooterStyle = Style11
+        Me.C1TrueDBDropdown2.FooterStyle = Style27
-        Me.C1TrueDBDropdown2.HeadingStyle = Style12
+        Me.C1TrueDBDropdown2.HeadingStyle = Style28
-        Me.C1TrueDBDropdown2.HighLightRowStyle = Style13
+        Me.C1TrueDBDropdown2.HighLightRowStyle = Style29
         Me.C1TrueDBDropdown2.Images.Add(CType(resources.GetObject("C1TrueDBDropdown2.Images"), System.Drawing.Image))
         Me.C1TrueDBDropdown2.Location = New System.Drawing.Point(189, 153)
         Me.C1TrueDBDropdown2.Name = "C1TrueDBDropdown2"
-        Me.C1TrueDBDropdown2.OddRowStyle = Style14
+        Me.C1TrueDBDropdown2.OddRowStyle = Style30
-        Me.C1TrueDBDropdown2.RecordSelectorStyle = Style15
+        Me.C1TrueDBDropdown2.RecordSelectorStyle = Style31
         Me.C1TrueDBDropdown2.RowDivider.Color = System.Drawing.Color.DarkGray
         Me.C1TrueDBDropdown2.RowDivider.Style = C1.Win.C1TrueDBGrid.LineStyleEnum.[Single]
         Me.C1TrueDBDropdown2.RowSubDividerColor = System.Drawing.Color.DarkGray
         Me.C1TrueDBDropdown2.ScrollTips = False
         Me.C1TrueDBDropdown2.Size = New System.Drawing.Size(233, 150)
-        Me.C1TrueDBDropdown2.Style = Style16
+        Me.C1TrueDBDropdown2.Style = Style32
         Me.C1TrueDBDropdown2.TabIndex = 15
         Me.C1TrueDBDropdown2.Visible = False
         Me.C1TrueDBDropdown2.PropBag = resources.GetString("C1TrueDBDropdown2.PropBag")
@@ -249,18 +250,18 @@ Partial Class clsStammdaten_flat
         '
         Me.ctxMenuTarif.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TarifBearbeitenToolStripMenuItem, Me.NeuerTarifeintragErstellenToolStripMenuItem})
         Me.ctxMenuTarif.Name = "ctxMenuTarif"
-        Me.ctxMenuTarif.Size = New System.Drawing.Size(217, 48)
+        Me.ctxMenuTarif.Size = New System.Drawing.Size(216, 48)
         '
         'TarifBearbeitenToolStripMenuItem
         '
         Me.TarifBearbeitenToolStripMenuItem.Name = "TarifBearbeitenToolStripMenuItem"
-        Me.TarifBearbeitenToolStripMenuItem.Size = New System.Drawing.Size(216, 22)
+        Me.TarifBearbeitenToolStripMenuItem.Size = New System.Drawing.Size(215, 22)
         Me.TarifBearbeitenToolStripMenuItem.Text = "Tarif bearbeiten"
         '
         'NeuerTarifeintragErstellenToolStripMenuItem
         '
         Me.NeuerTarifeintragErstellenToolStripMenuItem.Name = "NeuerTarifeintragErstellenToolStripMenuItem"
-        Me.NeuerTarifeintragErstellenToolStripMenuItem.Size = New System.Drawing.Size(216, 22)
+        Me.NeuerTarifeintragErstellenToolStripMenuItem.Size = New System.Drawing.Size(215, 22)
         Me.NeuerTarifeintragErstellenToolStripMenuItem.Text = "Neuer Tarifeintrag erstellen"
         '
         'ctxmenuDentotar
@@ -272,14 +273,24 @@ Partial Class clsStammdaten_flat
         '
         Me.ContextMenuStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TarifBearbeitenToolStripMenuItem1})
         Me.ContextMenuStrip2.Name = "ContextMenuStrip2"
-        Me.ContextMenuStrip2.Size = New System.Drawing.Size(181, 48)
+        Me.ContextMenuStrip2.Size = New System.Drawing.Size(156, 26)
         '
         'TarifBearbeitenToolStripMenuItem1
         '
         Me.TarifBearbeitenToolStripMenuItem1.Name = "TarifBearbeitenToolStripMenuItem1"
-        Me.TarifBearbeitenToolStripMenuItem1.Size = New System.Drawing.Size(180, 22)
+        Me.TarifBearbeitenToolStripMenuItem1.Size = New System.Drawing.Size(155, 22)
         Me.TarifBearbeitenToolStripMenuItem1.Text = "Tarif bearbeiten"
         '
+        'tsnewdentotar
+        '
+        Me.tsnewdentotar.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.tsnewdentotar.Image = CType(resources.GetObject("tsnewdentotar.Image"), System.Drawing.Image)
+        Me.tsnewdentotar.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.tsnewdentotar.Name = "tsnewdentotar"
+        Me.tsnewdentotar.Size = New System.Drawing.Size(23, 22)
+        Me.tsnewdentotar.Text = "Neuer Dentotar-Eintrag"
+        Me.tsnewdentotar.Visible = False
+        '
         'clsStammdaten_flat
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -322,4 +333,5 @@ Partial Class clsStammdaten_flat
     Friend WithEvents ctxmenuDentotar As ContextMenuStrip
     Friend WithEvents ContextMenuStrip2 As ContextMenuStrip
     Friend WithEvents TarifBearbeitenToolStripMenuItem1 As ToolStripMenuItem
+    Friend WithEvents tsnewdentotar As ToolStripButton
 End Class

DPM2016/Klassen/clsStammdaten_flat.resx

@@ -155,7 +155,7 @@
 </value>
   </data>
   <data name="c1daten.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{}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;}Style6{}Style1{}Caption{AlignHorz:Center;}Style2{}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" FetchRowStyles="True" 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, 756, 374&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, 756, 374&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;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}Heading{Wrap:True;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;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{}FilterBar{BackColor:Info;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FetchRowStyles="True" 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, 756, 374&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, 756, 374&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
   </data>
   <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>163, 17</value>
@@ -163,19 +163,19 @@
   <data name="ToolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        HjYG5iJY7GaE3ueb6EwKsmcjnBA4GgT5B5egq1FU3cAXNBhq9NN/ch3XKhRGL5Yz3KymhmjJqRH0vPbh
+        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
-        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
+        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
-        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
+        3Kn1MFCVx9WjHgabY0y2RVIEorNsLZtKyyiNbaN085YkMZPCkq3crpG5dkyh94iba3UhptoLEbquo2sh
-        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
+        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
-        Y67Cg1IxmR0AAAAASUVORK5CYII=
+        X0fCgJOjtY0AAAAASUVORK5CYII=
 </value>
   </data>
   <data name="ToolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -196,16 +196,16 @@
   <data name="ToolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIXSURBVDhPlY9dSJNhFMffCylqduHIEk2pdyuFRWVeJF1Z
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIWSURBVDhPlY9dSJNhFMffCylqduHIEk2pbaWwqMyLpCsL
-        0AeGKckIIpBGdzaU8KIomKN1ZUHQB9jFqH23Wdv7bs3pVtuK1U0IWki+rRFOa2+buc1dtJH79wyey7bZ
+        +sAwJRlBBNLozoYSXhQFc7Su9CLoA+xi1L7brH02p1ttK1c3IWgh+bZGOM29vjO3uYs2cv+ewXPZu9kP
-        D/6c5znnf855HmYj+FmWe9vWdp1e/4/pnp4H9xgG+ro6BGSyj2/k8npaqk5x/lHnXEyA++Zt3CFDxiUS
+        /pznOed/znkeZisEJBLX+5aW2/T6f0x1dT16wDDQ1dQgKJV+fieT1dJSZYrzT9rn4iw8d+9jlAwZE4nw
-        PG9sxAzLdlNLZX7PXkumJzuQEB4juiBifDeL+zU14KXSG9RSnvWozvDLfxoJrhVLZgbL/hMQfiTxUj30
+        sr4eMxJJJ7WU5/fsLT490YYk+xSxBQ5j+yV4WFUFt1h8h1qE2Yxp9b8C55F0NWPJxGA5cAbsCo/XqoEf
-        jVrKU4zpTqVDSiTcCjJAhqUJKZLedny3b0Js9lkrtf0bwaveLAYv50WyOTV1DHHHNqxMdZFBcvzxS9TU
+        1CJMMa49lw4rkPTIyQAplsbF4H2t+Gnbhvjsi2Zq+zesT7WdC13Pc2RzavIUEvZdWJvsIINk+BMQqahN
-        Vp71ueGA6FFgZfokecF+srkDSd9RZL07ItRSnqJwVZXyduKn5xBWg0qI5Aurr/sQubuv+MleX0tt5SnM
+        mM25wSDnlWNt6ix5wWGyuQ28/ySyvj1RahGmyN5UpnztWPUew3pIAY58Yf1tD6ZHDxW/2GqrqU2Ywvzj
-        P4yLnnbk3l9BcvIIMqELSJHtxdDec9RSmfznJ0gvuJCeuYXMq16y/SwKocMTtFyZsbGLEoguZL+8wNpi
+        BOdtRe7jDfATJ5AJX0GKbC+GD16ilvLkvz5DesGJ9Mw9ZN50k+0XUQgfH6fl8oyMXBWBcyL77RU2FkPI
-        ELl4ALlI9xotV6e5eafifF8XMl/dyIsRoBC1Z5c/bKfl6jS1tJzZsrUWuxoa+NTiuyaa3hjhcHiPRqMZ
+        JYLIRTs3aLkyjY175Zd7OpD57kGeiwKFmC27/Gk3LVemoanpwo6d1dhXV+dOLX5ooOmtEYlEDqjV6mGN
-        1Wq1OoPZrNTrnw5YLJZBp9M5UpLL5RokUhFd4nm+n+O44z6fT07bGcbhcBywWq29pGnAaDQOmUymERJH
+        RqPVm0wKne55n9ls7nc4HEMlOZ3OfiIl0TW3293rcrlO+/1+GW1nGLvdfsRisXSTpj6DwTBgNBqHSBwm
-        SdSURM+l3DCRymAw9NtstoMMwzB/AVAKJEhi14wrAAAAAElFTkSuQmCC
+        UV0SPZdyg0RKvV7fa7VajzIMw/wFTEUkRqq1mZcAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="ToolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -243,191 +243,191 @@
   <data name="ToolStripButton6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAACsRSURBVHhe7Z0HnBRV1vZX3V15P/d791WUJJlhYIgDQ05D
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAACsTSURBVHhe7Z0HnBRV1vZX3V19P/d79zWRJDMMGQaGzMAw
-        HAYkSXBEGKIgOcMAkkSCYlhd067rumYxkJMgSQQTu76KklEREAUVFEWJ3u88t+pUn7p9e6Y64MJ+c3/8
+        zAADkkQQkZxzDkMGUcC8uqZd13XNmZwEFRFRVHZ9ASWjIklBBERQovc7z6061adu356pDriw39wff7qn
-        6Z7u6tvV53nuuaGqun+TX/JLfskv+SW/5Jf8kl/yS37JL/klv+SX/CJLVlZWdpfOXQ7269fvl+HDh6uR
+        u/p29Xmee26oqu7f5Jf8kl/yS37JL/klv+SX/JJf8kt+yS/5Jb/I0qlTp263tL9lb+/evX8ZNmyYGjFi
-        I0eqUaNGqdGjR6sxY8aosWPHqnHjxqkJ48ernAkTVE5Ojpo4caKaRIwbO04NHjRIPf/iS+rZ+a+q519a
+        hBo5cqQaNWqUGj16tBozZowaO3asGj9unMoZP17l5OSoCRMmqInE2DFj1aCBA9WLL7+qnn/lDfXiq3PV
-        oF58ZbFatHi5WrxkpVqybJVatmK1WrFyjVq5aq1atXqdeu31DWrN2jfU6+s2qbUb3tSs27DZz8bNav3G
+        y68vUPMXLFELFi5TCxcvV4uXrlBLl61Uy5a/rZaveEe9+da7auXb76m33lmj3n73fc077671s3qtWrX6
-        LZoNb0jeUhs2MW+rjeDNt9Ubm99Rmza/G2LLe+rNtyRb1ea3tzr3t2Cbd+g1zms3Ul3rqW6857qNtD/r
+        A82770k+VO+uYdap1eD9deq9tR+pNWs/DvHBJ+r9DyXr1dp16537H2Cbj+g1zmtXU12rqG685zuraX9W
-        N9G+Yf82qtWvr9esWrOO9n2tWvna62rFqjX0eVar5SteU8uWr1JLl9HnXLqCPu8ytYhYuHipWrhoiVqw
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        XkyeOEmNGzNWPf7441+6MsZehgwafG7QwNsUM6D/rSqr200+snv09J43cQzQnITxG8AU5JvvToeJFhS8
+        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
-        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
+        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
-        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
+        pdZIVTVTU+m2hqpUsaK67dZOvu2YnHHjHQMcO6l27j/iYRPFg4XLC9trDXxCC7GDCJ6X6FG3dovwp844
-        jIM0wHfaAC3iNsA9d89TJGH8BpDUrFFTpTdpolq1bKlaZ2RocWGKTh06+rZjYIDmzcIN4AkhxUkEXK+L
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        b06oLwgnA/ysmlG3CQPYYhqU2XfOSrwBQL8+fX30p27Ath1wDJCuDfAZCc9woDBqTiRSBD/Owgtjjs4l
+        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
-        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
+        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
-        FnIT1IYnMnAFtgoNSNhYBae7PtG14K7ov+jnne3NWUBCDDAzAQZA646HsaPH0CAx3AA+AVxsQgXBVpeG
+        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
-        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
+        TGCGBI0kNDDFDiI4/dMFtxBcih6q53y4AajbxHTbFtOg4CCeK2PsxVZxNEgD7CbhGasAAptwEttrcoUE
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        e8HZkyvfOBz0szs3DoTYJdh54GsH33F/hx0+jqod+4+q7QSmfFj4+fTwMQ8sm2PcNGTQYGtMgzL19ikX
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        BGRc8SLhExW4fbJVXGAR2BM5gNASeWxELhdjv9Bt9undxxrToOAbWlwZYy+2iqMBFyg0qAcD/OBLc16g
+        PlGB2ydbxQUWgT2RAwgtkcdG5HIx9gvdZs8ePa0xDQq+ocWVMfZiqzgacIFC/bowwI++NOcF2hQgHjzx
-        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
+        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
-        zRG2IAMIERTb64PiCWoRNUxYxv0alyAiRxLaQ18iF1oY2/65c3AIwADoNntl97LGNCgXhQFw7WD9evV0
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        mAYF52O6MsZebBVHAwYyMACWXL3gEAiiDHYiMcUKQkjQcFF9wgKruLkLzPwL6BNGD3j8k5Db7DnoGOCW
-        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
+        m+MzwLChQxNggPa3qHi4jQYydWrWon7tGAXrGw9bkC80PhGBENEkJGowYZnQGcF+gT3cs4HXezgLWHJ7
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        WTNmzFAz77hD3Xnnnequu+5Ss2fNUnPmzNG/nnHvPfeo++69V91/333qgfvvVw8+8IB68MEHnVsCj+E5
-        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
+        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
-        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
+        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
-        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
+        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
-        MfbSiQZo+Vya4JoMV8bYi63ifC4NBvTrH78BMEXL59IEF+W4MsZesBiRz6VJ/7594zdAB6oon0uT/n0S
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        ktYtW+lWtXXrVrVv3z4/e/eqvZI9ezR7JLt3q90mu3apXZKdOzU7mR07NDsMtm/frna44L7k448/9vHR
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        SwyDclOXrvEbADuQSDA44YUKmAEXWUAARooEcLEGVtRyZ6gaNmSIGjxokHsRRh/Vu1cv6l7mhBnEFJG7
+        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
-        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
+        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
-        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
+        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
-        06xdu1abBBkAI3sM8OTn1uK7wrP4TZs0cQxAnwmvgwGwnRm7oOACUVfG2Ivc4USA1I9TlvmgDbdSbl1S
+        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
-        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
+        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
-        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
+        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
-        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
+        vMAiCgWsBk2dsIhSrUpVvapWjQLI5jLfgx/nroCRXQKex7ZSfDaA+TdA2ocR3nzzTbV8+XL9HFI5Fn+Q
-        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
+        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
-        LAi4nBpzZ3y7Vhq6ARpAYSFFtm4JvydjtnCJ7Nc5xXOa59bPooOVK1eqFStW6NdhNA8D4OfgPeF1q3eA
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        G8PrZPyiAautroyxF+xAIsH0BMJnZjjLlbimX4rCQjEQNy/QWmpR+se8uYo+klZemwAHU2RdqJ+F55aO
+        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
-        jCBTu2zlbAKbGVh0wCZAy1+8eLFatGiRWrhwod4WsxKMUyCur+W74nPqB3rGQ1NAfLcyGwCvk/GLBpxU
+        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
-        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
+        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
-        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
+        WzkEl6KDuXPnqjfeeEObA8bEGAWDO5/wrkjpIjZYAMIMANvDONoAZAoZv2jAINuVMfYCV15IJozP8QTC
-        xAk5nkC4NQ2AlpAnFGQcU4cBcIwdB1FSaByQnFTeNwZggVlkbtmyRcs0DmFxi79lapfwNjAARH/llVc0
+        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
-        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
+        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
-        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
+        vEIXZgAKRF4gWDUoWFgAQkZA4DgTsOgyxUsDMJzeYQJu5VJ0eR9io5WjtXPLx98Q/tVXX1WvvPKKBtvC
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        LPxzzz2nnn32WW0MiKgXqEhcR/AQcjUTz+s1DWr96NawolmVujFbDBmkfj2rcAeW+Fs+j4bmyhh7wZw0
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        6qmn9N/olrCPWBE0Vy8hOMNT2lo1aEBLBtCfiV5riyGDcwp4wIc+H3+bz7syxl5sK2/xALdiwKIHLrSD
-        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
+        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
-        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
+        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
-        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
+        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
-        S5HN1g2R+ZaB4BCbReYUL1s7RGfh//rXv6q//OUv+nnsV3XqBiCsX2xn/UJOZZH60V0gY+AzwQC2GKIR
+        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
-        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
+        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
-        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
+        /7EcjNYO4SO1aBaYW7TZqiOJDaEhMsSWoj/xxBPq8ccf12A7rEgiO0FULTKmriQ08GYyJDpwxK+ql7S5
-        X00vaXOXZoshQAPS3QcJzauhALGV910ZYy++FbcEgNavT1jQs4Am2gByqmZO01KSk3U6R6suTwKDpDJl
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        z3/+s3r44Yd1FsCBKWQsnJ+Akb0HCQ0guAdaPsYzbvrHmMaMnwSpXv6NrkH+jcbmyhh74XSVKHQXQM5k
-        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
+        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
-        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
+        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
-        n7oLiI+uDdnPFkMGjQljKtxH69eNSjyP2YErY+yFXLqG01YiwI7qRSDqn9BHjR450kv3MIA5H0fLR8vW
+        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
-        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
+        +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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        lBLZRPbxLLJM5Ri921o3t2pu2QxSO7dwiA3k/Xnz5qm7775bAxNggJpMg1KIitmMiZ7Z0HPejAYmJhwD
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        EzyO7Ri8DpmBs4QUH5SgaWzpEiVITMwGHHHzAuInuyufthgGAWMtMsIvpFUqUZq4gfgDgS49UDeADTAG
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        V/v16/dKp06dXiJDvZCcnPz0H//4x8d/97vfIT5/JnD7KGKSC3ge25ng9ZKHiYeI+wg0SIjemWhB1CMw
-        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
+        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
-        JZHnUcDvo370QeIhEuoR4jHq46nLf/zv1Pf/g3iaxgPP0rjgeRofvEDMp8HgyzRQXEDTxoXEEmIpDR6X
+        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
-        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
+        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
-        +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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
 </value>
   </data>
   <data name="ToolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -443,6 +443,21 @@
         mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
         kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
         TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="tsnewdentotar.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAINSURBVDhPY6AVYAyc67K/+XD1/SYg9p3quAQqTiQIZWAO
+        Wu75Zu6Nuf9nX5/9322S/TmoDJEAaIDnctc3k69M/D/hSt9/p0nm56EyRAKwATZveq+0/O++0gg0wAiP
+        AfUMTOYLtWx81tnYB0CxZZ+ak88myw9dV8v/d1wp+e88T++2/XxtB591FvYeQOyyzsTeYJGyFVi/cAGn
+        Se6J5P99V5v+T7ze8H/Szbr/U27V/O++kfe/43rm/9Zr6f87r+f+775e9L/tSsH/hot5/yvPZf8P2Ov6
+        ny+OXZlBLJfTogoo0H+9Fqi56v+U2xX/p94p/d9+M+5/283o/y03I/533Ur+33Mz63/79fT/DZdT/1ee
+        T/4fdtD5P28ImzqDUAaLRcQOwf9ph4T/554U+l94Ruh/wRnB/zXXzP633/H533rH83/5ZZ3/+af5/+cB
+        cdZx/v9JB/j++27lAhrAoM7A6cQgLRnPsFk2mWGbYhrDNuV0IA3EaftFf3Y+sP3f/sDqf9gm8Q8gMRgG
+        qRWPZ9jAZ8EgBA4HIGBEwfYMLOGHmN7UPeb4X/eY67/7ciZQLKCqgWAcABiNiecY3nS8YvgPwj5rGEhP
+        B7kXBN4s+CT/f/5H+f9hG3lJNyBpr+6bOQ89/oNwwCJ1Eg1gYGCSymXYYdjGcAOExeIZ5kHFSQIsDCoM
+        7GDMwMAMEUIHDAwArmHzT5KTHe0AAAAASUVORK5CYII=
 </value>
   </data>
   <data name="C1TrueDBDropdown1.Images" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -453,7 +468,7 @@
 </value>
   </data>
   <data name="C1TrueDBDropdown1.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{}EvenRow{BackColor:Aqua;}Normal{}RecordSelector{AlignImage:Center;}OddRow{}Style14{}Footer{}FilterBar{}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style3{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style6{}Style1{}Caption{AlignHorz:Center;}Style2{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.DropdownView Name="" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" RecordSelectors="False" 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, 213, 148&lt;/ClientRect&gt;&lt;BorderSide&gt;0&lt;/BorderSide&gt;&lt;/C1.Win.C1TrueDBGrid.DropdownView&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, 213, 148&lt;/ClientArea&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:Aqua;}Normal{}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{}Style14{}Footer{}Heading{Wrap:True;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style3{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.DropdownView Name="" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" RecordSelectors="False" 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, 213, 148&lt;/ClientRect&gt;&lt;BorderSide&gt;0&lt;/BorderSide&gt;&lt;/C1.Win.C1TrueDBGrid.DropdownView&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, 213, 148&lt;/ClientArea&gt;&lt;/Blob&gt;</value>
   </data>
   <data name="C1TrueDBDropdown2.Images" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -463,7 +478,7 @@
 </value>
   </data>
   <data name="C1TrueDBDropdown2.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{}EvenRow{BackColor:Aqua;}Normal{}RecordSelector{AlignImage:Center;}OddRow{}Style14{}Footer{}FilterBar{}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style3{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style6{}Style1{}Caption{AlignHorz:Center;}Style2{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.DropdownView Name="" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" RecordSelectors="False" 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, 231, 148&lt;/ClientRect&gt;&lt;BorderSide&gt;0&lt;/BorderSide&gt;&lt;/C1.Win.C1TrueDBGrid.DropdownView&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, 231, 148&lt;/ClientArea&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:Aqua;}Normal{}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{}Style14{}Footer{}Heading{Wrap:True;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style3{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.DropdownView Name="" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" RecordSelectors="False" 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, 231, 148&lt;/ClientRect&gt;&lt;BorderSide&gt;0&lt;/BorderSide&gt;&lt;/C1.Win.C1TrueDBGrid.DropdownView&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, 231, 148&lt;/ClientArea&gt;&lt;/Blob&gt;</value>
   </data>
   <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>270, 17</value>

DPM2016/Klassen/clsStammdaten_flat.vb

@@ -67,7 +67,9 @@ Public Class clsStammdaten_flat
 
             Me.c1d.ContextMenuStrip = Nothing
             Me.c1d.AllowAddNew = True
+            Me.tsnewdentotar.Visible = False
             Select Case Tablename
+
                 Case "Auswertung"
                     Dim printer As New clsPrinter
                     printer.Get_Printers()
@@ -84,6 +86,8 @@ Public Class clsStammdaten_flat
                 Case "Dentotar"
                     Me.c1d.ContextMenuStrip = Me.ctxmenuDentotar
                     Me.c1d.AllowAddNew = False
+                    Me.tsnewdentotar.Visible = True
+
 
             End Select
         Catch ex As Exception
@@ -196,6 +200,8 @@ Public Class clsStammdaten_flat
 
 
                     f.ShowDialog()
+                    Me.c1daten.Columns("LeistungNrNeu").Value = f.TextBox1.Text
+                    f.Update_Data(Me.c1daten.Columns("LeistungNrNeu").Value)
                     Me.c1daten.Columns("LeistungD").Value = f.TextBox2.Text
                     Me.c1daten.Columns("Interpretationd").Value = f.TextBox3.Text
                     Me.c1daten.Columns("Abrechnungseinheit").Value = f.TextBox4.Text
@@ -282,4 +288,58 @@ Public Class clsStammdaten_flat
     Private Sub TarifBearbeitenToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles TarifBearbeitenToolStripMenuItem1.Click
         c1daten_DoubleClick(sender, e)
     End Sub
+
+    Private Sub tsnewdentotar_Click(sender As Object, e As EventArgs) Handles tsnewdentotar.Click
+        Dim f As New frmDentotarDetail
+        f.pk = -1
+        f.TextBox1.Text = "4.xxxx"
+        f.TextBox2.Text = ""
+        f.TextBox3.Text = ""
+        f.TextBox4.Text = ""
+        f.TextBox5.Text = "CHF"
+        f.TextBox6.Text = "0.00"
+        f.TextBox7.Text = "0.00"
+        f.TextBox8.Text = "0.00"
+        f.TextBox9.Text = "0.00"
+        f.TextBox10.Text = "0.00"
+        f.ShowDialog()
+        If f.DialogResult = DialogResult.OK Then
+            Dim sql As String
+            db.Get_Tabledata("Dentotarx", "", "Select * from dentotar where pk=-100", "", False)
+            Dim r As DataRow = db.dsDaten.Tables(0).NewRow
+            r.Item(0) = ""
+            r.Item(1) = 3
+            r.Item(2) = ""
+            r.Item(3) = f.TextBox1.Text
+            r.Item(4) = f.TextBox2.Text
+            r.Item(5) = f.TextBox4.Text
+            r.Item(6) = f.TextBox4.Text
+            r.Item(7) = ""
+            r.Item(8) = ""
+            r.Item(9) = ""
+            r.Item(10) = f.TextBox5.Text
+            r.Item(11) = f.TextBox6.Text
+            r.Item(12) = f.TextBox7.Text
+            r.Item(13) = f.TextBox8.Text
+            r.Item(14) = f.TextBox9.Text
+            r.Item(15) = f.TextBox10.Text
+            db.dsDaten.Tables(0).Rows.Add(r)
+            'db.dsDaten.Tables(0).AcceptChanges()
+            db.Update_Data()
+
+            get_data()
+
+            Dim i As Integer
+            For i = 0 To Me.c1daten.Splits(0).Rows.Count - 1
+                Try
+                    If Me.c1daten.Columns("leistungnrneu").CellValue(i) = f.TextBox1.Text Then
+                        Me.c1daten.Bookmark = i
+                        Exit For
+                    End If
+                Catch
+                End Try
+            Next
+
+        End If
+    End Sub
 End Class

DPM2016/My Project/licenses.licx

@@ -1,3 +1,4 @@
-C1.Win.C1Command.C1DockingTab, C1.Win.C1Command.4, Version=4.0.20153.110, Culture=neutral, PublicKeyToken=e808566f358766d8
+ComponentOwl.BetterThumbnailBrowser.BetterThumbnailBrowser, BetterThumbnailBrowser-net35, Version=3.15.0.0, Culture=neutral, PublicKeyToken=e6c91a3add447be2
 C1.Win.C1TrueDBGrid.C1TrueDBGrid, C1.Win.C1TrueDBGrid.2, Version=2.0.20153.110, Culture=neutral, PublicKeyToken=75ae3fb0e2b1e0da
 C1.Win.C1Input.C1PictureBox, C1.Win.C1Input.4, Version=4.0.20153.110, Culture=neutral, PublicKeyToken=7e7ff60f0c214f9a
+C1.Win.C1Command.C1DockingTab, C1.Win.C1Command.4, Version=4.0.20153.110, Culture=neutral, PublicKeyToken=e808566f358766d8

DPM2016/Patient/Patient.vb

@@ -14,6 +14,7 @@
             Me.Behandlung1.PatientNr = value
             Me.Finanzen1.Patientnr = value
             Me.Recall1.Patientnr = value
+            Me.ClsDokumente1.Patientnr = value
             Globals.OnLoad = False
             Cursor = Cursors.Default
         End Set

DPM2016/Sysadmin/frmStammdaten.Designer.vb

@@ -38,25 +38,28 @@ Partial Class frmStammdaten
         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 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("Tarif", New System.Windows.Forms.TreeNode() {TreeNode8, TreeNode9, TreeNode10, TreeNode11, TreeNode12, TreeNode13, TreeNode14, TreeNode15})
+        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("Ansatz")
+        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 TreeNode18 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Abrechnungstyp")
+        Dim TreeNode18 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Ansatz")
-        Dim TreeNode19 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Formulartyp / Einzahlungsschein")
+        Dim TreeNode19 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Abrechnungstyp")
-        Dim TreeNode20 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Rechnungstyp")
+        Dim TreeNode20 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Formulartyp / Einzahlungsschein")
-        Dim TreeNode21 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Abrechnung", New System.Windows.Forms.TreeNode() {TreeNode17, TreeNode18, TreeNode19, TreeNode20})
+        Dim TreeNode21 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Rechnungstyp")
-        Dim TreeNode22 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Behandlungsart")
+        Dim TreeNode22 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Standards")
-        Dim TreeNode23 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Gesetz")
+        Dim TreeNode23 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Abrechnung", New System.Windows.Forms.TreeNode() {TreeNode18, TreeNode19, TreeNode20, TreeNode21, TreeNode22})
-        Dim TreeNode24 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Diverse Stammdaten", New System.Windows.Forms.TreeNode() {TreeNode22, TreeNode23})
+        Dim TreeNode24 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Behandlungsart")
-        Dim TreeNode25 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Auswertung")
+        Dim TreeNode25 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Gesetz")
-        Dim TreeNode26 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Reporting", New System.Windows.Forms.TreeNode() {TreeNode25})
+        Dim TreeNode26 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Diverse Stammdaten", New System.Windows.Forms.TreeNode() {TreeNode24, TreeNode25})
-        Dim TreeNode27 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Einstellungen")
+        Dim TreeNode27 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Auswertung")
-        Dim TreeNode28 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Struktur")
+        Dim TreeNode28 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Reporting", New System.Windows.Forms.TreeNode() {TreeNode27})
-        Dim TreeNode29 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("DokumentManagement", New System.Windows.Forms.TreeNode() {TreeNode27, TreeNode28})
+        Dim TreeNode29 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Einstellungen")
-        Dim TreeNode30 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Spalten")
+        Dim TreeNode30 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Struktur")
-        Dim TreeNode31 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Options")
+        Dim TreeNode31 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("DokumentManagement", New System.Windows.Forms.TreeNode() {TreeNode29, TreeNode30})
-        Dim TreeNode32 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("User")
+        Dim TreeNode32 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Spalten")
-        Dim TreeNode33 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Absender")
+        Dim TreeNode33 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Options")
-        Dim TreeNode34 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Diverse", New System.Windows.Forms.TreeNode() {TreeNode30, TreeNode31, TreeNode32, TreeNode33})
+        Dim TreeNode34 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("User")
+        Dim TreeNode35 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Absender")
+        Dim TreeNode36 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Konto-Angaben")
+        Dim TreeNode37 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Diverse", New System.Windows.Forms.TreeNode() {TreeNode32, TreeNode33, TreeNode34, TreeNode35, TreeNode36})
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmStammdaten))
         Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
         Me.SchliessenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -75,29 +78,31 @@ Partial Class frmStammdaten
         'MenuStrip1
         '
         Me.MenuStrip1.AllowMerge = False
+        Me.MenuStrip1.ImageScalingSize = New System.Drawing.Size(20, 20)
         Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SchliessenToolStripMenuItem, Me.DentotarImportToolStripMenuItem})
         Me.MenuStrip1.Location = New System.Drawing.Point(0, 0)
         Me.MenuStrip1.Name = "MenuStrip1"
-        Me.MenuStrip1.Size = New System.Drawing.Size(957, 24)
+        Me.MenuStrip1.Size = New System.Drawing.Size(1276, 30)
         Me.MenuStrip1.TabIndex = 0
         Me.MenuStrip1.Text = "MenuStrip1"
         '
         'SchliessenToolStripMenuItem
         '
         Me.SchliessenToolStripMenuItem.Name = "SchliessenToolStripMenuItem"
-        Me.SchliessenToolStripMenuItem.Size = New System.Drawing.Size(73, 20)
+        Me.SchliessenToolStripMenuItem.Size = New System.Drawing.Size(90, 26)
         Me.SchliessenToolStripMenuItem.Text = "&Schliessen"
         '
         'DentotarImportToolStripMenuItem
         '
         Me.DentotarImportToolStripMenuItem.Name = "DentotarImportToolStripMenuItem"
-        Me.DentotarImportToolStripMenuItem.Size = New System.Drawing.Size(106, 20)
+        Me.DentotarImportToolStripMenuItem.Size = New System.Drawing.Size(133, 26)
         Me.DentotarImportToolStripMenuItem.Text = "Dentotar-Import"
         '
         'TreeView1
         '
         Me.TreeView1.Dock = System.Windows.Forms.DockStyle.Left
-        Me.TreeView1.Location = New System.Drawing.Point(0, 24)
+        Me.TreeView1.Location = New System.Drawing.Point(0, 30)
+        Me.TreeView1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.TreeView1.Name = "TreeView1"
         TreeNode1.Name = "Konto"
         TreeNode1.Text = "Konto"
@@ -134,51 +139,57 @@ Partial Class frmStammdaten
         TreeNode15.Name = "Dentotar_Parameter"
         TreeNode15.Tag = "Demo"
         TreeNode15.Text = "Dentotar_Parameter"
-        TreeNode16.Name = "Knoten8"
+        TreeNode16.Name = "Dentotar_223"
-        TreeNode16.Text = "Tarif"
+        TreeNode16.Text = "Zahntechnik (223)"
-        TreeNode17.Name = "Ansatz"
+        TreeNode17.Name = "Knoten8"
-        TreeNode17.Tag = "Demo"
+        TreeNode17.Text = "Tarif"
-        TreeNode17.Text = "Ansatz"
+        TreeNode18.Name = "Ansatz"
-        TreeNode18.Name = "Abrtyp"
+        TreeNode18.Tag = "Demo"
-        TreeNode18.Text = "Abrechnungstyp"
+        TreeNode18.Text = "Ansatz"
-        TreeNode19.Name = "ESTyp"
+        TreeNode19.Name = "Abrtyp"
-        TreeNode19.Text = "Formulartyp / Einzahlungsschein"
+        TreeNode19.Text = "Abrechnungstyp"
-        TreeNode20.Name = "RGTyp"
+        TreeNode20.Name = "ESTyp"
-        TreeNode20.Text = "Rechnungstyp"
+        TreeNode20.Text = "Formulartyp / Einzahlungsschein"
-        TreeNode21.Name = "Knoten14"
+        TreeNode21.Name = "RGTyp"
-        TreeNode21.Text = "Abrechnung"
+        TreeNode21.Text = "Rechnungstyp"
-        TreeNode22.Name = "Behandlungsart"
+        TreeNode22.Name = "Standards"
-        TreeNode22.Text = "Behandlungsart"
+        TreeNode22.Text = "Standards"
-        TreeNode23.Name = "Gesetz"
+        TreeNode23.Name = "Knoten14"
-        TreeNode23.Tag = "Demo"
+        TreeNode23.Text = "Abrechnung"
-        TreeNode23.Text = "Gesetz"
+        TreeNode24.Name = "Behandlungsart"
-        TreeNode24.Name = "Diverse Stammdaten"
+        TreeNode24.Text = "Behandlungsart"
-        TreeNode24.Text = "Diverse Stammdaten"
+        TreeNode25.Name = "Gesetz"
-        TreeNode25.Name = "Auswertung"
+        TreeNode25.Tag = "Demo"
-        TreeNode25.Text = "Auswertung"
+        TreeNode25.Text = "Gesetz"
-        TreeNode26.Name = "Reporting"
+        TreeNode26.Name = "Diverse Stammdaten"
-        TreeNode26.Text = "Reporting"
+        TreeNode26.Text = "Diverse Stammdaten"
-        TreeNode27.Name = "dms_settings"
+        TreeNode27.Name = "Auswertung"
-        TreeNode27.Tag = "DMS"
+        TreeNode27.Text = "Auswertung"
-        TreeNode27.Text = "Einstellungen"
+        TreeNode28.Name = "Reporting"
-        TreeNode28.Name = "DMS_Struktur"
+        TreeNode28.Text = "Reporting"
-        TreeNode28.Tag = "DMS"
+        TreeNode29.Name = "dms_settings"
-        TreeNode28.Text = "Struktur"
-        TreeNode29.Name = "DokumentManagement"
         TreeNode29.Tag = "DMS"
-        TreeNode29.Text = "DokumentManagement"
+        TreeNode29.Text = "Einstellungen"
-        TreeNode30.Name = "Spalten"
+        TreeNode30.Name = "DMS_Struktur"
-        TreeNode30.Text = "Spalten"
+        TreeNode30.Tag = "DMS"
-        TreeNode31.Name = "Options"
+        TreeNode30.Text = "Struktur"
-        TreeNode31.Text = "Options"
+        TreeNode31.Name = "DokumentManagement"
-        TreeNode32.Name = "User"
+        TreeNode31.Tag = "DMS"
-        TreeNode32.Text = "User"
+        TreeNode31.Text = "DokumentManagement"
-        TreeNode33.Name = "Absender"
+        TreeNode32.Name = "Spalten"
-        TreeNode33.Text = "Absender"
+        TreeNode32.Text = "Spalten"
-        TreeNode34.Name = "Diverse"
+        TreeNode33.Name = "Options"
-        TreeNode34.Text = "Diverse"
+        TreeNode33.Text = "Options"
-        Me.TreeView1.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode2, TreeNode7, TreeNode16, TreeNode21, TreeNode24, TreeNode26, TreeNode29, TreeNode34})
+        TreeNode34.Name = "User"
-        Me.TreeView1.Size = New System.Drawing.Size(204, 425)
+        TreeNode34.Text = "User"
+        TreeNode35.Name = "Absender"
+        TreeNode35.Text = "Absender"
+        TreeNode36.Name = "vdkonti"
+        TreeNode36.Text = "Konto-Angaben"
+        TreeNode37.Name = "Diverse"
+        TreeNode37.Text = "Diverse"
+        Me.TreeView1.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode2, TreeNode7, TreeNode17, TreeNode23, TreeNode26, TreeNode28, TreeNode31, TreeNode37})
+        Me.TreeView1.Size = New System.Drawing.Size(271, 523)
         Me.TreeView1.TabIndex = 1
         '
         'C1TrueDBGrid1
@@ -186,13 +197,14 @@ Partial Class frmStammdaten
         Me.C1TrueDBGrid1.Dock = System.Windows.Forms.DockStyle.Fill
         Me.C1TrueDBGrid1.GroupByCaption = "Drag a column header here to group by that column"
         Me.C1TrueDBGrid1.Images.Add(CType(resources.GetObject("C1TrueDBGrid1.Images"), System.Drawing.Image))
-        Me.C1TrueDBGrid1.Location = New System.Drawing.Point(204, 24)
+        Me.C1TrueDBGrid1.Location = New System.Drawing.Point(271, 30)
+        Me.C1TrueDBGrid1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.C1TrueDBGrid1.Name = "C1TrueDBGrid1"
         Me.C1TrueDBGrid1.PreviewInfo.Location = New System.Drawing.Point(0, 0)
         Me.C1TrueDBGrid1.PreviewInfo.Size = New System.Drawing.Size(0, 0)
         Me.C1TrueDBGrid1.PreviewInfo.ZoomFactor = 75.0R
         Me.C1TrueDBGrid1.PrintInfo.PageSettings = CType(resources.GetObject("C1TrueDBGrid1.PrintInfo.PageSettings"), System.Drawing.Printing.PageSettings)
-        Me.C1TrueDBGrid1.Size = New System.Drawing.Size(753, 425)
+        Me.C1TrueDBGrid1.Size = New System.Drawing.Size(1005, 523)
         Me.C1TrueDBGrid1.TabIndex = 2
         Me.C1TrueDBGrid1.Text = "C1TrueDBGrid1"
         Me.C1TrueDBGrid1.PropBag = resources.GetString("C1TrueDBGrid1.PropBag")
@@ -204,11 +216,13 @@ Partial Class frmStammdaten
         '
         'ContextMenuStrip1
         '
+        Me.ContextMenuStrip1.ImageScalingSize = New System.Drawing.Size(20, 20)
         Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
         Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
         '
         'ContextMenuStrip2
         '
+        Me.ContextMenuStrip2.ImageScalingSize = New System.Drawing.Size(20, 20)
         Me.ContextMenuStrip2.Name = "ContextMenuStrip2"
         Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4)
         '
@@ -219,9 +233,10 @@ Partial Class frmStammdaten
         Me.ClsStammdaten_Bez1.KeyField_right = Nothing
         Me.ClsStammdaten_Bez1.Keyfieldbez_left = Nothing
         Me.ClsStammdaten_Bez1.Keyfieldbez_right = Nothing
-        Me.ClsStammdaten_Bez1.Location = New System.Drawing.Point(575, 294)
+        Me.ClsStammdaten_Bez1.Location = New System.Drawing.Point(767, 362)
+        Me.ClsStammdaten_Bez1.Margin = New System.Windows.Forms.Padding(5)
         Me.ClsStammdaten_Bez1.Name = "ClsStammdaten_Bez1"
-        Me.ClsStammdaten_Bez1.Size = New System.Drawing.Size(434, 170)
+        Me.ClsStammdaten_Bez1.Size = New System.Drawing.Size(579, 209)
         Me.ClsStammdaten_Bez1.TabIndex = 4
         Me.ClsStammdaten_Bez1.Tablename_bottom = Nothing
         Me.ClsStammdaten_Bez1.Tablename_left = Nothing
@@ -230,17 +245,18 @@ Partial Class frmStammdaten
         'ClsStammdaten_flat1
         '
         Me.ClsStammdaten_flat1.Connectionstring = Nothing
-        Me.ClsStammdaten_flat1.Location = New System.Drawing.Point(232, 56)
+        Me.ClsStammdaten_flat1.Location = New System.Drawing.Point(309, 69)
+        Me.ClsStammdaten_flat1.Margin = New System.Windows.Forms.Padding(5)
         Me.ClsStammdaten_flat1.Name = "ClsStammdaten_flat1"
-        Me.ClsStammdaten_flat1.Size = New System.Drawing.Size(558, 232)
+        Me.ClsStammdaten_flat1.Size = New System.Drawing.Size(744, 286)
         Me.ClsStammdaten_flat1.TabIndex = 3
         Me.ClsStammdaten_flat1.Tablename = Nothing
         '
         'frmStammdaten
         '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(957, 449)
+        Me.ClientSize = New System.Drawing.Size(1276, 553)
         Me.Controls.Add(Me.ClsStammdaten_Bez1)
         Me.Controls.Add(Me.ClsStammdaten_flat1)
         Me.Controls.Add(Me.C1TrueDBGrid1)
@@ -248,6 +264,7 @@ Partial Class frmStammdaten
         Me.Controls.Add(Me.MenuStrip1)
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
         Me.MainMenuStrip = Me.MenuStrip1
+        Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.Name = "frmStammdaten"
         Me.Text = "frmStammdaten"
         Me.MenuStrip1.ResumeLayout(False)

DPM2016/Sysadmin/frmStammdaten.resx

@@ -124,7 +124,7 @@
   <data name="C1TrueDBGrid1.Images" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAA0SURBVChTdYkBCgAgDAL9/6eLIsd0eSCKhw/r9aCLtC88
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAA0SURBVChTdYkBCgAgDAL9/6eLIsd0eSCKhw/r9aCLtC88
         vAdHMEIXKUIUhMK76EfagglgA6CqHOQpL6GyAAAAAElFTkSuQmCC
 </value>
   </data>
@@ -158,7 +158,7 @@
 </value>
   </data>
   <data name="C1TrueDBGrid1.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:Aqua;}Normal{}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{}Style3{}Footer{}Style14{}Heading{ForeColor:ControlText;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;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{}FilterBar{}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" 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, 751, 423&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, 751, 423&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:Aqua;}Normal{}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{}Style3{}Footer{}Style14{}Heading{ForeColor:ControlText;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;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{}FilterBar{}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="21" DefRecSelWidth="21" 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, 1003, 521&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;21&lt;/DefaultRecSelWidth&gt;&lt;ClientArea&gt;0, 0, 1003, 521&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
   </data>
   <metadata name="OpenFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>239, 17</value>

DPM2016/Sysadmin/frmStammdaten.vb

@@ -30,6 +30,8 @@ Public Class frmStammdaten
                         'MsgBox("Diese Funktion ist im DEMO-Modus nicht verfügbar.")
                         Exit Sub
                     End If
+                Case "DENTOTAR"
+
             End Select
             Me.ClsStammdaten_Bez1.Visible = True
             Me.ClsStammdaten_flat1.Visible = True

DPM2016/Utils/Globals.vb

@@ -5,8 +5,8 @@ Module Globals
     Public Seriennummer As String = "1.001.2018"
     Public Productname As String = "Dental Practice Manager"
     Public Lizenzgeber As String = "Stefan Hutter Unternehmensberatung, 8808 Pfäffikon"
-    Public Version As String = "1.0.2.1808"
+    Public Version As String = "1.2.0.1921"
-    Public Versionastaum As String = "12.11.2018"
+    Public Versionastaum As String = "21.09.2019"
 
     Public RGCollection As New Collection
     Public Spaltendaten As New DataTable

DPM2016/Utils/frmLogin.Designer.vb

@@ -111,6 +111,7 @@ Partial Class frmLogin
         Me.Name = "frmLogin"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
         Me.Text = "Login"
+        Me.TopMost = True
         CType(Me.C1PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()

DPM2016/Utils/frmSuche.Designer.vb

@@ -36,16 +36,16 @@ Partial Class frmSuche
         Me.Label5 = New System.Windows.Forms.Label()
         Me.TextBox5 = New System.Windows.Forms.TextBox()
         Me.Dokumente = New DevComponents.DotNetBar.SuperTabItem()
-        Me.SuperTabControlPanel4 = New DevComponents.DotNetBar.SuperTabControlPanel()
-        Me.Button4 = New System.Windows.Forms.Button()
-        Me.Label4 = New System.Windows.Forms.Label()
-        Me.TextBox4 = New System.Windows.Forms.TextBox()
-        Me.SuperTabItem4 = New DevComponents.DotNetBar.SuperTabItem()
         Me.SuperTabControlPanel1 = New DevComponents.DotNetBar.SuperTabControlPanel()
         Me.Button1 = New System.Windows.Forms.Button()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.TextBox1 = New System.Windows.Forms.TextBox()
         Me.SuperTabItem1 = New DevComponents.DotNetBar.SuperTabItem()
+        Me.SuperTabControlPanel4 = New DevComponents.DotNetBar.SuperTabControlPanel()
+        Me.Button4 = New System.Windows.Forms.Button()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.TextBox4 = New System.Windows.Forms.TextBox()
+        Me.SuperTabItem4 = New DevComponents.DotNetBar.SuperTabItem()
         Me.SuperTabControlPanel2 = New DevComponents.DotNetBar.SuperTabControlPanel()
         Me.Button2 = New System.Windows.Forms.Button()
         Me.Label2 = New System.Windows.Forms.Label()
@@ -67,8 +67,8 @@ Partial Class frmSuche
         CType(Me.SuperTabControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuperTabControl1.SuspendLayout()
         Me.SuperTabControlPanel5.SuspendLayout()
-        Me.SuperTabControlPanel4.SuspendLayout()
         Me.SuperTabControlPanel1.SuspendLayout()
+        Me.SuperTabControlPanel4.SuspendLayout()
         Me.SuperTabControlPanel2.SuspendLayout()
         Me.SuperTabControlPanel3.SuspendLayout()
         CType(Me.C1Daten, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -133,8 +133,8 @@ Partial Class frmSuche
         Me.SuperTabControl1.ControlBox.MenuBox.Name = ""
         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.SuperTabControlPanel5)
         Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel1)
+        Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel5)
         Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel4)
         Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel2)
         Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel3)
@@ -204,50 +204,6 @@ Partial Class frmSuche
         Me.Dokumente.Name = "Dokumente"
         Me.Dokumente.Text = "Dokumente"
         '
-        'SuperTabControlPanel4
-        '
-        Me.SuperTabControlPanel4.Controls.Add(Me.Button4)
-        Me.SuperTabControlPanel4.Controls.Add(Me.Label4)
-        Me.SuperTabControlPanel4.Controls.Add(Me.TextBox4)
-        Me.SuperTabControlPanel4.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.SuperTabControlPanel4.Location = New System.Drawing.Point(0, 25)
-        Me.SuperTabControlPanel4.Name = "SuperTabControlPanel4"
-        Me.SuperTabControlPanel4.Size = New System.Drawing.Size(800, 104)
-        Me.SuperTabControlPanel4.TabIndex = 0
-        Me.SuperTabControlPanel4.TabItem = Me.SuperTabItem4
-        '
-        'Button4
-        '
-        Me.Button4.Location = New System.Drawing.Point(12, 71)
-        Me.Button4.Name = "Button4"
-        Me.Button4.Size = New System.Drawing.Size(75, 23)
-        Me.Button4.TabIndex = 11
-        Me.Button4.Text = "Suchen"
-        Me.Button4.UseVisualStyleBackColor = True
-        '
-        'Label4
-        '
-        Me.Label4.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(12, 15)
-        Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(61, 13)
-        Me.Label4.TabIndex = 10
-        Me.Label4.Text = "Suchbegriff"
-        '
-        'TextBox4
-        '
-        Me.TextBox4.Location = New System.Drawing.Point(79, 12)
-        Me.TextBox4.Name = "TextBox4"
-        Me.TextBox4.Size = New System.Drawing.Size(154, 20)
-        Me.TextBox4.TabIndex = 9
-        '
-        'SuperTabItem4
-        '
-        Me.SuperTabItem4.AttachedControl = Me.SuperTabControlPanel4
-        Me.SuperTabItem4.GlobalItem = False
-        Me.SuperTabItem4.Name = "SuperTabItem4"
-        Me.SuperTabItem4.Text = "Zahlung"
-        '
         'SuperTabControlPanel1
         '
         Me.SuperTabControlPanel1.Controls.Add(Me.Button1)
@@ -292,6 +248,50 @@ Partial Class frmSuche
         Me.SuperTabItem1.Name = "SuperTabItem1"
         Me.SuperTabItem1.Text = "Patient"
         '
+        'SuperTabControlPanel4
+        '
+        Me.SuperTabControlPanel4.Controls.Add(Me.Button4)
+        Me.SuperTabControlPanel4.Controls.Add(Me.Label4)
+        Me.SuperTabControlPanel4.Controls.Add(Me.TextBox4)
+        Me.SuperTabControlPanel4.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.SuperTabControlPanel4.Location = New System.Drawing.Point(0, 25)
+        Me.SuperTabControlPanel4.Name = "SuperTabControlPanel4"
+        Me.SuperTabControlPanel4.Size = New System.Drawing.Size(800, 104)
+        Me.SuperTabControlPanel4.TabIndex = 0
+        Me.SuperTabControlPanel4.TabItem = Me.SuperTabItem4
+        '
+        'Button4
+        '
+        Me.Button4.Location = New System.Drawing.Point(12, 71)
+        Me.Button4.Name = "Button4"
+        Me.Button4.Size = New System.Drawing.Size(75, 23)
+        Me.Button4.TabIndex = 11
+        Me.Button4.Text = "Suchen"
+        Me.Button4.UseVisualStyleBackColor = True
+        '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.Location = New System.Drawing.Point(12, 15)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(61, 13)
+        Me.Label4.TabIndex = 10
+        Me.Label4.Text = "Suchbegriff"
+        '
+        'TextBox4
+        '
+        Me.TextBox4.Location = New System.Drawing.Point(79, 12)
+        Me.TextBox4.Name = "TextBox4"
+        Me.TextBox4.Size = New System.Drawing.Size(154, 20)
+        Me.TextBox4.TabIndex = 9
+        '
+        'SuperTabItem4
+        '
+        Me.SuperTabItem4.AttachedControl = Me.SuperTabControlPanel4
+        Me.SuperTabItem4.GlobalItem = False
+        Me.SuperTabItem4.Name = "SuperTabItem4"
+        Me.SuperTabItem4.Text = "Zahlung"
+        '
         'SuperTabControlPanel2
         '
         Me.SuperTabControlPanel2.Controls.Add(Me.Button2)
@@ -404,19 +404,19 @@ Partial Class frmSuche
         '
         Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DettailsAnzeigenToolStripMenuItem})
         Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
-        Me.ContextMenuStrip1.Size = New System.Drawing.Size(164, 26)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(181, 48)
         '
         'DettailsAnzeigenToolStripMenuItem
         '
         Me.DettailsAnzeigenToolStripMenuItem.Name = "DettailsAnzeigenToolStripMenuItem"
-        Me.DettailsAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(163, 22)
+        Me.DettailsAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
-        Me.DettailsAnzeigenToolStripMenuItem.Text = "Dettails anzeigen"
+        Me.DettailsAnzeigenToolStripMenuItem.Text = "Details anzeigen"
         '
         'ContextMenuStrip2
         '
         Me.ContextMenuStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DokumentAnzeigenToolStripMenuItem, Me.PatientFirmaAnzeigenToolStripMenuItem})
         Me.ContextMenuStrip2.Name = "ContextMenuStrip2"
-        Me.ContextMenuStrip2.Size = New System.Drawing.Size(197, 70)
+        Me.ContextMenuStrip2.Size = New System.Drawing.Size(197, 48)
         '
         'DokumentAnzeigenToolStripMenuItem
         '
@@ -449,10 +449,10 @@ Partial Class frmSuche
         Me.SuperTabControl1.ResumeLayout(False)
         Me.SuperTabControlPanel5.ResumeLayout(False)
         Me.SuperTabControlPanel5.PerformLayout()
-        Me.SuperTabControlPanel4.ResumeLayout(False)
-        Me.SuperTabControlPanel4.PerformLayout()
         Me.SuperTabControlPanel1.ResumeLayout(False)
         Me.SuperTabControlPanel1.PerformLayout()
+        Me.SuperTabControlPanel4.ResumeLayout(False)
+        Me.SuperTabControlPanel4.PerformLayout()
         Me.SuperTabControlPanel2.ResumeLayout(False)
         Me.SuperTabControlPanel2.PerformLayout()
         Me.SuperTabControlPanel3.ResumeLayout(False)

DPM2016/Utils/frmSuche.resx

@@ -182,7 +182,7 @@
 </value>
   </data>
   <data name="C1Daten.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{}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;}Style6{}Style1{}Caption{AlignHorz:Center;}Style2{}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, 798, 270&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, 798, 270&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;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}Heading{Wrap:True;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;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{}FilterBar{BackColor:Info;}&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, 798, 270&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, 798, 270&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
   </data>
   <metadata name="ContextMenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>388, 17</value>

DPM2016/Zahlung/frmZahlung.resx

@@ -142,24 +142,24 @@
   <data name="tsbtnSave.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        y+27MTExgUKhoCuZTDJE7ejo+JggiyjJ/WQ3I0lFe3v7cwzgk5QVrPktiSWuy3jquzEs3j2KZ76/ivc8
-        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
+        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
-        dICAtLW1vex0Ou9rbGy8zQypABRFAddv/tLwgh+we4F6H+BiQO84tn6+RzcuFotIpVIYHh5GOBxGJBLR
+        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
-        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
+        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
-        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
+        wSqbzfY4Ae41/G9MwGPyX1KxeoASGABrF9DkTWPzLrfePUsk4ZrL5XQYQ8h8DaVYUlVV9YDhXwSI5bGi
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        IIytgLm58iKtT4wwFnVRADEOq6nZmD/nlx5rQQCbXU0CaJaAmnVdgDDiar6JP7N2be5c1AUTmDsWMKvM
+        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
-        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
+        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
-        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
+        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
 </value>
   </data>
   <metadata name="OpenFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

DPM2016/Zahlung/frmZahlung.vb

@@ -185,7 +185,7 @@ Public Class frmZahlung
                 dr.Item("Datum") = "20" + s.Substring(59, 2) + "-" + s.Substring(61, 2) + "-" + s.Substring(63, 2)
                 dr.Item("Transaktion") = s.Substring(0, 3)
                 dr.Item("svbnr") = s.Substring(3, 9)
-                dr.Item("Referenz") = s.Substring(11, 27)
+                dr.Item("Referenz") = s.Substring(12, 27)
                 b1 = s.Substring(39, 10)
                 b1 = b1 / 100
                 dr.Item("Betrag") = b1
@@ -217,7 +217,7 @@ Public Class frmZahlung
     Private Function Verbuchen(ByRef dr As DataRow) As Boolean
         Dim db1 As New clsDB
         Dim fakturanr As String
-        fakturanr = dr.Item("Referenz").Substring(7, 10)
+        fakturanr = dr.Item("Referenz").Substring(6, 10)
         If fakturanr.Substring(4, 1) = "9" Then
             'Anzahlung_Verbuchen'
 

DPM2016/bin/Debug/Connectionstrings.cfg

@@ -1,8 +1,9 @@
-¦´«­º±ÃŽ¸¦Æ¶nÇ´ÇÀ¨­Š¸¶ÈruªÂ¾Â°™¤P›±º¢±µ­†¯¿»²Æ´«­º±Ã½³ÆºµÆ¦Æ³©hÀª±È´®Æº‘¨¡—s Â¹ª¸ºf¼°²ÃŽ¹¿a·¶»Ã‘«³ÁÁ¹€É½·³À¹¯Ç«´Àa½¹‹‚¨™“£µºa¸¯À®ˆƒ~ŒŠ€»´³ºu½¸‚Ŷ‰Ä¦ÅÁ¼·¿©‹}µ­Çs
+˜ª´µ¯´‡§Á®¾ºˆ¸¦Æ¯e»¼ºÀ¶§‚Å©É…~‚¡¦™¬¹§­e©§½¬»½º‘©¶®­¬ºÂȦ¾‡ÁÁ®¾³€±»¹³º´¦Æ¦¸uÁ¬›­¢¡Ä¿~˜™–’†¿³ÅÇ®¹µn»º·É·»ÉÇt®À´´…³¦ºÆ§€É°ÆÀÁ»™¬™§¾fª©ƒ¹¬²¹¸Èe¹ªÈ­’ˆ„~ˆÃǪÄn®¬Š¸¯Ž²¦Å´ËÄÀ«ub£ Åxz
+¦´«­º±ÃŽ¸¦Æ¶nÇ´ÇÀ¨­Š¸¶ÈruªÂ¾Â°™¤P›±º¢±µ­†¯¿»²Æ´«­º±Ã½³ÆºµÆ¦Æ³©hÀª±È´®Æº‘¨¡—s Â¹ª¸ºf¼°²ÃŽ¹¿a·¶»Ã‘«³ÁÁ¹€É½·³À¹¯Ç«´Àa½¹‹‚¨™“£µºa¸¯À®ˆƒ~ŒŠ€»´³ºu½¸‚Ŷ‰Ä¦ÅÁ¼·¿©‹}µ­Çs
 ˜Š“ˆ¬¶ÈµeÅÄÃƨ·‹¸°Âu~Ž«³»µ½¶ºg›™¤™¼µ¨‚ª¶¶ª³³ÁȦ²sÁµ¾À¹€»Ã¹¬Ä¯¹­±eÁ¸¥ºÄªÈ΋š‹ˆysÀ«³¸¯¹½k³¶É·¯µÇh¾Âº´»¯À¸·‰¼·¿°ÁÇ£¹»°Âu·«us ™³±¦¹f¹²Å´‹‡„~||ûºÆt®¶’Áµ€Â¯¸»Ä´À·oũɇ‡
 ˜ª´µ·»¸µ¹³uÁúıª…À­Ãƒr€»¯½É·¨¤X“™Ä§­´­ƒ­»¼€ƒ…}¥r‰±Ãȹ¬Ä¶Â¹©rÁª«Â··Ç»‚¥”¤ž‰·ª£¡Ãºa¸«©¾½¸ÂÌt®´§½…»µÀ¸·Å÷½Á¹©Á®½Áb®¶~Å¯ª£¤Xﻪƒzy„…‰ÈǪ¸a·¬’ǵ€Â¶ÁǼÁÀ©…w¸¶Èt~
 ¤·§¹·»¸µ¹³uÁúıª…À­Ãƒr€»¯½É·¨¤X“™Ä§­´­ƒ­»¼­£Æ¦¾ªÁƒ¾ÂȪ¹Ç¯Èª¶n¸­°ºÀ¼¶¾”§¥—‚¨¢«¹¹µe¹«¬ÀÁ·ÇÍe¯¯´·’ºµ±Åº‰Ë´Ä¹¸¼®¹·Â°e»¥‘¾¨›£•¬p¹ª¿«ƒ}{ˆ„ŽÉ¸«³n±¹‘ǦÅ¯Ç¸É½·¬ŠoÁ»·w‹
-˜ª´µ·»´ª¡¶¶ÂµeŽºº°ª‹„{w€rŠ|xii^mˆª³¯º²¬»n¶µ¹§­½¯’˜¹³Æ¾ÁºÅ³·h¶©‹Æ£€Â¢ÇÈŶªœmbî¶w
+˜ª´µ·»´ª¡¶¶ÂµeŽºº°ª‹„{w€rŠ|xii^iƒy|®´¯½´°ºs·¦º¢º·¼‘˜ªÀÉ·Ç€ÇÁªºm®²µ¦±µÈÁ¾§ª”uî¶owy
-¤·§¹·»´ª¡¶¶ÂµeŽºº°ª‹„{w€rŠ|xii^mˆª³¯º²¬»n¶µ¹§­½¯’¤Æ¦Ê¾ÁºÅ³·h¶©‹Æ£€Â¢ÇÈŶªœmbî¶w
+¤·§¹·»´ª¡¶¶ÂµeŽºº°ª‹„{w€rŠ|xii^iƒy|®´¯½´°ºs·¦º¢º·¼‘¤·³Í·Ç€ÇÁªºm®²µ¦±µÈÁ¾§ª”uî¶owy
 ˜ª´µ·»´¡Í˜£¡ˆÇªÄĪºŠ±½¶£±º°Çɉœ«¢X™ª~·µµ½†³¯Çµ§§´³…¹ÄÁw‚††³v¾¦»À¼½Å¦‚źǹ°¨
 ˜ª³°¥­·Àµ³¶²µ¹³n¸·Â·±¸²Å´ÅÁ„u¯’¤±´¥s©®„´½·Ç½¦²a±©ÉµÀ´¹’Á¼º´²¤¬½²²¸¯´±µ¸¹¬¬X£¡Ê«~yv†ÄÁ¸Æe¯¥‹»½É¶©±¹¾Á©·»´ƒ½¦Áƹ´Ä¥‘¨–œbœ ¥´«®´x

DPM2016/bin/Debug/DPM2018.application

@@ -7,14 +7,14 @@
     <framework targetVersion="4.6" profile="Full" supportedRuntime="4.0.30319" />
   </compatibleFrameworks>
   <dependency>
-    <dependentAssembly dependencyType="install" codebase="DPM2018.exe.manifest" size="27536">
+    <dependentAssembly dependencyType="install" codebase="DPM2018.exe.manifest" size="31624">
       <assemblyIdentity name="DPM2018.exe" version="1.0.0.1" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
       <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>j6iOzVhg/wmUAnUdIIcsTQxiFzWd7Y6Umtx1txLmI1c=</dsig:DigestValue>
+        <dsig:DigestValue>Z8/ohDHQOVC31fah+orrfmUNEEtGz0wHX7Oq4dtjFoI=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

DPM2016/bin/Debug/DPM2018.exe.manifest

@@ -42,16 +42,6 @@
       <assemblyIdentity name="Microsoft.Windows.CommonLanguageRuntime" version="4.0.30319.0" />
     </dependentAssembly>
   </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="preRequisite" allowDelayedBinding="true">
-      <assemblyIdentity name="MySql.Data" version="6.7.4.0" publicKeyToken="C5687FC88969C44D" language="neutral" processorArchitecture="msil" />
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="preRequisite" allowDelayedBinding="true">
-      <assemblyIdentity name="MySql.Data.Entity" version="6.7.4.0" publicKeyToken="C5687FC88969C44D" language="neutral" processorArchitecture="msil" />
-    </dependentAssembly>
-  </dependency>
   <dependency>
     <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Aga.Controls.dll" size="86016">
       <assemblyIdentity name="Aga.Controls" version="1.0.0.0" publicKeyToken="FCC90FBF924463A3" language="neutral" processorArchitecture="msil" />
@@ -161,50 +151,50 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DPM2018.exe" size="5652472">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DPM2018.exe" size="6055424">
       <assemblyIdentity name="DPM2018" 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>GsZRKuwqk6Xf22e5r6oFfIc37kkzT/TEAJj+uJl3Gfw=</dsig:DigestValue>
+        <dsig:DigestValue>hNnUof7//Uy8zZASBh7rydpiZh9+tC3tmgXR//G5ZB0=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="FastReport.dll" size="5801360">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="FastReport.dll" size="6798704">
-      <assemblyIdentity name="FastReport" version="2018.4.2.0" publicKeyToken="DB7E5CE63278458C" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="FastReport" version="2019.3.22.0" publicKeyToken="DB7E5CE63278458C" 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>Q4G0ogKvbQzRIJzuroDUiWIrdBwZD46FuFb1mHdASHw=</dsig:DigestValue>
+        <dsig:DigestValue>YAf8e3ucgCHDEwPA3fc/SOplq1xZf3ZTVBu4wThvScc=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="FastReport.Bars.dll" size="5218192">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="FastReport.Bars.dll" size="5228400">
-      <assemblyIdentity name="FastReport.Bars" version="2018.4.2.0" publicKeyToken="DB7E5CE63278458C" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="FastReport.Bars" version="2019.3.22.0" publicKeyToken="DB7E5CE63278458C" 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>x6TKeRADnpG8iL/70WnGw1xisC+RBP+9WmhHQbG017E=</dsig:DigestValue>
+        <dsig:DigestValue>87cKk42NVnZOUHZGYzqYbyOFQjptSR0B+bF66eUtXL8=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="FastReport.Editor.dll" size="988048">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="FastReport.Editor.dll" size="994160">
-      <assemblyIdentity name="FastReport.Editor" version="2018.4.2.0" publicKeyToken="DB7E5CE63278458C" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="FastReport.Editor" version="2019.3.22.0" publicKeyToken="DB7E5CE63278458C" 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>ybdrHZO0BacH/7QbqvtfSecWyzFfJXyRv3MInd4Z/f0=</dsig:DigestValue>
+        <dsig:DigestValue>JGMlbhgez57QxT811uoBJwieYZwmnt4ToEGbmbFle7I=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -317,98 +307,182 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MySql.Data.dll" size="698368">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="KP-ImageViewerV2.dll" size="68096">
-      <assemblyIdentity name="MySql.Data" version="8.0.12.0" publicKeyToken="C5687FC88969C44D" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="KP-ImageViewerV2" version="1.5.1.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>o1A1TiMHyyY2HLODhWlzi01juSSiEk3jKsgc9fnbhpo=</dsig:DigestValue>
+        <dsig:DigestValue>o7uNKkCPWlpIPT3q2xKzifMRcunxI4Ky/bElVbVHWaU=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PropertyGridEx.dll" size="48128">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MsgReader.dll" size="378368">
-      <assemblyIdentity name="PropertyGridEx" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="MsgReader" version="3.6.1.0" publicKeyToken="3BA01CF3434959FA" 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>g+nWXc4h/DaKewOmkCJQA0uOR5aVfJrS29T7d3pRR8E=</dsig:DigestValue>
+        <dsig:DigestValue>70vYni89hl8KEmP5ZGGnL4VHtavroZmHcWsmE7P5qCI=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="SHUKeyGen.dll" size="27136">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="de\MsgReader.resources.dll" size="13824">
-      <assemblyIdentity name="SHUKeyGen" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="MsgReader.resources" version="3.6.1.0" publicKeyToken="3BA01CF3434959FA" language="de" 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>geK4YQkCftVr3r0piMztFkKxuUV5k7IzQBSnapnZCEk=</dsig:DigestValue>
+        <dsig:DigestValue>Uv+ZAtv89LSuYAVmpIjK+G5Z2mbRqXF/l8WYJhaveoQ=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Syncfusion.Compression.Base.dll" size="77824">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="es\MsgReader.resources.dll" size="13824">
-      <assemblyIdentity name="Syncfusion.Compression.Base" version="16.2350.0.41" publicKeyToken="3D67ED1F87D44C89" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="MsgReader.resources" version="3.6.1.0" publicKeyToken="3BA01CF3434959FA" language="es" 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>1ScUcT75tiLzlA5I53HBMuMTekq02JWjxr3wQOXFprI=</dsig:DigestValue>
+        <dsig:DigestValue>az2ZzaDPDmQsLyAOI2gQf+1JyjuhvQr0RLEN7NwKA/c=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Syncfusion.Pdf.Base.dll" size="6098944">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="fr\MsgReader.resources.dll" size="13824">
-      <assemblyIdentity name="Syncfusion.Pdf.Base" version="16.2350.0.41" publicKeyToken="3D67ED1F87D44C89" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="MsgReader.resources" version="3.6.1.0" publicKeyToken="3BA01CF3434959FA" language="fr" 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>tWGgFCYEHEmx57z5BHjSmQg4wak3EfSKmXhAPC099TY=</dsig:DigestValue>
+        <dsig:DigestValue>7X56fvOHJrUmIfy6vUPlmFiqboysSBDNBPyqQgkaesA=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Syncfusion.PdfViewer.Windows.dll" size="1893888">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="nl\MsgReader.resources.dll" size="13824">
-      <assemblyIdentity name="Syncfusion.PdfViewer.Windows" version="16.2350.0.41" publicKeyToken="3D67ED1F87D44C89" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="MsgReader.resources" version="3.6.1.0" publicKeyToken="3BA01CF3434959FA" language="nl" 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>IIBVzhy6EYdd8gXI9sVU/NqxevRGxCADg9ULapTktOs=</dsig:DigestValue>
+        <dsig:DigestValue>OS0StxZPf9WpfactpCk1R9QvfEZ91sd/c3D5XZUqSyY=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Syncfusion.Shared.Base.dll" size="4308992">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="pt\MsgReader.resources.dll" size="13824">
-      <assemblyIdentity name="Syncfusion.Shared.Base" version="16.2350.0.41" publicKeyToken="3D67ED1F87D44C89" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="MsgReader.resources" version="3.6.1.0" publicKeyToken="3BA01CF3434959FA" language="pt" 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>THgqsOP8jM1MWtCbJSY8B94/YKQ4l8cDzNSu+SP7HdU=</dsig:DigestValue>
+        <dsig:DigestValue>qOeonQf/zIy44t0zdulKEQFv6wbNfwtf+2veMnHs2yQ=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Syncfusion.Shared.Windows.dll" size="36864">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="zh-CN\MsgReader.resources.dll" size="13824">
-      <assemblyIdentity name="Syncfusion.Shared.Windows" version="16.2350.0.41" publicKeyToken="3D67ED1F87D44C89" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="MsgReader.resources" version="3.6.1.0" publicKeyToken="3BA01CF3434959FA" language="zh-CN" 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>Brwtr52FiQEEmKQX3ygNODbMfR2HklOGYyA+bmRkdAo=</dsig:DigestValue>
+        <dsig:DigestValue>8/Z5ezUxuoo3x4BDdK5YD296JUs5ni25jlIgWCJYWWA=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="zh-TW\MsgReader.resources.dll" size="13824">
+      <assemblyIdentity name="MsgReader.resources" version="3.6.1.0" publicKeyToken="3BA01CF3434959FA" language="zh-TW" 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>YroZpkn+ylpTTzd8/wU4IqvB7svEKuD2K2vqPgvVqgY=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MySql.Data.dll" size="698368">
+      <assemblyIdentity name="MySql.Data" version="8.0.12.0" publicKeyToken="C5687FC88969C44D" 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>o1A1TiMHyyY2HLODhWlzi01juSSiEk3jKsgc9fnbhpo=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="OpenMcdf.dll" size="60928">
+      <assemblyIdentity name="OpenMcdf" version="2.2.1.2" publicKeyToken="FDBB1629D7C00800" 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>updVzBVQHuepY38OPgyOorWRbE8dlOAxLUGhDi153cg=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PropertyGridEx.dll" size="48128">
+      <assemblyIdentity name="PropertyGridEx" 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>g+nWXc4h/DaKewOmkCJQA0uOR5aVfJrS29T7d3pRR8E=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="RtfPipe.dll" size="140288">
+      <assemblyIdentity name="RtfPipe" version="1.0.0.0" publicKeyToken="317A45EC926873FC" 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>PqGSYEmfTjtZh0kCZwaAteRDsA4e6nEuTd25X/JYt40=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="SHUKeyGen.dll" size="27136">
+      <assemblyIdentity name="SHUKeyGen" 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>1xEEyKAhxpWXiCJNDjzueoHEZPjMX322lKsIH72xkUQ=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Syncfusion.PdfViewer.Windows.dll" size="1893888">
+      <assemblyIdentity name="Syncfusion.PdfViewer.Windows" version="16.2350.0.41" publicKeyToken="3D67ED1F87D44C89" 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>IIBVzhy6EYdd8gXI9sVU/NqxevRGxCADg9ULapTktOs=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

DPM2016/bin/Debug/Dentis/Reporting/Report/kgetiketten.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="Vb" TextQuality="Regular" ReportInfo.Description="Demonstrates how to use the Table object. Notes:&#13;&#10;- to set the number of columns and rows, use &quot;ColumnCount&quot; and &quot;RowCount&quot; properties. Also you may add new columns/rows from a column/row context menu;&#13;&#10;- to join/split cells, use context menu of the cell;&#13;&#10;- to set the column/row autosize, use context menu of the column/row. " ReportInfo.Created="01/17/2008 17:08:04" ReportInfo.Modified="09/20/2018 10:31:54" ReportInfo.CreatorVersion="2018.2.11.0">
+<Report ScriptLanguage="Vb" TextQuality="Regular" ReportInfo.Description="Demonstrates how to use the Table object. Notes:&#13;&#10;- to set the number of columns and rows, use &quot;ColumnCount&quot; and &quot;RowCount&quot; properties. Also you may add new columns/rows from a column/row context menu;&#13;&#10;- to join/split cells, use context menu of the cell;&#13;&#10;- to set the column/row autosize, use context menu of the column/row. " ReportInfo.Created="01/17/2008 17:08:04" ReportInfo.Modified="04/09/2019 18:38:08" ReportInfo.CreatorVersion="2018.4.2.0">
   <ScriptText>Imports System
 Imports System.Collections
 Imports System.Collections.Generic
@@ -21,6 +21,34 @@ Namespace FastReport
     Private Sub Text1_BeforePrint(ByVal sender As object, ByVal e As EventArgs)
       if CType(Report.GetColumnValue(&quot;Daten.nrprivat&quot;), Int32)&lt;0 then text1.Text=&quot;&quot;
     End Sub
+ 
+
+    Private Sub Text3_BeforePrint(ByVal sender As object, ByVal e As EventArgs)
+      text1.visible=true
+      text2.visible=true
+      text3.visible=true
+      text4.visible=true
+      text5.visible=true
+      text6.visible=true
+      text7.visible=true
+      text8.visible=true
+      text9.visible=true
+      text10.visible=true
+      text11.visible=true      
+      If CType(Report.GetColumnValue(&quot;Daten.NRPRIVAT&quot;), Int32) &lt; 1 Then
+        text1.visible=false
+        text2.visible=false
+        text3.visible=false
+        text4.visible=false
+        text5.visible=false
+        text6.visible=false
+        text7.visible=false
+        text8.visible=false
+        text9.visible=false
+        text10.visible=false
+        text11.visible=false
+      end if      
+    End Sub
   End Class
 End Namespace
 </ScriptText>
@@ -115,15 +143,34 @@ End Namespace
       <Column Name="GLN" DataType="System.String"/>
       <Column Name="Kanton" DataType="System.String"/>
       <Column Name="ZSR" DataType="System.String"/>
+      <Column Name="NRANREDE1" DataType="System.Int32"/>
+      <Column Name="Mandant1" DataType="System.Int32"/>
+      <Column Name="Anrede_D" DataType="System.String"/>
+      <Column Name="Anrede_F" DataType="System.String"/>
+      <Column Name="Anrede_I" DataType="System.String"/>
+      <Column Name="erstellt_am1" DataType="System.DateTime"/>
+      <Column Name="mutiert_am1" DataType="System.DateTime"/>
+      <Column Name="mutierer1" DataType="System.Int32"/>
+      <Column Name="aktiv1" DataType="System.Boolean" BindableControl="CheckBox"/>
+      <Column Name="anrede_d1" DataType="System.String"/>
     </TableDataSource>
     <Parameter Name="Absender" DataType="System.String"/>
     <Parameter Name="Startposition" DataType="System.String"/>
     <Parameter Name="Nummern (Komma-Getrennt)" DataType="System.String"/>
   </Dictionary>
-  <ReportPage Name="Page1" RawPaperSize="9" Columns.Count="2" Columns.Width="95" Columns.Positions="0,95">
+  <ReportPage Name="Page1" RawPaperSize="9" TopMargin="5" BottomMargin="0" FirstPageSource="15" OtherPagesSource="15" Columns.Count="2" Columns.Width="105" Columns.Positions="0,95">
-    <DataBand Name="Data1" Width="359.1" Height="113.4" CanGrow="true" DataSource="Daten">
+    <DataBand Name="Data1" Width="396.9" Height="274.05" CanGrow="true" DataSource="Daten">
-      <TextObject Name="Text1" Left="255.15" Top="9.45" Width="94.5" Height="18.9" BeforePrintEvent="Text1_BeforePrint" Text="[Daten.NRPRIVAT]" HideValue="&lt; 0"/>
+      <TextObject Name="Text1" Left="95.5" Top="18.9" Width="94.5" Height="18.9" BeforePrintEvent="Text1_BeforePrint" Text="[Daten.NRPRIVAT]" HideValue="&lt; 0" Format="Date" Format.Format="d" Font="Arial, 12pt, style=Bold"/>
-      <TextObject Name="Text2" Left="9.45" Top="37.8" Width="226.8" Height="18.9" Text="[Daten.NAME] [Daten.VORNAME]"/>
+      <TextObject Name="Text2" Left="94.5" Top="61.15" Width="283.5" Height="18.9" Text="[Daten.NAME] [Daten.VORNAME]" HideValue="daten.nrprivat  1" Font="Arial, 12pt, style=Bold"/>
+      <TextObject Name="Text3" Left="9.45" Top="18.9" Width="66.15" Height="18.9" BeforePrintEvent="Text3_BeforePrint" Text="Patient:" Font="Arial, 12pt, style=Bold"/>
+      <TextObject Name="Text4" Left="94.5" Top="44.25" Width="122.85" Height="18.9" Text="[Daten.anrede_d1]" HideValue="daten.nrprivat  1"/>
+      <TextObject Name="Text5" Left="94.5" Top="82.05" Width="283.5" Height="18.9" Text="[Daten.STRASSE]" Format="Date" Format.Format="d"/>
+      <TextObject Name="Text6" Left="94.5" Top="97.5" Width="283.5" Height="18.9" Text="[Daten.PLZ] [Daten.ORT]"/>
+      <TextObject Name="Text7" Left="94.5" Top="132.3" Width="283.5" Height="28.35" Text="[Daten.GEBDAT]&#13;&#10;[Daten.BERUF]" Format="Date" Format.Format="d"/>
+      <TextObject Name="Text8" Left="9.45" Top="132.3" Width="94.5" Height="28.35" Text="Geb.-Dat.:&#13;&#10;Beruf:"/>
+      <TextObject Name="Text9" Left="9.45" Top="179.55" Width="94.5" Height="47.25" Text="Tel-/Handy P:&#13;&#10;Tel./Fax. G:&#13;&#10;E-Mail:"/>
+      <TextObject Name="Text10" Left="103.95" Top="141.75" Height="9.45" Text="[Daten.GEBDAT]&#13;&#10;[Daten.BERUF]" Format="Date" Format.Format="d" Font="Arial, 9pt"/>
+      <TextObject Name="Text11" Left="94.5" Top="179.55" Width="283.5" Height="47.25" Text="[Daten.TELP] / [Daten.Natel]&#13;&#10;[Daten.TELG] / [Daten.FAXG]&#13;&#10;[Daten.E_Mail]" Format="Date" Format.Format="d"/>
     </DataBand>
   </ReportPage>
 </Report>

DPM2016/bin/Debug/Dentis/Reporting/SQL/Labels_Privat.sql

@@ -8,5 +8,5 @@ select * into #tmp1 from privat where NRPRIVAT in (#Parameter2)
      insert #tmp1 (nrprivat) values (@i*-1)
      set @i=@i+1
   end
-  select * from #tmp1 order by nrprivat;
+  select *, anrede.anrede_d from #tmp1 left outer join anrede on #tmp1.nranrede = anrede.nranrede order by nrprivat;
   drop table #tmp1;

DPM2016/bin/Debug/Roellin/Reporting/Report/Abgeschlossene_Behandlungen.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="Vb" ReportInfo.Created="11/28/2015 07:43:07" ReportInfo.Modified="02/18/2019 09:10:27" ReportInfo.CreatorVersion="2018.4.2.0">
+<Report ScriptLanguage="Vb" ReportInfo.Created="11/28/2015 07:43:07" ReportInfo.Modified="04/15/2019 20:24:40" ReportInfo.CreatorVersion="2018.4.2.0">
   <ScriptText>Imports System
 Imports System.Collections
 Imports System.Collections.Generic
@@ -45,27 +45,32 @@ End Namespace
       <Column Name="aktiv" DataType="System.Boolean" BindableControl="CheckBox"/>
     </TableDataSource>
     <Parameter Name="Absender" DataType="System.String"/>
+    <Total Name="Total" Expression="[Daten.Total]" Evaluator="Data1"/>
   </Dictionary>
   <ReportPage Name="Page1">
     <ReportTitleBand Name="ReportTitle1" Width="718.2" Height="75.6">
       <TextObject Name="Text1" Left="444.15" Width="255.15" Height="18.9" Text="Abgeschlossene Behandlungen" HorzAlign="Right" Font="Arial, 10pt, style=Bold, Underline"/>
       <TextObject Name="Text12" Left="349.65" Top="18.9" Width="349.65" Height="18.9" Text="[Absender]" HorzAlign="Right"/>
-      <PictureObject Name="Picture1" Left="9.45" Width="132.3" Height="66.15" BeforePrintEvent="Picture1_BeforePrint" ImageLocation="E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\\Reporting\Logo\reportlogo.png"/>
+      <PictureObject Name="Picture1" Left="9.45" Width="132.3" Height="66.15" BeforePrintEvent="Picture1_BeforePrint" ImageLocation="E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Roellin\Reporting\Logo\reportlogo.png"/>
     </ReportTitleBand>
     <PageHeaderBand Name="PageHeader1" Top="78.46" Width="718.2" Height="28.35">
       <TextObject Name="Text3" Left="9.45" Width="94.5" Height="18.9" Text="Beh-Beginn" Font="Arial, 10pt, style=Bold"/>
-      <TextObject Name="Text5" Left="122.85" Width="94.5" Height="18.9" Text="Patient" Font="Arial, 10pt, style=Bold"/>
+      <TextObject Name="Text5" Left="103.95" Width="94.5" Height="18.9" Text="Patient" Font="Arial, 10pt, style=Bold"/>
-      <TextObject Name="Text7" Left="415.8" Width="122.85" Height="18.9" Text="Behandler" Font="Arial, 10pt, style=Bold"/>
+      <TextObject Name="Text7" Left="387.45" Width="122.85" Height="18.9" Text="Behandler" Font="Arial, 10pt, style=Bold"/>
       <TextObject Name="Text9" Left="604.8" Width="94.5" Height="18.9" Text="Total" HorzAlign="Right" Font="Arial, 10pt, style=Bold"/>
       <LineObject Name="Line1" Left="9.45" Top="18.9" Width="689.85"/>
     </PageHeaderBand>
     <DataBand Name="Data1" Top="109.66" Width="718.2" Height="18.9" DataSource="Daten">
-      <TextObject Name="Text2" Left="9.45" Width="94.5" Height="18.9" Text="[Daten.Behandlungsbeginn]" Format="Date" Format.Format="d"/>
+      <TextObject Name="Text2" Left="9.45" Width="94.5" Height="18.9" Text="[Daten.Behandlungsbeginn]" Format="Date" Format.Format="d" Font="Arial, 9pt"/>
-      <TextObject Name="Text4" Left="122.85" Width="283.5" Height="18.9" Text="[Daten.Patient]"/>
+      <TextObject Name="Text4" Left="103.95" Width="283.5" Height="18.9" Text="[Daten.Patient]" Font="Arial, 9pt"/>
-      <TextObject Name="Text6" Left="415.8" Width="189" Height="18.9" Text="[Daten.Behandler]"/>
+      <TextObject Name="Text6" Left="387.45" Width="226.8" Height="15.35" Text="[Daten.Behandler]" Font="Arial, 9pt"/>
-      <TextObject Name="Text8" Left="604.8" Width="94.5" Height="18.9" Text="[Daten.Total]" Format="Number" Format.UseLocale="true" HorzAlign="Right" WordWrap="false" Trimming="EllipsisCharacter"/>
+      <TextObject Name="Text8" Left="623.7" Width="75.6" Height="18.9" Text="[Daten.Total]" Format="Number" Format.UseLocale="true" HorzAlign="Right" WordWrap="false" Font="Arial, 9pt" Trimming="EllipsisCharacter"/>
     </DataBand>
-    <PageFooterBand Name="PageFooter1" Top="131.42" Width="718.2" Height="37.8">
+    <ReportSummaryBand Name="ReportSummary1" Top="131.42" Width="718.2" Height="37.8">
+      <TextObject Name="Text13" Left="604.8" Top="5" Width="94.5" Height="18.9" Text="[Total]" Format="Number" Format.UseLocale="true" HorzAlign="Right" Font="Arial, 9pt, style=Bold"/>
+      <LineObject Name="Line3" Left="9.45" Width="689.85"/>
+    </ReportSummaryBand>
+    <PageFooterBand Name="PageFooter1" Top="172.08" Width="718.2" Height="37.8">
       <TextObject Name="Text10" Left="9.45" Top="9.45" Width="170.1" Height="18.9" Text="[Date]"/>
       <LineObject Name="Line2" Left="9.45" Width="689.85"/>
       <TextObject Name="Text11" Left="604.8" Top="9.45" Width="94.5" Height="18.9" Text="[Page#]" HorzAlign="Right"/>

DPM2016/bin/Debug/Roellin/Reporting/Report/Monatsumsaetze.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="Vb" ReportInfo.Created="11/28/2015 07:43:07" ReportInfo.Modified="02/19/2019 11:26:01" ReportInfo.CreatorVersion="2018.4.2.0">
+<Report ScriptLanguage="Vb" DoublePass="true" ReportInfo.Created="11/28/2015 07:43:07" ReportInfo.Modified="04/15/2019 20:46:58" ReportInfo.CreatorVersion="2018.4.2.0">
   <ScriptText>Imports System
 Imports System.Collections
 Imports System.Collections.Generic
@@ -45,6 +45,7 @@ End Namespace
     <Parameter Name="Absender" DataType="System.String"/>
     <Parameter Name="Anzahl Monate" DataType="System.String"/>
     <Total Name="Total" Expression="[Daten.Total]" Evaluator="Data1"/>
+    <Total Name="Total1" Expression="[Daten.Total]" Evaluator="Data1" PrintOn="GroupFooter1" ResetOnReprint="true"/>
   </Dictionary>
   <ReportPage Name="Page1" RawPaperSize="9" FirstPageSource="15" OtherPagesSource="15" Columns.Count="2" Columns.Width="95" Columns.Positions="0,95">
     <ReportTitleBand Name="ReportTitle1" Width="718.2" Height="103.95">
@@ -60,18 +61,27 @@ End Namespace
       <TextObject Name="Text13" Left="368.55" Width="94.5" Height="18.9" Text="Jahr / Monat" Font="Arial, 10pt, style=Bold"/>
       <TextObject Name="Text14" Left="481.95" Width="94.5" Height="18.9" Text="Total" HorzAlign="Right" Font="Arial, 10pt, style=Bold"/>
     </PageHeaderBand>
-    <DataBand Name="Data1" Top="138.01" Width="359.1" Height="18.9" DataSource="Daten">
+    <GroupHeaderBand Name="GroupHeader1" Top="138.01" Width="359.1" Height="9.45" Condition="[Daten.Jahr]" SortOrder="Descending">
-      <TextObject Name="Text2" Left="9.45" Width="94.5" Height="18.9" Text="[Daten.Expr1]"/>
+      <DataBand Name="Data1" Top="150.32" Width="359.1" Height="18.9" DataSource="Daten">
-      <TextObject Name="Text4" Left="122.85" Width="94.5" Height="18.9" Text="[Daten.Total]" Format="Number" Format.UseLocale="true" HorzAlign="Right" WordWrap="false" Trimming="EllipsisCharacter"/>
+        <TextObject Name="Text2" Left="9.45" Width="94.5" Height="18.9" Text="[IIf(Length([Daten.Monat])=1,&quot;0&quot;,&quot;&quot;)][Daten.Monat].[Daten.Jahr]"/>
-      <Sort>
+        <TextObject Name="Text4" Left="122.85" Width="94.5" Height="18.9" Text="[Daten.Total]" Format="Number" Format.UseLocale="true" HorzAlign="Right" WordWrap="false" Trimming="EllipsisCharacter"/>
-        <Sort Expression="[Daten.Expr1]" Descending="true"/>
+        <Sort>
-      </Sort>
+          <Sort Expression="[Daten.Jahr]" Descending="true"/>
-    </DataBand>
+          <Sort Expression="[Daten.Monat]"/>
-    <ReportSummaryBand Name="ReportSummary1" Top="159.77" Width="359.1" Height="37.8">
+        </Sort>
+      </DataBand>
+      <GroupFooterBand Name="GroupFooter1" Top="172.08" Width="359.1" Height="37.8">
+        <TextObject Name="Text8" Left="132.3" Top="3" Width="85.05" Height="18.9" Text="[Total1]" Format="Number" Format.UseLocale="true" HorzAlign="Right" Font="Arial, 10pt, style=Bold"/>
+        <TextObject Name="Text15" Left="9.45" Top="3" Width="103.95" Height="18.9" Text="Total [Daten.Jahr]" Font="Arial, 10pt, style=Bold"/>
+        <LineObject Name="Line1" Left="9.45" Top="1.45" Width="207.9"/>
+      </GroupFooterBand>
+    </GroupHeaderBand>
+    <ReportSummaryBand Name="ReportSummary1" Top="212.74" Width="359.1" Height="37.8">
       <TextObject Name="Text6" Left="122.85" Top="9.45" Width="94.5" Height="18.9" Text="[Total]" Format="Number" Format.UseLocale="true" HorzAlign="Right" Font="Arial, 10pt, style=Bold"/>
-      <LineObject Name="Line1" Left="9.45" Top="4.45" Width="207.9" Height="-28.35"/>
+      <TextObject Name="Text16" Left="9.45" Top="9.45" Width="103.95" Height="18.9" Text="Gesamttotal" Font="Arial, 10pt, style=Bold"/>
+      <LineObject Name="Line4" Left="9.45" Top="9.45" Width="207.9"/>
     </ReportSummaryBand>
-    <PageFooterBand Name="PageFooter1" Top="200.43" Width="718.2" Height="37.8">
+    <PageFooterBand Name="PageFooter1" Top="253.39" Width="718.2" Height="37.8">
       <TextObject Name="Text10" Left="9.45" Top="9.45" Width="170.1" Height="18.9" Text="[Date]"/>
       <TextObject Name="Text11" Left="604.8" Top="9.45" Width="94.5" Height="18.9" Text="[Page#]" HorzAlign="Right"/>
     </PageFooterBand>

DPM2016/bin/Debug/Roellin/Reporting/Report/esrjournal.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="Vb" ReportInfo.Created="11/28/2015 07:43:07" ReportInfo.Modified="02/18/2019 09:53:34" ReportInfo.CreatorVersion="2018.4.2.0">
+<Report ScriptLanguage="Vb" ReportInfo.Created="11/28/2015 07:43:07" ReportInfo.Modified="04/15/2019 20:13:59" ReportInfo.CreatorVersion="2018.4.2.0">
   <ScriptText>Imports System
 Imports System.Collections
 Imports System.Collections.Generic
@@ -33,6 +33,14 @@ Namespace FastReport
       ReportLogo=pfad+&quot;Logo\reportlogo.png&quot;
       picture1.ImageLocation=Reportlogo
     End Sub
+
+    Private Sub Text9_BeforePrint(ByVal sender As object, ByVal e As EventArgs)
+       if CType(Report.GetColumnValue(&quot;Daten.Patient&quot;), String) = CType(Report.GetColumnValue(&quot;Daten.Debitor&quot;), String) then
+        text11.visible=false
+       else
+        text11.Visible=true
+       end if
+    End Sub
   End Class
 End Namespace
 </ScriptText>
@@ -62,7 +70,6 @@ End Namespace
     <PageHeaderBand Name="PageHeader1" Top="2.86" Width="718.2" Height="156.65">
       <PictureObject Name="Picture1" Width="132.3" Height="56.7" BeforePrintEvent="Picture1_BeforePrint" ImageLocation="E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Roellin\Reporting\Logo\reportlogo.png"/>
       <TextObject Name="Text1" Left="406.35" Top="9.45" Width="302.4" Height="28.35" Text="ESR-Journal " HorzAlign="Right"/>
-      <LineObject Name="Line2" Top="156.65" Width="708.75"/>
       <TextObject Name="Text2" Top="75.6" Width="94.5" Height="18.9" Text="Datum" Font="Arial, 10pt, style=Bold"/>
       <TextObject Name="Text3" Left="113.4" Top="75.6" Width="94.5" Height="18.9" Text="[Daten.Datum]" Format="Date" Format.Format="d" Font="Arial, 10pt, style=Bold"/>
       <TextObject Name="Text16" Top="94.5" Width="94.5" Height="18.9" Text="Totalbetrag" Font="Arial, 10pt, style=Bold"/>
@@ -73,22 +80,26 @@ End Namespace
       <TextObject Name="Text20" Left="226.8" Top="132.3" Width="151.2" Height="18.9" Text="Patient / Debitor" Font="Arial, 10pt, style=Bold"/>
       <TextObject Name="Text21" Left="548.1" Top="132.3" Width="85.05" Height="18.9" Text="Gebühren" HorzAlign="Right" Font="Arial, 10pt, style=Bold"/>
       <TextObject Name="Text22" Left="661.5" Top="132.3" Width="47.25" Height="18.9" Text="Verb." Font="Arial, 10pt, style=Bold"/>
+      <LineObject Name="Line2" Top="147.65" Width="708.75"/>
+      <TextObject Name="Text10" Left="396.9" Top="28.35" Width="311.85" Height="18.9" Text="[Absender]" HorzAlign="Right"/>
     </PageHeaderBand>
-    <DataBand Name="Data1" Top="162.36" Width="718.2" Height="37.8" CanGrow="true" DataSource="Daten">
+    <DataBand Name="Data1" Top="162.36" Width="718.2" Height="37.8" CanGrow="true" CanShrink="true" DataSource="Daten">
       <TextObject Name="Text6" Width="37.8" Height="18.9" Text="[Daten.Transaktion]"/>
       <TextObject Name="Text7" Left="47.25" Width="66.15" Height="18.9" Text="[Daten.Einzelbetrag]" Format="Number" Format.UseLocale="true" HorzAlign="Right" WordWrap="false" Trimming="EllipsisCharacter"/>
       <TextObject Name="Text8" Left="122.85" Width="94.5" Height="18.9" Text="[Daten.Valuta]" Format="Date" Format.Format="d"/>
-      <TextObject Name="Text9" Left="226.8" Width="359.1" Height="18.9" Text="[Daten.Patient]"/>
+      <TextObject Name="Text9" Left="226.8" Width="359.1" Height="18.9" BeforePrintEvent="Text9_BeforePrint" Text="[Daten.Patient]"/>
       <TextObject Name="Text11" Left="226.8" Top="18.9" Width="359.1" Height="18.9" Text="[Daten.Debitor]"/>
       <TextObject Name="Text12" Left="585.9" Width="47.25" Height="18.9" Text="[Daten.Taxen_PTT]" Format="Number" Format.UseLocale="true" HorzAlign="Right" WordWrap="false" Trimming="EllipsisCharacter"/>
-      <LineObject Name="Line3" Top="37.8" Width="708.75"/>
+      <TextObject Name="Text13" Left="652.05" Width="37.8" Height="18.9" BeforePrintEvent="Text13_BeforePrint" Text="[IIf([Daten.Verbucht]=true,&quot;&quot;,&quot;N&quot;)]" HorzAlign="Right" Font="Arial, 10pt, style=Bold"/>
-      <TextObject Name="Text13" Left="652.05" Top="9.45" Width="37.8" Height="18.9" BeforePrintEvent="Text13_BeforePrint" Text="[IIf([Daten.Verbucht]=true,&quot;&quot;,&quot;N&quot;)]" HorzAlign="Right" Font="Arial, 10pt, style=Bold"/>
+      <ChildBand Name="Child1" Top="203.02" Width="718.2" Height="1.61">
+        <LineObject Name="Line3" Width="708.75"/>
+      </ChildBand>
     </DataBand>
-    <ReportSummaryBand Name="ReportSummary1" Top="203.02" Width="718.2" Height="37.8">
+    <ReportSummaryBand Name="ReportSummary1" Top="207.49" Width="718.2" Height="37.8">
       <TextObject Name="Text14" Left="18.9" Width="94.5" Height="18.9" Text="[Total]" Format="Number" Format.UseLocale="false" Format.DecimalDigits="2" Format.DecimalSeparator="." Format.GroupSeparator="'" Format.NegativePattern="1" HorzAlign="Right" Font="Arial, 10pt, style=Bold"/>
       <TextObject Name="Text23" Left="538.65" Width="94.5" Height="18.9" Text="[Total1]" Format="Number" Format.UseLocale="false" Format.DecimalDigits="2" Format.DecimalSeparator="." Format.GroupSeparator="'" Format.NegativePattern="1" HorzAlign="Right" Font="Arial, 10pt, style=Bold"/>
     </ReportSummaryBand>
-    <PageFooterBand Name="PageFooter1" Top="243.68" Width="718.2" Height="18.9">
+    <PageFooterBand Name="PageFooter1" Top="248.15" Width="718.2" Height="18.9">
       <TextObject Name="Text5" Width="189" Height="18.9" Text="[Date]" Font="Arial, 9pt"/>
       <TextObject Name="Text15" Left="614.25" Width="94.5" Height="18.9" Text="[Page#]" HorzAlign="Right" Font="Arial, 9pt"/>
     </PageFooterBand>

DPM2016/bin/Debug/Roellin/Reporting/Report/mahnliste.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="Vb" ReportInfo.Name="Fakturajournal" ReportInfo.Description="#Parameter1:Datum von:datetime:firstofcurrentyear&#13;&#10;#Parameter2:Datum bis:datetime:currentdate&#13;&#10;#Parameter3:Behandler:DataTable:select name+' '+vorname from privat where behandler=1 AND aktiv=1 order by nrprivat&#13;&#10;-SQL-&#13;&#10;SELECT        Nrfaktura, Nrdebitor, Nrpatient, Datum, Total, dbo.faktura.Status, dbo.get_name(Nrpatient) AS Patient, case when nrdebitor&lt;&gt;nrpatient then dbo.get_name(Nrdebitor) else '' end AS Debitor, dbo.privat.name+' '+dbo.privat.vorname as behandler&#13;&#10;FROM            dbo.Faktura  JOIN&#13;&#10;                         dbo.PRIVAT ON dbo.Faktura.Nrbehandler = dbo.PRIVAT.NRPRIVAT&#13;&#10;where  datum&gt;='#Parameter1 00:00:00' and datum &lt;='#Parameter2 23:59:59' and (''='#Parameter3' or '#Parameter3'= dbo.privat.name+' '+dbo.privat.vorname)  " ReportInfo.Created="11/28/2015 07:43:07" ReportInfo.Modified="02/18/2019 09:18:25" ReportInfo.CreatorVersion="2018.4.2.0">
+<Report ScriptLanguage="Vb" ReportInfo.Name="Fakturajournal" ReportInfo.Description="#Parameter1:Datum von:datetime:firstofcurrentyear&#13;&#10;#Parameter2:Datum bis:datetime:currentdate&#13;&#10;#Parameter3:Behandler:DataTable:select name+' '+vorname from privat where behandler=1 AND aktiv=1 order by nrprivat&#13;&#10;-SQL-&#13;&#10;SELECT        Nrfaktura, Nrdebitor, Nrpatient, Datum, Total, dbo.faktura.Status, dbo.get_name(Nrpatient) AS Patient, case when nrdebitor&lt;&gt;nrpatient then dbo.get_name(Nrdebitor) else '' end AS Debitor, dbo.privat.name+' '+dbo.privat.vorname as behandler&#13;&#10;FROM            dbo.Faktura  JOIN&#13;&#10;                         dbo.PRIVAT ON dbo.Faktura.Nrbehandler = dbo.PRIVAT.NRPRIVAT&#13;&#10;where  datum&gt;='#Parameter1 00:00:00' and datum &lt;='#Parameter2 23:59:59' and (''='#Parameter3' or '#Parameter3'= dbo.privat.name+' '+dbo.privat.vorname)  " ReportInfo.Created="11/28/2015 07:43:07" ReportInfo.Modified="04/15/2019 20:22:13" ReportInfo.CreatorVersion="2018.4.2.0">
   <ScriptText>Imports System
 Imports System.Collections
 Imports System.Collections.Generic
@@ -31,6 +31,14 @@ Namespace FastReport
       ReportLogo=pfad+&quot;Logo\reportlogo.png&quot;
       picture1.ImageLocation=Reportlogo
     End Sub
+
+    Private Sub Text4_BeforePrint(ByVal sender As object, ByVal e As EventArgs)
+      if CType(Report.GetColumnValue(&quot;Daten.Patient&quot;), String)  =  CType(Report.GetColumnValue(&quot;Daten.Debitor&quot;), String) then 
+        text16.Visible=false
+      else
+        text16.Visible=true
+      end if
+    End Sub
   End Class
 End Namespace
 </ScriptText>
@@ -64,11 +72,12 @@ End Namespace
     <Parameter Name="Datum bis" DataType="System.String"/>
     <Parameter Name="Behandler" DataType="System.String"/>
     <Parameter Name="Mahnstufe" DataType="System.String"/>
+    <Total Name="Total" Expression="[Daten.Offener_Betrag]" Evaluator="Data1"/>
   </Dictionary>
   <ReportPage Name="Page1">
     <ReportTitleBand Name="ReportTitle1" Width="718.2"/>
     <PageHeaderBand Name="PageHeader1" Top="2.86" Width="718.2" Height="113.4">
-      <PictureObject Name="Picture1" Width="132.3" Height="56.7" BeforePrintEvent="Picture1_BeforePrint" ImageLocation="E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\\Reporting\Logo\reportlogo.png"/>
+      <PictureObject Name="Picture1" Width="132.3" Height="56.7" BeforePrintEvent="Picture1_BeforePrint" ImageLocation="E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Roellin\Reporting\Logo\reportlogo.png"/>
       <TextObject Name="Text8" Top="75.6" Width="94.5" Height="18.9" Text="RG-Nummer" Font="Arial, 9pt, style=Bold"/>
       <TextObject Name="Text9" Left="85.05" Top="75.6" Width="94.5" Height="18.9" Text="Datum" Font="Arial, 9pt, style=Bold"/>
       <TextObject Name="Text10" Left="179.55" Top="75.6" Width="170.1" Height="18.9" Text="Patient / Debitor" Font="Arial, 9pt, style=Bold"/>
@@ -76,19 +85,23 @@ End Namespace
       <TextObject Name="Text12" Left="642.6" Top="75.6" Width="66.15" Height="18.9" Text="M-Stop" HorzAlign="Right" Font="Arial, 9pt, style=Bold"/>
       <LineObject Name="Line2" Top="90.5" Width="708.75"/>
       <TextObject Name="Text1" Left="387.45" Width="321.3" Height="18.9" Text="Mahnliste Stufe [Daten.Mahnstufe]" HorzAlign="Right" Font="Arial, 11pt, style=Bold"/>
+      <TextObject Name="Text13" Left="302.4" Top="18.9" Width="406.35" Height="18.9" Text="[Absender]" HorzAlign="Right" Font="Arial, 10pt, style=Bold"/>
     </PageHeaderBand>
-    <DataBand Name="Data1" Top="119.11" Width="718.2" Height="19.9" CanGrow="true" DataSource="Daten">
+    <DataBand Name="Data1" Top="119.11" Width="718.2" Height="38.8" CanGrow="true" CanShrink="true" DataSource="Daten">
       <TextObject Name="Text2" Left="-9.45" Width="94.5" Height="18.9" Text="[Daten.Nrfaktura]"/>
       <TextObject Name="Text3" Left="85.05" Width="85.05" Height="18.9" Text="[Daten.Faelligam]" Format="Date" Format.Format="d"/>
-      <TextObject Name="Text4" Left="179.55" Width="387.45" Height="18.9" CanGrow="true" CanBreak="false" Text="[Daten.Patient]&#13;&#10;[Daten.Debitor]"/>
+      <TextObject Name="Text4" Left="179.55" Width="387.45" Height="18.9" CanGrow="true" BeforePrintEvent="Text4_BeforePrint" CanBreak="false" Text="[Daten.Patient]"/>
       <TextObject Name="Text7" Left="567" Width="94.5" Height="18.9" Text="[Daten.Offener_Betrag]" Format="Number" Format.UseLocale="true" HorzAlign="Right" WordWrap="false" Trimming="EllipsisCharacter"/>
       <CheckBoxObject Name="CheckBox1" Left="680.4" Width="18.9" Height="18.9" Checked="false" DataColumn="Daten.MAHNSTOP"/>
-      <ChildBand Name="Child1" Top="141.87" Width="718.2" Height="9.45" CanGrow="true">
+      <TextObject Name="Text16" Left="179.55" Top="18.9" Width="387.45" Height="18.9" CanGrow="true" CanBreak="false" Text="[Daten.Debitor]"/>
+      <ChildBand Name="Child1" Top="160.77" Width="718.2" Height="9.45" CanGrow="true">
         <LineObject Name="Line1" Left="-9.45" Width="708.75"/>
       </ChildBand>
     </DataBand>
-    <ReportSummaryBand Name="ReportSummary1" Top="154.18" Width="718.2" Height="37.8"/>
+    <ReportSummaryBand Name="ReportSummary1" Top="173.08" Width="718.2" Height="37.8">
-    <PageFooterBand Name="PageFooter1" Top="194.84" Width="718.2" Height="18.9">
+      <TextObject Name="Text6" Left="567" Width="94.5" Height="18.9" Text="[Total]" Format="Number" Format.UseLocale="true" HorzAlign="Right" Font="Arial, 10pt, style=Bold"/>
+    </ReportSummaryBand>
+    <PageFooterBand Name="PageFooter1" Top="213.74" Width="718.2" Height="18.9">
       <TextObject Name="Text5" Width="189" Height="18.9" Text="[Date]" Font="Arial, 9pt"/>
       <TextObject Name="Text15" Left="614.25" Width="94.5" Height="18.9" Text="[Page#]" HorzAlign="Right" Font="Arial, 9pt"/>
     </PageFooterBand>

DPM2016/bin/Debug/Roellin/Reporting/SQL/Monatsumsaetze.sql

@@ -1,9 +1,9 @@
-#Parameter1:Anzahl Monate:Table:24;1;2;3;4;5;6;7;8;9;10;11;12;13;14;15;16;17;18;19;20;21;22;23
+#Parameter1:Anzahl Monate:Table:10000;1;2;3;4;5;6;7;8;9;10;11;12;13;14;15;16;17;18;19;20;21;22;23
 -SQL-
-SELECT        TOP (100) PERCENT SUM(Total) AS Total, DATEDIFF(MM, Datum, GETDATE()) AS Anz_Monate, YEAR(Datum) AS Jahr, MONTH(Datum) AS Monat, LTRIM(STR(YEAR(Datum))) + '.' + LTRIM(STR(MONTH(Datum))) AS Expr1
+SELECT        TOP (100) PERCENT SUM(Total) AS Total, DATEDIFF(MM, datum, GETDATE()) AS Anz_Monate, YEAR(datum) AS Jahr, MONTH(datum) AS Monat, LTRIM(STR(YEAR(datum))) + '.' + LTRIM(STR(MONTH(datum))) AS Expr1
 FROM            dbo.Faktura
 WHERE        (Status <> 9)
-GROUP BY DATEDIFF(MM, Datum, GETDATE()), YEAR(Datum), MONTH(Datum), LTRIM(STR(YEAR(Datum))) + '.' + LTRIM(STR(MONTH(Datum)))
+GROUP BY DATEDIFF(MM, datum, GETDATE()), YEAR(datum), MONTH(datum), LTRIM(STR(YEAR(datum))) + '.' + LTRIM(STR(MONTH(datum)))
-HAVING        (DATEDIFF(MM, Datum, GETDATE()) <= #Parameter1 - 1)
+HAVING        (DATEDIFF(MM, datum, GETDATE()) <= #Parameter1 - 1) 
 ORDER BY Jahr, Monat
  

DPM2016/bin/Release/DPM2018.application

@@ -7,14 +7,14 @@
     <framework targetVersion="4.6" profile="Full" supportedRuntime="4.0.30319" />
   </compatibleFrameworks>
   <dependency>
-    <dependentAssembly dependencyType="install" codebase="DPM2018.exe.manifest" size="27536">
+    <dependentAssembly dependencyType="install" codebase="DPM2018.exe.manifest" size="31624">
       <assemblyIdentity name="DPM2018.exe" version="1.0.0.1" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
       <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>r9I4JOe32LBVFgcdaPPlVcvHP7zP2iJj3sPA+I9vPcc=</dsig:DigestValue>
+        <dsig:DigestValue>gf1BCnIKCun70zLCXqaCdMzAAaNu/bkJUcIA8o8jiNM=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

DPM2016/bin/Release/DPM2018.exe.manifest

@@ -42,16 +42,6 @@
       <assemblyIdentity name="Microsoft.Windows.CommonLanguageRuntime" version="4.0.30319.0" />
     </dependentAssembly>
   </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="preRequisite" allowDelayedBinding="true">
-      <assemblyIdentity name="MySql.Data" version="6.7.4.0" publicKeyToken="C5687FC88969C44D" language="neutral" processorArchitecture="msil" />
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="preRequisite" allowDelayedBinding="true">
-      <assemblyIdentity name="MySql.Data.Entity" version="6.7.4.0" publicKeyToken="C5687FC88969C44D" language="neutral" processorArchitecture="msil" />
-    </dependentAssembly>
-  </dependency>
   <dependency>
     <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Aga.Controls.dll" size="86016">
       <assemblyIdentity name="Aga.Controls" version="1.0.0.0" publicKeyToken="FCC90FBF924463A3" language="neutral" processorArchitecture="msil" />
@@ -161,50 +151,50 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DPM2018.exe" size="5593592">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DPM2018.exe" size="5978112">
       <assemblyIdentity name="DPM2018" 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>DRVR9BQmgKOelVyXVGVk5RXJfYpVrspq+CA4+XOfI/A=</dsig:DigestValue>
+        <dsig:DigestValue>ivy3xzEwUYSdYoFaEXNMVn827lH0WJ9amM5GtoA4+t0=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="FastReport.dll" size="5801360">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="FastReport.dll" size="6798704">
-      <assemblyIdentity name="FastReport" version="2018.4.2.0" publicKeyToken="DB7E5CE63278458C" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="FastReport" version="2019.3.22.0" publicKeyToken="DB7E5CE63278458C" 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>Q4G0ogKvbQzRIJzuroDUiWIrdBwZD46FuFb1mHdASHw=</dsig:DigestValue>
+        <dsig:DigestValue>YAf8e3ucgCHDEwPA3fc/SOplq1xZf3ZTVBu4wThvScc=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="FastReport.Bars.dll" size="5218192">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="FastReport.Bars.dll" size="5228400">
-      <assemblyIdentity name="FastReport.Bars" version="2018.4.2.0" publicKeyToken="DB7E5CE63278458C" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="FastReport.Bars" version="2019.3.22.0" publicKeyToken="DB7E5CE63278458C" 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>x6TKeRADnpG8iL/70WnGw1xisC+RBP+9WmhHQbG017E=</dsig:DigestValue>
+        <dsig:DigestValue>87cKk42NVnZOUHZGYzqYbyOFQjptSR0B+bF66eUtXL8=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="FastReport.Editor.dll" size="988048">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="FastReport.Editor.dll" size="994160">
-      <assemblyIdentity name="FastReport.Editor" version="2018.4.2.0" publicKeyToken="DB7E5CE63278458C" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="FastReport.Editor" version="2019.3.22.0" publicKeyToken="DB7E5CE63278458C" 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>ybdrHZO0BacH/7QbqvtfSecWyzFfJXyRv3MInd4Z/f0=</dsig:DigestValue>
+        <dsig:DigestValue>JGMlbhgez57QxT811uoBJwieYZwmnt4ToEGbmbFle7I=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -317,98 +307,182 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MySql.Data.dll" size="698368">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="KP-ImageViewerV2.dll" size="68096">
-      <assemblyIdentity name="MySql.Data" version="8.0.12.0" publicKeyToken="C5687FC88969C44D" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="KP-ImageViewerV2" version="1.5.1.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>o1A1TiMHyyY2HLODhWlzi01juSSiEk3jKsgc9fnbhpo=</dsig:DigestValue>
+        <dsig:DigestValue>o7uNKkCPWlpIPT3q2xKzifMRcunxI4Ky/bElVbVHWaU=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PropertyGridEx.dll" size="48128">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MsgReader.dll" size="378368">
-      <assemblyIdentity name="PropertyGridEx" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="MsgReader" version="3.6.1.0" publicKeyToken="3BA01CF3434959FA" 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>g+nWXc4h/DaKewOmkCJQA0uOR5aVfJrS29T7d3pRR8E=</dsig:DigestValue>
+        <dsig:DigestValue>70vYni89hl8KEmP5ZGGnL4VHtavroZmHcWsmE7P5qCI=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="SHUKeyGen.dll" size="27136">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="de\MsgReader.resources.dll" size="13824">
-      <assemblyIdentity name="SHUKeyGen" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="MsgReader.resources" version="3.6.1.0" publicKeyToken="3BA01CF3434959FA" language="de" 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>geK4YQkCftVr3r0piMztFkKxuUV5k7IzQBSnapnZCEk=</dsig:DigestValue>
+        <dsig:DigestValue>Uv+ZAtv89LSuYAVmpIjK+G5Z2mbRqXF/l8WYJhaveoQ=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Syncfusion.Compression.Base.dll" size="77824">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="es\MsgReader.resources.dll" size="13824">
-      <assemblyIdentity name="Syncfusion.Compression.Base" version="16.2350.0.41" publicKeyToken="3D67ED1F87D44C89" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="MsgReader.resources" version="3.6.1.0" publicKeyToken="3BA01CF3434959FA" language="es" 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>1ScUcT75tiLzlA5I53HBMuMTekq02JWjxr3wQOXFprI=</dsig:DigestValue>
+        <dsig:DigestValue>az2ZzaDPDmQsLyAOI2gQf+1JyjuhvQr0RLEN7NwKA/c=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Syncfusion.Pdf.Base.dll" size="6098944">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="fr\MsgReader.resources.dll" size="13824">
-      <assemblyIdentity name="Syncfusion.Pdf.Base" version="16.2350.0.41" publicKeyToken="3D67ED1F87D44C89" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="MsgReader.resources" version="3.6.1.0" publicKeyToken="3BA01CF3434959FA" language="fr" 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>tWGgFCYEHEmx57z5BHjSmQg4wak3EfSKmXhAPC099TY=</dsig:DigestValue>
+        <dsig:DigestValue>7X56fvOHJrUmIfy6vUPlmFiqboysSBDNBPyqQgkaesA=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Syncfusion.PdfViewer.Windows.dll" size="1893888">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="nl\MsgReader.resources.dll" size="13824">
-      <assemblyIdentity name="Syncfusion.PdfViewer.Windows" version="16.2350.0.41" publicKeyToken="3D67ED1F87D44C89" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="MsgReader.resources" version="3.6.1.0" publicKeyToken="3BA01CF3434959FA" language="nl" 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>IIBVzhy6EYdd8gXI9sVU/NqxevRGxCADg9ULapTktOs=</dsig:DigestValue>
+        <dsig:DigestValue>OS0StxZPf9WpfactpCk1R9QvfEZ91sd/c3D5XZUqSyY=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Syncfusion.Shared.Base.dll" size="4308992">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="pt\MsgReader.resources.dll" size="13824">
-      <assemblyIdentity name="Syncfusion.Shared.Base" version="16.2350.0.41" publicKeyToken="3D67ED1F87D44C89" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="MsgReader.resources" version="3.6.1.0" publicKeyToken="3BA01CF3434959FA" language="pt" 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>THgqsOP8jM1MWtCbJSY8B94/YKQ4l8cDzNSu+SP7HdU=</dsig:DigestValue>
+        <dsig:DigestValue>qOeonQf/zIy44t0zdulKEQFv6wbNfwtf+2veMnHs2yQ=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Syncfusion.Shared.Windows.dll" size="36864">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="zh-CN\MsgReader.resources.dll" size="13824">
-      <assemblyIdentity name="Syncfusion.Shared.Windows" version="16.2350.0.41" publicKeyToken="3D67ED1F87D44C89" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="MsgReader.resources" version="3.6.1.0" publicKeyToken="3BA01CF3434959FA" language="zh-CN" 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>Brwtr52FiQEEmKQX3ygNODbMfR2HklOGYyA+bmRkdAo=</dsig:DigestValue>
+        <dsig:DigestValue>8/Z5ezUxuoo3x4BDdK5YD296JUs5ni25jlIgWCJYWWA=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="zh-TW\MsgReader.resources.dll" size="13824">
+      <assemblyIdentity name="MsgReader.resources" version="3.6.1.0" publicKeyToken="3BA01CF3434959FA" language="zh-TW" 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>YroZpkn+ylpTTzd8/wU4IqvB7svEKuD2K2vqPgvVqgY=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MySql.Data.dll" size="698368">
+      <assemblyIdentity name="MySql.Data" version="8.0.12.0" publicKeyToken="C5687FC88969C44D" 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>o1A1TiMHyyY2HLODhWlzi01juSSiEk3jKsgc9fnbhpo=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="OpenMcdf.dll" size="60928">
+      <assemblyIdentity name="OpenMcdf" version="2.2.1.2" publicKeyToken="FDBB1629D7C00800" 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>updVzBVQHuepY38OPgyOorWRbE8dlOAxLUGhDi153cg=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PropertyGridEx.dll" size="48128">
+      <assemblyIdentity name="PropertyGridEx" 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>g+nWXc4h/DaKewOmkCJQA0uOR5aVfJrS29T7d3pRR8E=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="RtfPipe.dll" size="140288">
+      <assemblyIdentity name="RtfPipe" version="1.0.0.0" publicKeyToken="317A45EC926873FC" 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>PqGSYEmfTjtZh0kCZwaAteRDsA4e6nEuTd25X/JYt40=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="SHUKeyGen.dll" size="27136">
+      <assemblyIdentity name="SHUKeyGen" 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>1xEEyKAhxpWXiCJNDjzueoHEZPjMX322lKsIH72xkUQ=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Syncfusion.PdfViewer.Windows.dll" size="1893888">
+      <assemblyIdentity name="Syncfusion.PdfViewer.Windows" version="16.2350.0.41" publicKeyToken="3D67ED1F87D44C89" 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>IIBVzhy6EYdd8gXI9sVU/NqxevRGxCADg9ULapTktOs=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

DPM2016/frmMain.Designer.vb

@@ -28,6 +28,12 @@ Partial Class frmMain
         Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
         Me.AbmeldenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ÜberDPMToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem7 = New System.Windows.Forms.ToolStripSeparator()
+        Me.ToolsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.DatenbankSicherungErstellenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.TemporäreVorschaudateienLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.SQLScriptAusführenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem8 = New System.Windows.Forms.ToolStripSeparator()
         Me.BeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.PatientToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.FirmenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -61,6 +67,7 @@ Partial Class frmMain
         Me.Label1 = New System.Windows.Forms.Label()
         Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
         Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog()
+        Me.InterneTabellenLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.mnuMain.SuspendLayout()
         Me.SuspendLayout()
         '
@@ -75,7 +82,7 @@ Partial Class frmMain
         '
         'DateiToolStripMenuItem
         '
-        Me.DateiToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem3, Me.AbmeldenToolStripMenuItem, Me.ÜberDPMToolStripMenuItem, Me.BeendenToolStripMenuItem})
+        Me.DateiToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem3, Me.AbmeldenToolStripMenuItem, Me.ÜberDPMToolStripMenuItem, Me.ToolStripMenuItem7, Me.ToolsToolStripMenuItem, Me.ToolStripMenuItem8, Me.BeendenToolStripMenuItem})
         Me.DateiToolStripMenuItem.Name = "DateiToolStripMenuItem"
         Me.DateiToolStripMenuItem.Size = New System.Drawing.Size(46, 23)
         Me.DateiToolStripMenuItem.Text = "&Datei"
@@ -98,6 +105,41 @@ Partial Class frmMain
         Me.ÜberDPMToolStripMenuItem.Size = New System.Drawing.Size(183, 22)
         Me.ÜberDPMToolStripMenuItem.Text = "Über DPM"
         '
+        'ToolStripMenuItem7
+        '
+        Me.ToolStripMenuItem7.Name = "ToolStripMenuItem7"
+        Me.ToolStripMenuItem7.Size = New System.Drawing.Size(180, 6)
+        '
+        'ToolsToolStripMenuItem
+        '
+        Me.ToolsToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DatenbankSicherungErstellenToolStripMenuItem1, Me.TemporäreVorschaudateienLöschenToolStripMenuItem, Me.SQLScriptAusführenToolStripMenuItem})
+        Me.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem"
+        Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(183, 22)
+        Me.ToolsToolStripMenuItem.Text = "Tools"
+        '
+        'DatenbankSicherungErstellenToolStripMenuItem1
+        '
+        Me.DatenbankSicherungErstellenToolStripMenuItem1.Name = "DatenbankSicherungErstellenToolStripMenuItem1"
+        Me.DatenbankSicherungErstellenToolStripMenuItem1.Size = New System.Drawing.Size(264, 22)
+        Me.DatenbankSicherungErstellenToolStripMenuItem1.Text = "Datenbank-Sicherung erstellen"
+        '
+        'TemporäreVorschaudateienLöschenToolStripMenuItem
+        '
+        Me.TemporäreVorschaudateienLöschenToolStripMenuItem.Name = "TemporäreVorschaudateienLöschenToolStripMenuItem"
+        Me.TemporäreVorschaudateienLöschenToolStripMenuItem.Size = New System.Drawing.Size(264, 22)
+        Me.TemporäreVorschaudateienLöschenToolStripMenuItem.Text = "Temporäre Vorschaudateien löschen"
+        '
+        'SQLScriptAusführenToolStripMenuItem
+        '
+        Me.SQLScriptAusführenToolStripMenuItem.Name = "SQLScriptAusführenToolStripMenuItem"
+        Me.SQLScriptAusführenToolStripMenuItem.Size = New System.Drawing.Size(264, 22)
+        Me.SQLScriptAusführenToolStripMenuItem.Text = "SQL-Script ausführen"
+        '
+        'ToolStripMenuItem8
+        '
+        Me.ToolStripMenuItem8.Name = "ToolStripMenuItem8"
+        Me.ToolStripMenuItem8.Size = New System.Drawing.Size(180, 6)
+        '
         'BeendenToolStripMenuItem
         '
         Me.BeendenToolStripMenuItem.Name = "BeendenToolStripMenuItem"
@@ -191,7 +233,7 @@ Partial Class frmMain
         '
         'StammdatenToolStripMenuItem
         '
-        Me.StammdatenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SpaltentitelToolStripMenuItem, Me.StammdatenToolStripMenuItem1, Me.AuswertungenToolStripMenuItem1, Me.SecurityObjekteToolStripMenuItem, Me.ToolStripMenuItem6, Me.DatenbankSicherungErstellenToolStripMenuItem, Me.DatenbankSicherungZurückladenToolStripMenuItem})
+        Me.StammdatenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SpaltentitelToolStripMenuItem, Me.StammdatenToolStripMenuItem1, Me.AuswertungenToolStripMenuItem1, Me.SecurityObjekteToolStripMenuItem, Me.ToolStripMenuItem6, Me.DatenbankSicherungErstellenToolStripMenuItem, Me.DatenbankSicherungZurückladenToolStripMenuItem, Me.InterneTabellenLöschenToolStripMenuItem})
         Me.StammdatenToolStripMenuItem.Image = CType(resources.GetObject("StammdatenToolStripMenuItem.Image"), System.Drawing.Image)
         Me.StammdatenToolStripMenuItem.Name = "StammdatenToolStripMenuItem"
         Me.StammdatenToolStripMenuItem.Size = New System.Drawing.Size(106, 23)
@@ -306,6 +348,12 @@ Partial Class frmMain
         '
         Me.OpenFileDialog1.FileName = "OpenFileDialog1"
         '
+        'InterneTabellenLöschenToolStripMenuItem
+        '
+        Me.InterneTabellenLöschenToolStripMenuItem.Name = "InterneTabellenLöschenToolStripMenuItem"
+        Me.InterneTabellenLöschenToolStripMenuItem.Size = New System.Drawing.Size(254, 22)
+        Me.InterneTabellenLöschenToolStripMenuItem.Text = "Interne Tabellen löschen"
+        '
         'frmMain
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -362,4 +410,11 @@ Partial Class frmMain
     Friend WithEvents DatenbankSicherungZurückladenToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents OpenFileDialog1 As OpenFileDialog
     Friend WithEvents SaveFileDialog1 As SaveFileDialog
+    Friend WithEvents ToolStripMenuItem7 As ToolStripSeparator
+    Friend WithEvents ToolsToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents DatenbankSicherungErstellenToolStripMenuItem1 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem8 As ToolStripSeparator
+    Friend WithEvents TemporäreVorschaudateienLöschenToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents SQLScriptAusführenToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents InterneTabellenLöschenToolStripMenuItem As ToolStripMenuItem
 End Class

DPM2016/frmMain.vb

@@ -114,7 +114,7 @@ Public Class frmMain
         End Select
 
         Check_Tempdir()
-
+        IntTables.Inttables.Tables.Clear()
     End Sub
 
     Sub Check_Tempdir()
@@ -476,6 +476,47 @@ Public Class frmMain
         End If
     End Sub
 
+    Private Sub DatenbankSicherungErstellenToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles DatenbankSicherungErstellenToolStripMenuItem1.Click
+        Shell(Application.StartupPath + "\sqlbackup.cmd", AppWinStyle.NormalFocus)
+    End Sub
+
+    Private Sub TemporäreVorschaudateienLöschenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles TemporäreVorschaudateienLöschenToolStripMenuItem.Click
+        If Globals.PreViewDir = "" Then
+            Dim db As New clsDB
+            db.Get_Tabledata("dms", "", "Select * from dms_Settings where nreintrag=6")
+            Globals.PreViewDir = db.dsDaten.Tables(0).Rows(0).Item(2)
+            If Not System.IO.Directory.Exists(Globals.PreViewDir) Then
+                System.IO.Directory.CreateDirectory(Globals.PreViewDir)
+            End If
+        End If
+        Try
+            Dim directoryName As String = Globals.PreViewDir
+            For Each deleteFile In Directory.GetFiles(directoryName, "*.*", SearchOption.TopDirectoryOnly)
+                Try
+                    File.Delete(deleteFile)
+                Catch
+                End Try
+
+            Next
+        Catch
+        End Try
+
+    End Sub
+
+    Private Sub SQLScriptAusführenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SQLScriptAusführenToolStripMenuItem.Click
+        Dim f As New frmSQLCript
+        f.MdiParent = Me
+        f.Show()
+    End Sub
+
+    Private Sub frmMain_FormClosing(sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing
+
+    End Sub
+
+    Private Sub InterneTabellenLöschenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles InterneTabellenLöschenToolStripMenuItem.Click
+        IntTables.Inttables.Tables.Clear()
+    End Sub
+
     'Private Sub SecurityObjekteToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SecurityObjekteToolStripMenuItem.Click
     '    Dim formselector As New frmFormSelector
     '    formselector.ListForms.Items.Clear()