update Auftragsmanagement

CryptoEditor/obj/Debug/CryptoEditor.vbproj.FileListAbsolute.txt

@@ -11,3 +11,4 @@ E:\Software-Projekte\DPM\DPM2016\CryptoEditor\obj\Debug\CryptoEditor.exe
 E:\Software-Projekte\DPM\DPM2016\CryptoEditor\obj\Debug\CryptoEditor.xml
 E:\Software-Projekte\DPM\DPM2016\CryptoEditor\obj\Debug\CryptoEditor.pdb
 E:\Software-Projekte\DPM\DPM2016\CryptoEditor\obj\Debug\CryptoEditor.vbproj.AssemblyReference.cache
+E:\Software-Projekte\DPM\DPM2016\CryptoEditor\obj\Debug\CryptoEditor.vbproj.SuggestedBindingRedirects.cache

CryptoEditor/obj/Debug/_IsIncrementalBuild

@@ -0,0 +1 @@
+obj\Debug\\_IsIncrementalBuild

CryptoTest/obj/CryptoTest.csproj.nuget.dgspec.json

@@ -14,10 +14,12 @@
         "outputPath": "E:\\Software-Projekte\\DPM\\DPM2016\\CryptoTest\\obj\\",
         "projectStyle": "PackageReference",
         "fallbackFolders": [
+          "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
           "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
         ],
         "configFilePaths": [
           "C:\\Users\\Steafn Hutter lokal\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
         ],
@@ -61,7 +63,7 @@
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.400\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.300\\RuntimeIdentifierGraph.json"
         }
       }
     }

CryptoTest/obj/CryptoTest.csproj.nuget.g.props

@@ -5,15 +5,13 @@
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
     <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Steafn Hutter lokal\.nuget\packages\;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\</NuGetPackageFolders>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Steafn Hutter lokal\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.11.0</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.2.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <SourceRoot Include="C:\Users\Steafn Hutter lokal\.nuget\packages\" />
+    <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
     <SourceRoot Include="C:\Program Files (x86)\Microsoft\Xamarin\NuGet\" />
   </ItemGroup>
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-  </PropertyGroup>
 </Project>

CryptoTest/obj/CryptoTest.csproj.nuget.g.targets

@@ -1,6 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-  </PropertyGroup>
-</Project>

CryptoTest/obj/project.assets.json

@@ -9,6 +9,7 @@
   },
   "packageFolders": {
     "C:\\Users\\Steafn Hutter lokal\\.nuget\\packages\\": {},
+    "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {},
     "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}
   },
   "project": {
@@ -21,10 +22,12 @@
       "outputPath": "E:\\Software-Projekte\\DPM\\DPM2016\\CryptoTest\\obj\\",
       "projectStyle": "PackageReference",
       "fallbackFolders": [
+        "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
         "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
       ],
       "configFilePaths": [
         "C:\\Users\\Steafn Hutter lokal\\AppData\\Roaming\\NuGet\\NuGet.Config",
+        "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
         "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
         "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
       ],
@@ -68,7 +71,7 @@
             "privateAssets": "all"
           }
         },
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.400\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.300\\RuntimeIdentifierGraph.json"
       }
     }
   }

CryptoTest/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "std4UYPs221hI7vR2vhPUbP+DIYsOyBLiOWEcs0m0l5U2Xi32ZS9gqOQx1tOV03BtaSlQBX2gXL9U+CUh2hJwQ==",
+  "dgSpecHash": "u1Qm23obG+kXJscuNlrlbRAdA4gkHsaSnS5+8eb9Os4xKyi3s8cSJN1hiBmAlxL2qtTjqoH2AQzR50VbycgTdA==",
   "success": true,
   "projectFilePath": "E:\\Software-Projekte\\DPM\\DPM2016\\CryptoTest\\CryptoTest.csproj",
   "expectedPackageFiles": [],

DPM2016/Behandlung/Behandlung.Designer.vb

@@ -32,7 +32,6 @@ Partial Class Behandlung
         Me.treebehandlungen = New DevComponents.AdvTree.AdvTree()
         Me.ctxmenubehandlung = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.NeueBehandlungToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripSeparator()
         Me.BehandlungabschliessenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
         Me.AbschlussMitRecallAnzeigeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.AbshlussOhneRecallAnzeigeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -41,6 +40,7 @@ Partial Class Behandlung
         Me.AbschlussUndSofortrechungAlsPDFToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.AbschlussUndSofortrechnungAlsOutlookMailToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.AbschlussUndVerbuchenOhneRGQuittungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripSeparator()
         Me.BehandlungZurücksetzenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.BehandlungKopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem4 = New System.Windows.Forms.ToolStripSeparator()
@@ -88,6 +88,58 @@ Partial Class Behandlung
         Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
         Me.tsbtnbehandlungdelete = New System.Windows.Forms.ToolStrip()
         Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.ctxMenuAuftragsamanagement = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.tsamnew = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
+        Me.OfferteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.OffertPDF = New System.Windows.Forms.ToolStripMenuItem()
+        Me.PDFPerMailToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.DruckenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.VorschauToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.EntwurfToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.AuftragsbestätigungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.PDFToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.PDFPerMailToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.DruckenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.VorschauToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.EntwurfToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.LieferscheinToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.PDFToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.PDFPerMailToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.DruckenToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.VorschauToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.EntwurfToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem10 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem11 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem12 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
+        Me.ToolStripMenuItem13 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem14 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem15 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem16 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
+        Me.ToolStripMenuItem19 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem20 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem21 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator()
+        Me.ToolStripMenuItem22 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem23 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem24 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem25 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem26 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem27 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem9 = New System.Windows.Forms.ToolStripSeparator()
+        Me.ToolStripMenuItem17 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem18 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator()
+        Me.tsamdelete = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripSeparator6 = New System.Windows.Forms.ToolStripSeparator()
+        Me.ToolStripMenuItem29 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem30 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripSeparator7 = New System.Windows.Forms.ToolStripSeparator()
+        Me.tsamerstemahnung = New System.Windows.Forms.ToolStripMenuItem()
+        Me.tsamzweitemahnung = New System.Windows.Forms.ToolStripMenuItem()
+        Me.tsamdrittemahnung = New System.Windows.Forms.ToolStripMenuItem()
         Me.tsbtndelete.SuspendLayout()
         Me.GroupBox1.SuspendLayout()
         CType(Me.treebehandlungen, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -100,6 +152,7 @@ Partial Class Behandlung
         Me.Panel1.SuspendLayout()
         Me.tsbtnbehandlungdelete.SuspendLayout()
         Me.ContextMenuStrip1.SuspendLayout()
+        Me.ctxMenuAuftragsamanagement.SuspendLayout()
         Me.SuspendLayout()
         '
         'tsbtndelete
@@ -108,7 +161,7 @@ Partial Class Behandlung
         Me.tsbtndelete.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnnewbehandlung, Me.tsbtndeletebehandlung, Me.ToolStripButton2})
         Me.tsbtndelete.Location = New System.Drawing.Point(0, 0)
         Me.tsbtndelete.Name = "tsbtndelete"
-        Me.tsbtndelete.Size = New System.Drawing.Size(1285, 27)
+        Me.tsbtndelete.Size = New System.Drawing.Size(1713, 27)
         Me.tsbtndelete.TabIndex = 1
         Me.tsbtndelete.Text = "ToolStrip1"
         '
@@ -118,7 +171,7 @@ Partial Class Behandlung
         Me.tsbtnnewbehandlung.Image = CType(resources.GetObject("tsbtnnewbehandlung.Image"), System.Drawing.Image)
         Me.tsbtnnewbehandlung.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.tsbtnnewbehandlung.Name = "tsbtnnewbehandlung"
-        Me.tsbtnnewbehandlung.Size = New System.Drawing.Size(24, 24)
+        Me.tsbtnnewbehandlung.Size = New System.Drawing.Size(29, 24)
         Me.tsbtnnewbehandlung.Text = "Neue Behandlung"
         '
         'tsbtndeletebehandlung
@@ -127,7 +180,7 @@ Partial Class Behandlung
         Me.tsbtndeletebehandlung.Image = CType(resources.GetObject("tsbtndeletebehandlung.Image"), System.Drawing.Image)
         Me.tsbtndeletebehandlung.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.tsbtndeletebehandlung.Name = "tsbtndeletebehandlung"
-        Me.tsbtndeletebehandlung.Size = New System.Drawing.Size(24, 24)
+        Me.tsbtndeletebehandlung.Size = New System.Drawing.Size(29, 24)
         Me.tsbtndeletebehandlung.Text = "Behandlung löschen"
         '
         'ToolStripButton2
@@ -136,7 +189,7 @@ Partial Class Behandlung
         Me.ToolStripButton2.Image = CType(resources.GetObject("ToolStripButton2.Image"), System.Drawing.Image)
         Me.ToolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton2.Name = "ToolStripButton2"
-        Me.ToolStripButton2.Size = New System.Drawing.Size(24, 24)
+        Me.ToolStripButton2.Size = New System.Drawing.Size(29, 24)
         Me.ToolStripButton2.Text = "Aktualisieren"
         '
         'GroupBox1
@@ -144,8 +197,10 @@ Partial Class Behandlung
         Me.GroupBox1.Controls.Add(Me.treebehandlungen)
         Me.GroupBox1.Dock = System.Windows.Forms.DockStyle.Left
         Me.GroupBox1.Location = New System.Drawing.Point(0, 27)
+        Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4)
         Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(220, 811)
+        Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4)
+        Me.GroupBox1.Size = New System.Drawing.Size(273, 1004)
         Me.GroupBox1.TabIndex = 2
         Me.GroupBox1.TabStop = False
         Me.GroupBox1.Text = "Behandlungen"
@@ -167,13 +222,14 @@ Partial Class Behandlung
         Me.treebehandlungen.DragDropNodeCopyEnabled = False
         Me.treebehandlungen.ImageList = Me.ImageList1
         Me.treebehandlungen.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"
-        Me.treebehandlungen.Location = New System.Drawing.Point(3, 16)
+        Me.treebehandlungen.Location = New System.Drawing.Point(4, 19)
+        Me.treebehandlungen.Margin = New System.Windows.Forms.Padding(4)
         Me.treebehandlungen.Name = "treebehandlungen"
         Me.treebehandlungen.Nodes.AddRange(New DevComponents.AdvTree.Node() {Me.Node2})
         Me.treebehandlungen.NodesConnector = Me.NodeConnector1
         Me.treebehandlungen.NodeStyle = Me.ElementStyle1
         Me.treebehandlungen.PathSeparator = ";"
-        Me.treebehandlungen.Size = New System.Drawing.Size(214, 792)
+        Me.treebehandlungen.Size = New System.Drawing.Size(265, 981)
         Me.treebehandlungen.Styles.Add(Me.ElementStyle1)
         Me.treebehandlungen.TabIndex = 0
         Me.treebehandlungen.Text = "AdvTree1"
@@ -181,196 +237,196 @@ Partial Class Behandlung
         'ctxmenubehandlung
         '
         Me.ctxmenubehandlung.ImageScalingSize = New System.Drawing.Size(20, 20)
-        Me.ctxmenubehandlung.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeueBehandlungToolStripMenuItem1, Me.ToolStripMenuItem2, Me.BehandlungabschliessenToolStripMenuItem1, Me.BehandlungZurücksetzenToolStripMenuItem, Me.BehandlungKopierenToolStripMenuItem, Me.ToolStripMenuItem4, Me.SofortRechnungDruckenToolStripMenuItem, Me.KopieErstellenToolStripMenuItem, Me.ToolStripMenuItem3, Me.BehandlungLöschenToolStripMenuItem1, Me.ToolStripMenuItem5, Me.RechungKVVorschauToolStripMenuItem, Me.RechnungKVEntwurfToolStripMenuItem, Me.ToolStripMenuItem8, Me.ErsteMahnungDruckenToolStripMenuItem, Me.ZweiteMahnungDruckenToolStripMenuItem, Me.LetzteMahnungDruckenToolStripMenuItem})
+        Me.ctxmenubehandlung.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeueBehandlungToolStripMenuItem1, Me.BehandlungabschliessenToolStripMenuItem1, Me.ToolStripMenuItem2, Me.BehandlungZurücksetzenToolStripMenuItem, Me.BehandlungKopierenToolStripMenuItem, Me.ToolStripMenuItem4, Me.SofortRechnungDruckenToolStripMenuItem, Me.KopieErstellenToolStripMenuItem, Me.ToolStripMenuItem3, Me.BehandlungLöschenToolStripMenuItem1, Me.ToolStripMenuItem5, Me.RechungKVVorschauToolStripMenuItem, Me.RechnungKVEntwurfToolStripMenuItem, Me.ToolStripMenuItem8, Me.ErsteMahnungDruckenToolStripMenuItem, Me.ZweiteMahnungDruckenToolStripMenuItem, Me.LetzteMahnungDruckenToolStripMenuItem})
         Me.ctxmenubehandlung.Name = "ContextMenuStrip1"
-        Me.ctxmenubehandlung.Size = New System.Drawing.Size(212, 320)
+        Me.ctxmenubehandlung.Size = New System.Drawing.Size(247, 322)
         '
         'NeueBehandlungToolStripMenuItem1
         '
         Me.NeueBehandlungToolStripMenuItem1.Name = "NeueBehandlungToolStripMenuItem1"
-        Me.NeueBehandlungToolStripMenuItem1.Size = New System.Drawing.Size(211, 22)
+        Me.NeueBehandlungToolStripMenuItem1.Size = New System.Drawing.Size(246, 24)
         Me.NeueBehandlungToolStripMenuItem1.Text = "&Neue Behandlung"
         '
-        'ToolStripMenuItem2
-        '
-        Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2"
-        Me.ToolStripMenuItem2.Size = New System.Drawing.Size(208, 6)
-        '
         'BehandlungabschliessenToolStripMenuItem1
         '
         Me.BehandlungabschliessenToolStripMenuItem1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AbschlussMitRecallAnzeigeToolStripMenuItem, Me.AbshlussOhneRecallAnzeigeToolStripMenuItem, Me.ToolStripMenuItem7, Me.AbschlussUndSofortrechnungToolStripMenuItem, Me.AbschlussUndSofortrechungAlsPDFToolStripMenuItem, Me.AbschlussUndSofortrechnungAlsOutlookMailToolStripMenuItem, Me.AbschlussUndVerbuchenOhneRGQuittungToolStripMenuItem})
         Me.BehandlungabschliessenToolStripMenuItem1.Name = "BehandlungabschliessenToolStripMenuItem1"
-        Me.BehandlungabschliessenToolStripMenuItem1.Size = New System.Drawing.Size(211, 22)
+        Me.BehandlungabschliessenToolStripMenuItem1.Size = New System.Drawing.Size(246, 24)
         Me.BehandlungabschliessenToolStripMenuItem1.Text = "Behandlung &abschliessen"
         '
         'AbschlussMitRecallAnzeigeToolStripMenuItem
         '
         Me.AbschlussMitRecallAnzeigeToolStripMenuItem.Name = "AbschlussMitRecallAnzeigeToolStripMenuItem"
-        Me.AbschlussMitRecallAnzeigeToolStripMenuItem.Size = New System.Drawing.Size(328, 22)
+        Me.AbschlussMitRecallAnzeigeToolStripMenuItem.Size = New System.Drawing.Size(405, 26)
         Me.AbschlussMitRecallAnzeigeToolStripMenuItem.Text = "Abschluss mit Recall-Anzeige"
         '
         'AbshlussOhneRecallAnzeigeToolStripMenuItem
         '
         Me.AbshlussOhneRecallAnzeigeToolStripMenuItem.Name = "AbshlussOhneRecallAnzeigeToolStripMenuItem"
-        Me.AbshlussOhneRecallAnzeigeToolStripMenuItem.Size = New System.Drawing.Size(328, 22)
+        Me.AbshlussOhneRecallAnzeigeToolStripMenuItem.Size = New System.Drawing.Size(405, 26)
         Me.AbshlussOhneRecallAnzeigeToolStripMenuItem.Text = "Abschluss ohne Recall-Anzeige"
         '
         'ToolStripMenuItem7
         '
         Me.ToolStripMenuItem7.Name = "ToolStripMenuItem7"
-        Me.ToolStripMenuItem7.Size = New System.Drawing.Size(325, 6)
+        Me.ToolStripMenuItem7.Size = New System.Drawing.Size(402, 6)
         '
         'AbschlussUndSofortrechnungToolStripMenuItem
         '
         Me.AbschlussUndSofortrechnungToolStripMenuItem.Name = "AbschlussUndSofortrechnungToolStripMenuItem"
-        Me.AbschlussUndSofortrechnungToolStripMenuItem.Size = New System.Drawing.Size(328, 22)
+        Me.AbschlussUndSofortrechnungToolStripMenuItem.Size = New System.Drawing.Size(405, 26)
         Me.AbschlussUndSofortrechnungToolStripMenuItem.Text = "Abschluss und Sofortrechnung "
         '
         'AbschlussUndSofortrechungAlsPDFToolStripMenuItem
         '
         Me.AbschlussUndSofortrechungAlsPDFToolStripMenuItem.Name = "AbschlussUndSofortrechungAlsPDFToolStripMenuItem"
-        Me.AbschlussUndSofortrechungAlsPDFToolStripMenuItem.Size = New System.Drawing.Size(328, 22)
+        Me.AbschlussUndSofortrechungAlsPDFToolStripMenuItem.Size = New System.Drawing.Size(405, 26)
         Me.AbschlussUndSofortrechungAlsPDFToolStripMenuItem.Text = "Abschluss und Sofortrechung als PDF"
         '
         'AbschlussUndSofortrechnungAlsOutlookMailToolStripMenuItem
         '
         Me.AbschlussUndSofortrechnungAlsOutlookMailToolStripMenuItem.Name = "AbschlussUndSofortrechnungAlsOutlookMailToolStripMenuItem"
-        Me.AbschlussUndSofortrechnungAlsOutlookMailToolStripMenuItem.Size = New System.Drawing.Size(328, 22)
+        Me.AbschlussUndSofortrechnungAlsOutlookMailToolStripMenuItem.Size = New System.Drawing.Size(405, 26)
         Me.AbschlussUndSofortrechnungAlsOutlookMailToolStripMenuItem.Text = "Abschluss und Sofortrechnung als Outlook-Mail"
         '
         'AbschlussUndVerbuchenOhneRGQuittungToolStripMenuItem
         '
         Me.AbschlussUndVerbuchenOhneRGQuittungToolStripMenuItem.Name = "AbschlussUndVerbuchenOhneRGQuittungToolStripMenuItem"
-        Me.AbschlussUndVerbuchenOhneRGQuittungToolStripMenuItem.Size = New System.Drawing.Size(328, 22)
+        Me.AbschlussUndVerbuchenOhneRGQuittungToolStripMenuItem.Size = New System.Drawing.Size(405, 26)
         Me.AbschlussUndVerbuchenOhneRGQuittungToolStripMenuItem.Text = "Abschluss und verbuchen, ohne RG/Quittung"
         '
+        'ToolStripMenuItem2
+        '
+        Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2"
+        Me.ToolStripMenuItem2.Size = New System.Drawing.Size(243, 6)
+        '
         'BehandlungZurücksetzenToolStripMenuItem
         '
         Me.BehandlungZurücksetzenToolStripMenuItem.Name = "BehandlungZurücksetzenToolStripMenuItem"
-        Me.BehandlungZurücksetzenToolStripMenuItem.Size = New System.Drawing.Size(211, 22)
+        Me.BehandlungZurücksetzenToolStripMenuItem.Size = New System.Drawing.Size(246, 24)
         Me.BehandlungZurücksetzenToolStripMenuItem.Text = "Behandlung zurücksetzen"
         '
         'BehandlungKopierenToolStripMenuItem
         '
         Me.BehandlungKopierenToolStripMenuItem.Name = "BehandlungKopierenToolStripMenuItem"
-        Me.BehandlungKopierenToolStripMenuItem.Size = New System.Drawing.Size(211, 22)
+        Me.BehandlungKopierenToolStripMenuItem.Size = New System.Drawing.Size(246, 24)
         Me.BehandlungKopierenToolStripMenuItem.Text = "Behandlung kopieren"
         '
         'ToolStripMenuItem4
         '
         Me.ToolStripMenuItem4.Name = "ToolStripMenuItem4"
-        Me.ToolStripMenuItem4.Size = New System.Drawing.Size(208, 6)
+        Me.ToolStripMenuItem4.Size = New System.Drawing.Size(243, 6)
         '
         'SofortRechnungDruckenToolStripMenuItem
         '
         Me.SofortRechnungDruckenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VorschauToolStripMenuItem, Me.EntwurfToolStripMenuItem, Me.ToolStripMenuItem6, Me.AlsPdfToolStripMenuItem1, Me.AlsMailToolStripMenuItem})
         Me.SofortRechnungDruckenToolStripMenuItem.Name = "SofortRechnungDruckenToolStripMenuItem"
-        Me.SofortRechnungDruckenToolStripMenuItem.Size = New System.Drawing.Size(211, 22)
+        Me.SofortRechnungDruckenToolStripMenuItem.Size = New System.Drawing.Size(246, 24)
         Me.SofortRechnungDruckenToolStripMenuItem.Text = "Sofort-Rechnung drucken"
         '
         'VorschauToolStripMenuItem
         '
         Me.VorschauToolStripMenuItem.Name = "VorschauToolStripMenuItem"
-        Me.VorschauToolStripMenuItem.Size = New System.Drawing.Size(202, 22)
+        Me.VorschauToolStripMenuItem.Size = New System.Drawing.Size(252, 26)
         Me.VorschauToolStripMenuItem.Text = "Vorschau"
         '
         'EntwurfToolStripMenuItem
         '
         Me.EntwurfToolStripMenuItem.Name = "EntwurfToolStripMenuItem"
-        Me.EntwurfToolStripMenuItem.Size = New System.Drawing.Size(202, 22)
+        Me.EntwurfToolStripMenuItem.Size = New System.Drawing.Size(252, 26)
         Me.EntwurfToolStripMenuItem.Text = "Entwurf"
         '
         'ToolStripMenuItem6
         '
         Me.ToolStripMenuItem6.Name = "ToolStripMenuItem6"
-        Me.ToolStripMenuItem6.Size = New System.Drawing.Size(199, 6)
+        Me.ToolStripMenuItem6.Size = New System.Drawing.Size(249, 6)
         '
         'AlsPdfToolStripMenuItem1
         '
         Me.AlsPdfToolStripMenuItem1.Name = "AlsPdfToolStripMenuItem1"
-        Me.AlsPdfToolStripMenuItem1.Size = New System.Drawing.Size(202, 22)
+        Me.AlsPdfToolStripMenuItem1.Size = New System.Drawing.Size(252, 26)
         Me.AlsPdfToolStripMenuItem1.Text = "als PDF"
         '
         'AlsMailToolStripMenuItem
         '
         Me.AlsMailToolStripMenuItem.Name = "AlsMailToolStripMenuItem"
-        Me.AlsMailToolStripMenuItem.Size = New System.Drawing.Size(202, 22)
+        Me.AlsMailToolStripMenuItem.Size = New System.Drawing.Size(252, 26)
         Me.AlsMailToolStripMenuItem.Text = "als PDF an Outlook-Mail"
         '
         'KopieErstellenToolStripMenuItem
         '
         Me.KopieErstellenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AlsPDFToolStripMenuItem, Me.ÜberDruckerToolStripMenuItem, Me.AlsPDFPerMailToolStripMenuItem})
         Me.KopieErstellenToolStripMenuItem.Name = "KopieErstellenToolStripMenuItem"
-        Me.KopieErstellenToolStripMenuItem.Size = New System.Drawing.Size(211, 22)
+        Me.KopieErstellenToolStripMenuItem.Size = New System.Drawing.Size(246, 24)
         Me.KopieErstellenToolStripMenuItem.Text = "Rechnungskopie erstellen"
         '
         'AlsPDFToolStripMenuItem
         '
         Me.AlsPDFToolStripMenuItem.Name = "AlsPDFToolStripMenuItem"
-        Me.AlsPDFToolStripMenuItem.Size = New System.Drawing.Size(206, 22)
+        Me.AlsPDFToolStripMenuItem.Size = New System.Drawing.Size(258, 26)
         Me.AlsPDFToolStripMenuItem.Text = "als PDF"
         '
         'ÜberDruckerToolStripMenuItem
         '
         Me.ÜberDruckerToolStripMenuItem.Name = "ÜberDruckerToolStripMenuItem"
-        Me.ÜberDruckerToolStripMenuItem.Size = New System.Drawing.Size(206, 22)
+        Me.ÜberDruckerToolStripMenuItem.Size = New System.Drawing.Size(258, 26)
         Me.ÜberDruckerToolStripMenuItem.Text = "über Drucker"
         '
         'AlsPDFPerMailToolStripMenuItem
         '
         Me.AlsPDFPerMailToolStripMenuItem.Name = "AlsPDFPerMailToolStripMenuItem"
-        Me.AlsPDFPerMailToolStripMenuItem.Size = New System.Drawing.Size(206, 22)
+        Me.AlsPDFPerMailToolStripMenuItem.Size = New System.Drawing.Size(258, 26)
         Me.AlsPDFPerMailToolStripMenuItem.Text = "als PDF per Outlook-Mail"
         '
         'ToolStripMenuItem3
         '
         Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3"
-        Me.ToolStripMenuItem3.Size = New System.Drawing.Size(208, 6)
+        Me.ToolStripMenuItem3.Size = New System.Drawing.Size(243, 6)
         '
         'BehandlungLöschenToolStripMenuItem1
         '
         Me.BehandlungLöschenToolStripMenuItem1.Name = "BehandlungLöschenToolStripMenuItem1"
-        Me.BehandlungLöschenToolStripMenuItem1.Size = New System.Drawing.Size(211, 22)
+        Me.BehandlungLöschenToolStripMenuItem1.Size = New System.Drawing.Size(246, 24)
         Me.BehandlungLöschenToolStripMenuItem1.Text = "&Behandlung löschen"
         '
         'ToolStripMenuItem5
         '
         Me.ToolStripMenuItem5.Name = "ToolStripMenuItem5"
-        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(208, 6)
+        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(243, 6)
         '
         'RechungKVVorschauToolStripMenuItem
         '
         Me.RechungKVVorschauToolStripMenuItem.Name = "RechungKVVorschauToolStripMenuItem"
-        Me.RechungKVVorschauToolStripMenuItem.Size = New System.Drawing.Size(211, 22)
+        Me.RechungKVVorschauToolStripMenuItem.Size = New System.Drawing.Size(246, 24)
         Me.RechungKVVorschauToolStripMenuItem.Text = "Rechung/KV Vorschau"
         '
         'RechnungKVEntwurfToolStripMenuItem
         '
         Me.RechnungKVEntwurfToolStripMenuItem.Name = "RechnungKVEntwurfToolStripMenuItem"
-        Me.RechnungKVEntwurfToolStripMenuItem.Size = New System.Drawing.Size(211, 22)
+        Me.RechnungKVEntwurfToolStripMenuItem.Size = New System.Drawing.Size(246, 24)
         Me.RechnungKVEntwurfToolStripMenuItem.Text = "Rechnung/KV Entwurf"
         '
         'ToolStripMenuItem8
         '
         Me.ToolStripMenuItem8.Name = "ToolStripMenuItem8"
-        Me.ToolStripMenuItem8.Size = New System.Drawing.Size(208, 6)
+        Me.ToolStripMenuItem8.Size = New System.Drawing.Size(243, 6)
         '
         'ErsteMahnungDruckenToolStripMenuItem
         '
         Me.ErsteMahnungDruckenToolStripMenuItem.Name = "ErsteMahnungDruckenToolStripMenuItem"
-        Me.ErsteMahnungDruckenToolStripMenuItem.Size = New System.Drawing.Size(211, 22)
+        Me.ErsteMahnungDruckenToolStripMenuItem.Size = New System.Drawing.Size(246, 24)
         Me.ErsteMahnungDruckenToolStripMenuItem.Text = "Erste Mahnung drucken"
         '
         'ZweiteMahnungDruckenToolStripMenuItem
         '
         Me.ZweiteMahnungDruckenToolStripMenuItem.Name = "ZweiteMahnungDruckenToolStripMenuItem"
-        Me.ZweiteMahnungDruckenToolStripMenuItem.Size = New System.Drawing.Size(211, 22)
+        Me.ZweiteMahnungDruckenToolStripMenuItem.Size = New System.Drawing.Size(246, 24)
         Me.ZweiteMahnungDruckenToolStripMenuItem.Text = "Zweite Mahnung drucken"
         '
         'LetzteMahnungDruckenToolStripMenuItem
         '
         Me.LetzteMahnungDruckenToolStripMenuItem.Name = "LetzteMahnungDruckenToolStripMenuItem"
-        Me.LetzteMahnungDruckenToolStripMenuItem.Size = New System.Drawing.Size(211, 22)
+        Me.LetzteMahnungDruckenToolStripMenuItem.Size = New System.Drawing.Size(246, 24)
         Me.LetzteMahnungDruckenToolStripMenuItem.Text = "Letzte Mahnung drucken"
         '
         'ImageList1
@@ -400,42 +456,42 @@ Partial Class Behandlung
         'NeueBehandlungToolStripMenuItem
         '
         Me.NeueBehandlungToolStripMenuItem.Name = "NeueBehandlungToolStripMenuItem"
-        Me.NeueBehandlungToolStripMenuItem.Size = New System.Drawing.Size(243, 22)
+        Me.NeueBehandlungToolStripMenuItem.Size = New System.Drawing.Size(288, 24)
         Me.NeueBehandlungToolStripMenuItem.Text = "&Neue Behandlung"
         '
         'BehandlungAbschliessenToolStripMenuItem
         '
         Me.BehandlungAbschliessenToolStripMenuItem.Name = "BehandlungAbschliessenToolStripMenuItem"
-        Me.BehandlungAbschliessenToolStripMenuItem.Size = New System.Drawing.Size(243, 22)
+        Me.BehandlungAbschliessenToolStripMenuItem.Size = New System.Drawing.Size(288, 24)
         Me.BehandlungAbschliessenToolStripMenuItem.Text = "&Behandlung abschliessen"
         '
         'BehandlungLöschenToolStripMenuItem
         '
         Me.BehandlungLöschenToolStripMenuItem.Name = "BehandlungLöschenToolStripMenuItem"
-        Me.BehandlungLöschenToolStripMenuItem.Size = New System.Drawing.Size(243, 22)
+        Me.BehandlungLöschenToolStripMenuItem.Size = New System.Drawing.Size(288, 24)
         Me.BehandlungLöschenToolStripMenuItem.Text = "Behandlung &löschen"
         '
         'ToolStripMenuItem1
         '
         Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
-        Me.ToolStripMenuItem1.Size = New System.Drawing.Size(240, 6)
+        Me.ToolStripMenuItem1.Size = New System.Drawing.Size(285, 6)
         '
         'NeuerKostenvoranschlagToolStripMenuItem
         '
         Me.NeuerKostenvoranschlagToolStripMenuItem.Name = "NeuerKostenvoranschlagToolStripMenuItem"
-        Me.NeuerKostenvoranschlagToolStripMenuItem.Size = New System.Drawing.Size(243, 22)
+        Me.NeuerKostenvoranschlagToolStripMenuItem.Size = New System.Drawing.Size(288, 24)
         Me.NeuerKostenvoranschlagToolStripMenuItem.Text = "Neuer &Kostenvoranschlag"
         '
         'KostenvoranschlagAbschliessenToolStripMenuItem
         '
         Me.KostenvoranschlagAbschliessenToolStripMenuItem.Name = "KostenvoranschlagAbschliessenToolStripMenuItem"
-        Me.KostenvoranschlagAbschliessenToolStripMenuItem.Size = New System.Drawing.Size(243, 22)
+        Me.KostenvoranschlagAbschliessenToolStripMenuItem.Size = New System.Drawing.Size(288, 24)
         Me.KostenvoranschlagAbschliessenToolStripMenuItem.Text = "Kostenvoranschlag abschliessen"
         '
         'KostenvoranschlagLöschenToolStripMenuItem
         '
         Me.KostenvoranschlagLöschenToolStripMenuItem.Name = "KostenvoranschlagLöschenToolStripMenuItem"
-        Me.KostenvoranschlagLöschenToolStripMenuItem.Size = New System.Drawing.Size(243, 22)
+        Me.KostenvoranschlagLöschenToolStripMenuItem.Size = New System.Drawing.Size(288, 24)
         Me.KostenvoranschlagLöschenToolStripMenuItem.Text = "Kostenvoranschlag löschen"
         '
         'SuperTabControl1
@@ -457,12 +513,13 @@ Partial Class Behandlung
         Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel2)
         Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel3)
         Me.SuperTabControl1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.SuperTabControl1.Location = New System.Drawing.Point(220, 27)
+        Me.SuperTabControl1.Location = New System.Drawing.Point(273, 27)
+        Me.SuperTabControl1.Margin = New System.Windows.Forms.Padding(4)
         Me.SuperTabControl1.Name = "SuperTabControl1"
         Me.SuperTabControl1.ReorderTabsEnabled = True
         Me.SuperTabControl1.SelectedTabFont = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold)
         Me.SuperTabControl1.SelectedTabIndex = 0
-        Me.SuperTabControl1.Size = New System.Drawing.Size(1065, 811)
+        Me.SuperTabControl1.Size = New System.Drawing.Size(1440, 1004)
         Me.SuperTabControl1.TabFont = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.SuperTabControl1.TabIndex = 9
         Me.SuperTabControl1.Tabs.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.STBehandlung, Me.STLeistung})
@@ -472,9 +529,10 @@ Partial Class Behandlung
         '
         Me.SuperTabControlPanel1.Controls.Add(Me.Panel2)
         Me.SuperTabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.SuperTabControlPanel1.Location = New System.Drawing.Point(0, 25)
+        Me.SuperTabControlPanel1.Location = New System.Drawing.Point(0, 28)
+        Me.SuperTabControlPanel1.Margin = New System.Windows.Forms.Padding(4)
         Me.SuperTabControlPanel1.Name = "SuperTabControlPanel1"
-        Me.SuperTabControlPanel1.Size = New System.Drawing.Size(1065, 786)
+        Me.SuperTabControlPanel1.Size = New System.Drawing.Size(1440, 976)
         Me.SuperTabControlPanel1.TabIndex = 1
         Me.SuperTabControlPanel1.TabItem = Me.STBehandlung
         '
@@ -482,8 +540,9 @@ Partial Class Behandlung
         '
         Me.Panel2.Controls.Add(Me.Behandungdetail1)
         Me.Panel2.Location = New System.Drawing.Point(0, 0)
+        Me.Panel2.Margin = New System.Windows.Forms.Padding(4)
         Me.Panel2.Name = "Panel2"
-        Me.Panel2.Size = New System.Drawing.Size(1062, 788)
+        Me.Panel2.Size = New System.Drawing.Size(1416, 970)
         Me.Panel2.TabIndex = 9
         '
         'Behandungdetail1
@@ -491,11 +550,11 @@ Partial Class Behandlung
         Me.Behandungdetail1.Behandlungsnr = 0
         Me.Behandungdetail1.Behandlungsstatus = 0
         Me.Behandungdetail1.HasChanges = False
-        Me.Behandungdetail1.Location = New System.Drawing.Point(3, 6)
+        Me.Behandungdetail1.Location = New System.Drawing.Point(4, 7)
-        Me.Behandungdetail1.Margin = New System.Windows.Forms.Padding(4)
+        Me.Behandungdetail1.Margin = New System.Windows.Forms.Padding(5)
         Me.Behandungdetail1.Name = "Behandungdetail1"
         Me.Behandungdetail1.Patientnr = 0
-        Me.Behandungdetail1.Size = New System.Drawing.Size(1059, 779)
+        Me.Behandungdetail1.Size = New System.Drawing.Size(1412, 959)
         Me.Behandungdetail1.TabIndex = 0
         '
         'STBehandlung
@@ -509,9 +568,10 @@ Partial Class Behandlung
         '
         Me.SuperTabControlPanel2.Controls.Add(Me.Panel1)
         Me.SuperTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.SuperTabControlPanel2.Location = New System.Drawing.Point(0, 23)
+        Me.SuperTabControlPanel2.Location = New System.Drawing.Point(0, 28)
+        Me.SuperTabControlPanel2.Margin = New System.Windows.Forms.Padding(4)
         Me.SuperTabControlPanel2.Name = "SuperTabControlPanel2"
-        Me.SuperTabControlPanel2.Size = New System.Drawing.Size(1065, 790)
+        Me.SuperTabControlPanel2.Size = New System.Drawing.Size(1255, 976)
         Me.SuperTabControlPanel2.TabIndex = 0
         Me.SuperTabControlPanel2.TabItem = Me.STLeistung
         '
@@ -520,8 +580,9 @@ Partial Class Behandlung
         Me.Panel1.Controls.Add(Me.Leistungen1)
         Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill
         Me.Panel1.Location = New System.Drawing.Point(0, 0)
+        Me.Panel1.Margin = New System.Windows.Forms.Padding(4)
         Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(1065, 790)
+        Me.Panel1.Size = New System.Drawing.Size(1255, 976)
         Me.Panel1.TabIndex = 1
         '
         'Leistungen1
@@ -533,9 +594,9 @@ Partial Class Behandlung
         Me.Leistungen1.Dock = System.Windows.Forms.DockStyle.Fill
         Me.Leistungen1.Frankenwert = 0R
         Me.Leistungen1.Location = New System.Drawing.Point(0, 0)
-        Me.Leistungen1.Margin = New System.Windows.Forms.Padding(4)
+        Me.Leistungen1.Margin = New System.Windows.Forms.Padding(5)
         Me.Leistungen1.Name = "Leistungen1"
-        Me.Leistungen1.Size = New System.Drawing.Size(1065, 790)
+        Me.Leistungen1.Size = New System.Drawing.Size(1255, 976)
         Me.Leistungen1.TabIndex = 0
         '
         'STLeistung
@@ -549,8 +610,9 @@ Partial Class Behandlung
         '
         Me.SuperTabControlPanel3.Dock = System.Windows.Forms.DockStyle.Fill
         Me.SuperTabControlPanel3.Location = New System.Drawing.Point(0, 0)
+        Me.SuperTabControlPanel3.Margin = New System.Windows.Forms.Padding(4)
         Me.SuperTabControlPanel3.Name = "SuperTabControlPanel3"
-        Me.SuperTabControlPanel3.Size = New System.Drawing.Size(1065, 811)
+        Me.SuperTabControlPanel3.Size = New System.Drawing.Size(1440, 1004)
         Me.SuperTabControlPanel3.TabIndex = 0
         '
         'tsbtnnew
@@ -559,7 +621,7 @@ Partial Class Behandlung
         Me.tsbtnnew.Image = CType(resources.GetObject("tsbtnnew.Image"), System.Drawing.Image)
         Me.tsbtnnew.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.tsbtnnew.Name = "tsbtnnew"
-        Me.tsbtnnew.Size = New System.Drawing.Size(24, 22)
+        Me.tsbtnnew.Size = New System.Drawing.Size(29, 22)
         Me.tsbtnnew.Text = "Neue Behandlung"
         '
         'ToolStripButton1
@@ -568,7 +630,7 @@ Partial Class Behandlung
         Me.ToolStripButton1.Image = CType(resources.GetObject("ToolStripButton1.Image"), System.Drawing.Image)
         Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton1.Name = "ToolStripButton1"
-        Me.ToolStripButton1.Size = New System.Drawing.Size(24, 22)
+        Me.ToolStripButton1.Size = New System.Drawing.Size(29, 22)
         Me.ToolStripButton1.Text = "ToolStripButton1"
         '
         'tsbtnbehandlungdelete
@@ -586,17 +648,332 @@ Partial Class Behandlung
         Me.ContextMenuStrip1.ImageScalingSize = New System.Drawing.Size(20, 20)
         Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeueBehandlungToolStripMenuItem, Me.BehandlungAbschliessenToolStripMenuItem, Me.BehandlungLöschenToolStripMenuItem, Me.ToolStripMenuItem1, Me.NeuerKostenvoranschlagToolStripMenuItem, Me.KostenvoranschlagAbschliessenToolStripMenuItem, Me.KostenvoranschlagLöschenToolStripMenuItem})
         Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
-        Me.ContextMenuStrip1.Size = New System.Drawing.Size(244, 142)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(289, 154)
+        '
+        'ctxMenuAuftragsamanagement
+        '
+        Me.ctxMenuAuftragsamanagement.ImageScalingSize = New System.Drawing.Size(20, 20)
+        Me.ctxMenuAuftragsamanagement.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsamnew, Me.ToolStripSeparator1, Me.OfferteToolStripMenuItem, Me.AuftragsbestätigungToolStripMenuItem, Me.LieferscheinToolStripMenuItem, Me.ToolStripMenuItem10, Me.ToolStripSeparator3, Me.ToolStripMenuItem19, Me.ToolStripMenuItem24, Me.ToolStripMenuItem9, Me.ToolStripMenuItem17, Me.ToolStripMenuItem18, Me.ToolStripSeparator5, Me.tsamdelete, Me.ToolStripSeparator6, Me.ToolStripMenuItem29, Me.ToolStripMenuItem30, Me.ToolStripSeparator7, Me.tsamerstemahnung, Me.tsamzweitemahnung, Me.tsamdrittemahnung})
+        Me.ctxMenuAuftragsamanagement.Name = "ContextMenuStrip1"
+        Me.ctxMenuAuftragsamanagement.Size = New System.Drawing.Size(247, 428)
+        '
+        'tsamnew
+        '
+        Me.tsamnew.Name = "tsamnew"
+        Me.tsamnew.Size = New System.Drawing.Size(246, 24)
+        Me.tsamnew.Text = "&Neuer Auftrag"
+        '
+        'ToolStripSeparator1
+        '
+        Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
+        Me.ToolStripSeparator1.Size = New System.Drawing.Size(243, 6)
+        '
+        'OfferteToolStripMenuItem
+        '
+        Me.OfferteToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OffertPDF, Me.PDFPerMailToolStripMenuItem, Me.DruckenToolStripMenuItem, Me.VorschauToolStripMenuItem1, Me.EntwurfToolStripMenuItem1})
+        Me.OfferteToolStripMenuItem.Name = "OfferteToolStripMenuItem"
+        Me.OfferteToolStripMenuItem.Size = New System.Drawing.Size(246, 24)
+        Me.OfferteToolStripMenuItem.Text = "Offerte"
+        '
+        'OffertPDF
+        '
+        Me.OffertPDF.Name = "OffertPDF"
+        Me.OffertPDF.Size = New System.Drawing.Size(224, 26)
+        Me.OffertPDF.Text = "PDF"
+        '
+        'PDFPerMailToolStripMenuItem
+        '
+        Me.PDFPerMailToolStripMenuItem.Name = "PDFPerMailToolStripMenuItem"
+        Me.PDFPerMailToolStripMenuItem.Size = New System.Drawing.Size(224, 26)
+        Me.PDFPerMailToolStripMenuItem.Text = "PDF per Mail"
+        '
+        'DruckenToolStripMenuItem
+        '
+        Me.DruckenToolStripMenuItem.Name = "DruckenToolStripMenuItem"
+        Me.DruckenToolStripMenuItem.Size = New System.Drawing.Size(224, 26)
+        Me.DruckenToolStripMenuItem.Text = "Drucken"
+        '
+        'VorschauToolStripMenuItem1
+        '
+        Me.VorschauToolStripMenuItem1.Name = "VorschauToolStripMenuItem1"
+        Me.VorschauToolStripMenuItem1.Size = New System.Drawing.Size(224, 26)
+        Me.VorschauToolStripMenuItem1.Text = "Vorschau"
+        '
+        'EntwurfToolStripMenuItem1
+        '
+        Me.EntwurfToolStripMenuItem1.Name = "EntwurfToolStripMenuItem1"
+        Me.EntwurfToolStripMenuItem1.Size = New System.Drawing.Size(224, 26)
+        Me.EntwurfToolStripMenuItem1.Text = "Entwurf"
+        '
+        'AuftragsbestätigungToolStripMenuItem
+        '
+        Me.AuftragsbestätigungToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.PDFToolStripMenuItem, Me.PDFPerMailToolStripMenuItem1, Me.DruckenToolStripMenuItem1, Me.VorschauToolStripMenuItem2, Me.EntwurfToolStripMenuItem2})
+        Me.AuftragsbestätigungToolStripMenuItem.Name = "AuftragsbestätigungToolStripMenuItem"
+        Me.AuftragsbestätigungToolStripMenuItem.Size = New System.Drawing.Size(246, 24)
+        Me.AuftragsbestätigungToolStripMenuItem.Text = "Auftragsbestätigung"
+        '
+        'PDFToolStripMenuItem
+        '
+        Me.PDFToolStripMenuItem.Name = "PDFToolStripMenuItem"
+        Me.PDFToolStripMenuItem.Size = New System.Drawing.Size(177, 26)
+        Me.PDFToolStripMenuItem.Text = "PDF"
+        '
+        'PDFPerMailToolStripMenuItem1
+        '
+        Me.PDFPerMailToolStripMenuItem1.Name = "PDFPerMailToolStripMenuItem1"
+        Me.PDFPerMailToolStripMenuItem1.Size = New System.Drawing.Size(177, 26)
+        Me.PDFPerMailToolStripMenuItem1.Text = "PDF per Mail"
+        '
+        'DruckenToolStripMenuItem1
+        '
+        Me.DruckenToolStripMenuItem1.Name = "DruckenToolStripMenuItem1"
+        Me.DruckenToolStripMenuItem1.Size = New System.Drawing.Size(177, 26)
+        Me.DruckenToolStripMenuItem1.Text = "Drucken"
+        '
+        'VorschauToolStripMenuItem2
+        '
+        Me.VorschauToolStripMenuItem2.Name = "VorschauToolStripMenuItem2"
+        Me.VorschauToolStripMenuItem2.Size = New System.Drawing.Size(177, 26)
+        Me.VorschauToolStripMenuItem2.Text = "Vorschau"
+        '
+        'EntwurfToolStripMenuItem2
+        '
+        Me.EntwurfToolStripMenuItem2.Name = "EntwurfToolStripMenuItem2"
+        Me.EntwurfToolStripMenuItem2.Size = New System.Drawing.Size(177, 26)
+        Me.EntwurfToolStripMenuItem2.Text = "Entwurf"
+        '
+        'LieferscheinToolStripMenuItem
+        '
+        Me.LieferscheinToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.PDFToolStripMenuItem1, Me.PDFPerMailToolStripMenuItem2, Me.DruckenToolStripMenuItem2, Me.VorschauToolStripMenuItem3, Me.EntwurfToolStripMenuItem3})
+        Me.LieferscheinToolStripMenuItem.Name = "LieferscheinToolStripMenuItem"
+        Me.LieferscheinToolStripMenuItem.Size = New System.Drawing.Size(246, 24)
+        Me.LieferscheinToolStripMenuItem.Text = "Lieferschein"
+        '
+        'PDFToolStripMenuItem1
+        '
+        Me.PDFToolStripMenuItem1.Name = "PDFToolStripMenuItem1"
+        Me.PDFToolStripMenuItem1.Size = New System.Drawing.Size(177, 26)
+        Me.PDFToolStripMenuItem1.Text = "PDF"
+        '
+        'PDFPerMailToolStripMenuItem2
+        '
+        Me.PDFPerMailToolStripMenuItem2.Name = "PDFPerMailToolStripMenuItem2"
+        Me.PDFPerMailToolStripMenuItem2.Size = New System.Drawing.Size(177, 26)
+        Me.PDFPerMailToolStripMenuItem2.Text = "PDF per Mail"
+        '
+        'DruckenToolStripMenuItem2
+        '
+        Me.DruckenToolStripMenuItem2.Name = "DruckenToolStripMenuItem2"
+        Me.DruckenToolStripMenuItem2.Size = New System.Drawing.Size(177, 26)
+        Me.DruckenToolStripMenuItem2.Text = "Drucken"
+        '
+        'VorschauToolStripMenuItem3
+        '
+        Me.VorschauToolStripMenuItem3.Name = "VorschauToolStripMenuItem3"
+        Me.VorschauToolStripMenuItem3.Size = New System.Drawing.Size(177, 26)
+        Me.VorschauToolStripMenuItem3.Text = "Vorschau"
+        '
+        'EntwurfToolStripMenuItem3
+        '
+        Me.EntwurfToolStripMenuItem3.Name = "EntwurfToolStripMenuItem3"
+        Me.EntwurfToolStripMenuItem3.Size = New System.Drawing.Size(177, 26)
+        Me.EntwurfToolStripMenuItem3.Text = "Entwurf"
+        '
+        'ToolStripMenuItem10
+        '
+        Me.ToolStripMenuItem10.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem11, Me.ToolStripMenuItem12, Me.ToolStripSeparator2, Me.ToolStripMenuItem13, Me.ToolStripMenuItem14, Me.ToolStripMenuItem15, Me.ToolStripMenuItem16})
+        Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10"
+        Me.ToolStripMenuItem10.Size = New System.Drawing.Size(246, 24)
+        Me.ToolStripMenuItem10.Text = "Auftrag a&bschliessen"
+        '
+        'ToolStripMenuItem11
+        '
+        Me.ToolStripMenuItem11.Name = "ToolStripMenuItem11"
+        Me.ToolStripMenuItem11.Size = New System.Drawing.Size(405, 26)
+        Me.ToolStripMenuItem11.Text = "Abschluss mit Recall-Anzeige"
+        Me.ToolStripMenuItem11.Visible = False
+        '
+        'ToolStripMenuItem12
+        '
+        Me.ToolStripMenuItem12.Name = "ToolStripMenuItem12"
+        Me.ToolStripMenuItem12.Size = New System.Drawing.Size(405, 26)
+        Me.ToolStripMenuItem12.Text = "Abschluss ohne Recall-Anzeige"
+        Me.ToolStripMenuItem12.Visible = False
+        '
+        'ToolStripSeparator2
+        '
+        Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
+        Me.ToolStripSeparator2.Size = New System.Drawing.Size(402, 6)
+        Me.ToolStripSeparator2.Visible = False
+        '
+        'ToolStripMenuItem13
+        '
+        Me.ToolStripMenuItem13.Name = "ToolStripMenuItem13"
+        Me.ToolStripMenuItem13.Size = New System.Drawing.Size(405, 26)
+        Me.ToolStripMenuItem13.Text = "Abschluss und Sofortrechnung "
+        '
+        'ToolStripMenuItem14
+        '
+        Me.ToolStripMenuItem14.Name = "ToolStripMenuItem14"
+        Me.ToolStripMenuItem14.Size = New System.Drawing.Size(405, 26)
+        Me.ToolStripMenuItem14.Text = "Abschluss und Sofortrechung als PDF"
+        '
+        'ToolStripMenuItem15
+        '
+        Me.ToolStripMenuItem15.Name = "ToolStripMenuItem15"
+        Me.ToolStripMenuItem15.Size = New System.Drawing.Size(405, 26)
+        Me.ToolStripMenuItem15.Text = "Abschluss und Sofortrechnung als Outlook-Mail"
+        '
+        'ToolStripMenuItem16
+        '
+        Me.ToolStripMenuItem16.Name = "ToolStripMenuItem16"
+        Me.ToolStripMenuItem16.Size = New System.Drawing.Size(405, 26)
+        Me.ToolStripMenuItem16.Text = "Abschluss und verbuchen, ohne RG/Quittung"
+        '
+        'ToolStripSeparator3
+        '
+        Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
+        Me.ToolStripSeparator3.Size = New System.Drawing.Size(243, 6)
+        '
+        'ToolStripMenuItem19
+        '
+        Me.ToolStripMenuItem19.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem20, Me.ToolStripMenuItem21, Me.ToolStripSeparator4, Me.ToolStripMenuItem22, Me.ToolStripMenuItem23})
+        Me.ToolStripMenuItem19.Name = "ToolStripMenuItem19"
+        Me.ToolStripMenuItem19.Size = New System.Drawing.Size(246, 24)
+        Me.ToolStripMenuItem19.Text = "Sofort-Rechnung drucken"
+        '
+        'ToolStripMenuItem20
+        '
+        Me.ToolStripMenuItem20.Name = "ToolStripMenuItem20"
+        Me.ToolStripMenuItem20.Size = New System.Drawing.Size(252, 26)
+        Me.ToolStripMenuItem20.Text = "Vorschau"
+        '
+        'ToolStripMenuItem21
+        '
+        Me.ToolStripMenuItem21.Name = "ToolStripMenuItem21"
+        Me.ToolStripMenuItem21.Size = New System.Drawing.Size(252, 26)
+        Me.ToolStripMenuItem21.Text = "Entwurf"
+        '
+        'ToolStripSeparator4
+        '
+        Me.ToolStripSeparator4.Name = "ToolStripSeparator4"
+        Me.ToolStripSeparator4.Size = New System.Drawing.Size(249, 6)
+        '
+        'ToolStripMenuItem22
+        '
+        Me.ToolStripMenuItem22.Name = "ToolStripMenuItem22"
+        Me.ToolStripMenuItem22.Size = New System.Drawing.Size(252, 26)
+        Me.ToolStripMenuItem22.Text = "als PDF"
+        '
+        'ToolStripMenuItem23
+        '
+        Me.ToolStripMenuItem23.Name = "ToolStripMenuItem23"
+        Me.ToolStripMenuItem23.Size = New System.Drawing.Size(252, 26)
+        Me.ToolStripMenuItem23.Text = "als PDF an Outlook-Mail"
+        '
+        'ToolStripMenuItem24
+        '
+        Me.ToolStripMenuItem24.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem25, Me.ToolStripMenuItem26, Me.ToolStripMenuItem27})
+        Me.ToolStripMenuItem24.Name = "ToolStripMenuItem24"
+        Me.ToolStripMenuItem24.Size = New System.Drawing.Size(246, 24)
+        Me.ToolStripMenuItem24.Text = "Rechnungskopie erstellen"
+        '
+        'ToolStripMenuItem25
+        '
+        Me.ToolStripMenuItem25.Name = "ToolStripMenuItem25"
+        Me.ToolStripMenuItem25.Size = New System.Drawing.Size(258, 26)
+        Me.ToolStripMenuItem25.Text = "als PDF"
+        '
+        'ToolStripMenuItem26
+        '
+        Me.ToolStripMenuItem26.Name = "ToolStripMenuItem26"
+        Me.ToolStripMenuItem26.Size = New System.Drawing.Size(258, 26)
+        Me.ToolStripMenuItem26.Text = "über Drucker"
+        '
+        'ToolStripMenuItem27
+        '
+        Me.ToolStripMenuItem27.Name = "ToolStripMenuItem27"
+        Me.ToolStripMenuItem27.Size = New System.Drawing.Size(258, 26)
+        Me.ToolStripMenuItem27.Text = "als PDF per Outlook-Mail"
+        '
+        'ToolStripMenuItem9
+        '
+        Me.ToolStripMenuItem9.Name = "ToolStripMenuItem9"
+        Me.ToolStripMenuItem9.Size = New System.Drawing.Size(243, 6)
+        '
+        'ToolStripMenuItem17
+        '
+        Me.ToolStripMenuItem17.Name = "ToolStripMenuItem17"
+        Me.ToolStripMenuItem17.Size = New System.Drawing.Size(246, 24)
+        Me.ToolStripMenuItem17.Text = "Auftrag zurücksetzen"
+        '
+        'ToolStripMenuItem18
+        '
+        Me.ToolStripMenuItem18.Name = "ToolStripMenuItem18"
+        Me.ToolStripMenuItem18.Size = New System.Drawing.Size(246, 24)
+        Me.ToolStripMenuItem18.Text = "Auftrag kopieren"
+        '
+        'ToolStripSeparator5
+        '
+        Me.ToolStripSeparator5.Name = "ToolStripSeparator5"
+        Me.ToolStripSeparator5.Size = New System.Drawing.Size(243, 6)
+        '
+        'tsamdelete
+        '
+        Me.tsamdelete.Name = "tsamdelete"
+        Me.tsamdelete.Size = New System.Drawing.Size(246, 24)
+        Me.tsamdelete.Text = "&Auftrag löschen"
+        '
+        'ToolStripSeparator6
+        '
+        Me.ToolStripSeparator6.Name = "ToolStripSeparator6"
+        Me.ToolStripSeparator6.Size = New System.Drawing.Size(243, 6)
+        '
+        'ToolStripMenuItem29
+        '
+        Me.ToolStripMenuItem29.Name = "ToolStripMenuItem29"
+        Me.ToolStripMenuItem29.Size = New System.Drawing.Size(246, 24)
+        Me.ToolStripMenuItem29.Text = "Rechung Vorschau"
+        '
+        'ToolStripMenuItem30
+        '
+        Me.ToolStripMenuItem30.Name = "ToolStripMenuItem30"
+        Me.ToolStripMenuItem30.Size = New System.Drawing.Size(246, 24)
+        Me.ToolStripMenuItem30.Text = "Rechnung Entwurf"
+        '
+        'ToolStripSeparator7
+        '
+        Me.ToolStripSeparator7.Name = "ToolStripSeparator7"
+        Me.ToolStripSeparator7.Size = New System.Drawing.Size(243, 6)
+        '
+        'tsamerstemahnung
+        '
+        Me.tsamerstemahnung.Name = "tsamerstemahnung"
+        Me.tsamerstemahnung.Size = New System.Drawing.Size(246, 24)
+        Me.tsamerstemahnung.Text = "Erste Mahnung drucken"
+        '
+        'tsamzweitemahnung
+        '
+        Me.tsamzweitemahnung.Name = "tsamzweitemahnung"
+        Me.tsamzweitemahnung.Size = New System.Drawing.Size(246, 24)
+        Me.tsamzweitemahnung.Text = "Zweite Mahnung drucken"
+        '
+        'tsamdrittemahnung
+        '
+        Me.tsamdrittemahnung.Name = "tsamdrittemahnung"
+        Me.tsamdrittemahnung.Size = New System.Drawing.Size(246, 24)
+        Me.tsamdrittemahnung.Text = "Letzte Mahnung drucken"
         '
         'Behandlung
         '
-        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.Controls.Add(Me.SuperTabControl1)
         Me.Controls.Add(Me.GroupBox1)
         Me.Controls.Add(Me.tsbtndelete)
+        Me.Margin = New System.Windows.Forms.Padding(4)
         Me.Name = "Behandlung"
-        Me.Size = New System.Drawing.Size(1285, 838)
+        Me.Size = New System.Drawing.Size(1713, 1031)
         Me.tsbtndelete.ResumeLayout(False)
         Me.tsbtndelete.PerformLayout()
         Me.GroupBox1.ResumeLayout(False)
@@ -611,6 +988,7 @@ Partial Class Behandlung
         Me.tsbtnbehandlungdelete.ResumeLayout(False)
         Me.tsbtnbehandlungdelete.PerformLayout()
         Me.ContextMenuStrip1.ResumeLayout(False)
+        Me.ctxMenuAuftragsamanagement.ResumeLayout(False)
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -679,4 +1057,56 @@ Partial Class Behandlung
     Friend WithEvents ErsteMahnungDruckenToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents ZweiteMahnungDruckenToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents LetzteMahnungDruckenToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents ctxMenuAuftragsamanagement As ContextMenuStrip
+    Friend WithEvents tsamnew As ToolStripMenuItem
+    Friend WithEvents ToolStripSeparator1 As ToolStripSeparator
+    Friend WithEvents ToolStripMenuItem10 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem11 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem12 As ToolStripMenuItem
+    Friend WithEvents ToolStripSeparator2 As ToolStripSeparator
+    Friend WithEvents ToolStripMenuItem13 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem14 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem15 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem16 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem17 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem18 As ToolStripMenuItem
+    Friend WithEvents ToolStripSeparator3 As ToolStripSeparator
+    Friend WithEvents ToolStripMenuItem19 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem20 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem21 As ToolStripMenuItem
+    Friend WithEvents ToolStripSeparator4 As ToolStripSeparator
+    Friend WithEvents ToolStripMenuItem22 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem23 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem24 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem25 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem26 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem27 As ToolStripMenuItem
+    Friend WithEvents ToolStripSeparator5 As ToolStripSeparator
+    Friend WithEvents tsamdelete As ToolStripMenuItem
+    Friend WithEvents ToolStripSeparator6 As ToolStripSeparator
+    Friend WithEvents ToolStripMenuItem29 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem30 As ToolStripMenuItem
+    Friend WithEvents ToolStripSeparator7 As ToolStripSeparator
+    Friend WithEvents tsamerstemahnung As ToolStripMenuItem
+    Friend WithEvents tsamzweitemahnung As ToolStripMenuItem
+    Friend WithEvents tsamdrittemahnung As ToolStripMenuItem
+    Friend WithEvents OfferteToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents OffertPDF As ToolStripMenuItem
+    Friend WithEvents DruckenToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents VorschauToolStripMenuItem1 As ToolStripMenuItem
+    Friend WithEvents EntwurfToolStripMenuItem1 As ToolStripMenuItem
+    Friend WithEvents AuftragsbestätigungToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents PDFToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents DruckenToolStripMenuItem1 As ToolStripMenuItem
+    Friend WithEvents VorschauToolStripMenuItem2 As ToolStripMenuItem
+    Friend WithEvents EntwurfToolStripMenuItem2 As ToolStripMenuItem
+    Friend WithEvents LieferscheinToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents PDFToolStripMenuItem1 As ToolStripMenuItem
+    Friend WithEvents DruckenToolStripMenuItem2 As ToolStripMenuItem
+    Friend WithEvents VorschauToolStripMenuItem3 As ToolStripMenuItem
+    Friend WithEvents EntwurfToolStripMenuItem3 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem9 As ToolStripSeparator
+    Friend WithEvents PDFPerMailToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents PDFPerMailToolStripMenuItem1 As ToolStripMenuItem
+    Friend WithEvents PDFPerMailToolStripMenuItem2 As ToolStripMenuItem
 End Class

DPM2016/Behandlung/Behandlung.resx

@@ -124,7 +124,7 @@
   <data name="tsbtnnewbehandlung.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAINSURBVDhPY6AVYAyc67K/+XD1/SYg9p3quAQqTiQIZWAO
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAINSURBVDhPY6AVYAyc67K/+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
@@ -139,7 +139,7 @@
   <data name="tsbtndeletebehandlung.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJASURBVDhPfZNLSxtRFMdn5Suah0oChhiJmlGj8RGfiKIi
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAJASURBVDhPfZNLSxtRFMdn5Suah0oChhiJmlGj8RGfiKIi
         gouAEPULuMlSxe+Rrbt8hKEWGfJobNq5k0ZaJ7Vgq90ILW5auiiFLv8955oJiU37hwPDPfd3/ufMvVex
         VTk4SF0mEprmcrmrS39JCwbdpZ0dzdjeTlWXHvUhmUw/nJ7i7e4uspGIxRurqZqqsPXp5ATG4iJyo6Np
         mWBnCScSMNfXIVZXoatqQ5EafHwMMTcHY2ZGRkZVUwq3zc42LJaXYSwtQQ+HZZEafHQEEYtBTE3VQh8a
@@ -155,7 +155,7 @@
   <data name="ToolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAA+oSURBVHhe7Z0J8H5THcYp2cJky5IpCqP8LSnrVBSViBiy
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAA+oSURBVHhe7Z0J8H5THcYp2cJky5IpCqP8LSnrVBSViBiy
         VfaQrMkSypYskbQRZQuhKSRbY6eikq1sWcJEEWXLlup5+P/G6/W87+++7znn3nvOfT4zn2nS796cc+/7
         vvee812mMcYYY4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOMKZN54FJwVbgR
         3BHuAw+Ah8Aj4Dfh4VP/2V5wZ7gZXB3yWJ7jddCYLJkWLgY/DQ+FP4U3wafg/yL5PLwdngsPg1vC98A3
@@ -236,7 +236,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABO
-        DQAAAk1TRnQBSQFMAgEBBQEAAQgBBAEIAQQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        DQAAAk1TRnQBSQFMAgEBBQEAARgBBQEYAQUBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -298,7 +298,7 @@
   <data name="tsbtnnew.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAINSURBVDhPY6AVYAyc67K/+XD1/SYg9p3quAQqTiQIZWAO
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAINSURBVDhPY6AVYAyc67K/+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
@@ -313,7 +313,7 @@
   <data name="ToolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJASURBVDhPfZNLSxtRFMdn5Suah0oChhiJmlGj8RGfiKIi
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAJASURBVDhPfZNLSxtRFMdn5Suah0oChhiJmlGj8RGfiKIi
         gouAEPULuMlSxe+Rrbt8hKEWGfJobNq5k0ZaJ7Vgq90ILW5auiiFLv8955oJiU37hwPDPfd3/ufMvVex
         VTk4SF0mEprmcrmrS39JCwbdpZ0dzdjeTlWXHvUhmUw/nJ7i7e4uspGIxRurqZqqsPXp5ATG4iJyo6Np
         mWBnCScSMNfXIVZXoatqQ5EafHwMMTcHY2ZGRkZVUwq3zc42LJaXYSwtQQ+HZZEafHQEEYtBTE3VQh8a
@@ -332,4 +332,7 @@
   <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>234, 17</value>
   </metadata>
+  <metadata name="ctxMenuAuftragsamanagement.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>391, 17</value>
+  </metadata>
 </root>

DPM2016/Behandlung/Behandlung.vb

@@ -6,6 +6,16 @@ Imports Syncfusion.Pdf.Parsing
 Public Class Behandlung
 
 #Region "Properties"
+    Dim m_auftragsmanagement As String = ""
+    Property Auftragsmanagement As Boolean
+        Get
+            If m_auftragsmanagement = "" Then m_auftragsmanagement = DB.Get_Option(40001)
+            Return m_auftragsmanagement = "True"
+        End Get
+        Set(value As Boolean)
+            '            m_auftragsmanagement = DB.Get_Option(40001)
+        End Set
+    End Property
     Dim m_patientnr As Integer
     Property PatientNr As Integer
         Get
@@ -232,60 +242,94 @@ Public Class Behandlung
         BH.Nodes.Add(BHoffen)
         BH.Nodes.Add(BHabgeshlossen)
         BH.Nodes.Add(BHFakturiert)
-        If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then
-            kv.Text = "Offerten"
-        Else
-
-            kv.Text = "Kostenvoranschläge"
-        End If
-        '        kv.Text = "Kostenvoranschlag"
-        kv.Tag = -2
-        kv.ImageIndex = 1
-        kvoffen.Text = "Offen"
-        kvoffen.Tag = -22
-        kvoffen.ImageIndex = 1
-        kvabgeschlossen.Text = "Abgeschlossen"
-        kvabgeschlossen.Tag = -23
-        kvabgeschlossen.ImageIndex = 1
         Me.treebehandlungen.Nodes.Add(BH)
-        Me.treebehandlungen.Nodes.Add(kv)
+        If Not Auftragsmanagement Then
-        kv.Nodes.Add(kvoffen)
+
-        kv.Nodes.Add(kvabgeschlossen)
+            If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then
+                kv.Text = "Offerten"
+            Else
+
+                kv.Text = "Kostenvoranschläge"
+            End If
+            '        kv.Text = "Kostenvoranschlag"
+            kv.Tag = -2
+            kv.ImageIndex = 1
+            kvoffen.Text = "Offen"
+            kvoffen.Tag = -22
+            kvoffen.ImageIndex = 1
+            kvabgeschlossen.Text = "Abgeschlossen"
+            kvabgeschlossen.Tag = -23
+            kvabgeschlossen.ImageIndex = 1
+
+            Me.treebehandlungen.Nodes.Add(kv)
+            kv.Nodes.Add(kvoffen)
+            kv.Nodes.Add(kvabgeschlossen)
+        End If
 
         Dim firstnode_tag As Integer = 0
-        For Each r As DataRow In DB.dsDaten.Tables(0).Rows
+        If Auftragsmanagement Then
-            If firstnode_tag = 0 Then firstnode_tag = r("nrbehandlung")
+            For Each r As DataRow In DB.dsDaten.Tables(0).Rows
-            Dim tn As New DevComponents.AdvTree.Node
+                If firstnode_tag = 0 Then firstnode_tag = r("nrbehandlung")
-            tn.Tag = r("nrbehandlung")
+                Dim tn As New DevComponents.AdvTree.Node
-            Dim total As Double = r("Total")
+                tn.Tag = r("nrbehandlung")
-            If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then
+                Dim total As Double = r("Total")
-                tn.Text = r("behandlungsgrund") + " / " + r("behandlungsbeginn") + " / " + total.ToString("N2")
+                If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then
-            Else
+                    tn.Text = r("behandlungsgrund") + " / " + r("behandlungsbeginn") + " / " + total.ToString("N2")
-                tn.Text = r("behandlungsbeginn") + " / " + total.ToString("N2")
+                Else
-            End If
+                    tn.Text = r("behandlungsbeginn") + " / " + total.ToString("N2")
-            Select Case r("status")
+                End If
-                Case 1
+                Select Case r("status")
-                    tn.ImageIndex = 2
+                    Case 1
-                    BHoffen.Nodes.Add(tn)
+                        tn.ImageIndex = 2
-                Case 2
+                        BHoffen.Nodes.Add(tn)
-                    tn.ImageIndex = 3
+                    Case 2
-                    BHabgeshlossen.Nodes.Add(tn)
+                        tn.ImageIndex = 3
-                Case 3
+                        BHabgeshlossen.Nodes.Add(tn)
-                    tn.ImageIndex = 4
+                    Case 3
-                    BHFakturiert.Nodes.Add(tn)
+                        tn.ImageIndex = 4
-                Case 4
+                        BHFakturiert.Nodes.Add(tn)
-                    tn.ImageIndex = 2
+                End Select
-                    kvoffen.Nodes.Add(tn)
+            Next
-                Case 5
+
-                    tn.ImageIndex = 3
+        Else
-                    kvabgeschlossen.Nodes.Add(tn)
+
-            End Select
+            For Each r As DataRow In DB.dsDaten.Tables(0).Rows
-        Next
+                If firstnode_tag = 0 Then firstnode_tag = r("nrbehandlung")
+                Dim tn As New DevComponents.AdvTree.Node
+                tn.Tag = r("nrbehandlung")
+                Dim total As Double = r("Total")
+                If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then
+                    tn.Text = r("behandlungsgrund") + " / " + r("behandlungsbeginn") + " / " + total.ToString("N2")
+                Else
+                    tn.Text = r("behandlungsbeginn") + " / " + total.ToString("N2")
+                End If
+                Select Case r("status")
+                    Case 1
+                        tn.ImageIndex = 2
+                        BHoffen.Nodes.Add(tn)
+                    Case 2
+                        tn.ImageIndex = 3
+                        BHabgeshlossen.Nodes.Add(tn)
+                    Case 3
+                        tn.ImageIndex = 4
+                        BHFakturiert.Nodes.Add(tn)
+                    Case 4
+                        tn.ImageIndex = 2
+                        kvoffen.Nodes.Add(tn)
+                    Case 5
+                        tn.ImageIndex = 3
+                        kvabgeschlossen.Nodes.Add(tn)
+                End Select
+            Next
+        End If
+
         Me.treebehandlungen.ExpandAll()
-        enable_disable_tabs(False)
+            enable_disable_tabs(False)
         Me.treebehandlungen.SelectedNode = Globals.FindNode(Me.treebehandlungen.Nodes, firstnode_tag, firstnode_tag)
         If firstnode_tag <> 0 Then nodeselected()
-
+        If Auftragsmanagement = True Then
+            Me.treebehandlungen.ContextMenuStrip = Me.ctxMenuAuftragsamanagement
+        End If
 
 
     End Sub
@@ -377,10 +421,19 @@ Public Class Behandlung
 
 
     Private Sub tsbtnnewbehandlung_Click(sender As Object, e As EventArgs) Handles tsbtnnewbehandlung.Click
-        If Me.NeueBehandlungToolStripMenuItem1.Text = "Neuer Kostenvoranschlag" Then
+        If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then
-            Neue_Behandlung(4)
+            If Me.NeueBehandlungToolStripMenuItem1.Text = "Neue Offerte" Then
+                Neue_Behandlung(4)
+            Else
+                Neue_Behandlung(1)
+            End If
+
         Else
-            Neue_Behandlung(1)
+            If Me.NeueBehandlungToolStripMenuItem1.Text = "Neuer Kostenvoranschlag" Then
+                Neue_Behandlung(4)
+            Else
+                Neue_Behandlung(1)
+            End If
         End If
 
     End Sub
@@ -627,8 +680,19 @@ Public Class Behandlung
     End Sub
 
     Private Sub BehandlunKopierenToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles BehandlungKopierenToolStripMenuItem.Click
+        Dim s As String
+        If Me.Auftragsmanagement = True Then
+            DB.Copy_Behandlung(Me.treebehandlungen.SelectedNode.Tag.ToString.ToString, 1)
+            Exit Sub
+        End If
         If BehandlungKopierenToolStripMenuItem.Text = "Kostenvoranschlag kopieren" Then
-            Dim dl As MsgBoxResult = MsgBox("Als Kostenvoranschlag kopieren (Ja) oder als neue Behandlung kopieren (Nein)?", vbYesNoCancel + vbQuestion)
+
+            If My.Settings.SoftwareType = "PADM" Then
+                s = "Als Kostenvoranschlag kopieren (Ja) oder als neues Projekt kopieren (Nein)?"
+            Else
+                s = "Als Kostenvoranschlag kopieren (Ja) oder als neue Behandlung kopieren (Nein)?"
+            End If
+            Dim dl As MsgBoxResult = MsgBox(s, vbYesNoCancel + vbQuestion)
             If dl = vbYes Then
                 Dim db As New clsDB
                 db.Copy_Behandlung(Me.treebehandlungen.SelectedNode.Tag.ToString.ToString, 1)
@@ -638,7 +702,12 @@ Public Class Behandlung
                 db.Copy_Behandlung(Me.treebehandlungen.SelectedNode.Tag.ToString, 2)
             End If
         Else
-            Dim dl As MsgBoxResult = MsgBox("Als Behandlung kopieren (Ja) oder als neuer KV kopieren (Nein)?", vbYesNoCancel + vbQuestion)
+            If My.Settings.SoftwareType = "PADM" Then
+                s = "Als Projekt kopieren (Ja) oder als neuer KV kopieren (Nein)?"
+            Else
+                s = "Als Behandlung kopieren (Ja) oder als neuer KV kopieren (Nein)?"
+            End If
+            Dim dl As MsgBoxResult = MsgBox(s, vbYesNoCancel + vbQuestion)
             If dl = vbYes Then
                 Dim db As New clsDB
                 db.Copy_Behandlung(Me.treebehandlungen.SelectedNode.Tag.ToString, 3)
@@ -725,7 +794,7 @@ Public Class Behandlung
                         Me.BehandlungabschliessenToolStripMenuItem1.Text = "Offerte abschliessen"
                         Me.BehandlungabschliessenToolStripMenuItem1.Enabled = False
                         BehandlungabschliessenToolStripMenuItem1.Enabled = False
-                        Me.NeueBehandlungToolStripMenuItem1.Text = "Neuer Offerte"
+                        Me.NeueBehandlungToolStripMenuItem1.Text = "Neue Offerte"
                         Me.BehandlungZurücksetzenToolStripMenuItem.Text = "Offerte zurücksetzen"
                         Me.BehandlungZurücksetzenToolStripMenuItem.Enabled = False
                         Me.BehandlungLöschenToolStripMenuItem1.Text = "Offerte löschen"
@@ -735,12 +804,12 @@ Public Class Behandlung
                     Case > -20
                         Me.BehandlungabschliessenToolStripMenuItem1.Text = "Projekt abschliessen"
                         Me.NeueBehandlungToolStripMenuItem1.Text = "Neues Projekt"
-                        Me.BehandlungZurücksetzenToolStripMenuItem.Text = "Projek zurücksetzen"
+                        Me.BehandlungZurücksetzenToolStripMenuItem.Text = "Projekt zurücksetzen"
                         Me.BehandlungZurücksetzenToolStripMenuItem.Visible = True
                         Me.BehandlungLöschenToolStripMenuItem1.Text = "Projekt löschen"
                         Me.BehandlungKopierenToolStripMenuItem.Text = "Projekt kopieren"
                     Case < -20 And
-                Me.BehandlungabschliessenToolStripMenuItem1.Text = "Offerte abschliessen"
+                        Me.BehandlungabschliessenToolStripMenuItem1.Text = "Offerte abschliessen"
                         BehandlungabschliessenToolStripMenuItem1.Enabled = True
                         Me.BehandlungabschliessenToolStripMenuItem1.Text = "Offerte abschliessen"
                         Me.NeueBehandlungToolStripMenuItem1.Text = "Neue Offerte"
@@ -821,6 +890,9 @@ Public Class Behandlung
             ErsteMahnungDruckenToolStripMenuItem.Visible = False
             ZweiteMahnungDruckenToolStripMenuItem.Visible = False
             LetzteMahnungDruckenToolStripMenuItem.Visible = False
+            tsamerstemahnung.Visible = False
+            tsamzweitemahnung.Visible = False
+            tsamdrittemahnung.Visible = False
             Try
                 If Me.Behandungdetail1.txtrgnummer.Text <> "" Then
                     DB.Get_Tabledata("Mahnung", "", "Select * from View_Offene_Mahnungen where nrfaktura=" + Microsoft.VisualBasic.Left(Me.Behandungdetail1.txtrgnummer.Text, 10), "", False)
@@ -828,10 +900,13 @@ Public Class Behandlung
                         Select Case DB.dsDaten.Tables(0).Rows(0).Item("Mahnstufe")
                             Case 1
                                 ErsteMahnungDruckenToolStripMenuItem.Visible = True
+                                tsamerstemahnung.Visible = True
                             Case 2
                                 ZweiteMahnungDruckenToolStripMenuItem.Visible = True
+                                tsamzweitemahnung.Visible = True
                             Case 3
                                 LetzteMahnungDruckenToolStripMenuItem.Visible = True
+                                tsamdrittemahnung.Visible = True
                         End Select
                     Else
 
@@ -857,9 +932,10 @@ Public Class Behandlung
         Dim key As Integer = Me.treebehandlungen.SelectedNode.Tag
         db.Get_Tabledata("Behandlu", "where nrbehandlung=" + key.ToString)
         If db.dsDaten.Tables(0).Rows(0).Item("Status") = 2 Or db.dsDaten.Tables(0).Rows(0).Item("Status") = 3 Then
-            Messagetext = "Behandlung "
+            If Globals.Applicationtype = Globals.ApplicationTypes.Projektabrechnung Then Messagetext = "Projekt " Else Messagetext = "Behandlung "
+            'Messagetext = "Behandlung "
         Else
-            Messagetext = "Kostenvoranschlag"
+                Messagetext = "Kostenvoranschlag"
         End If
 
         Dim fakt As New clsFakturierung
@@ -870,17 +946,27 @@ Public Class Behandlung
                     Behandlung_Zurücksetzen(Me.treebehandlungen.SelectedNode.Tag.ToString)
                 End If
             Case 1
-                If MsgBox("Rechnung stornieren und Behandlung zurücksetzen?", vbYesNo + vbQuestion) = vbYes Then
+                Dim s As String
+                If Globals.Applicationtype = Applicationtype.Projektabrechnung Then
+                    s = "Rechnung stornieren und Projekt zurücksetzen?"
+                Else
+                    s = "Rechnung stornieren und Behandlung zurücksetzen?"
+                End If
+                If MsgBox(s, vbYesNo + vbQuestion) = vbYes Then
                     fakt.Storno(Me.treebehandlungen.SelectedNode.Tag)
                     Behandlung_Zurücksetzen(Me.treebehandlungen.SelectedNode.Tag.ToString)
                     If Globals.License.DMS = True Then
                         Dim dok As New clsDok
-                        dok.delete_doks(Me.treebehandlungen.SelectedNode.Tag)
+                        dok.Delete_Doks(Me.treebehandlungen.SelectedNode.Tag)
                         dok = Nothing
                     End If
                 End If
             Case 2
-                MsgBox("Behandlung kann nicht zurückgesetzt werden, da bereits Zahlung für die Rechnung eingegangen sind.", vbExclamation)
+                If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then
+                    MsgBox("Projekt kann nicht zurückgesetzt werden, da bereits Zahlung für die Rechnung eingegangen sind.", vbExclamation)
+                Else
+                    MsgBox("Behandlung kann nicht zurückgesetzt werden, da bereits Zahlung für die Rechnung eingegangen sind.", vbExclamation)
+                End If
         End Select
 
     End Sub
@@ -1245,6 +1331,235 @@ Public Class Behandlung
 
     End Sub
 
+    Private Sub ToolStripMenuItem9_Click(sender As Object, e As EventArgs) Handles tsamnew.Click
+        NeueBehandlungToolStripMenuItem1_Click(sender, e)
+    End Sub
+
+    Private Sub tsamdelete_Click(sender As Object, e As EventArgs) Handles tsamdelete.Click
+        BehandlungLöschenToolStripMenuItem1_Click(sender, e)
+    End Sub
+
+    Private Sub ToolStripMenuItem10_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem10.Click
+        BehandlungabschliessenToolStripMenuItem1_Click(sender, e)
+    End Sub
+
+    Private Sub ToolStripMenuItem11_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem11.Click
+        AbschlussMitRecallAnzeigeToolStripMenuItem_Click(sender, e)
+    End Sub
+
+    Private Sub ToolStripMenuItem12_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem12.Click
+        AbshlussOhneRecallAnzeigeToolStripMenuItem_Click(sender, e)
+    End Sub
+
+    Private Sub ToolStripMenuItem13_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem13.Click
+        AbschlussUndSofortrechnungToolStripMenuItem_Click(sender, e)
+    End Sub
+
+    Private Sub ToolStripMenuItem14_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem14.Click
+        AbschlussUndSofortrechungAlsPDFToolStripMenuItem_Click(sender, e)
+    End Sub
+
+    Private Sub ToolStripMenuItem15_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem15.Click
+        AbschlussUndSofortrechnungAlsOutlookMailToolStripMenuItem_Click(sender, e)
+    End Sub
+
+    Private Sub ToolStripMenuItem16_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem16.Click
+        AbschlussUndVerbuchenOhneRGQuittungToolStripMenuItem_Click(sender, e)
+    End Sub
+
+    Private Sub ToolStripMenuItem17_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem17.Click
+        BehandlungZurücksetzenToolStripMenuItem_Click(sender, e)
+    End Sub
+
+    Private Sub ToolStripMenuItem18_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem18.Click
+        BehandlunKopierenToolStripMenuItem1_Click(sender, e)
+    End Sub
+
+    Private Sub ToolStripMenuItem20_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem20.Click
+        VorschauToolStripMenuItem_Click(sender, e)
+    End Sub
+
+    Private Sub ToolStripMenuItem21_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem21.Click
+        EntwurfToolStripMenuItem_Click(sender, e)
+    End Sub
+
+    Private Sub ToolStripMenuItem22_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem22.Click
+        AlsPdfToolStripMenuItem1_Click(sender, e)
+    End Sub
+
+    Private Sub ToolStripMenuItem23_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem23.Click
+        AlsMailToolStripMenuItem_Click(sender, e)
+    End Sub
+
+    Private Sub ToolStripMenuItem25_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem25.Click
+        AlsPDFToolStripMenuItem_Click(sender, e)
+    End Sub
+
+    Private Sub ToolStripMenuItem26_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem26.Click
+        ÜberDruckerToolStripMenuItem_Click(sender, e)
+    End Sub
+
+    Private Sub ToolStripMenuItem27_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem27.Click
+        AlsPDFPerMailToolStripMenuItem_Click(sender, e)
+    End Sub
+
+    Private Sub ToolStripMenuItem29_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem29.Click
+        RechungKVVorschauToolStripMenuItem_Click(sender, e)
+    End Sub
+
+    Private Sub ToolStripMenuItem30_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem30.Click
+        RechnungKVEntwurfToolStripMenuItem_Click(sender, e)
+    End Sub
+
+    Private Sub tsamerstemahnung_Click(sender As Object, e As EventArgs) Handles tsamerstemahnung.Click, tsamzweitemahnung.Click, tsamdrittemahnung.Click
+        Try
+            Select Case sender.name
+                Case "tsamerstemahnung"
+                    Dim s As String = Microsoft.VisualBasic.Left(Me.Behandungdetail1.txtrgnummer.Text, 10)
+                    Globals.Rg_Funktionen.Mahnung(s, 1, False, False)
+                Case "tsamzweitemahnung"
+                    Dim s As String = Microsoft.VisualBasic.Left(Me.Behandungdetail1.txtrgnummer.Text, 10)
+                    Globals.Rg_Funktionen.Mahnung(s, 2, False, False)
+                Case "tsamdrittemahnung"
+                    Dim s As String = Microsoft.VisualBasic.Left(Me.Behandungdetail1.txtrgnummer.Text, 10)
+                    Globals.Rg_Funktionen.Mahnung(s, 3, False, False)
+            End Select
+        Catch ex As Exception
+
+        End Try
+
+    End Sub
+
+    Private Sub VorschauToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles VorschauToolStripMenuItem1.Click
+        Behandungdetail1.Vorschau_Offerte(1)
+    End Sub
+
+    Private Sub OffertPDF_Click(sender As Object, e As EventArgs) Handles OffertPDF.Click
+        Behandungdetail1.Vorschau_Offerte(2)
+    End Sub
+
+    Private Sub PDFPerMailToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PDFPerMailToolStripMenuItem.Click
+        Behandungdetail1.Vorschau_Offerte(3)
+    End Sub
+
+    Private Sub DruckenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DruckenToolStripMenuItem.Click
+        Behandungdetail1.Vorschau_Offerte(4)
+    End Sub
+
+    Private Sub ToolStripMenuItem19_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem19.Click
+        Behandungdetail1.Sofortrechung_normal()
+    End Sub
+
+    Private Sub ToolStripMenuItem24_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem24.Click
+        KopieErstellenToolStripMenuItem_Click(sender, e)
+    End Sub
+
+    Private Sub PDFToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PDFToolStripMenuItem.Click
+        Behandungdetail1.Vorschau_Offerte(12)
+    End Sub
+
+    Private Sub PDFPerMailToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles PDFPerMailToolStripMenuItem1.Click
+        Behandungdetail1.Vorschau_Offerte(13)
+    End Sub
+
+    Private Sub DruckenToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles DruckenToolStripMenuItem1.Click
+        Behandungdetail1.Vorschau_Offerte(14)
+    End Sub
+
+    Private Sub VorschauToolStripMenuItem2_Click(sender As Object, e As EventArgs) Handles VorschauToolStripMenuItem2.Click
+        Behandungdetail1.Vorschau_Offerte(11)
+    End Sub
+
+    Private Sub PDFToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles PDFToolStripMenuItem1.Click
+        Behandungdetail1.Vorschau_Offerte(22)
+    End Sub
+
+    Private Sub PDFPerMailToolStripMenuItem2_Click(sender As Object, e As EventArgs) Handles PDFPerMailToolStripMenuItem2.Click
+        Behandungdetail1.Vorschau_Offerte(23)
+    End Sub
+
+    Private Sub DruckenToolStripMenuItem2_Click(sender As Object, e As EventArgs) Handles DruckenToolStripMenuItem2.Click
+        Behandungdetail1.Vorschau_Offerte(24)
+    End Sub
+
+    Private Sub VorschauToolStripMenuItem3_Click(sender As Object, e As EventArgs) Handles VorschauToolStripMenuItem3.Click
+        Behandungdetail1.Vorschau_Offerte(21)
+    End Sub
+
+    Private Sub EntwurfToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles EntwurfToolStripMenuItem1.Click
+        Behandungdetail1.Vorschau_Offerte(5)
+    End Sub
+
+    Private Sub EntwurfToolStripMenuItem2_Click(sender As Object, e As EventArgs) Handles EntwurfToolStripMenuItem2.Click
+        Behandungdetail1.Vorschau_Offerte(15)
+    End Sub
+
+    Private Sub EntwurfToolStripMenuItem3_Click(sender As Object, e As EventArgs) Handles EntwurfToolStripMenuItem3.Click
+        Behandungdetail1.Vorschau_Offerte(25)
+    End Sub
+
+    Private Sub ctxMenuAuftragsamanagement_Opening(sender As Object, e As CancelEventArgs) Handles ctxMenuAuftragsamanagement.Opening
+        Dim i As Integer
+        Try
+            i = Me.treebehandlungen.SelectedNode.Parent.Tag
+        Catch
+            i = Me.treebehandlungen.SelectedNode.Tag
+        End Try
+        ToolStripMenuItem17.Enabled = True
+        ToolStripMenuItem10.Enabled = True
+        ToolStripMenuItem18.Enabled = True
+        ToolStripMenuItem24.Enabled = True
+        ToolStripMenuItem19.Visible = True
+        ToolStripMenuItem10.Enabled = True
+        ToolStripMenuItem10.Visible = True
+        Select Case i
+            Case -11
+                ToolStripMenuItem17.Enabled = False
+                ToolStripMenuItem10.Enabled = True
+                ToolStripMenuItem18.Enabled = True
+                ToolStripMenuItem24.Enabled = False
+                ToolStripMenuItem19.Visible = False
+
+            Case -12
+                ToolStripMenuItem17.Enabled = True
+                ToolStripMenuItem10.Enabled = True
+                ToolStripMenuItem18.Enabled = False
+                ToolStripMenuItem24.Enabled = False
+                ToolStripMenuItem19.Visible = True
+                ToolStripMenuItem10.Visible = False
+
+            Case -13
+                ToolStripMenuItem19.Visible = False
+                ToolStripMenuItem10.Enabled = False
+        End Select
+
+        tsamerstemahnung.Visible = False
+        tsamzweitemahnung.Visible = False
+        tsamdrittemahnung.Visible = False
+        Try
+            If Me.Behandungdetail1.txtrgnummer.Text <> "" Then
+                DB.Get_Tabledata("Mahnung", "", "Select * from View_Offene_Mahnungen where nrfaktura=" + Microsoft.VisualBasic.Left(Me.Behandungdetail1.txtrgnummer.Text, 10), "", False)
+                If DB.dsDaten.Tables(0).Rows.Count > 0 Then
+                    Select Case DB.dsDaten.Tables(0).Rows(0).Item("Mahnstufe")
+                        Case 1
+                            ErsteMahnungDruckenToolStripMenuItem.Visible = True
+                            tsamerstemahnung.Visible = True
+                        Case 2
+                            ZweiteMahnungDruckenToolStripMenuItem.Visible = True
+                            tsamzweitemahnung.Visible = True
+                        Case 3
+                            LetzteMahnungDruckenToolStripMenuItem.Visible = True
+                            tsamdrittemahnung.Visible = True
+                    End Select
+                Else
+
+                End If
+            End If
+        Catch
+        End Try
+    End Sub
+
+
 
 
 

DPM2016/Behandlung/Benhandungdetail.resx

@@ -124,7 +124,7 @@
   <data name="tsbtnSave.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABSSURBVDhP3YxbCgAgCAQ9ukfzZkXBlkIv7Sf6GNB1HRKR
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAABSSURBVDhP3YxbCgAgCAQ9ukfzZkXBlkIv7Sf6GNB1HRKR
         dEMVEFEII2Du4Yr2eCMAdUfoEejubwIcVujeUHDKVFDmHSFB6ekuskcEOHgxghiSMjk0Kh+omBHQAAAA
         AElFTkSuQmCC
 </value>
@@ -132,7 +132,7 @@
   <data name="ToolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAETSURBVDhPtZLBSsNAFEXzMcVvEPSj1J3ion5C27TB4D/o
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAETSURBVDhPtZLBSsNAFEXzMcVvEPSj1J3ion5C27TB4D/o
         xqWCLlpw5aZVghYhkE3SkE0ySSC99j1nTKKvwS68cAgz785JCGP9zOnZObrQte2h0rbsJCiKogXlf76A
         Ng37RyORg+MBDk+G3+vmmdYbadifvqH/8CJyMX3njokouFxGcF4DEXe56hKseTicBxg8f4iMFkGHoCp5
         +BewLlFVVS3I8xxRGKJUGW7uZrh9fBK5vp9BpSlWUYgsy2pBkiS82IU4jvnJgnRjpeder4fJxIXv+/A8
@@ -143,7 +143,7 @@
   <data name="tsbtnGarantAnzeigen.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
         YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
         0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
         bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc

DPM2016/Behandlung/Benhandungdetail.vb

@@ -33,12 +33,14 @@
                     GrpGaramt.Visible = False
                     grpglndiagnose.Visible = False
                     grpBehandlungsdaten.Text = "Projektdaten"
+                    lblRGStellung.Text = "Anfrage vom"
                     Label2.Text = "Offert-Betrag"
                     lblBehandlungstotal.Text = "Leistungstotal"
                     Label7.Text = "Verantw."
                     grpEmpfaenger.Left = GrpGaramt.Left
                     GrpRechnungstext.Left = grpEmpfaenger.Left
                     GrpRechnungstext.Top = grpEmpfaenger.Top + grpEmpfaenger.Height
+
                     GrpPatient.Text = "Verantwortung / Rechnungsart"
                     Me.grpZusammenfassugn.Top = grpZusammenfassugn.Top + 20
                     Me.GrpRaten.Top = GrpRaten.Top + 20
@@ -50,6 +52,14 @@
                     Me.cbboxNRESTyp.Top = Me.cbboxNRESTyp.Top + 20
                     Me.lblProjekt.Visible = True
                     Me.txtProjekt.Visible = True
+                    Me.lblTaxpunkte.Visible = False
+                    Me.cbboxNrtaxpunkt.Visible = False
+                    Me.chkAndrucken_Taxpunkte.Text = "Betrag andrucken"
+                    Me.grpEmpfaenger.Visible = False
+                    Me.GrpRechnungstext.Top = Me.grpEmpfaenger.Top
+                    If db.Get_Option(8000) = "True" Then
+                        Me.GrpGaramt.Visible = False
+                    End If
                 End If
 
             End If
@@ -1068,7 +1078,7 @@
             End If
             Dim pdfh As New clspdfhelper
             If result = 5 Then
-                pdfh.Create_Archivdoc(clspdfhelper.GetEmpfaengerType.FromLastFaktura, "", "Kostenvoranschlag:")
+                pdfh.Create_Archivdoc(clspdfhelper.GetEmpfaengerType.FromOfferte, "", "Kostenvoranschlag:", Me.Behandlungsnr)
             Else
                 pdfh.Create_Archivdoc(clspdfhelper.GetEmpfaengerType.FromLastFaktura, "", "Sofortrechnung:")
 
@@ -1458,4 +1468,48 @@
     'Private Sub mtxtTaxpunktwert_TextChanged(sender As Object, e As EventArgs) Handles mtxtTaxpunktwert.TextChanged
     '    mtxtTaxpunktwert_Leave(sender, e)
     'End Sub
+
+    Public Function Vorschau_Offerte(ByVal typ As Integer)
+        Me.Save_Data()
+        Select Case typ
+            Case 1
+                Globals.Rg_Funktionen.Offerte_Auftragsbestaegitigung_Lieferschein(Me.Behandlungsnr, 1, 0, False, Nothing)
+            Case 2
+                Globals.Rg_Funktionen.Offerte_Auftragsbestaegitigung_Lieferschein(Me.Behandlungsnr, 1, 1, True, clspdfhelper.GetEmpfaengerType.FromOfferte)
+                Dim pdfh As New clspdfhelper
+            Case 3
+                Globals.Rg_Funktionen.Offerte_Auftragsbestaegitigung_Lieferschein(Me.Behandlungsnr, 1, 2, True, clspdfhelper.GetEmpfaengerType.FromOfferte)
+
+            Case 4
+                Globals.Rg_Funktionen.Offerte_Auftragsbestaegitigung_Lieferschein(Me.Behandlungsnr, 1, 3, True, clspdfhelper.GetEmpfaengerType.FromOfferte)
+            Case 5
+                Globals.Rg_Funktionen.Offerte_Auftragsbestaegitigung_Lieferschein(Me.Behandlungsnr, 1, 4, True, clspdfhelper.GetEmpfaengerType.FromOfferte)
+            Case 11
+                Globals.Rg_Funktionen.Offerte_Auftragsbestaegitigung_Lieferschein(Me.Behandlungsnr, 2, 0, False, Nothing)
+            Case 12
+                Globals.Rg_Funktionen.Offerte_Auftragsbestaegitigung_Lieferschein(Me.Behandlungsnr, 2, 1, True, clspdfhelper.GetEmpfaengerType.FromAuftragsbestaegigung)
+            Case 13
+                Globals.Rg_Funktionen.Offerte_Auftragsbestaegitigung_Lieferschein(Me.Behandlungsnr, 2, 2, True, clspdfhelper.GetEmpfaengerType.FromAuftragsbestaegigung)
+            Case 14
+                Globals.Rg_Funktionen.Offerte_Auftragsbestaegitigung_Lieferschein(Me.Behandlungsnr, 2, 3, True, clspdfhelper.GetEmpfaengerType.FromAuftragsbestaegigung)
+            Case 15
+                Globals.Rg_Funktionen.Offerte_Auftragsbestaegitigung_Lieferschein(Me.Behandlungsnr, 2, 4, True, clspdfhelper.GetEmpfaengerType.FromOfferte)
+
+            Case 21
+                Globals.Rg_Funktionen.Offerte_Auftragsbestaegitigung_Lieferschein(Me.Behandlungsnr, 3, 0, False, Nothing)
+            Case 22
+                Globals.Rg_Funktionen.Offerte_Auftragsbestaegitigung_Lieferschein(Me.Behandlungsnr, 3, 1, True, clspdfhelper.GetEmpfaengerType.FromLieferschein)
+            Case 23
+                Globals.Rg_Funktionen.Offerte_Auftragsbestaegitigung_Lieferschein(Me.Behandlungsnr, 3, 2, True, clspdfhelper.GetEmpfaengerType.FromLieferschein)
+            Case 24
+                Globals.Rg_Funktionen.Offerte_Auftragsbestaegitigung_Lieferschein(Me.Behandlungsnr, 3, 3, True, clspdfhelper.GetEmpfaengerType.FromLieferschein)
+            Case 25
+                Globals.Rg_Funktionen.Offerte_Auftragsbestaegitigung_Lieferschein(Me.Behandlungsnr, 3, 4, True, clspdfhelper.GetEmpfaengerType.FromOfferte)
+
+        End Select
+
+
+
+    End Function
+
 End Class

DPM2016/Behandlung/Leistungen.Designer.vb

@@ -37,6 +37,8 @@ Partial Class Leistungen
         Me.tsUp = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripLabel1 = New System.Windows.Forms.ToolStripLabel()
         Me.txtfilter = New System.Windows.Forms.ToolStripTextBox()
+        Me.lblLagerbewtand = New System.Windows.Forms.ToolStripLabel()
+        Me.lblLageranzahl = New System.Windows.Forms.ToolStripLabel()
         Me.Panel4 = New System.Windows.Forms.Panel()
         Me.TreeTarifGruppen = New DevComponents.AdvTree.AdvTree()
         Me.Node1 = New DevComponents.AdvTree.Node()
@@ -105,14 +107,14 @@ Partial Class Leistungen
         Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslabelbhtotal})
         Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
         Me.ToolStrip1.Name = "ToolStrip1"
-        Me.ToolStrip1.Size = New System.Drawing.Size(1079, 25)
+        Me.ToolStrip1.Size = New System.Drawing.Size(1439, 25)
         Me.ToolStrip1.TabIndex = 0
         Me.ToolStrip1.Text = "ToolStrip1"
         '
         'tslabelbhtotal
         '
         Me.tslabelbhtotal.Name = "tslabelbhtotal"
-        Me.tslabelbhtotal.Size = New System.Drawing.Size(87, 22)
+        Me.tslabelbhtotal.Size = New System.Drawing.Size(113, 22)
         Me.tslabelbhtotal.Text = "ToolStripLabel1"
         '
         'GrpTarif
@@ -120,8 +122,10 @@ Partial Class Leistungen
         Me.GrpTarif.Controls.Add(Me.TabTarife)
         Me.GrpTarif.Dock = System.Windows.Forms.DockStyle.Left
         Me.GrpTarif.Location = New System.Drawing.Point(0, 0)
+        Me.GrpTarif.Margin = New System.Windows.Forms.Padding(4)
         Me.GrpTarif.Name = "GrpTarif"
-        Me.GrpTarif.Size = New System.Drawing.Size(729, 284)
+        Me.GrpTarif.Padding = New System.Windows.Forms.Padding(4)
+        Me.GrpTarif.Size = New System.Drawing.Size(972, 350)
         Me.GrpTarif.TabIndex = 1
         Me.GrpTarif.TabStop = False
         Me.GrpTarif.Text = "Tarife"
@@ -131,10 +135,11 @@ Partial Class Leistungen
         Me.TabTarife.Controls.Add(Me.TabPage1)
         Me.TabTarife.Controls.Add(Me.TabPage2)
         Me.TabTarife.Dock = System.Windows.Forms.DockStyle.Left
-        Me.TabTarife.Location = New System.Drawing.Point(3, 16)
+        Me.TabTarife.Location = New System.Drawing.Point(4, 19)
+        Me.TabTarife.Margin = New System.Windows.Forms.Padding(4)
         Me.TabTarife.Name = "TabTarife"
         Me.TabTarife.SelectedIndex = 0
-        Me.TabTarife.Size = New System.Drawing.Size(720, 265)
+        Me.TabTarife.Size = New System.Drawing.Size(960, 327)
         Me.TabTarife.TabIndex = 0
         '
         'TabPage1
@@ -143,10 +148,11 @@ Partial Class Leistungen
         Me.TabPage1.Controls.Add(Me.ToolStrip2)
         Me.TabPage1.Controls.Add(Me.Panel4)
         Me.TabPage1.Controls.Add(Me.TreeTarifGruppen)
-        Me.TabPage1.Location = New System.Drawing.Point(4, 22)
+        Me.TabPage1.Location = New System.Drawing.Point(4, 25)
+        Me.TabPage1.Margin = New System.Windows.Forms.Padding(4)
         Me.TabPage1.Name = "TabPage1"
-        Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
+        Me.TabPage1.Padding = New System.Windows.Forms.Padding(4)
-        Me.TabPage1.Size = New System.Drawing.Size(712, 239)
+        Me.TabPage1.Size = New System.Drawing.Size(952, 298)
         Me.TabPage1.TabIndex = 0
         Me.TabPage1.Text = "Tarif"
         Me.TabPage1.UseVisualStyleBackColor = True
@@ -163,9 +169,10 @@ Partial Class Leistungen
         Me.lbtarif1.ContextMenuStrip = Me.ContextMenuStrip1
         Me.lbtarif1.DragDropSupport = True
         Me.lbtarif1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"
-        Me.lbtarif1.Location = New System.Drawing.Point(196, 28)
+        Me.lbtarif1.Location = New System.Drawing.Point(261, 34)
+        Me.lbtarif1.Margin = New System.Windows.Forms.Padding(4)
         Me.lbtarif1.Name = "lbtarif1"
-        Me.lbtarif1.Size = New System.Drawing.Size(513, 208)
+        Me.lbtarif1.Size = New System.Drawing.Size(684, 256)
         Me.lbtarif1.TabIndex = 5
         Me.lbtarif1.Text = "ListBoxAdv1"
         '
@@ -174,21 +181,21 @@ Partial Class Leistungen
         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(131, 26)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(151, 28)
         '
         'TarifdetailsToolStripMenuItem
         '
         Me.TarifdetailsToolStripMenuItem.Name = "TarifdetailsToolStripMenuItem"
-        Me.TarifdetailsToolStripMenuItem.Size = New System.Drawing.Size(130, 22)
+        Me.TarifdetailsToolStripMenuItem.Size = New System.Drawing.Size(150, 24)
         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.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsDown, Me.tsUp, Me.ToolStripLabel1, Me.txtfilter, Me.lblLagerbewtand, Me.lblLageranzahl})
-        Me.ToolStrip2.Location = New System.Drawing.Point(196, 3)
+        Me.ToolStrip2.Location = New System.Drawing.Point(261, 4)
         Me.ToolStrip2.Name = "ToolStrip2"
-        Me.ToolStrip2.Size = New System.Drawing.Size(513, 25)
+        Me.ToolStrip2.Size = New System.Drawing.Size(687, 27)
         Me.ToolStrip2.TabIndex = 6
         Me.ToolStrip2.Text = "ToolStrip2"
         '
@@ -198,7 +205,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(24, 24)
+        Me.tsDown.Size = New System.Drawing.Size(29, 24)
         Me.tsDown.Text = "ToolStripButton2"
         Me.tsDown.Visible = False
         '
@@ -208,34 +215,46 @@ 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(24, 24)
+        Me.tsUp.Size = New System.Drawing.Size(29, 24)
         Me.tsUp.Text = "ToolStripButton1"
         Me.tsUp.Visible = False
         '
         'ToolStripLabel1
         '
         Me.ToolStripLabel1.Name = "ToolStripLabel1"
-        Me.ToolStripLabel1.Size = New System.Drawing.Size(46, 22)
+        Me.ToolStripLabel1.Size = New System.Drawing.Size(56, 24)
         Me.ToolStripLabel1.Text = "Suchen"
         '
         '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)
+        Me.txtfilter.Size = New System.Drawing.Size(132, 27)
+        '
+        'lblLagerbewtand
+        '
+        Me.lblLagerbewtand.Name = "lblLagerbewtand"
+        Me.lblLagerbewtand.Size = New System.Drawing.Size(102, 24)
+        Me.lblLagerbewtand.Text = "Lagerbestand:"
+        '
+        'lblLageranzahl
+        '
+        Me.lblLageranzahl.Name = "lblLageranzahl"
+        Me.lblLageranzahl.Size = New System.Drawing.Size(17, 24)
+        Me.lblLageranzahl.Text = "0"
         '
         'Panel4
         '
         Me.Panel4.Dock = System.Windows.Forms.DockStyle.Left
-        Me.Panel4.Location = New System.Drawing.Point(181, 3)
+        Me.Panel4.Location = New System.Drawing.Point(241, 4)
+        Me.Panel4.Margin = New System.Windows.Forms.Padding(4)
         Me.Panel4.Name = "Panel4"
-        Me.Panel4.Size = New System.Drawing.Size(15, 233)
+        Me.Panel4.Size = New System.Drawing.Size(20, 290)
         Me.Panel4.TabIndex = 5
         '
         'TreeTarifGruppen
         '
         Me.TreeTarifGruppen.AccessibleRole = System.Windows.Forms.AccessibleRole.Outline
-        Me.TreeTarifGruppen.AllowDrop = True
         Me.TreeTarifGruppen.BackColor = System.Drawing.SystemColors.Window
         '
         '
@@ -244,13 +263,14 @@ Partial Class Leistungen
         Me.TreeTarifGruppen.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
         Me.TreeTarifGruppen.Dock = System.Windows.Forms.DockStyle.Left
         Me.TreeTarifGruppen.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"
-        Me.TreeTarifGruppen.Location = New System.Drawing.Point(3, 3)
+        Me.TreeTarifGruppen.Location = New System.Drawing.Point(4, 4)
+        Me.TreeTarifGruppen.Margin = New System.Windows.Forms.Padding(4)
         Me.TreeTarifGruppen.Name = "TreeTarifGruppen"
         Me.TreeTarifGruppen.Nodes.AddRange(New DevComponents.AdvTree.Node() {Me.Node1})
         Me.TreeTarifGruppen.NodesConnector = Me.NodeConnector1
         Me.TreeTarifGruppen.NodeStyle = Me.ElementStyle1
         Me.TreeTarifGruppen.PathSeparator = ";"
-        Me.TreeTarifGruppen.Size = New System.Drawing.Size(178, 233)
+        Me.TreeTarifGruppen.Size = New System.Drawing.Size(237, 290)
         Me.TreeTarifGruppen.Styles.Add(Me.ElementStyle1)
         Me.TreeTarifGruppen.TabIndex = 7
         Me.TreeTarifGruppen.Text = "AdvTree1"
@@ -275,10 +295,11 @@ Partial Class Leistungen
         '
         Me.TabPage2.Controls.Add(Me.lbPakete)
         Me.TabPage2.Controls.Add(Me.Panel1)
-        Me.TabPage2.Location = New System.Drawing.Point(4, 22)
+        Me.TabPage2.Location = New System.Drawing.Point(4, 25)
+        Me.TabPage2.Margin = New System.Windows.Forms.Padding(4)
         Me.TabPage2.Name = "TabPage2"
-        Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
+        Me.TabPage2.Padding = New System.Windows.Forms.Padding(4)
-        Me.TabPage2.Size = New System.Drawing.Size(712, 239)
+        Me.TabPage2.Size = New System.Drawing.Size(952, 298)
         Me.TabPage2.TabIndex = 1
         Me.TabPage2.Text = "Leistungspaket"
         Me.TabPage2.UseVisualStyleBackColor = True
@@ -291,14 +312,14 @@ Partial Class Leistungen
         '
         Me.lbPakete.BackgroundStyle.Class = "ListBoxAdv"
         Me.lbPakete.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
-        Me.lbPakete.CheckStateMember = Nothing
         Me.lbPakete.ContainerControlProcessDialogKey = True
         Me.lbPakete.Dock = System.Windows.Forms.DockStyle.Fill
         Me.lbPakete.DragDropSupport = True
         Me.lbPakete.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"
-        Me.lbPakete.Location = New System.Drawing.Point(3, 33)
+        Me.lbPakete.Location = New System.Drawing.Point(4, 41)
+        Me.lbPakete.Margin = New System.Windows.Forms.Padding(4)
         Me.lbPakete.Name = "lbPakete"
-        Me.lbPakete.Size = New System.Drawing.Size(706, 203)
+        Me.lbPakete.Size = New System.Drawing.Size(944, 253)
         Me.lbPakete.TabIndex = 2
         Me.lbPakete.Text = "ListBoxAdv1"
         '
@@ -308,16 +329,18 @@ Partial Class Leistungen
         Me.Panel1.Controls.Add(Me.intAnzahl)
         Me.Panel1.Controls.Add(Me.lblAnzahl)
         Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
-        Me.Panel1.Location = New System.Drawing.Point(3, 3)
+        Me.Panel1.Location = New System.Drawing.Point(4, 4)
+        Me.Panel1.Margin = New System.Windows.Forms.Padding(4)
         Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(706, 30)
+        Me.Panel1.Size = New System.Drawing.Size(944, 37)
         Me.Panel1.TabIndex = 1
         '
         'btnPaketeinfuegen
         '
-        Me.btnPaketeinfuegen.Location = New System.Drawing.Point(197, 3)
+        Me.btnPaketeinfuegen.Location = New System.Drawing.Point(263, 4)
+        Me.btnPaketeinfuegen.Margin = New System.Windows.Forms.Padding(4)
         Me.btnPaketeinfuegen.Name = "btnPaketeinfuegen"
-        Me.btnPaketeinfuegen.Size = New System.Drawing.Size(75, 23)
+        Me.btnPaketeinfuegen.Size = New System.Drawing.Size(100, 28)
         Me.btnPaketeinfuegen.TabIndex = 1
         Me.btnPaketeinfuegen.Text = "Einfügen"
         Me.btnPaketeinfuegen.UseVisualStyleBackColor = True
@@ -330,19 +353,21 @@ Partial Class Leistungen
         Me.intAnzahl.BackgroundStyle.Class = "DateTimeInputBackground"
         Me.intAnzahl.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
         Me.intAnzahl.ButtonFreeText.Shortcut = DevComponents.DotNetBar.eShortcut.F2
-        Me.intAnzahl.Location = New System.Drawing.Point(49, 5)
+        Me.intAnzahl.Location = New System.Drawing.Point(65, 6)
+        Me.intAnzahl.Margin = New System.Windows.Forms.Padding(4)
         Me.intAnzahl.Name = "intAnzahl"
         Me.intAnzahl.ShowUpDown = True
-        Me.intAnzahl.Size = New System.Drawing.Size(142, 20)
+        Me.intAnzahl.Size = New System.Drawing.Size(189, 22)
         Me.intAnzahl.TabIndex = 0
         Me.intAnzahl.Value = 1
         '
         'lblAnzahl
         '
         Me.lblAnzahl.AutoSize = True
-        Me.lblAnzahl.Location = New System.Drawing.Point(4, 8)
+        Me.lblAnzahl.Location = New System.Drawing.Point(5, 10)
+        Me.lblAnzahl.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblAnzahl.Name = "lblAnzahl"
-        Me.lblAnzahl.Size = New System.Drawing.Size(39, 13)
+        Me.lblAnzahl.Size = New System.Drawing.Size(47, 16)
         Me.lblAnzahl.TabIndex = 0
         Me.lblAnzahl.Text = "Anzahl"
         '
@@ -367,44 +392,50 @@ Partial Class Leistungen
         Me.grpLeistungsdetails.Controls.Add(Me.lblPosition)
         Me.grpLeistungsdetails.Controls.Add(Me.lbldatum)
         Me.grpLeistungsdetails.Controls.Add(Me.dtdatum)
-        Me.grpLeistungsdetails.Location = New System.Drawing.Point(735, 3)
+        Me.grpLeistungsdetails.Location = New System.Drawing.Point(980, 4)
+        Me.grpLeistungsdetails.Margin = New System.Windows.Forms.Padding(4)
         Me.grpLeistungsdetails.Name = "grpLeistungsdetails"
-        Me.grpLeistungsdetails.Size = New System.Drawing.Size(341, 275)
+        Me.grpLeistungsdetails.Padding = New System.Windows.Forms.Padding(4)
+        Me.grpLeistungsdetails.Size = New System.Drawing.Size(455, 338)
         Me.grpLeistungsdetails.TabIndex = 2
         Me.grpLeistungsdetails.TabStop = False
         Me.grpLeistungsdetails.Text = "Leistungsdetails"
         '
         'txtErgänzung
         '
-        Me.txtErgänzung.Location = New System.Drawing.Point(85, 166)
+        Me.txtErgänzung.Location = New System.Drawing.Point(113, 204)
+        Me.txtErgänzung.Margin = New System.Windows.Forms.Padding(4)
         Me.txtErgänzung.Multiline = True
         Me.txtErgänzung.Name = "txtErgänzung"
-        Me.txtErgänzung.Size = New System.Drawing.Size(177, 18)
+        Me.txtErgänzung.Size = New System.Drawing.Size(235, 21)
         Me.txtErgänzung.TabIndex = 4
         '
         'Label2
         '
         Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(11, 169)
+        Me.Label2.Location = New System.Drawing.Point(15, 208)
+        Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(58, 13)
+        Me.Label2.Size = New System.Drawing.Size(71, 16)
         Me.Label2.TabIndex = 24
         Me.Label2.Text = "Ergänzung"
         '
         'txtBezD
         '
-        Me.txtBezD.Location = New System.Drawing.Point(85, 115)
+        Me.txtBezD.Location = New System.Drawing.Point(113, 142)
+        Me.txtBezD.Margin = New System.Windows.Forms.Padding(4)
         Me.txtBezD.Multiline = True
         Me.txtBezD.Name = "txtBezD"
-        Me.txtBezD.Size = New System.Drawing.Size(177, 45)
+        Me.txtBezD.Size = New System.Drawing.Size(235, 54)
         Me.txtBezD.TabIndex = 3
         '
         'lblBeschreibung
         '
         Me.lblBeschreibung.AutoSize = True
-        Me.lblBeschreibung.Location = New System.Drawing.Point(11, 118)
+        Me.lblBeschreibung.Location = New System.Drawing.Point(15, 145)
+        Me.lblBeschreibung.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblBeschreibung.Name = "lblBeschreibung"
-        Me.lblBeschreibung.Size = New System.Drawing.Size(72, 13)
+        Me.lblBeschreibung.Size = New System.Drawing.Size(90, 16)
         Me.lblBeschreibung.TabIndex = 22
         Me.lblBeschreibung.Text = "Beschreibung"
         '
@@ -412,9 +443,10 @@ Partial Class Leistungen
         '
         Me.cbboxnrbehandler.Dataselection = Nothing
         Me.cbboxnrbehandler.Displaymember = Nothing
-        Me.cbboxnrbehandler.Location = New System.Drawing.Point(85, 61)
+        Me.cbboxnrbehandler.Location = New System.Drawing.Point(113, 75)
+        Me.cbboxnrbehandler.Margin = New System.Windows.Forms.Padding(4)
         Me.cbboxnrbehandler.Name = "cbboxnrbehandler"
-        Me.cbboxnrbehandler.Size = New System.Drawing.Size(177, 21)
+        Me.cbboxnrbehandler.Size = New System.Drawing.Size(235, 24)
         Me.cbboxnrbehandler.TabIndex = 1
         Me.cbboxnrbehandler.Table = Nothing
         Me.cbboxnrbehandler.TableAlias = ""
@@ -423,17 +455,19 @@ Partial Class Leistungen
         'lblbehandler
         '
         Me.lblbehandler.AutoSize = True
-        Me.lblbehandler.Location = New System.Drawing.Point(11, 63)
+        Me.lblbehandler.Location = New System.Drawing.Point(15, 78)
+        Me.lblbehandler.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblbehandler.Name = "lblbehandler"
-        Me.lblbehandler.Size = New System.Drawing.Size(55, 13)
+        Me.lblbehandler.Size = New System.Drawing.Size(69, 16)
         Me.lblbehandler.TabIndex = 14
         Me.lblbehandler.Text = "Behandler"
         '
         'BtnInsertLeistung
         '
-        Me.BtnInsertLeistung.Location = New System.Drawing.Point(194, 246)
+        Me.BtnInsertLeistung.Location = New System.Drawing.Point(259, 303)
+        Me.BtnInsertLeistung.Margin = New System.Windows.Forms.Padding(4)
         Me.BtnInsertLeistung.Name = "BtnInsertLeistung"
-        Me.BtnInsertLeistung.Size = New System.Drawing.Size(120, 23)
+        Me.BtnInsertLeistung.Size = New System.Drawing.Size(160, 28)
         Me.BtnInsertLeistung.TabIndex = 8
         Me.BtnInsertLeistung.Text = "Leistung einfügen"
         Me.BtnInsertLeistung.UseVisualStyleBackColor = True
@@ -441,10 +475,11 @@ Partial Class Leistungen
         'txtTotal
         '
         Me.txtTotal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtTotal.Location = New System.Drawing.Point(49, 246)
+        Me.txtTotal.Location = New System.Drawing.Point(65, 303)
+        Me.txtTotal.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.txtTotal.Name = "txtTotal"
         Me.txtTotal.RightToLeft = System.Windows.Forms.RightToLeft.No
-        Me.txtTotal.Size = New System.Drawing.Size(92, 13)
+        Me.txtTotal.Size = New System.Drawing.Size(123, 16)
         Me.txtTotal.TabIndex = 12
         Me.txtTotal.Text = "0.00www"
         Me.txtTotal.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -453,18 +488,20 @@ Partial Class Leistungen
         '
         Me.Label1.AutoSize = True
         Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label1.Location = New System.Drawing.Point(11, 246)
+        Me.Label1.Location = New System.Drawing.Point(15, 303)
+        Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(36, 13)
+        Me.Label1.Size = New System.Drawing.Size(45, 17)
         Me.Label1.TabIndex = 10
         Me.Label1.Text = "Total"
         '
         'lblWert
         '
         Me.lblWert.AutoSize = True
-        Me.lblWert.Location = New System.Drawing.Point(11, 220)
+        Me.lblWert.Location = New System.Drawing.Point(15, 271)
+        Me.lblWert.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblWert.Name = "lblWert"
-        Me.lblWert.Size = New System.Drawing.Size(30, 13)
+        Me.lblWert.Size = New System.Drawing.Size(35, 16)
         Me.lblWert.TabIndex = 9
         Me.lblWert.Text = "Wert"
         '
@@ -477,18 +514,20 @@ Partial Class Leistungen
         Me.diwert.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
         Me.diwert.ButtonFreeText.Shortcut = DevComponents.DotNetBar.eShortcut.F2
         Me.diwert.Increment = 1.0R
-        Me.diwert.Location = New System.Drawing.Point(85, 216)
+        Me.diwert.Location = New System.Drawing.Point(113, 266)
+        Me.diwert.Margin = New System.Windows.Forms.Padding(4)
         Me.diwert.Name = "diwert"
         Me.diwert.ShowUpDown = True
-        Me.diwert.Size = New System.Drawing.Size(68, 20)
+        Me.diwert.Size = New System.Drawing.Size(91, 22)
         Me.diwert.TabIndex = 7
         '
         'lblMenge
         '
         Me.lblMenge.AutoSize = True
-        Me.lblMenge.Location = New System.Drawing.Point(11, 193)
+        Me.lblMenge.Location = New System.Drawing.Point(15, 238)
+        Me.lblMenge.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblMenge.Name = "lblMenge"
-        Me.lblMenge.Size = New System.Drawing.Size(40, 13)
+        Me.lblMenge.Size = New System.Drawing.Size(49, 16)
         Me.lblMenge.TabIndex = 7
         Me.lblMenge.Text = "Menge"
         '
@@ -501,18 +540,20 @@ Partial Class Leistungen
         Me.DIMenge.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
         Me.DIMenge.ButtonFreeText.Shortcut = DevComponents.DotNetBar.eShortcut.F2
         Me.DIMenge.Increment = 1.0R
-        Me.DIMenge.Location = New System.Drawing.Point(85, 190)
+        Me.DIMenge.Location = New System.Drawing.Point(113, 234)
+        Me.DIMenge.Margin = New System.Windows.Forms.Padding(4)
         Me.DIMenge.Name = "DIMenge"
         Me.DIMenge.ShowUpDown = True
-        Me.DIMenge.Size = New System.Drawing.Size(68, 20)
+        Me.DIMenge.Size = New System.Drawing.Size(91, 22)
         Me.DIMenge.TabIndex = 5
         '
         'lblTaxpunkte
         '
         Me.lblTaxpunkte.AutoSize = True
-        Me.lblTaxpunkte.Location = New System.Drawing.Point(159, 193)
+        Me.lblTaxpunkte.Location = New System.Drawing.Point(212, 238)
+        Me.lblTaxpunkte.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblTaxpunkte.Name = "lblTaxpunkte"
-        Me.lblTaxpunkte.Size = New System.Drawing.Size(41, 13)
+        Me.lblTaxpunkte.Size = New System.Drawing.Size(48, 16)
         Me.lblTaxpunkte.TabIndex = 5
         Me.lblTaxpunkte.Text = "Punkte"
         '
@@ -524,34 +565,38 @@ Partial Class Leistungen
         Me.DIPunkte.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
         Me.DIPunkte.ButtonFreeText.Shortcut = DevComponents.DotNetBar.eShortcut.F2
         Me.DIPunkte.Increment = 1.0R
-        Me.DIPunkte.Location = New System.Drawing.Point(206, 190)
+        Me.DIPunkte.Location = New System.Drawing.Point(275, 234)
+        Me.DIPunkte.Margin = New System.Windows.Forms.Padding(4)
         Me.DIPunkte.Name = "DIPunkte"
         Me.DIPunkte.ShowUpDown = True
-        Me.DIPunkte.Size = New System.Drawing.Size(56, 20)
+        Me.DIPunkte.Size = New System.Drawing.Size(75, 22)
         Me.DIPunkte.TabIndex = 6
         '
         'txtPosition
         '
-        Me.txtPosition.Location = New System.Drawing.Point(85, 89)
+        Me.txtPosition.Location = New System.Drawing.Point(113, 110)
+        Me.txtPosition.Margin = New System.Windows.Forms.Padding(4)
         Me.txtPosition.Name = "txtPosition"
-        Me.txtPosition.Size = New System.Drawing.Size(56, 20)
+        Me.txtPosition.Size = New System.Drawing.Size(73, 22)
         Me.txtPosition.TabIndex = 2
         '
         'lblPosition
         '
         Me.lblPosition.AutoSize = True
-        Me.lblPosition.Location = New System.Drawing.Point(11, 92)
+        Me.lblPosition.Location = New System.Drawing.Point(15, 113)
+        Me.lblPosition.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblPosition.Name = "lblPosition"
-        Me.lblPosition.Size = New System.Drawing.Size(44, 13)
+        Me.lblPosition.Size = New System.Drawing.Size(55, 16)
         Me.lblPosition.TabIndex = 2
         Me.lblPosition.Text = "Position"
         '
         'lbldatum
         '
         Me.lbldatum.AutoSize = True
-        Me.lbldatum.Location = New System.Drawing.Point(11, 38)
+        Me.lbldatum.Location = New System.Drawing.Point(15, 47)
+        Me.lbldatum.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lbldatum.Name = "lbldatum"
-        Me.lbldatum.Size = New System.Drawing.Size(38, 13)
+        Me.lbldatum.Size = New System.Drawing.Size(46, 16)
         Me.lbldatum.TabIndex = 1
         Me.lbldatum.Text = "Datum"
         '
@@ -565,7 +610,8 @@ Partial Class Leistungen
         Me.dtdatum.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown
         Me.dtdatum.ButtonDropDown.Visible = True
         Me.dtdatum.IsPopupCalendarOpen = False
-        Me.dtdatum.Location = New System.Drawing.Point(85, 35)
+        Me.dtdatum.Location = New System.Drawing.Point(113, 43)
+        Me.dtdatum.Margin = New System.Windows.Forms.Padding(4)
         '
         '
         '
@@ -596,7 +642,7 @@ Partial Class Leistungen
         Me.dtdatum.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
         Me.dtdatum.MonthCalendar.TodayButtonVisible = True
         Me.dtdatum.Name = "dtdatum"
-        Me.dtdatum.Size = New System.Drawing.Size(177, 20)
+        Me.dtdatum.Size = New System.Drawing.Size(236, 22)
         Me.dtdatum.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled
         Me.dtdatum.TabIndex = 0
         '
@@ -605,8 +651,10 @@ Partial Class Leistungen
         Me.GrpLeistungen.Controls.Add(Me.C1Leistungen)
         Me.GrpLeistungen.Dock = System.Windows.Forms.DockStyle.Fill
         Me.GrpLeistungen.Location = New System.Drawing.Point(0, 0)
+        Me.GrpLeistungen.Margin = New System.Windows.Forms.Padding(4)
         Me.GrpLeistungen.Name = "GrpLeistungen"
-        Me.GrpLeistungen.Size = New System.Drawing.Size(1079, 158)
+        Me.GrpLeistungen.Padding = New System.Windows.Forms.Padding(4)
+        Me.GrpLeistungen.Size = New System.Drawing.Size(1439, 200)
         Me.GrpLeistungen.TabIndex = 3
         Me.GrpLeistungen.TabStop = False
         Me.GrpLeistungen.Text = "Leistungen"
@@ -619,13 +667,14 @@ Partial Class Leistungen
         Me.C1Leistungen.FilterBar = True
         Me.C1Leistungen.GroupByCaption = "Drag a column header here to group by that column"
         Me.C1Leistungen.Images.Add(CType(resources.GetObject("C1Leistungen.Images"), System.Drawing.Image))
-        Me.C1Leistungen.Location = New System.Drawing.Point(3, 16)
+        Me.C1Leistungen.Location = New System.Drawing.Point(4, 19)
+        Me.C1Leistungen.Margin = New System.Windows.Forms.Padding(4)
         Me.C1Leistungen.Name = "C1Leistungen"
         Me.C1Leistungen.PreviewInfo.Location = New System.Drawing.Point(0, 0)
         Me.C1Leistungen.PreviewInfo.Size = New System.Drawing.Size(0, 0)
         Me.C1Leistungen.PreviewInfo.ZoomFactor = 75.0R
         Me.C1Leistungen.PrintInfo.PageSettings = CType(resources.GetObject("C1Leistungen.PrintInfo.PageSettings"), System.Drawing.Printing.PageSettings)
-        Me.C1Leistungen.Size = New System.Drawing.Size(1073, 139)
+        Me.C1Leistungen.Size = New System.Drawing.Size(1431, 177)
         Me.C1Leistungen.TabIndex = 2
         Me.C1Leistungen.Text = "C1TrueDBGrid1"
         Me.C1Leistungen.PropBag = resources.GetString("C1Leistungen.PropBag")
@@ -635,30 +684,30 @@ Partial Class Leistungen
         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)
+        Me.ctxMenuLeistung.Size = New System.Drawing.Size(233, 100)
         '
         'BearbeitenToolStripMenuItem
         '
         Me.BearbeitenToolStripMenuItem.Name = "BearbeitenToolStripMenuItem"
-        Me.BearbeitenToolStripMenuItem.Size = New System.Drawing.Size(199, 22)
+        Me.BearbeitenToolStripMenuItem.Size = New System.Drawing.Size(232, 24)
         Me.BearbeitenToolStripMenuItem.Text = "&Bearbeiten"
         '
         'LöschenToolStripMenuItem
         '
         Me.LöschenToolStripMenuItem.Name = "LöschenToolStripMenuItem"
-        Me.LöschenToolStripMenuItem.Size = New System.Drawing.Size(199, 22)
+        Me.LöschenToolStripMenuItem.Size = New System.Drawing.Size(232, 24)
         Me.LöschenToolStripMenuItem.Text = "&Löschen"
         '
         'AnzeigenToolStripMenuItem
         '
         Me.AnzeigenToolStripMenuItem.Name = "AnzeigenToolStripMenuItem"
-        Me.AnzeigenToolStripMenuItem.Size = New System.Drawing.Size(199, 22)
+        Me.AnzeigenToolStripMenuItem.Size = New System.Drawing.Size(232, 24)
         Me.AnzeigenToolStripMenuItem.Text = "Anzeigen"
         '
         'LeistungsdatumÄndernToolStripMenuItem
         '
         Me.LeistungsdatumÄndernToolStripMenuItem.Name = "LeistungsdatumÄndernToolStripMenuItem"
-        Me.LeistungsdatumÄndernToolStripMenuItem.Size = New System.Drawing.Size(199, 22)
+        Me.LeistungsdatumÄndernToolStripMenuItem.Size = New System.Drawing.Size(232, 24)
         Me.LeistungsdatumÄndernToolStripMenuItem.Text = "Leistungsdatum ändern"
         '
         'Panel2
@@ -667,28 +716,31 @@ Partial Class Leistungen
         Me.Panel2.Controls.Add(Me.grpLeistungsdetails)
         Me.Panel2.Dock = System.Windows.Forms.DockStyle.Top
         Me.Panel2.Location = New System.Drawing.Point(0, 25)
+        Me.Panel2.Margin = New System.Windows.Forms.Padding(4)
         Me.Panel2.Name = "Panel2"
-        Me.Panel2.Size = New System.Drawing.Size(1079, 284)
+        Me.Panel2.Size = New System.Drawing.Size(1439, 350)
         Me.Panel2.TabIndex = 4
         '
         'Panel3
         '
         Me.Panel3.Controls.Add(Me.GrpLeistungen)
         Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.Panel3.Location = New System.Drawing.Point(0, 309)
+        Me.Panel3.Location = New System.Drawing.Point(0, 375)
+        Me.Panel3.Margin = New System.Windows.Forms.Padding(4)
         Me.Panel3.Name = "Panel3"
-        Me.Panel3.Size = New System.Drawing.Size(1079, 158)
+        Me.Panel3.Size = New System.Drawing.Size(1439, 200)
         Me.Panel3.TabIndex = 5
         '
         'Leistungen
         '
-        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.Controls.Add(Me.Panel3)
         Me.Controls.Add(Me.Panel2)
         Me.Controls.Add(Me.ToolStrip1)
+        Me.Margin = New System.Windows.Forms.Padding(4)
         Me.Name = "Leistungen"
-        Me.Size = New System.Drawing.Size(1079, 467)
+        Me.Size = New System.Drawing.Size(1439, 575)
         Me.ToolStrip1.ResumeLayout(False)
         Me.ToolStrip1.PerformLayout()
         Me.GrpTarif.ResumeLayout(False)
@@ -771,4 +823,6 @@ Partial Class Leistungen
     Friend WithEvents txtErgänzung As TextBox
     Friend WithEvents Label2 As Label
     Friend WithEvents LeistungsdatumÄndernToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents lblLagerbewtand As ToolStripLabel
+    Friend WithEvents lblLageranzahl As ToolStripLabel
 End Class

DPM2016/Behandlung/Leistungen.resx

@@ -130,7 +130,7 @@
   <data name="tsDown.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
         YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
         0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
         bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
@@ -145,7 +145,7 @@
   <data name="tsUp.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
         YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
         0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
         bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
@@ -163,7 +163,7 @@
   <data name="C1Leistungen.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>
@@ -197,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{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>
+    <value>&lt;?xml version="1.0"?&gt;&lt;Blob&gt;&lt;Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"&gt;&lt;Data&gt;Style11{}Style10{}Style13{}Style12{}Footer{}Style2{}Style3{}FilterBar{BackColor:Info;}RecordSelector{AlignImage:Center;}Style15{}OddRow{BackColor:ControlLight;}Caption{AlignHorz:Center;}EvenRow{BackColor:White;}HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style1{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}Style9{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style5{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style8{}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;Wrap:True;BackColor:Control;ForeColor:ControlText;}Style6{}Normal{}Style7{}Editor{}Style4{}Style14{}Style16{}&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="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, 1429, 169&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, 1429, 169&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

@@ -46,6 +46,10 @@ Public Class Leistungen
                     Me.BearbeitenToolStripMenuItem.Enabled = False
                     Me.LöschenToolStripMenuItem.Enabled = False
             End Select
+            If Globals.Applicationtype = Applicationtype.Projektabrechnung Then
+                Me.TabPage1.Text = "Artikel"
+                Me.GrpTarif.Text = "Artikel"
+            End If
         End Set
     End Property
 
@@ -586,8 +590,27 @@ Public Class Leistungen
 
     End Sub
 
+    Sub update_lagerbesatnd()
+        If Globals.User_Lagerbestand Then
+            Me.lblLagerbewtand.Visible = True
+            Me.lblLageranzahl.Visible = True
+            Dim db As New clsDB
+            Try
+                db.Get_Tabledata("Lager", "", "Select isnull(lagerbestand,0) as lagerbestand from tarif where sso_nummer='" + Me.txtPosition.Text.ToString + "'")
+                Me.lblLageranzahl.Text = db.dsDaten.Tables(0).Rows(0).Item(0)
+            Catch
+            Finally
+                db.Dispose()
+            End Try
+
+        Else
+            Me.lblLagerbewtand.Visible = False
+            Me.lblLageranzahl.Visible = False
+        End If
+    End Sub
     Dim interror As Integer = 0
     Private Sub txtPosition_TextChanged(sender As Object, e As EventArgs) Handles txtPosition.Leave
+
         If Me.dtdatum.Value = "00:00:00" Then Me.dtdatum.Value = Now
         Try
             If cbboxnrbehandler.SelectedValue < 1 Then Me.cbboxnrbehandler.SelectedValue = Me.behandler
@@ -651,6 +674,8 @@ Public Class Leistungen
 
         End If
 
+
+        update_lagerbesatnd()
         Dim dv As New DataView(IntTables.Inttables.Tables("Tarif"), "sso_nummer='" + Me.txtPosition.Text.ToString + "'", "", DataViewRowState.CurrentRows)
         If dv.Count > 0 Then
             For Each drv As DataRowView In dv
@@ -945,7 +970,7 @@ Public Class Leistungen
 
     End Sub
 
-    Sub Leistung_Einfuegen(Optional ssonummer As String = "", Optional anzahl As Integer = 1)
+    Sub Leistung_Einfuegen(Optional ssonummer As String = "", Optional anzahl As Integer = 1, Optional VonPaket As Boolean = False)
         ' If ssonummer = "" Then Exit Sub
         'If ssonummer = "7006" Then
         '    MsgBox("Hallo")
@@ -998,7 +1023,12 @@ Public Class Leistungen
         Else
             r.Item("bezd") = drv("bezd") + " " + Me.txtErgänzung.Text
         End If
+        Try
+            If My.Settings.SoftwareType = "PADM" Then r.Item("bezf") = drv("bezf")
 
+        Catch ex As Exception
+
+        End Try
         If ssonummer = "" Then
             r.Item("taxpunkte") = Me.DIPunkte.Value
         Else
@@ -1027,12 +1057,17 @@ Public Class Leistungen
         End If
 
         Dim leistungsbetrag As Double
-        If ssonummer = "" Then
+        If VonPaket = True Then
-            r.Item("frankenprotaxpunkt") = Me.diwert.Value
+            r.Item("frankenprotaxpunkt") = drv.Item("frankenbetrag")
-            leistungsbetrag = Me.diwert.Value
         Else
-            r.Item("frankenprotaxpunkt") = Frankenwert
+
-            leistungsbetrag = Frankenwert
+            If ssonummer = "" Then
+                r.Item("frankenprotaxpunkt") = Me.diwert.Value
+                leistungsbetrag = Me.diwert.Value
+            Else
+                r.Item("frankenprotaxpunkt") = Frankenwert
+                leistungsbetrag = Frankenwert
+            End If
         End If
 
         If ssonummer = "" Then
@@ -1053,6 +1088,16 @@ Public Class Leistungen
         r.Item("nrbehandler") = Me.cbboxnrbehandler.SelectedValue
         db.dsDaten.Tables(0).Rows.Add(r)
         db.Update_Data()
+
+
+        If db.Get_Option(70010) = "True" Then
+            Try
+                db.Update_Lager(Me.Behandlungnr, drv("Nrtarif"), anzahl, 1)
+            Catch
+            End Try
+
+        End If
+
         db.Dispose()
         refresh_leistungen()
 
@@ -1080,6 +1125,7 @@ Public Class Leistungen
                 If Me.C1Leistungen.SelectedRows.Count < 2 Then
                     ldb.delete_leistung(Me.C1Leistungen.Columns("nrleistung").Value)
                     refresh_leistungen()
+                    update_lagerbesatnd()
                     Exit Sub
                 End If
                 If Me.C1Leistungen.SelectedRows.Count > 1 Then
@@ -1095,6 +1141,7 @@ Public Class Leistungen
                         ldb.delete_leistung(cl(i))
                     Next
                     refresh_leistungen()
+                    update_lagerbesatnd()
                 End If
             End If
         Catch ex As Exception
@@ -1106,6 +1153,7 @@ Public Class Leistungen
 
     Private Sub TreeTarifGruppen_NodeClick(sender As Object, e As DevComponents.AdvTree.TreeNodeMouseEventArgs) Handles TreeTarifGruppen.NodeClick
         Load_Tarif()
+        update_lagerbesatnd()
     End Sub
 
     Private Sub btnPaketeinfuegen_Click(sender As Object, e As EventArgs) Handles btnPaketeinfuegen.Click
@@ -1147,7 +1195,7 @@ Public Class Leistungen
                 If drv.Item("Dentotar") = False Then
                     dvt = New DataView(IntTables.Inttables.Tables("Tarif"), "nrtarif=" + drv.Item("nrtarif").ToString, "", DataViewRowState.CurrentRows)
                     For Each dvtr As DataRowView In dvt
-                        Leistung_Einfuegen(dvtr("SSO_Nummer").ToString, Me.intAnzahl.Value)
+                        Leistung_Einfuegen(dvtr("SSO_Nummer").ToString, Me.intAnzahl.Value, True)
                     Next
                 End If
 
@@ -1192,6 +1240,20 @@ Public Class Leistungen
 
     Private Sub C1Leistungen_DoubleClick(sender As Object, e As EventArgs) Handles C1Leistungen.DoubleClick
         Try
+            If My.Settings.SoftwareType = "PADM" Then
+                Dim f1 As New frmLeistungDetailPADM
+                f1.cbboxnrbehandler.Dataselection = db.Get_SQL(2)
+                f1.cbboxnrbehandler.TableAlias = "Behandler_BH"
+                f1.cbboxnrbehandler.Table = "Behandler"
+                f1.cbboxnrbehandler.Displaymember = "Name"
+                f1.cbboxnrbehandler.Valuemember = "nrprivat"
+                f1.Leistungsnummer = C1Leistungen.Columns(0).Value.ToString
+                If Me.grpLeistungsdetails.Enabled = False Then f1.IsReadonly = True Else f1.IsReadonly = False
+                f1.ShowDialog()
+                Me.refresh_leistungen()
+                update_lagerbesatnd()
+                Exit Sub
+            End If
             Dim f As New frmLeistungDetail
             f.cbboxnrbehandler.Dataselection = db.Get_SQL(2)
             f.cbboxnrbehandler.TableAlias = "Behandler_BH"
@@ -1202,6 +1264,7 @@ Public Class Leistungen
             If Me.grpLeistungsdetails.Enabled = False Then f.IsReadonly = True Else f.IsReadonly = False
             f.ShowDialog()
             Me.refresh_leistungen()
+            update_lagerbesatnd()
         Catch ex As Exception
             MsgBox(ex.Message)
         End Try
@@ -1290,6 +1353,7 @@ Public Class Leistungen
             db.Update_Data()
             Me.C1Leistungen.Columns("datum").Value = f.MaskedTextBox1.Text
             db.Dispose()
+            update_lagerbesatnd()
         End If
     End Sub
 
@@ -1301,6 +1365,7 @@ Public Class Leistungen
         'ldb.dsDaten.AcceptChanges()
         Me.C1Leistungen.UpdateData()
         ldb.Update_Data()
+        update_lagerbesatnd()
         'ldb.Update_Tabeldata()
     End Sub
 

DPM2016/Behandlung/clsFakturaFunktionen.vb

@@ -14,6 +14,7 @@
         Dim Separater_Druckjob As Boolean
         Dim doloop As Boolean = True
         db.Get_Tabledata("Auswertung", "where auswertungnr=" + reportnr.ToString)
+
         Folgeauswertung = db.dsDaten.Tables(0).Rows(0).Item("Folge_Report")
         Separater_Druckjob = db.dsDaten.Tables(0).Rows(0).Item("Folgereport_Sep_Druckjob")
 
@@ -148,7 +149,7 @@
 
     End Sub
 
-    Public Sub Mahnung(ByVal Fakturanr As String, ByVal Stufe As Integer, Optional Preview As Boolean = False, Optional Design As Boolean = False)
+    Public Sub Mahnung(ByVal Fakturanr As String, ByVal Stufe As Integer, Optional Preview As Boolean = False, Optional Design As Boolean = False, Optional asPDF As Boolean = False, Optional perMail As Boolean = False)
         Globals.pdfCollection.Clear()
         Dim db As New clsDB
         Dim db1 As New clsDB
@@ -233,4 +234,86 @@
 
     End Sub
 
+    Public Sub Offerte_Auftragsbestaegitigung_Lieferschein(ByVal nrbehandlung As String, ByVal typ As Integer, ByVal PDFHandling As Integer, ByVal archivdoc As Boolean, ByVal fromtype As clspdfhelper.GetEmpfaengerType)
+        Dim pdfh As New clspdfhelper
+
+        Dim db As New clsDB
+        Dim db1 As New clsDB
+        Dim anzahlraten As Integer = 0
+        'db.Get_Tabledata("Behandlu", "where nrbehandlung=" + Me.Behandlungsnr.ToString)
+        db.Get_Tabledata("Behandlu", "where nrbehandlung=" + nrbehandlung)
+        db1.Get_Tabledata("estyp", "where nrestyp=" + db.dsDaten.Tables(0).Rows(0).Item("nrestyp").ToString)
+        anzahlraten = db.dsDaten.Tables(0).Rows(0).Item("Anzahlraten")
+        If anzahlraten = 0 Then anzahlraten = 1
+        Dim reportnr As Integer
+        Dim Doktype As String
+        Dim MAILTEXTNR As Integer
+        Select Case typ
+            Case 1
+                Doktype = "Offerte"
+                MAILTEXTNR = 3
+                reportnr = db.Get_ReportNr("Offerte")
+            Case 2
+                Doktype = "Auftragsbestätigung"
+                MAILTEXTNR = 4
+                reportnr = db.Get_ReportNr("Offerte")
+            Case 3
+                MAILTEXTNR = 5
+                Doktype = "Lieferschein"
+
+                reportnr = db.Get_ReportNr("Offerte")
+
+        End Select
+
+        Dim Folgeauswertung As Integer
+        Dim Separater_Druckjob As Boolean
+        Dim doloop As Boolean = True
+        db.Get_Tabledata("Auswertung", "where auswertungnr=" + reportnr.ToString)
+
+        Folgeauswertung = db.dsDaten.Tables(0).Rows(0).Item("Folge_Report")
+        Separater_Druckjob = db.dsDaten.Tables(0).Rows(0).Item("Folgereport_Sep_Druckjob")
+        Select Case PDFHandling
+            Case 0
+                Dim f As New frmReportView(reportnr, False, "Vorschau ", " where nrbehandlung = " + nrbehandlung, nrbehandlung)
+                f.Show()
+                f.Print_Rechnung(True, False, 1, 0, 0, Doktype)
+            Case 1
+                Dim f As New frmReportView(reportnr, False, "PDF ", " where nrbehandlung = " + nrbehandlung, nrbehandlung, True)
+                f.Visible = False
+                f.Print_Rechnung(False, False, 1, 0, 0, Doktype)
+
+                pdfh.Create_Archivdoc(fromtype, "", "Lieferschein:", nrbehandlung)
+
+            Case 2
+                Dim f As New frmReportView(reportnr, False, "PDF/Mail ", " where nrbehandlung = " + nrbehandlung, nrbehandlung, True)
+                f.Visible = False
+                f.Print_Rechnung(False, False, 1, 0, 0, Doktype)
+                pdfh.Create_Archivdoc(fromtype, "", "Auftragsbestätigung:", nrbehandlung)
+            Case 3
+                Dim f As New frmReportView(reportnr, False, "Druck ", " where nrbehandlung = " + nrbehandlung, nrbehandlung)
+                f.Visible = False
+                f.Show()
+                f.Print_Rechnung(False, False, 1, 0, 0, Doktype)
+                f.Close()
+                pdfh.Create_Archivdoc(fromtype, "", "Lieferschein:", nrbehandlung)
+            Case 4
+                Dim f As New frmReportView(reportnr, False, "Vorschau ", " where nrbehandlung = " + nrbehandlung, nrbehandlung)
+                f.Show()
+                f.Print_Rechnung(False, True, 1, 0, 0, Doktype)
+                f.Close()
+        End Select
+
+
+        Dim asPDF As Boolean = False
+        Dim PerMail As Boolean = False
+        Select Case PDFHandling
+            Case 1
+                pdfh.HandlePDF(True, False, MAILTEXTNR, clsMailClient.EmpfangerFrom.Behandlung, nrbehandlung)
+            Case 2
+
+                pdfh.HandlePDF(True, True, MAILTEXTNR, clsMailClient.EmpfangerFrom.Behandlung, nrbehandlung)
+        End Select
+
+    End Sub
+
 End Class

DPM2016/Behandlung/frmLeistungDetail.Designer.vb

@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmLeistungDetail
     Inherits System.Windows.Forms.Form
 
     'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
     Protected Overrides Sub Dispose(ByVal disposing As Boolean)
         Try
             If disposing AndAlso components IsNot Nothing Then
@@ -20,7 +20,7 @@ Partial Class frmLeistungDetail
     'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
     'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmLeistungDetail))
         Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
@@ -29,7 +29,6 @@ Partial Class frmLeistungDetail
         Me.lblTarifnr = New System.Windows.Forms.Label()
         Me.lblLeistungsbeschreibung = New System.Windows.Forms.Label()
         Me.txtBezD = New System.Windows.Forms.TextBox()
-        Me.cbboxnrbehandler = New DPM2016.MyCombobox()
         Me.lblbehandler = New System.Windows.Forms.Label()
         Me.btnSave = New System.Windows.Forms.Button()
         Me.txtTotal = New System.Windows.Forms.Label()
@@ -42,6 +41,7 @@ Partial Class frmLeistungDetail
         Me.DIPunkte = New DevComponents.Editors.DoubleInput()
         Me.lbldatum = New System.Windows.Forms.Label()
         Me.dtdatum = New DevComponents.Editors.DateTimeAdv.DateTimeInput()
+        Me.cbboxnrbehandler = New DPM2016.MyCombobox()
         Me.grpLeistungsdetails.SuspendLayout()
         CType(Me.diwert, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DIMenge, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -51,9 +51,10 @@ Partial Class frmLeistungDetail
         '
         'ToolStrip1
         '
+        Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(20, 20)
         Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
         Me.ToolStrip1.Name = "ToolStrip1"
-        Me.ToolStrip1.Size = New System.Drawing.Size(388, 25)
+        Me.ToolStrip1.Size = New System.Drawing.Size(517, 31)
         Me.ToolStrip1.TabIndex = 1
         Me.ToolStrip1.Text = "ToolStrip1"
         Me.ToolStrip1.Visible = False
@@ -79,8 +80,10 @@ Partial Class frmLeistungDetail
         Me.grpLeistungsdetails.Controls.Add(Me.dtdatum)
         Me.grpLeistungsdetails.Dock = System.Windows.Forms.DockStyle.Fill
         Me.grpLeistungsdetails.Location = New System.Drawing.Point(0, 0)
+        Me.grpLeistungsdetails.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.grpLeistungsdetails.Name = "grpLeistungsdetails"
-        Me.grpLeistungsdetails.Size = New System.Drawing.Size(388, 389)
+        Me.grpLeistungsdetails.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.grpLeistungsdetails.Size = New System.Drawing.Size(517, 479)
         Me.grpLeistungsdetails.TabIndex = 3
         Me.grpLeistungsdetails.TabStop = False
         Me.grpLeistungsdetails.Text = "Leistungsdetails"
@@ -88,64 +91,58 @@ Partial Class frmLeistungDetail
         'lblSSONummer
         '
         Me.lblSSONummer.AutoSize = True
-        Me.lblSSONummer.Location = New System.Drawing.Point(77, 25)
+        Me.lblSSONummer.Location = New System.Drawing.Point(103, 31)
+        Me.lblSSONummer.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblSSONummer.Name = "lblSSONummer"
-        Me.lblSSONummer.Size = New System.Drawing.Size(31, 13)
+        Me.lblSSONummer.Size = New System.Drawing.Size(35, 16)
         Me.lblSSONummer.TabIndex = 0
         Me.lblSSONummer.Text = "0000"
         '
         'lblTarifnr
         '
         Me.lblTarifnr.AutoSize = True
-        Me.lblTarifnr.Location = New System.Drawing.Point(6, 25)
+        Me.lblTarifnr.Location = New System.Drawing.Point(8, 31)
+        Me.lblTarifnr.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblTarifnr.Name = "lblTarifnr"
-        Me.lblTarifnr.Size = New System.Drawing.Size(42, 13)
+        Me.lblTarifnr.Size = New System.Drawing.Size(51, 16)
         Me.lblTarifnr.TabIndex = 25
         Me.lblTarifnr.Text = "TarifNr."
         '
         'lblLeistungsbeschreibung
         '
         Me.lblLeistungsbeschreibung.AutoSize = True
-        Me.lblLeistungsbeschreibung.Location = New System.Drawing.Point(6, 53)
+        Me.lblLeistungsbeschreibung.Location = New System.Drawing.Point(8, 65)
+        Me.lblLeistungsbeschreibung.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblLeistungsbeschreibung.Name = "lblLeistungsbeschreibung"
-        Me.lblLeistungsbeschreibung.Size = New System.Drawing.Size(72, 13)
+        Me.lblLeistungsbeschreibung.Size = New System.Drawing.Size(90, 16)
         Me.lblLeistungsbeschreibung.TabIndex = 23
         Me.lblLeistungsbeschreibung.Text = "Beschreibung"
         '
         'txtBezD
         '
-        Me.txtBezD.Location = New System.Drawing.Point(80, 52)
+        Me.txtBezD.Location = New System.Drawing.Point(107, 64)
+        Me.txtBezD.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.txtBezD.Multiline = True
         Me.txtBezD.Name = "txtBezD"
-        Me.txtBezD.Size = New System.Drawing.Size(281, 120)
+        Me.txtBezD.Size = New System.Drawing.Size(373, 147)
         Me.txtBezD.TabIndex = 1
         '
-        'cbboxnrbehandler
-        '
-        Me.cbboxnrbehandler.Dataselection = Nothing
-        Me.cbboxnrbehandler.Displaymember = Nothing
-        Me.cbboxnrbehandler.Location = New System.Drawing.Point(80, 204)
-        Me.cbboxnrbehandler.Name = "cbboxnrbehandler"
-        Me.cbboxnrbehandler.Size = New System.Drawing.Size(281, 21)
-        Me.cbboxnrbehandler.TabIndex = 3
-        Me.cbboxnrbehandler.Table = Nothing
-        Me.cbboxnrbehandler.TableAlias = ""
-        Me.cbboxnrbehandler.Valuemember = Nothing
-        '
         'lblbehandler
         '
         Me.lblbehandler.AutoSize = True
-        Me.lblbehandler.Location = New System.Drawing.Point(6, 206)
+        Me.lblbehandler.Location = New System.Drawing.Point(8, 254)
+        Me.lblbehandler.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblbehandler.Name = "lblbehandler"
-        Me.lblbehandler.Size = New System.Drawing.Size(55, 13)
+        Me.lblbehandler.Size = New System.Drawing.Size(69, 16)
         Me.lblbehandler.TabIndex = 14
         Me.lblbehandler.Text = "Behandler"
         '
         'btnSave
         '
-        Me.btnSave.Location = New System.Drawing.Point(137, 329)
+        Me.btnSave.Location = New System.Drawing.Point(183, 405)
+        Me.btnSave.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.btnSave.Name = "btnSave"
-        Me.btnSave.Size = New System.Drawing.Size(120, 23)
+        Me.btnSave.Size = New System.Drawing.Size(160, 28)
         Me.btnSave.TabIndex = 8
         Me.btnSave.Text = "Speichern"
         Me.btnSave.UseVisualStyleBackColor = True
@@ -153,10 +150,11 @@ Partial Class frmLeistungDetail
         'txtTotal
         '
         Me.txtTotal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtTotal.Location = New System.Drawing.Point(44, 291)
+        Me.txtTotal.Location = New System.Drawing.Point(59, 358)
+        Me.txtTotal.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.txtTotal.Name = "txtTotal"
         Me.txtTotal.RightToLeft = System.Windows.Forms.RightToLeft.No
-        Me.txtTotal.Size = New System.Drawing.Size(92, 13)
+        Me.txtTotal.Size = New System.Drawing.Size(123, 16)
         Me.txtTotal.TabIndex = 7
         Me.txtTotal.Text = "0.00www"
         Me.txtTotal.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -165,18 +163,20 @@ Partial Class frmLeistungDetail
         '
         Me.Label1.AutoSize = True
         Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label1.Location = New System.Drawing.Point(6, 291)
+        Me.Label1.Location = New System.Drawing.Point(8, 358)
+        Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(36, 13)
+        Me.Label1.Size = New System.Drawing.Size(45, 17)
         Me.Label1.TabIndex = 10
         Me.Label1.Text = "Total"
         '
         'lblWert
         '
         Me.lblWert.AutoSize = True
-        Me.lblWert.Location = New System.Drawing.Point(6, 266)
+        Me.lblWert.Location = New System.Drawing.Point(8, 327)
+        Me.lblWert.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblWert.Name = "lblWert"
-        Me.lblWert.Size = New System.Drawing.Size(30, 13)
+        Me.lblWert.Size = New System.Drawing.Size(35, 16)
         Me.lblWert.TabIndex = 9
         Me.lblWert.Text = "Wert"
         '
@@ -189,18 +189,20 @@ Partial Class frmLeistungDetail
         Me.diwert.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
         Me.diwert.ButtonFreeText.Shortcut = DevComponents.DotNetBar.eShortcut.F2
         Me.diwert.Increment = 1.0R
-        Me.diwert.Location = New System.Drawing.Point(80, 262)
+        Me.diwert.Location = New System.Drawing.Point(107, 322)
+        Me.diwert.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.diwert.Name = "diwert"
         Me.diwert.ShowUpDown = True
-        Me.diwert.Size = New System.Drawing.Size(56, 20)
+        Me.diwert.Size = New System.Drawing.Size(75, 22)
         Me.diwert.TabIndex = 6
         '
         'lblMenge
         '
         Me.lblMenge.AutoSize = True
-        Me.lblMenge.Location = New System.Drawing.Point(6, 239)
+        Me.lblMenge.Location = New System.Drawing.Point(8, 294)
+        Me.lblMenge.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblMenge.Name = "lblMenge"
-        Me.lblMenge.Size = New System.Drawing.Size(40, 13)
+        Me.lblMenge.Size = New System.Drawing.Size(49, 16)
         Me.lblMenge.TabIndex = 7
         Me.lblMenge.Text = "Menge"
         '
@@ -213,18 +215,20 @@ Partial Class frmLeistungDetail
         Me.DIMenge.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
         Me.DIMenge.ButtonFreeText.Shortcut = DevComponents.DotNetBar.eShortcut.F2
         Me.DIMenge.Increment = 1.0R
-        Me.DIMenge.Location = New System.Drawing.Point(80, 236)
+        Me.DIMenge.Location = New System.Drawing.Point(107, 290)
+        Me.DIMenge.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.DIMenge.Name = "DIMenge"
         Me.DIMenge.ShowUpDown = True
-        Me.DIMenge.Size = New System.Drawing.Size(56, 20)
+        Me.DIMenge.Size = New System.Drawing.Size(75, 22)
         Me.DIMenge.TabIndex = 4
         '
         'lblTaxpunkte
         '
         Me.lblTaxpunkte.AutoSize = True
-        Me.lblTaxpunkte.Location = New System.Drawing.Point(154, 239)
+        Me.lblTaxpunkte.Location = New System.Drawing.Point(205, 294)
+        Me.lblTaxpunkte.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblTaxpunkte.Name = "lblTaxpunkte"
-        Me.lblTaxpunkte.Size = New System.Drawing.Size(41, 13)
+        Me.lblTaxpunkte.Size = New System.Drawing.Size(48, 16)
         Me.lblTaxpunkte.TabIndex = 5
         Me.lblTaxpunkte.Text = "Punkte"
         '
@@ -236,18 +240,20 @@ Partial Class frmLeistungDetail
         Me.DIPunkte.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
         Me.DIPunkte.ButtonFreeText.Shortcut = DevComponents.DotNetBar.eShortcut.F2
         Me.DIPunkte.Increment = 1.0R
-        Me.DIPunkte.Location = New System.Drawing.Point(201, 236)
+        Me.DIPunkte.Location = New System.Drawing.Point(268, 290)
+        Me.DIPunkte.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.DIPunkte.Name = "DIPunkte"
         Me.DIPunkte.ShowUpDown = True
-        Me.DIPunkte.Size = New System.Drawing.Size(56, 20)
+        Me.DIPunkte.Size = New System.Drawing.Size(75, 22)
         Me.DIPunkte.TabIndex = 5
         '
         'lbldatum
         '
         Me.lbldatum.AutoSize = True
-        Me.lbldatum.Location = New System.Drawing.Point(6, 181)
+        Me.lbldatum.Location = New System.Drawing.Point(8, 223)
+        Me.lbldatum.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lbldatum.Name = "lbldatum"
-        Me.lbldatum.Size = New System.Drawing.Size(38, 13)
+        Me.lbldatum.Size = New System.Drawing.Size(46, 16)
         Me.lbldatum.TabIndex = 1
         Me.lbldatum.Text = "Datum"
         '
@@ -261,7 +267,8 @@ Partial Class frmLeistungDetail
         Me.dtdatum.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown
         Me.dtdatum.ButtonDropDown.Visible = True
         Me.dtdatum.IsPopupCalendarOpen = False
-        Me.dtdatum.Location = New System.Drawing.Point(80, 178)
+        Me.dtdatum.Location = New System.Drawing.Point(107, 219)
+        Me.dtdatum.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         '
         '
         '
@@ -292,18 +299,32 @@ Partial Class frmLeistungDetail
         Me.dtdatum.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
         Me.dtdatum.MonthCalendar.TodayButtonVisible = True
         Me.dtdatum.Name = "dtdatum"
-        Me.dtdatum.Size = New System.Drawing.Size(281, 20)
+        Me.dtdatum.Size = New System.Drawing.Size(375, 22)
         Me.dtdatum.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled
         Me.dtdatum.TabIndex = 2
         '
+        'cbboxnrbehandler
+        '
+        Me.cbboxnrbehandler.Dataselection = Nothing
+        Me.cbboxnrbehandler.Displaymember = Nothing
+        Me.cbboxnrbehandler.Location = New System.Drawing.Point(107, 251)
+        Me.cbboxnrbehandler.Margin = New System.Windows.Forms.Padding(4)
+        Me.cbboxnrbehandler.Name = "cbboxnrbehandler"
+        Me.cbboxnrbehandler.Size = New System.Drawing.Size(373, 24)
+        Me.cbboxnrbehandler.TabIndex = 3
+        Me.cbboxnrbehandler.Table = Nothing
+        Me.cbboxnrbehandler.TableAlias = ""
+        Me.cbboxnrbehandler.Valuemember = Nothing
+        '
         'frmLeistungDetail
         '
-        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(388, 389)
+        Me.ClientSize = New System.Drawing.Size(517, 479)
         Me.Controls.Add(Me.grpLeistungsdetails)
         Me.Controls.Add(Me.ToolStrip1)
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.Name = "frmLeistungDetail"
         Me.Text = "Leistungsdetail"
         Me.grpLeistungsdetails.ResumeLayout(False)

DPM2016/Behandlung/frmLeistungDetailPADM.Designer.vb

@@ -0,0 +1,400 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frmLeistungDetailPADM
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.grpLeistungsdetails = New System.Windows.Forms.GroupBox()
+        Me.richTextBoxExtended1 = New RichTextBoxExtended.RichTextBoxExtended()
+        Me.lblSSONummer = New System.Windows.Forms.Label()
+        Me.lblTarifnr = New System.Windows.Forms.Label()
+        Me.lblLeistungsbeschreibung = New System.Windows.Forms.Label()
+        Me.txtBezD = New System.Windows.Forms.TextBox()
+        Me.cbboxnrbehandler = New DPM2016.MyCombobox()
+        Me.lblbehandler = New System.Windows.Forms.Label()
+        Me.btnSave = New System.Windows.Forms.Button()
+        Me.txtTotal = New System.Windows.Forms.Label()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.lblWert = New System.Windows.Forms.Label()
+        Me.diwert = New DevComponents.Editors.DoubleInput()
+        Me.lblMenge = New System.Windows.Forms.Label()
+        Me.DIMenge = New DevComponents.Editors.DoubleInput()
+        Me.lblTaxpunkte = New System.Windows.Forms.Label()
+        Me.DIPunkte = New DevComponents.Editors.DoubleInput()
+        Me.lbldatum = New System.Windows.Forms.Label()
+        Me.dtdatum = New DevComponents.Editors.DateTimeAdv.DateTimeInput()
+        Me.grpLeistungsdetails.SuspendLayout()
+        CType(Me.diwert, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.DIMenge, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.DIPunkte, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.dtdatum, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SuspendLayout()
+        '
+        'grpLeistungsdetails
+        '
+        Me.grpLeistungsdetails.Controls.Add(Me.richTextBoxExtended1)
+        Me.grpLeistungsdetails.Controls.Add(Me.lblSSONummer)
+        Me.grpLeistungsdetails.Controls.Add(Me.lblTarifnr)
+        Me.grpLeistungsdetails.Controls.Add(Me.lblLeistungsbeschreibung)
+        Me.grpLeistungsdetails.Controls.Add(Me.txtBezD)
+        Me.grpLeistungsdetails.Controls.Add(Me.cbboxnrbehandler)
+        Me.grpLeistungsdetails.Controls.Add(Me.lblbehandler)
+        Me.grpLeistungsdetails.Controls.Add(Me.btnSave)
+        Me.grpLeistungsdetails.Controls.Add(Me.txtTotal)
+        Me.grpLeistungsdetails.Controls.Add(Me.Label1)
+        Me.grpLeistungsdetails.Controls.Add(Me.lblWert)
+        Me.grpLeistungsdetails.Controls.Add(Me.diwert)
+        Me.grpLeistungsdetails.Controls.Add(Me.lblMenge)
+        Me.grpLeistungsdetails.Controls.Add(Me.DIMenge)
+        Me.grpLeistungsdetails.Controls.Add(Me.lblTaxpunkte)
+        Me.grpLeistungsdetails.Controls.Add(Me.DIPunkte)
+        Me.grpLeistungsdetails.Controls.Add(Me.lbldatum)
+        Me.grpLeistungsdetails.Controls.Add(Me.dtdatum)
+        Me.grpLeistungsdetails.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.grpLeistungsdetails.Location = New System.Drawing.Point(0, 0)
+        Me.grpLeistungsdetails.Margin = New System.Windows.Forms.Padding(4)
+        Me.grpLeistungsdetails.Name = "grpLeistungsdetails"
+        Me.grpLeistungsdetails.Padding = New System.Windows.Forms.Padding(4)
+        Me.grpLeistungsdetails.Size = New System.Drawing.Size(630, 664)
+        Me.grpLeistungsdetails.TabIndex = 4
+        Me.grpLeistungsdetails.TabStop = False
+        Me.grpLeistungsdetails.Text = "Leistungsdetails"
+        '
+        'richTextBoxExtended1
+        '
+        Me.richTextBoxExtended1.AcceptsTab = True
+        Me.richTextBoxExtended1.AutoWordSelection = True
+        Me.richTextBoxExtended1.DetectURLs = True
+        Me.richTextBoxExtended1.Location = New System.Drawing.Point(106, 184)
+        Me.richTextBoxExtended1.Name = "richTextBoxExtended1"
+        Me.richTextBoxExtended1.ReadOnly = False
+        '
+        '
+        '
+        Me.richTextBoxExtended1.RichTextBox.AcceptsTab = True
+        Me.richTextBoxExtended1.RichTextBox.AutoWordSelection = True
+        Me.richTextBoxExtended1.RichTextBox.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.richTextBoxExtended1.RichTextBox.Location = New System.Drawing.Point(0, 70)
+        Me.richTextBoxExtended1.RichTextBox.Name = "rtb1"
+        Me.richTextBoxExtended1.RichTextBox.Size = New System.Drawing.Size(489, 139)
+        Me.richTextBoxExtended1.RichTextBox.TabIndex = 1
+        Me.richTextBoxExtended1.ShowBold = True
+        Me.richTextBoxExtended1.ShowCenterJustify = True
+        Me.richTextBoxExtended1.ShowColors = True
+        Me.richTextBoxExtended1.ShowCopy = True
+        Me.richTextBoxExtended1.ShowCut = True
+        Me.richTextBoxExtended1.ShowFont = True
+        Me.richTextBoxExtended1.ShowFontSize = True
+        Me.richTextBoxExtended1.ShowItalic = True
+        Me.richTextBoxExtended1.ShowLeftJustify = True
+        Me.richTextBoxExtended1.ShowOpen = True
+        Me.richTextBoxExtended1.ShowPaste = True
+        Me.richTextBoxExtended1.ShowRedo = True
+        Me.richTextBoxExtended1.ShowRightJustify = True
+        Me.richTextBoxExtended1.ShowSave = True
+        Me.richTextBoxExtended1.ShowStamp = True
+        Me.richTextBoxExtended1.ShowStrikeout = True
+        Me.richTextBoxExtended1.ShowToolBarText = False
+        Me.richTextBoxExtended1.ShowUnderline = True
+        Me.richTextBoxExtended1.ShowUndo = True
+        Me.richTextBoxExtended1.Size = New System.Drawing.Size(489, 209)
+        Me.richTextBoxExtended1.StampAction = RichTextBoxExtended.StampActions.EditedBy
+        Me.richTextBoxExtended1.StampColor = System.Drawing.Color.Blue
+        Me.richTextBoxExtended1.TabIndex = 54
+        '
+        '
+        '
+        Me.richTextBoxExtended1.Toolbar.Appearance = System.Windows.Forms.ToolBarAppearance.Flat
+        Me.richTextBoxExtended1.Toolbar.ButtonSize = New System.Drawing.Size(16, 16)
+        Me.richTextBoxExtended1.Toolbar.Divider = False
+        Me.richTextBoxExtended1.Toolbar.DropDownArrows = True
+        Me.richTextBoxExtended1.Toolbar.Location = New System.Drawing.Point(0, 0)
+        Me.richTextBoxExtended1.Toolbar.Name = "tb1"
+        Me.richTextBoxExtended1.Toolbar.ShowToolTips = True
+        Me.richTextBoxExtended1.Toolbar.Size = New System.Drawing.Size(489, 70)
+        Me.richTextBoxExtended1.Toolbar.TabIndex = 0
+        '
+        'lblSSONummer
+        '
+        Me.lblSSONummer.AutoSize = True
+        Me.lblSSONummer.Location = New System.Drawing.Point(103, 31)
+        Me.lblSSONummer.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblSSONummer.Name = "lblSSONummer"
+        Me.lblSSONummer.Size = New System.Drawing.Size(35, 16)
+        Me.lblSSONummer.TabIndex = 0
+        Me.lblSSONummer.Text = "0000"
+        '
+        'lblTarifnr
+        '
+        Me.lblTarifnr.AutoSize = True
+        Me.lblTarifnr.Location = New System.Drawing.Point(8, 31)
+        Me.lblTarifnr.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblTarifnr.Name = "lblTarifnr"
+        Me.lblTarifnr.Size = New System.Drawing.Size(51, 16)
+        Me.lblTarifnr.TabIndex = 25
+        Me.lblTarifnr.Text = "TarifNr."
+        '
+        'lblLeistungsbeschreibung
+        '
+        Me.lblLeistungsbeschreibung.AutoSize = True
+        Me.lblLeistungsbeschreibung.Location = New System.Drawing.Point(8, 65)
+        Me.lblLeistungsbeschreibung.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblLeistungsbeschreibung.Name = "lblLeistungsbeschreibung"
+        Me.lblLeistungsbeschreibung.Size = New System.Drawing.Size(90, 16)
+        Me.lblLeistungsbeschreibung.TabIndex = 23
+        Me.lblLeistungsbeschreibung.Text = "Beschreibung"
+        '
+        'txtBezD
+        '
+        Me.txtBezD.Location = New System.Drawing.Point(107, 64)
+        Me.txtBezD.Margin = New System.Windows.Forms.Padding(4)
+        Me.txtBezD.Multiline = True
+        Me.txtBezD.Name = "txtBezD"
+        Me.txtBezD.Size = New System.Drawing.Size(488, 97)
+        Me.txtBezD.TabIndex = 1
+        '
+        'cbboxnrbehandler
+        '
+        Me.cbboxnrbehandler.Dataselection = Nothing
+        Me.cbboxnrbehandler.Displaymember = Nothing
+        Me.cbboxnrbehandler.Location = New System.Drawing.Point(107, 459)
+        Me.cbboxnrbehandler.Margin = New System.Windows.Forms.Padding(4)
+        Me.cbboxnrbehandler.Name = "cbboxnrbehandler"
+        Me.cbboxnrbehandler.Size = New System.Drawing.Size(373, 24)
+        Me.cbboxnrbehandler.TabIndex = 3
+        Me.cbboxnrbehandler.Table = Nothing
+        Me.cbboxnrbehandler.TableAlias = ""
+        Me.cbboxnrbehandler.Valuemember = Nothing
+        '
+        'lblbehandler
+        '
+        Me.lblbehandler.AutoSize = True
+        Me.lblbehandler.Location = New System.Drawing.Point(8, 462)
+        Me.lblbehandler.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblbehandler.Name = "lblbehandler"
+        Me.lblbehandler.Size = New System.Drawing.Size(69, 16)
+        Me.lblbehandler.TabIndex = 14
+        Me.lblbehandler.Text = "Behandler"
+        '
+        'btnSave
+        '
+        Me.btnSave.Location = New System.Drawing.Point(208, 613)
+        Me.btnSave.Margin = New System.Windows.Forms.Padding(4)
+        Me.btnSave.Name = "btnSave"
+        Me.btnSave.Size = New System.Drawing.Size(160, 28)
+        Me.btnSave.TabIndex = 8
+        Me.btnSave.Text = "Speichern"
+        Me.btnSave.UseVisualStyleBackColor = True
+        '
+        'txtTotal
+        '
+        Me.txtTotal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtTotal.Location = New System.Drawing.Point(59, 566)
+        Me.txtTotal.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.txtTotal.Name = "txtTotal"
+        Me.txtTotal.RightToLeft = System.Windows.Forms.RightToLeft.No
+        Me.txtTotal.Size = New System.Drawing.Size(123, 16)
+        Me.txtTotal.TabIndex = 7
+        Me.txtTotal.Text = "0.00www"
+        Me.txtTotal.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label1.Location = New System.Drawing.Point(8, 566)
+        Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(45, 17)
+        Me.Label1.TabIndex = 10
+        Me.Label1.Text = "Total"
+        '
+        'lblWert
+        '
+        Me.lblWert.AutoSize = True
+        Me.lblWert.Location = New System.Drawing.Point(8, 535)
+        Me.lblWert.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblWert.Name = "lblWert"
+        Me.lblWert.Size = New System.Drawing.Size(35, 16)
+        Me.lblWert.TabIndex = 9
+        Me.lblWert.Text = "Wert"
+        '
+        'diwert
+        '
+        '
+        '
+        '
+        Me.diwert.BackgroundStyle.Class = "DateTimeInputBackground"
+        Me.diwert.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.diwert.ButtonFreeText.Shortcut = DevComponents.DotNetBar.eShortcut.F2
+        Me.diwert.Increment = 1.0R
+        Me.diwert.Location = New System.Drawing.Point(107, 530)
+        Me.diwert.Margin = New System.Windows.Forms.Padding(4)
+        Me.diwert.Name = "diwert"
+        Me.diwert.ShowUpDown = True
+        Me.diwert.Size = New System.Drawing.Size(152, 22)
+        Me.diwert.TabIndex = 6
+        '
+        'lblMenge
+        '
+        Me.lblMenge.AutoSize = True
+        Me.lblMenge.Location = New System.Drawing.Point(8, 502)
+        Me.lblMenge.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblMenge.Name = "lblMenge"
+        Me.lblMenge.Size = New System.Drawing.Size(49, 16)
+        Me.lblMenge.TabIndex = 7
+        Me.lblMenge.Text = "Menge"
+        '
+        'DIMenge
+        '
+        '
+        '
+        '
+        Me.DIMenge.BackgroundStyle.Class = "DateTimeInputBackground"
+        Me.DIMenge.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.DIMenge.ButtonFreeText.Shortcut = DevComponents.DotNetBar.eShortcut.F2
+        Me.DIMenge.Increment = 1.0R
+        Me.DIMenge.Location = New System.Drawing.Point(107, 498)
+        Me.DIMenge.Margin = New System.Windows.Forms.Padding(4)
+        Me.DIMenge.Name = "DIMenge"
+        Me.DIMenge.ShowUpDown = True
+        Me.DIMenge.Size = New System.Drawing.Size(152, 22)
+        Me.DIMenge.TabIndex = 4
+        '
+        'lblTaxpunkte
+        '
+        Me.lblTaxpunkte.AutoSize = True
+        Me.lblTaxpunkte.Location = New System.Drawing.Point(344, 502)
+        Me.lblTaxpunkte.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblTaxpunkte.Name = "lblTaxpunkte"
+        Me.lblTaxpunkte.Size = New System.Drawing.Size(48, 16)
+        Me.lblTaxpunkte.TabIndex = 5
+        Me.lblTaxpunkte.Text = "Punkte"
+        '
+        'DIPunkte
+        '
+        '
+        '
+        '
+        Me.DIPunkte.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.DIPunkte.ButtonFreeText.Shortcut = DevComponents.DotNetBar.eShortcut.F2
+        Me.DIPunkte.Increment = 1.0R
+        Me.DIPunkte.Location = New System.Drawing.Point(407, 498)
+        Me.DIPunkte.Margin = New System.Windows.Forms.Padding(4)
+        Me.DIPunkte.Name = "DIPunkte"
+        Me.DIPunkte.ShowUpDown = True
+        Me.DIPunkte.Size = New System.Drawing.Size(75, 22)
+        Me.DIPunkte.TabIndex = 5
+        '
+        'lbldatum
+        '
+        Me.lbldatum.AutoSize = True
+        Me.lbldatum.Location = New System.Drawing.Point(8, 431)
+        Me.lbldatum.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lbldatum.Name = "lbldatum"
+        Me.lbldatum.Size = New System.Drawing.Size(46, 16)
+        Me.lbldatum.TabIndex = 1
+        Me.lbldatum.Text = "Datum"
+        '
+        'dtdatum
+        '
+        '
+        '
+        '
+        Me.dtdatum.BackgroundStyle.Class = "DateTimeInputBackground"
+        Me.dtdatum.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.dtdatum.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown
+        Me.dtdatum.ButtonDropDown.Visible = True
+        Me.dtdatum.IsPopupCalendarOpen = False
+        Me.dtdatum.Location = New System.Drawing.Point(107, 427)
+        Me.dtdatum.Margin = New System.Windows.Forms.Padding(4)
+        '
+        '
+        '
+        '
+        '
+        '
+        Me.dtdatum.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.dtdatum.MonthCalendar.CalendarDimensions = New System.Drawing.Size(1, 1)
+        Me.dtdatum.MonthCalendar.ClearButtonVisible = True
+        '
+        '
+        '
+        Me.dtdatum.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2
+        Me.dtdatum.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90
+        Me.dtdatum.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground
+        Me.dtdatum.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid
+        Me.dtdatum.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder
+        Me.dtdatum.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1
+        Me.dtdatum.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.dtdatum.MonthCalendar.DisplayMonth = New Date(2015, 6, 1, 0, 0, 0, 0)
+        Me.dtdatum.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday
+        '
+        '
+        '
+        Me.dtdatum.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2
+        Me.dtdatum.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90
+        Me.dtdatum.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground
+        Me.dtdatum.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.dtdatum.MonthCalendar.TodayButtonVisible = True
+        Me.dtdatum.Name = "dtdatum"
+        Me.dtdatum.Size = New System.Drawing.Size(375, 22)
+        Me.dtdatum.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled
+        Me.dtdatum.TabIndex = 2
+        '
+        'frmLeistungDetailPADM
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(630, 664)
+        Me.Controls.Add(Me.grpLeistungsdetails)
+        Me.Name = "frmLeistungDetailPADM"
+        Me.Text = "frmLeistungDetailPADM"
+        Me.grpLeistungsdetails.ResumeLayout(False)
+        Me.grpLeistungsdetails.PerformLayout()
+        CType(Me.diwert, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.DIMenge, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.DIPunkte, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.dtdatum, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ResumeLayout(False)
+
+    End Sub
+
+    Friend WithEvents grpLeistungsdetails As GroupBox
+    Friend WithEvents lblSSONummer As Label
+    Friend WithEvents lblTarifnr As Label
+    Friend WithEvents lblLeistungsbeschreibung As Label
+    Friend WithEvents txtBezD As TextBox
+    Friend WithEvents cbboxnrbehandler As MyCombobox
+    Friend WithEvents lblbehandler As Label
+    Friend WithEvents btnSave As Button
+    Friend WithEvents txtTotal As Label
+    Friend WithEvents Label1 As Label
+    Friend WithEvents lblWert As Label
+    Friend WithEvents diwert As DevComponents.Editors.DoubleInput
+    Friend WithEvents lblMenge As Label
+    Friend WithEvents DIMenge As DevComponents.Editors.DoubleInput
+    Friend WithEvents lblTaxpunkte As Label
+    Friend WithEvents DIPunkte As DevComponents.Editors.DoubleInput
+    Friend WithEvents lbldatum As Label
+    Friend WithEvents dtdatum As DevComponents.Editors.DateTimeAdv.DateTimeInput
+    Private WithEvents richTextBoxExtended1 As RichTextBoxExtended.RichTextBoxExtended
+End Class

DPM2016/Behandlung/frmLeistungDetailPADM.resx

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

DPM2016/Behandlung/frmLeistungDetailPADM.vb

@@ -0,0 +1,104 @@
+Public Class frmLeistungDetailPADM
+    Dim m_leistungsnummer As Integer
+    Property Leistungsnummer As Integer
+        Get
+            Return m_leistungsnummer
+        End Get
+        Set(value As Integer)
+            m_leistungsnummer = value
+            Update_data()
+        End Set
+    End Property
+
+    Dim m_IsReadOnly As Boolean
+    Property IsReadonly As Boolean
+        Get
+            Return m_IsReadOnly
+        End Get
+        Set(value As Boolean)
+            m_IsReadOnly = value
+            If value = True Then grpLeistungsdetails.Enabled = False Else grpLeistungsdetails.Enabled = True
+        End Set
+    End Property
+
+    Private Sub frmLeistungDetail_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then
+            Me.lblbehandler.Text = "Erbringer"
+        End If
+    End Sub
+
+    Dim db As New clsDB
+    Sub Update_data()
+
+        db.Get_Leistung(Me.Leistungsnummer)
+        Me.lblSSONummer.Text = db.dsDaten.Tables(0).Rows(0).Item("sso_nummer")
+        Me.txtBezD.Text = db.dsDaten.Tables(0).Rows(0).Item("bezd")
+        Me.dtdatum.Value = db.dsDaten.Tables(0).Rows(0).Item("datum")
+        Me.DIMenge.Value = db.dsDaten.Tables(0).Rows(0).Item("menge")
+        Me.DIPunkte.Value = db.dsDaten.Tables(0).Rows(0).Item("taxpunkte")
+        Me.diwert.Value = db.dsDaten.Tables(0).Rows(0).Item("frankenprotaxpunkt")
+        Me.cbboxnrbehandler.SelectedValue = db.dsDaten.Tables(0).Rows(0).Item("nrbehandler")
+        Me.richTextBoxExtended1.RichTextBox.Rtf = db.dsDaten.Tables(0).Rows(0).Item("bezf").ToString
+        If DIPunkte.Value = 0 Then DIPunkte.Enabled = False Else DIPunkte.Enabled = True
+        Dim t As Double
+        t = db.dsDaten.Tables(0).Rows(0).Item("total")
+        Me.txtTotal.Text = t.ToString("N2")
+
+    End Sub
+
+    Private Sub DIPunkte_ValueChanged(sender As Object, e As EventArgs) Handles DIPunkte.ValueChanged, DIMenge.ValueChanged, diwert.ValueChanged
+        Try
+            Dim total As Double
+            If DIPunkte.Value > 0 Then
+                total = DIPunkte.Value * DIMenge.Value * diwert.Value
+                Me.txtTotal.Text = total.ToString("N2")
+            Else
+                total = DIMenge.Value * diwert.Value
+                Me.txtTotal.Text = total.ToString("N2")
+            End If
+
+        Catch
+        End Try
+    End Sub
+
+    Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click
+        Me.lblSSONummer.Text = db.dsDaten.Tables(0).Rows(0).Item("sso_nummer")
+        db.dsDaten.Tables(0).Rows(0).Item("bezd") = Me.txtBezD.Text
+        db.dsDaten.Tables(0).Rows(0).Item("datum") = Me.dtdatum.Value
+        db.dsDaten.Tables(0).Rows(0).Item("menge") = Me.DIMenge.Value
+        db.dsDaten.Tables(0).Rows(0).Item("taxpunkte") = Me.DIPunkte.Value
+        db.dsDaten.Tables(0).Rows(0).Item("frankenprotaxpunkt") = Me.diwert.Value
+        db.dsDaten.Tables(0).Rows(0).Item("nrbehandler") = Me.cbboxnrbehandler.SelectedValue
+        db.dsDaten.Tables(0).Rows(0).Item("total") = Me.txtTotal.Text
+        db.dsDaten.Tables(0).Rows(0).Item("mutiert_am") = Now
+        db.dsDaten.Tables(0).Rows(0).Item("bezf") = Me.richTextBoxExtended1.RichTextBox.Rtf
+        db.Update_Data()
+        Me.Close()
+    End Sub
+
+    Private Sub dtdatum_Click(sender As Object, e As EventArgs) Handles dtdatum.Click
+
+    End Sub
+
+    Private Sub dtdatum_KeyDown(sender As Object, e As KeyEventArgs) Handles dtdatum.KeyDown
+        If e.KeyCode = Keys.Escape Then delete_date(sender)
+        If e.KeyCode = Keys.Decimal Then SendKeys.SendWait("{TAB}")
+        If e.KeyCode = 190 Then SendKeys.SendWait("{TAB}")
+
+    End Sub
+    Sub delete_date(sender)
+        sender.value = Nothing
+    End Sub
+
+    Private Sub txtTotal_Click(sender As Object, e As EventArgs) Handles txtTotal.Click
+
+    End Sub
+
+    Private Sub txtTotal_TextChanged(sender As Object, e As EventArgs) Handles txtTotal.TextChanged
+        Try
+            Me.txtTotal.Text = Globals.SwissCommercialRound(txtTotal.Text).ToString("N2")
+        Catch
+        End Try
+
+    End Sub
+End Class

DPM2016/DPM2016.vbproj

@@ -172,6 +172,9 @@
     <Reference Include="QRCoder">
       <HintPath>..\..\QR-Rechnung\QRCoder-master\QRCoder\bin\Debug\QRCoder.dll</HintPath>
     </Reference>
+    <Reference Include="RichTextBoxExtended">
+      <HintPath>..\..\..\_Demos\RichTextBoxExtended\bin\Debug\RichTextBoxExtended.dll</HintPath>
+    </Reference>
     <Reference Include="RtfPipe">
       <HintPath>..\..\ThirtPartyKlassen\MsgViewer\bin\Debug\RtfPipe.dll</HintPath>
     </Reference>
@@ -311,6 +314,12 @@
     <Compile Include="Behandlung\frmLeistungDetail.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="Behandlung\frmLeistungDetailPADM.Designer.vb">
+      <DependentUpon>frmLeistungDetailPADM.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Behandlung\frmLeistungDetailPADM.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Behandlung\frmPosition.Designer.vb">
       <DependentUpon>frmPosition.vb</DependentUpon>
     </Compile>
@@ -394,6 +403,12 @@
     <Compile Include="Dokumente\DokumentDetail.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="Dokumente\frmDokumentList.Designer.vb">
+      <DependentUpon>frmDokumentList.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Dokumente\frmDokumentList.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Dokumente\frmdokumentvorlagen.Designer.vb">
       <DependentUpon>frmdokumentvorlagen.vb</DependentUpon>
     </Compile>
@@ -591,6 +606,12 @@
     <Compile Include="Sysadmin\frmTexteditor.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="Sysadmin\TarifDetail_PADM.Designer.vb">
+      <DependentUpon>TarifDetail_PADM.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Sysadmin\TarifDetail_PADM.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Utils\clsLog.vb" />
     <Compile Include="Mobile\clsMobile.vb" />
     <Compile Include="Utils\Crypto.vb" />
@@ -636,6 +657,18 @@
     <Compile Include="Utils\frmLogin.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="Utils\frmRichText.Designer.vb">
+      <DependentUpon>frmRichText.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Utils\frmRichText.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Utils\frmrtf.Designer.vb">
+      <DependentUpon>frmrtf.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Utils\frmrtf.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Utils\frmSplash.Designer.vb">
       <DependentUpon>frmSplash.vb</DependentUpon>
     </Compile>
@@ -698,6 +731,9 @@
     <EmbeddedResource Include="Behandlung\frmLeistungDetail.resx">
       <DependentUpon>frmLeistungDetail.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Behandlung\frmLeistungDetailPADM.resx">
+      <DependentUpon>frmLeistungDetailPADM.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Behandlung\frmPosition.resx">
       <DependentUpon>frmPosition.vb</DependentUpon>
     </EmbeddedResource>
@@ -739,6 +775,9 @@
     <EmbeddedResource Include="Dokumente\DokumentDetail.resx">
       <DependentUpon>DokumentDetail.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Dokumente\frmDokumentList.resx">
+      <DependentUpon>frmDokumentList.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Dokumente\frmdokumentvorlagen.resx">
       <DependentUpon>frmdokumentvorlagen.vb</DependentUpon>
       <SubType>Designer</SubType>
@@ -816,6 +855,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Klassen\clsStammdaten_flat.resx">
       <DependentUpon>clsStammdaten_flat.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="My Project\licenses.licx" />
     <EmbeddedResource Include="My Project\Resources.resx">
@@ -831,6 +871,9 @@
     <EmbeddedResource Include="Sysadmin\frmTexteditor.resx">
       <DependentUpon>frmTexteditor.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Sysadmin\TarifDetail_PADM.resx">
+      <DependentUpon>TarifDetail_PADM.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Utils\frmcalendar.resx">
       <DependentUpon>frmcalendar.vb</DependentUpon>
     </EmbeddedResource>
@@ -852,6 +895,12 @@
     <EmbeddedResource Include="Utils\frmLogin.resx">
       <DependentUpon>frmLogin.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Utils\frmRichText.resx">
+      <DependentUpon>frmRichText.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Utils\frmrtf.resx">
+      <DependentUpon>frmrtf.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Utils\frmSplash.resx">
       <DependentUpon>frmSplash.vb</DependentUpon>
     </EmbeddedResource>

DPM2016/DPM2016.vbproj.user

@@ -14,6 +14,7 @@
     <EnableSecurityDebugging>false</EnableSecurityDebugging>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <StartArguments>PADM</StartArguments>
+    <StartArguments>
+    </StartArguments>
   </PropertyGroup>
 </Project>

DPM2016/Database/clsDB.vb

@@ -461,7 +461,7 @@ Public Class clsDB
     Public Function Search(ByVal Type As String, ByVal Searchstring As String) As Integer
         Select Case Type
             Case "Patient"
-
+                Searchstring = Searchstring.Replace("'", "''")
                 If IsNumeric(Searchstring) Then
                     Get_Tabledata("privat", " where nrprivat=" + Searchstring + " order by name, vorname, ort")
                     If dsDaten.Tables(0).Rows.Count = 0 Then
@@ -649,7 +649,7 @@ Public Class clsDB
         Next
 
         If Not found Then
-            Me.Get_Tabledata("Tarifgrp", "order by tarifvon")
+            Me.Get_Tabledata("Tarifgrp", "where aktiv=1 order by tarifvon")
             IntTables.Inttables.Tables.Add(dsDaten.Tables(0).Copy)
         End If
 
@@ -660,7 +660,7 @@ Public Class clsDB
             End If
         Next
         If Not found Then
-            Me.Get_Tabledata("Tarpaket", "order by paketbezeichnung")
+            Me.Get_Tabledata("Tarpaket", "where aktiv=1 order by paketbezeichnung")
             IntTables.Inttables.Tables.Add(dsDaten.Tables(0).Copy)
         End If
         If Not found Then
@@ -744,6 +744,31 @@ Public Class clsDB
         End Try
     End Sub
 
+    Public Sub Update_Lager(ByVal nrbehandlung As Integer, ByVal tarifnr As String, ByVal anzahl As Integer, ByVal Typ As String)
+        If Globals.OnLoad Then Exit Sub
+
+        Dim scmCmdToExecute As SqlCommand = New SqlCommand()
+
+        scmCmdToExecute.CommandText = "dbo.[sp_update_lagerbestand]"
+        Dim conn As New SqlConnection(My.Settings.ConnectionString)
+        scmCmdToExecute.CommandType = CommandType.StoredProcedure
+        scmCmdToExecute.Connection = conn
+        Try
+            scmCmdToExecute.Parameters.Add(New SqlParameter("@nrbehandlung", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 0, 0, "", DataRowVersion.Proposed, nrbehandlung))
+            scmCmdToExecute.Parameters.Add(New SqlParameter("@tarifnr", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 0, 0, "", DataRowVersion.Proposed, tarifnr))
+            scmCmdToExecute.Parameters.Add(New SqlParameter("@anzahl", SqlDbType.Int, 4, ParameterDirection.Input, True, 0, 0, "", DataRowVersion.Proposed, anzahl))
+            scmCmdToExecute.Parameters.Add(New SqlParameter("@typ", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 0, 0, "", DataRowVersion.Proposed, Typ))
+
+            scmCmdToExecute.Connection.Open()
+            scmCmdToExecute.ExecuteNonQuery()
+            Return
+        Catch ex As Exception
+            MsgBox(ex.Message)
+        Finally
+            scmCmdToExecute.Connection.Close()
+        End Try
+    End Sub
+
 
 
 #End Region

DPM2016/Diverses/frmProgrammeinstellungen.vb

@@ -21,7 +21,7 @@ Public Class frmProgrammeinstellungen
         Me.ClsStammdaten_flat3.Tablename = "Konto"
         Me.ClsStammdaten_flat3.ToolStripButton5.Visible = False
         Me.ClsStammdaten_flat3.get_data()
-
+        If My.Settings.SoftwareType = "PADM" Then Me.TabControl1.TabPages(0).Text = "Artikel"
         'Properties.ShowCustomProperties = True
         'Properties.Item.Clear()
         'Properties.Item.Add("Datum", New Date(Today.Ticks), False, "Parameter", "Datum", True)
@@ -714,6 +714,18 @@ DescriptionAttribute("Rabatt gesamt")>
             db.Save_Standard(8, Value)
         End Set
     End Property
+    <CategoryAttribute("Lager"),
+TypeConverter(GetType(TrueFalseList)),
+DefaultValueAttribute("False"),
+DescriptionAttribute("Lagerbestand")>
+    Public Property Lagerbestand As String
+        Get
+            Return db.Get_Option(70010)
+        End Get
+        Set(ByVal Value As String)
+            db.Save_Option(70010, Value)
+        End Set
+    End Property
 End Class
 
 

DPM2016/Dokumente/clsDok.vb

@@ -223,7 +223,14 @@ Public Class clsDok
 #Region "Tree"
     Public Function LoadTree(ByRef Tree As DevComponents.AdvTree.AdvTree)
         Dim db As New clsDB
-        db.Get_Tabledata("DMS_Struktur", "", "Select * from dms_struktur where aktiv=1")
+        Try
+            db.Get_Tabledata("DMS_Struktur", "", "Select * from dms_struktur where aktiv=1 order by sort, bezeichnung ")
+            If db.dsDaten.Tables(0).Rows.Count = 0 Then db.Get_Tabledata("DMS_Struktur", "", "Select * from dms_struktur where aktiv=1")
+        Catch
+            db.Get_Tabledata("DMS_Struktur", "", "Select * from dms_struktur where aktiv=1")
+
+        End Try
+
         Load_Treeview(db.dsDaten, Tree)
         db.Dispose()
         Tree.ExpandAll()

DPM2016/Dokumente/frmDokumentList.Designer.vb

@@ -0,0 +1,68 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frmDokumentList
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDokumentList))
+        Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
+        Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStrip1.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'ToolStrip1
+        '
+        Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(20, 20)
+        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton1})
+        Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
+        Me.ToolStrip1.Name = "ToolStrip1"
+        Me.ToolStrip1.Size = New System.Drawing.Size(1118, 27)
+        Me.ToolStrip1.TabIndex = 0
+        Me.ToolStrip1.Text = "ToolStrip1"
+        '
+        'ToolStripButton1
+        '
+        Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.ToolStripButton1.Image = CType(resources.GetObject("ToolStripButton1.Image"), System.Drawing.Image)
+        Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripButton1.Name = "ToolStripButton1"
+        Me.ToolStripButton1.Size = New System.Drawing.Size(29, 24)
+        Me.ToolStripButton1.Text = "ToolStripButton1"
+        '
+        'frmDokumentList
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(1118, 659)
+        Me.Controls.Add(Me.ToolStrip1)
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.Name = "frmDokumentList"
+        Me.Text = "frmDokumentList"
+        Me.ToolStrip1.ResumeLayout(False)
+        Me.ToolStrip1.PerformLayout()
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+
+    Friend WithEvents ToolStrip1 As ToolStrip
+    Friend WithEvents ToolStripButton1 As ToolStripButton
+End Class

DPM2016/Dokumente/frmDokumentList.resx

@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="ToolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        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>
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAICAEAAAAAADoAgAAFgAAACgAAAAgAAAAQAAAAAEABAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP//
+        AAD///8AAAAAAP8AAAAAAAAAAAAAAAAAAAiIiIj/8AAAAAAAAAAAAAD4d3d3eIiIj/8AAAAAAAAAj//4
+        iHd3d3eIjwAAAAAAAIj//////4iHd3gAAAAAAACI93d3//////94AAAAAAAAj///////////eAAAAAAA
+        AIj3d3f//////3gAAAAAAACP//////////94AAAAAAAAiP//////////eAAAAAAAAI///////////3gA
+        AAAAAACPiI////////94AAAAAAAAj/h3d3d3iP//eAAAAAAAAI//////+Ih//3gAAAAAAACP93d3d4j/
+        //94AAAAAAAAj/////iId3j/eAAAAAAAAI/3d3eIj////3gAAAAAAACP////iId3f/94AAAAAAAAj///
+        ////////eAAAAAAAAI///////////3gAAAAAAACP+Ij///////94AAAAAAAAj/iHd4//////eAAAAAAA
+        AI/4/////////3gAAAAAAACP93d3//////94AAAAAAAAj///////////eAAAAAAAAI94+I/4/////3gA
+        AAAAAACIc4c4h3939394AAAAAAAAh3N3d3c4g4h4fwAAAAAAAAO7e7d3N4N3d48AAAAAAAAPj/iPi4i4
+        gzjwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/P////gB///wAAP/8AAA//AAAP/wA
+        AD/8AAA//AAAP/wAAD/8AAA//AAAP/wAAD/8AAA//AAAP/wAAD/8AAA//AAAP/wAAD/8AAA//AAAP/wA
+        AD/8AAA//AAAP/wAAD/8AAA//AAAP/wAAD/8AAA//gAAP/4AAH///////////w==
+</value>
+  </data>
+</root>

DPM2016/Dokumente/frmDokumentList.vb

@@ -0,0 +1,5 @@
+Public Class frmDokumentList
+    Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
+        Me.Close()
+    End Sub
+End Class

DPM2016/Finanzaen/frmMahnungen.Designer.vb

@@ -58,6 +58,7 @@ Partial Class Mahnungen
         Me.MahnstufeZurücksetzen2ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem7 = New System.Windows.Forms.ToolStripSeparator()
         Me.PatientAnzeigenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.DebitorAnzeigenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStrip3 = New System.Windows.Forms.ToolStrip()
         Me.tsbtnMahnlauf2 = New System.Windows.Forms.ToolStripButton()
         Me.grpOffeneRechnungen = New System.Windows.Forms.GroupBox()
@@ -75,6 +76,7 @@ Partial Class Mahnungen
         Me.MahnstufeZurücksetzenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripSeparator()
         Me.PatientAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.DebitorAnzeigenToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStrip2 = New System.Windows.Forms.ToolStrip()
         Me.tsbtnMahnlauf1 = New System.Windows.Forms.ToolStripButton()
         Me.GroupBox1 = New System.Windows.Forms.GroupBox()
@@ -92,15 +94,13 @@ Partial Class Mahnungen
         Me.MahnstufeZurücksetzen3ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem8 = New System.Windows.Forms.ToolStripSeparator()
         Me.PatientAnzeigenToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.DebitorAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStrip4 = New System.Windows.Forms.ToolStrip()
         Me.tsbtnMahnlauf3 = New System.Windows.Forms.ToolStripButton()
         Me.GroupBox2 = New System.Windows.Forms.GroupBox()
         Me.C1Mahnungen4 = New C1.Win.C1TrueDBGrid.C1TrueDBGrid()
         Me.ContextMenuMahnungen4 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.MahnstufeZurücksetzen4ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.DebitorAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.DebitorAnzeigenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.DebitorAnzeigenToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStrip1.SuspendLayout()
         Me.MenuStrip1.SuspendLayout()
         Me.GrpAusgeschlosseneRechnungen.SuspendLayout()
@@ -208,7 +208,6 @@ Partial Class Mahnungen
         '
         'tstxtsuche
         '
-        Me.tstxtsuche.Font = New System.Drawing.Font("Segoe UI", 9.0!)
         Me.tstxtsuche.Name = "tstxtsuche"
         Me.tstxtsuche.Size = New System.Drawing.Size(100, 25)
         Me.tstxtsuche.Visible = False
@@ -400,6 +399,12 @@ Partial Class Mahnungen
         Me.PatientAnzeigenToolStripMenuItem1.Size = New System.Drawing.Size(202, 22)
         Me.PatientAnzeigenToolStripMenuItem1.Text = "Patient anzeigen"
         '
+        'DebitorAnzeigenToolStripMenuItem1
+        '
+        Me.DebitorAnzeigenToolStripMenuItem1.Name = "DebitorAnzeigenToolStripMenuItem1"
+        Me.DebitorAnzeigenToolStripMenuItem1.Size = New System.Drawing.Size(202, 22)
+        Me.DebitorAnzeigenToolStripMenuItem1.Text = "Debitor anzeigen"
+        '
         'ToolStrip3
         '
         Me.ToolStrip3.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnMahnlauf2})
@@ -527,6 +532,12 @@ Partial Class Mahnungen
         Me.PatientAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(202, 22)
         Me.PatientAnzeigenToolStripMenuItem.Text = "Patient anzeigen"
         '
+        'DebitorAnzeigenToolStripMenuItem2
+        '
+        Me.DebitorAnzeigenToolStripMenuItem2.Name = "DebitorAnzeigenToolStripMenuItem2"
+        Me.DebitorAnzeigenToolStripMenuItem2.Size = New System.Drawing.Size(202, 22)
+        Me.DebitorAnzeigenToolStripMenuItem2.Text = "Debitor anzeigen"
+        '
         'ToolStrip2
         '
         Me.ToolStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnMahnlauf1})
@@ -652,6 +663,12 @@ Partial Class Mahnungen
         Me.PatientAnzeigenToolStripMenuItem2.Size = New System.Drawing.Size(202, 22)
         Me.PatientAnzeigenToolStripMenuItem2.Text = "Patient anzeigen"
         '
+        'DebitorAnzeigenToolStripMenuItem
+        '
+        Me.DebitorAnzeigenToolStripMenuItem.Name = "DebitorAnzeigenToolStripMenuItem"
+        Me.DebitorAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(202, 22)
+        Me.DebitorAnzeigenToolStripMenuItem.Text = "Debitor Anzeigen"
+        '
         'ToolStrip4
         '
         Me.ToolStrip4.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnMahnlauf3})
@@ -714,24 +731,6 @@ Partial Class Mahnungen
         Me.MahnstufeZurücksetzen4ToolStripMenuItem.Size = New System.Drawing.Size(202, 22)
         Me.MahnstufeZurücksetzen4ToolStripMenuItem.Text = "Mahnstufe zurücksetzen"
         '
-        'DebitorAnzeigenToolStripMenuItem
-        '
-        Me.DebitorAnzeigenToolStripMenuItem.Name = "DebitorAnzeigenToolStripMenuItem"
-        Me.DebitorAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(202, 22)
-        Me.DebitorAnzeigenToolStripMenuItem.Text = "Debitor Anzeigen"
-        '
-        'DebitorAnzeigenToolStripMenuItem1
-        '
-        Me.DebitorAnzeigenToolStripMenuItem1.Name = "DebitorAnzeigenToolStripMenuItem1"
-        Me.DebitorAnzeigenToolStripMenuItem1.Size = New System.Drawing.Size(202, 22)
-        Me.DebitorAnzeigenToolStripMenuItem1.Text = "Debitor anzeigen"
-        '
-        'DebitorAnzeigenToolStripMenuItem2
-        '
-        Me.DebitorAnzeigenToolStripMenuItem2.Name = "DebitorAnzeigenToolStripMenuItem2"
-        Me.DebitorAnzeigenToolStripMenuItem2.Size = New System.Drawing.Size(202, 22)
-        Me.DebitorAnzeigenToolStripMenuItem2.Text = "Debitor anzeigen"
-        '
         'Mahnungen
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

DPM2016/Finanzaen/frmMahnungen.resx

@@ -437,7 +437,7 @@
 </value>
   </data>
   <data name="C1Mahnungen2.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;Style11{}Style10{}Style13{}Style12{}Footer{}Style2{}Style3{}FilterBar{BackColor:Info;}RecordSelector{AlignImage:Center;}Style15{}OddRow{BackColor:ControlLight;}Caption{AlignHorz:Center;}EvenRow{BackColor:White;}HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style1{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}Style9{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style5{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style8{}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style6{}Normal{}Style7{}Editor{}Style4{}Style14{}Style16{}&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, 792, 123&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, 123&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;Style11{}Style10{}Style13{}Style12{}Footer{}Style2{}Style3{}FilterBar{BackColor:Info;}RecordSelector{AlignImage:Center;}OddRow{BackColor:ControlLight;}Caption{AlignHorz:Center;}Style14{}Style4{}EvenRow{BackColor:White;}HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style1{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}Style9{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style5{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style8{}Heading{Wrap:True;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;ForeColor:ControlText;}Style6{}Style7{}Editor{}Style15{}Normal{}Style16{}&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, 792, 123&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, 123&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
   </data>
   <metadata name="ToolStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>560, 17</value>
@@ -497,7 +497,7 @@
 </value>
   </data>
   <data name="C1Mahnungen1.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;Style11{}Style10{}Style13{}Style12{}Footer{}Style2{}Style3{}FilterBar{BackColor:Info;}RecordSelector{AlignImage:Center;}Style15{}OddRow{BackColor:ControlLight;}Caption{AlignHorz:Center;}EvenRow{BackColor:White;}HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style1{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}Style9{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style5{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style8{}Heading{ForeColor:ControlText;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Style6{}Normal{}Style7{}Editor{}Style4{}Style14{}Style16{}&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, 792, 168&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, 168&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;Style11{}Style10{}Style13{}Style12{}Footer{}Style2{}Style3{}FilterBar{BackColor:Info;}RecordSelector{AlignImage:Center;}OddRow{BackColor:ControlLight;}Caption{AlignHorz:Center;}Style14{}Style4{}EvenRow{BackColor:White;}HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style1{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}Style9{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style5{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style8{}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style6{}Style7{}Editor{}Style15{}Normal{}Style16{}&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, 792, 168&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, 168&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>453, 17</value>
@@ -517,9 +517,6 @@
         TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
   </data>
-  <metadata name="ToolStrip4.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>667, 17</value>
-  </metadata>
   <metadata name="ContextMenuMahnung3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>174, 56</value>
   </metadata>
@@ -560,7 +557,7 @@
 </value>
   </data>
   <data name="C1Mahnungen3.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;Style11{}Style10{}Style13{}Style12{}Footer{}Style2{}Style3{}FilterBar{BackColor:Info;}RecordSelector{AlignImage:Center;}Style15{}OddRow{BackColor:ControlLight;}Caption{AlignHorz:Center;}EvenRow{BackColor:White;}HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style1{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}Style9{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style5{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style8{}Heading{Wrap:True;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;ForeColor:ControlText;}Style6{}Normal{}Style7{}Editor{}Style4{}Style14{}Style16{}&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, 792, 123&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, 123&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;Style11{}Style10{}Style13{}Style12{}Footer{}Style2{}Style3{}FilterBar{BackColor:Info;}RecordSelector{AlignImage:Center;}OddRow{BackColor:ControlLight;}Caption{AlignHorz:Center;}Style14{}Style4{}EvenRow{BackColor:White;}HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style1{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}Style9{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style5{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style8{}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;Wrap:True;BackColor:Control;ForeColor:ControlText;}Style6{}Style7{}Editor{}Style15{}Normal{}Style16{}&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, 792, 123&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, 123&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
   </data>
   <metadata name="ToolStrip4.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>667, 17</value>
@@ -620,7 +617,7 @@
 </value>
   </data>
   <data name="C1Mahnungen4.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;Style11{}Style10{}Style13{}Style12{}Footer{}Style2{}Style3{}FilterBar{BackColor:Info;}RecordSelector{AlignImage:Center;}Style15{}OddRow{BackColor:ControlLight;}Caption{AlignHorz:Center;}EvenRow{BackColor:White;}HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style1{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}Style9{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style5{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style8{}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;Wrap:True;BackColor:Control;ForeColor:ControlText;}Style6{}Normal{}Style7{}Editor{}Style4{}Style14{}Style16{}&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, 792, 138&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, 138&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;Style11{}Style10{}Style13{}Style12{}Footer{}Style2{}Style3{}FilterBar{BackColor:Info;}RecordSelector{AlignImage:Center;}OddRow{BackColor:ControlLight;}Caption{AlignHorz:Center;}Style14{}Style4{}EvenRow{BackColor:White;}HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style1{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}Style9{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style5{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style8{}Heading{ForeColor:ControlText;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Style6{}Style7{}Editor{}Style15{}Normal{}Style16{}&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, 792, 138&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, 138&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>108</value>

DPM2016/Klassen/clsStammdaten_Bez.vb

@@ -52,6 +52,7 @@
             m_tablename_bottom = value
             get_data_bottom()
             Me.GroupBox3.Text = value
+            Refresh_Bottom()
         End Set
     End Property
 
@@ -144,6 +145,7 @@
             Me.C1DropDownRight.ValueTranslate = True
             Me.C1DropDownRight.DisplayColumns(0).Width = 0
             Me.c1DatenBottom.Columns(Me.KeyField_right).ValueItems.Translate = True
+
         Catch ex As Exception
 
         End Try
@@ -175,15 +177,17 @@
     End Sub
 
     Sub Refresh_Bottom()
-        Dim s As String
+        Try
-        If Me.Focus_Left Then
+            Dim s As String
-            s = " where " + Me.KeyField_left + "=" + Me.c1Datenleft.Columns(KeyField_left).Value.ToString
+            If Me.Focus_Left Then
-        Else
+                s = " where " + Me.KeyField_left + "=" + Me.c1Datenleft.Columns(KeyField_left).Value.ToString
-            s = " where " + Me.KeyField_right + "=" + Me.c1DatenRight.Columns(KeyField_right).Value.ToString
+            Else
-
+                s = " where " + Me.KeyField_right + "=" + Me.c1DatenRight.Columns(KeyField_right).Value.ToString
-        End If
-        Me.get_data_bottom(s)
 
+            End If
+            Me.get_data_bottom(s)
+        Catch
+        End Try
     End Sub
 
     Private Sub c1Datenleft_RowColChange(sender As Object, e As C1.Win.C1TrueDBGrid.RowColChangeEventArgs) Handles c1Datenleft.RowColChange, c1DatenRight.RowColChange

DPM2016/Klassen/clsStammdaten_flat.vb

@@ -37,6 +37,10 @@ Public Class clsStammdaten_flat
         InitializeComponent()
         Me.Connectionstring = My.Settings.ConnectionString
         Me.c1d = Me.c1daten
+        If My.Settings.SoftwareType = "PADM" Then
+            Me.NeuerTarifeintragErstellenToolStripMenuItem.Text = "Neuer Artikel"
+            Me.TarifBearbeitenToolStripMenuItem.Text = "Artikel bearbeiten"
+        End If
     End Sub
 
     Public Sub get_data()
@@ -221,6 +225,45 @@ Public Class clsStammdaten_flat
                 End Try
 
             Case "Tarif"
+
+                If My.Settings.SoftwareType = "PADM" Then
+                    Dim f1 As New TarifDetail_PADM
+                    f1.txtnrtarif.Text = Me.c1daten.Columns("nrtarif").Value
+                    f1.cbboxTarifgruppe.SelectedValue = Me.c1daten.Columns("Nrtarifgruppe").Value
+                    f1.txtNummer.Text = Me.c1daten.Columns("sso_nummer").Value
+                    f1.txtBezd.Text = Me.c1daten.Columns("bezd").Value
+                    'f1.txtBezF.Text = Me.c1daten.Columns("bezf").Value
+                    f1.Handle_RTF(1, Me.c1daten.Columns("bezf").Value)
+                    f1.txtBezi.Text = Me.c1daten.Columns("bezi").Value
+                    f1.txtprivat.Text = Me.c1daten.Columns("privattarif").Value
+                    f1.txtsuva.Text = Me.c1daten.Columns("suvatarif").Value
+                    f1.txtmin.Text = Me.c1daten.Columns("minimaltarif").Value
+                    f1.txtmax.Text = Me.c1daten.Columns("maximaltarif").Value
+                    If Me.c1daten.Columns("MitLabor").Value = 1 Then f1.cbboxmitlabor.Checked = True Else f1.cbboxmitlabor.Checked = False
+                    f1.txtfrankenwert.Text = Me.c1daten.Columns("Frankenbetrag").Value
+                    f1.ShowDialog()
+                    If f1.DialogResult = DialogResult.OK Then
+                        Me.c1daten.Columns("nrtarif").Value = f1.txtnrtarif.Text
+                        Me.c1daten.Columns("Nrtarifgruppe").Value = f1.cbboxTarifgruppe.SelectedValue
+                        Me.c1daten.Columns("sso_nummer").Value = f1.txtNummer.Text
+                        Me.c1daten.Columns("bezd").Value = f1.txtBezd.Text
+                        Me.c1daten.Columns("bezf").Value = f1.Handle_RTF(2, "")
+                        'Me.c1daten.Columns("bezf").Value = f1.txtBezf.Text
+                        Me.c1daten.Columns("bezi").Value = f1.txtBezi.Text
+                        Me.c1daten.Columns("privattarif").Value = f1.txtprivat.Text
+                        Me.c1daten.Columns("suvatarif").Value = f1.txtsuva.Text
+                        Me.c1daten.Columns("minimaltarif").Value = f1.txtmin.Text
+                        Me.c1daten.Columns("maximaltarif").Value = f1.txtmax.Text
+                        If f1.cbboxmitlabor.Checked Then
+                            Me.c1daten.Columns("MitLabor").Value = 1
+                        Else
+                            Me.c1daten.Columns("MitLabor").Value = 0
+                        End If
+                        Me.c1daten.Columns("Frankenbetrag").Value = f1.txtfrankenwert.Text
+                    End If
+
+                    Exit Sub
+                End If
                 Dim f As New frmTarifDetail
                 f.txtnrtarif.Text = Me.c1daten.Columns("nrtarif").Value
                 f.cbboxTarifgruppe.SelectedValue = Me.c1daten.Columns("Nrtarifgruppe").Value
@@ -268,6 +311,24 @@ Public Class clsStammdaten_flat
     End Sub
 
     Private Sub NeuerTarifeintragErstellenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles NeuerTarifeintragErstellenToolStripMenuItem.Click
+        If My.Settings.SoftwareType = "PADM" Then
+            Dim f1 As New TarifDetail_PADM
+            Dim newkey1 As Integer = f1.New_Tarif
+            f1.Dispose()
+            get_data()
+            Dim d1 As DataSet = c1daten.DataSource
+            Dim i1 As Integer = 0
+            For Each r As DataRow In d1.Tables(0).Rows
+                i1 = i1 + 1
+                If newkey1 = r.Item(0) Then
+                    c1daten.Bookmark = i1
+                End If
+            Next
+            c1daten_DoubleClick(sender, e)
+
+            Exit Sub
+
+        End If
         Dim f As New frmTarifDetail
         Dim newkey As Integer = f.New_Tarif
         f.Dispose()

DPM2016/Klassen/clspdfhelper.vb

@@ -7,6 +7,9 @@ Public Class clspdfhelper
         FromLastFaktura
         Andere
         FromCollection
+        FromOfferte
+        FromLieferschein
+        FromAuftragsbestaegigung
     End Enum
     Public Function ConCatPDF(Optional DeleteSource As Boolean = True) As String
         Dim document As New PdfDocument
@@ -72,7 +75,7 @@ Public Class clspdfhelper
         End If
     End Sub
 
-    Public Sub Create_Archivdoc(ByVal From As GetEmpfaengerType, Optional keyvalue As String = "", Optional Bezeichnung As String = "")
+    Public Sub Create_Archivdoc(ByVal From As GetEmpfaengerType, Optional keyvalue As String = "", Optional Bezeichnung As String = "", Optional nrbehandlung As Integer = 0)
         If Globals.License.DMS = False Then Exit Sub
 
         Dim s As String
@@ -94,7 +97,7 @@ Public Class clspdfhelper
                 If tmpcolitem.fakturanr <> fakturanralt Then
                     fakturanralt = tmpcolitem.fakturanr
                     s = ConCatPDF(False)
-                    save_doc_to_db(s, Bezeichnung, 0, 0, From)
+                    save_doc_to_db(s, Bezeichnung, 0, 0, From, nrbehandlung)
                     Globals.pdfCollection.Clear()
                     Globals.pdfCollection.Add(tmpcollection.Item(i))
                 Else
@@ -104,7 +107,7 @@ Public Class clspdfhelper
         End If
         If Globals.pdfCollection.Count > 0 Then
             s = ConCatPDF(False)
-            save_doc_to_db(s, Bezeichnung, 0, 0, From)
+            save_doc_to_db(s, Bezeichnung, 0, 0, From, nrbehandlung)
         End If
 
 
@@ -114,13 +117,16 @@ Public Class clspdfhelper
         Next
 
     End Sub
-    Private Sub save_doc_to_db(ByVal ifilename As String, ByVal bezeichnung As String, ByVal patient As Integer, ByVal debitor As Integer, ByVal From As GetEmpfaengerType)
+    Private Sub save_doc_to_db(ByVal ifilename As String, ByVal bezeichnung As String, ByVal patient As Integer, ByVal debitor As Integer, ByVal From As GetEmpfaengerType, ByVal nrbehandlung As Integer)
         Dim s As String
         Dim db As New clsDB
         Dim Fakturadb As New clsDB
 
         Dim StrukturEintrag_Patient As Integer
         Dim StrukturEintrag_Garant As Integer
+        Dim StrukturEintrag_Offerte As Integer
+        Dim StrukturEintrag_Lieferschein As Integer
+        Dim Struktureintrag_Auftragsbestaetigung As Integer
         Dim CopyDocToGarant As String
         Dim nrfaktura As Integer
         Dim Patientname As String
@@ -136,6 +142,10 @@ Public Class clspdfhelper
             Fakturadb.Get_Tabledata("Faktura", "", "Select top 1 * from faktura WHeRE NRFAKTURA=" + pcolitem.fakturanr.ToString + " order by nrfaktura desc")
             Fakturanr = pcolitem.fakturanr
         End If
+        If From = GetEmpfaengerType.FromOfferte Or From = GetEmpfaengerType.FromAuftragsbestaegigung Or From = GetEmpfaengerType.FromLieferschein Then
+            Fakturadb.Get_Tabledata("Faktura", "", "Select nrpatient,0 as nrdebitor,behandlungsgrund from behandlu where nrbehandlung=" + nrbehandlung.ToString)
+            Fakturanr = 0
+        End If
 
         patient = Fakturadb.dsDaten.Tables(0).Rows(0).Item("nrpatient")
         debitor = Fakturadb.dsDaten.Tables(0).Rows(0).Item("nrdebitor")
@@ -152,6 +162,34 @@ Public Class clspdfhelper
 
             db.Get_Tabledata("DMS", "", "Select wert from dms_settings where nreintrag=10")
             CopyDocToGarant = db.dsDaten.Tables(0).Rows(0).Item(0)
+            Try
+                db.Get_Tabledata("DMS", "", "Select wert from dms_settings where nreintrag=12")
+                StrukturEintrag_Offerte = db.dsDaten.Tables(0).Rows(0).Item(0)
+                db.Get_Tabledata("DMS", "", "Select wert from dms_settings where nreintrag=14")
+                StrukturEintrag_Lieferschein = db.dsDaten.Tables(0).Rows(0).Item(0)
+                db.Get_Tabledata("DMS", "", "Select wert from dms_settings where nreintrag=13")
+                Struktureintrag_Auftragsbestaetigung = db.dsDaten.Tables(0).Rows(0).Item(0)
+
+                If From = GetEmpfaengerType.FromOfferte Then
+                    StrukturEintrag_Patient = StrukturEintrag_Offerte
+                    debitor = patient
+                    db.Get_Tabledata("Behandlung", "", "Select behandlungsgrund from behandlu where nrbehandlung=" + nrbehandlung.ToString)
+                    bezeichnung = "Offerte " + db.dsDaten.Tables(0).Rows(0).Item(0).ToString
+                End If
+                If From = GetEmpfaengerType.FromLieferschein Then
+                    StrukturEintrag_Patient = StrukturEintrag_Lieferschein
+                    debitor = patient
+                    db.Get_Tabledata("Behandlung", "", "Select behandlungsgrund from behandlu where nrbehandlung=" + nrbehandlung.ToString)
+                    bezeichnung = "Lieferschein " + db.dsDaten.Tables(0).Rows(0).Item(0).ToString
+                End If
+                If From = GetEmpfaengerType.FromAuftragsbestaegigung Then
+                    StrukturEintrag_Patient = Struktureintrag_Auftragsbestaetigung
+                    debitor = patient
+                    db.Get_Tabledata("Behandlung", "", "Select behandlungsgrund from behandlu where nrbehandlung=" + nrbehandlung.ToString)
+                    bezeichnung = "Auftragsbestätigung " + db.dsDaten.Tables(0).Rows(0).Item(0).ToString
+                End If
+            Catch
+            End Try
 
             'Patienten-Dokumente
             Dim dok As New clsDok

DPM2016/My Project/Settings.Designer.vb

@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -90,18 +90,6 @@ Namespace My
             End Set
         End Property
         
-        <Global.System.Configuration.UserScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("PADM")>  _
-        Public Property SoftwareType() As String
-            Get
-                Return CType(Me("SoftwareType"),String)
-            End Get
-            Set
-                Me("SoftwareType") = value
-            End Set
-        End Property
-        
         <Global.System.Configuration.UserScopedSettingAttribute(),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.Configuration.DefaultSettingValueAttribute("data source=shu00;initial catalog=SHUB_PADM;persist security info=false;workstati"& _ 
@@ -175,6 +163,18 @@ Namespace My
                 Me("WebAPI") = value
             End Set
         End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("PADM")>  _
+        Public Property SoftwareType() As String
+            Get
+                Return CType(Me("SoftwareType"),String)
+            End Get
+            Set
+                Me("SoftwareType") = value
+            End Set
+        End Property
     End Class
 End Namespace
 

DPM2016/My Project/Settings.settings

@@ -11,9 +11,6 @@
     <Setting Name="DocArchivPath" Type="System.String" Scope="User">
       <Value Profile="(Default)">h:\dpm\docarchiv</Value>
     </Setting>
-    <Setting Name="SoftwareType" Type="System.String" Scope="User">
-      <Value Profile="(Default)">PADM</Value>
-    </Setting>
     <Setting Name="ConnectionString" Type="System.String" Scope="User">
       <Value Profile="(Default)">data source=shu00;initial catalog=SHUB_PADM;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29</Value>
     </Setting>
@@ -32,5 +29,8 @@
     <Setting Name="WebAPI" Type="System.String" Scope="User">
       <Value Profile="(Default)">http://192.168.111.67</Value>
     </Setting>
+    <Setting Name="SoftwareType" Type="System.String" Scope="User">
+      <Value Profile="(Default)">PADM</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

DPM2016/My Project/licenses.licx

@@ -1,6 +1,3 @@
-C1.Win.C1Input.C1Button, C1.Win.C1Input.4, Version=4.0.20153.110, Culture=neutral, PublicKeyToken=7e7ff60f0c214f9a
-C1.Win.C1Command.C1CommandHolder, C1.Win.C1Command.2, Version=2.0.20153.110, Culture=neutral, PublicKeyToken=e808566f358766d8
-C1.Win.C1Command.C1DockingTab, C1.Win.C1Command.4, Version=4.0.20153.110, Culture=neutral, PublicKeyToken=e808566f358766d8
 C1.Win.C1Input.C1PictureBox, C1.Win.C1Input.4, Version=4.0.20153.110, Culture=neutral, PublicKeyToken=7e7ff60f0c214f9a
-C1.Win.C1Command.C1ContextMenu, C1.Win.C1Command.2, Version=2.0.20153.110, Culture=neutral, PublicKeyToken=e808566f358766d8
+C1.Win.C1Command.C1DockingTab, C1.Win.C1Command.4, Version=4.0.20153.110, Culture=neutral, PublicKeyToken=e808566f358766d8
 C1.Win.C1TrueDBGrid.C1TrueDBGrid, C1.Win.C1TrueDBGrid.2, Version=2.0.20153.110, Culture=neutral, PublicKeyToken=75ae3fb0e2b1e0da

DPM2016/Patient/Patient.Designer.vb

@@ -81,10 +81,11 @@ Partial Class Patient
         'ToolStrip1
         '
         Me.ToolStrip1.AllowDrop = True
+        Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(20, 20)
         Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnquit, Me.tsbtnnew, Me.tsbtnSave, Me.ToolStripButton4, Me.tstxtsuche, Me.ToolStripButton2, Me.ToolStripButton3, Me.ToolStripLabel1, Me.tsbtnfirst, Me.tsbtprev, Me.tsbtnnext, Me.tsbtnlast, Me.ToolStripSeparator1, Me.tsbtnVTX})
         Me.ToolStrip1.Location = New System.Drawing.Point(0, 24)
         Me.ToolStrip1.Name = "ToolStrip1"
-        Me.ToolStrip1.Size = New System.Drawing.Size(1278, 25)
+        Me.ToolStrip1.Size = New System.Drawing.Size(1278, 27)
         Me.ToolStrip1.TabIndex = 15
         Me.ToolStrip1.Text = "ToolStrip1"
         '
@@ -94,7 +95,7 @@ Partial Class Patient
         Me.tsbtnquit.Image = CType(resources.GetObject("tsbtnquit.Image"), System.Drawing.Image)
         Me.tsbtnquit.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.tsbtnquit.Name = "tsbtnquit"
-        Me.tsbtnquit.Size = New System.Drawing.Size(23, 22)
+        Me.tsbtnquit.Size = New System.Drawing.Size(24, 24)
         Me.tsbtnquit.Text = "Schliessen"
         '
         'tsbtnnew
@@ -103,7 +104,7 @@ Partial Class Patient
         Me.tsbtnnew.Image = CType(resources.GetObject("tsbtnnew.Image"), System.Drawing.Image)
         Me.tsbtnnew.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.tsbtnnew.Name = "tsbtnnew"
-        Me.tsbtnnew.Size = New System.Drawing.Size(23, 22)
+        Me.tsbtnnew.Size = New System.Drawing.Size(24, 24)
         Me.tsbtnnew.Text = "Neuer Datensatz"
         '
         'tsbtnSave
@@ -112,7 +113,7 @@ Partial Class Patient
         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"
         '
         'ToolStripButton4
@@ -121,15 +122,14 @@ Partial Class Patient
         Me.ToolStripButton4.Image = CType(resources.GetObject("ToolStripButton4.Image"), System.Drawing.Image)
         Me.ToolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton4.Name = "ToolStripButton4"
-        Me.ToolStripButton4.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton4.Size = New System.Drawing.Size(24, 24)
         Me.ToolStripButton4.Text = "Dokumentinformationen bearbeiten"
         Me.ToolStripButton4.Visible = False
         '
         'tstxtsuche
         '
-        Me.tstxtsuche.Font = New System.Drawing.Font("Segoe UI", 9.0!)
         Me.tstxtsuche.Name = "tstxtsuche"
-        Me.tstxtsuche.Size = New System.Drawing.Size(100, 25)
+        Me.tstxtsuche.Size = New System.Drawing.Size(100, 27)
         '
         'ToolStripButton2
         '
@@ -137,7 +137,7 @@ Partial Class Patient
         Me.ToolStripButton2.Image = CType(resources.GetObject("ToolStripButton2.Image"), System.Drawing.Image)
         Me.ToolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton2.Name = "ToolStripButton2"
-        Me.ToolStripButton2.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton2.Size = New System.Drawing.Size(24, 24)
         Me.ToolStripButton2.Text = "Dokument löschen"
         Me.ToolStripButton2.Visible = False
         '
@@ -147,14 +147,14 @@ Partial Class Patient
         Me.ToolStripButton3.Image = CType(resources.GetObject("ToolStripButton3.Image"), System.Drawing.Image)
         Me.ToolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton3.Name = "ToolStripButton3"
-        Me.ToolStripButton3.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton3.Size = New System.Drawing.Size(24, 24)
         Me.ToolStripButton3.Text = "Dokument anzeigen"
         Me.ToolStripButton3.Visible = False
         '
         'ToolStripLabel1
         '
         Me.ToolStripLabel1.Name = "ToolStripLabel1"
-        Me.ToolStripLabel1.Size = New System.Drawing.Size(39, 22)
+        Me.ToolStripLabel1.Size = New System.Drawing.Size(39, 24)
         Me.ToolStripLabel1.Text = "Suche"
         '
         'tsbtnfirst
@@ -163,7 +163,7 @@ Partial Class Patient
         Me.tsbtnfirst.Image = CType(resources.GetObject("tsbtnfirst.Image"), System.Drawing.Image)
         Me.tsbtnfirst.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.tsbtnfirst.Name = "tsbtnfirst"
-        Me.tsbtnfirst.Size = New System.Drawing.Size(23, 22)
+        Me.tsbtnfirst.Size = New System.Drawing.Size(24, 24)
         Me.tsbtnfirst.Text = "Erster Datensatz"
         '
         'tsbtprev
@@ -172,7 +172,7 @@ Partial Class Patient
         Me.tsbtprev.Image = CType(resources.GetObject("tsbtprev.Image"), System.Drawing.Image)
         Me.tsbtprev.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.tsbtprev.Name = "tsbtprev"
-        Me.tsbtprev.Size = New System.Drawing.Size(23, 22)
+        Me.tsbtprev.Size = New System.Drawing.Size(24, 24)
         Me.tsbtprev.Text = "Vorheriger Datensatz"
         '
         'tsbtnnext
@@ -181,7 +181,7 @@ Partial Class Patient
         Me.tsbtnnext.Image = CType(resources.GetObject("tsbtnnext.Image"), System.Drawing.Image)
         Me.tsbtnnext.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.tsbtnnext.Name = "tsbtnnext"
-        Me.tsbtnnext.Size = New System.Drawing.Size(23, 22)
+        Me.tsbtnnext.Size = New System.Drawing.Size(24, 24)
         Me.tsbtnnext.Text = "nächster Datensatz"
         '
         'tsbtnlast
@@ -190,13 +190,13 @@ Partial Class Patient
         Me.tsbtnlast.Image = CType(resources.GetObject("tsbtnlast.Image"), System.Drawing.Image)
         Me.tsbtnlast.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.tsbtnlast.Name = "tsbtnlast"
-        Me.tsbtnlast.Size = New System.Drawing.Size(23, 22)
+        Me.tsbtnlast.Size = New System.Drawing.Size(24, 24)
         Me.tsbtnlast.Text = "Letzter Datensatz"
         '
         'ToolStripSeparator1
         '
         Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25)
+        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 27)
         '
         'tsbtnVTX
         '
@@ -204,7 +204,7 @@ Partial Class Patient
         Me.tsbtnVTX.Image = CType(resources.GetObject("tsbtnVTX.Image"), System.Drawing.Image)
         Me.tsbtnVTX.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.tsbtnVTX.Name = "tsbtnVTX"
-        Me.tsbtnVTX.Size = New System.Drawing.Size(23, 22)
+        Me.tsbtnVTX.Size = New System.Drawing.Size(24, 24)
         Me.tsbtnVTX.Text = "ToolStripButton1"
         '
         'SuperTabControl1
@@ -230,12 +230,12 @@ Partial Class Patient
         Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel2)
         Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel5)
         Me.SuperTabControl1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.SuperTabControl1.Location = New System.Drawing.Point(0, 49)
+        Me.SuperTabControl1.Location = New System.Drawing.Point(0, 51)
         Me.SuperTabControl1.Name = "SuperTabControl1"
         Me.SuperTabControl1.ReorderTabsEnabled = True
         Me.SuperTabControl1.SelectedTabFont = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold)
         Me.SuperTabControl1.SelectedTabIndex = 0
-        Me.SuperTabControl1.Size = New System.Drawing.Size(1278, 637)
+        Me.SuperTabControl1.Size = New System.Drawing.Size(1278, 635)
         Me.SuperTabControl1.TabFont = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.SuperTabControl1.TabIndex = 18
         Me.SuperTabControl1.Tabs.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.Stammdaten, Me.Abrechnung, Me.Behandlungen, Me.Finanzen, Me.Recall, Me.Dokumente, Me.Krankengeschichte})
@@ -248,7 +248,7 @@ Partial Class Patient
         Me.SuperTabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill
         Me.SuperTabControlPanel1.Location = New System.Drawing.Point(0, 25)
         Me.SuperTabControlPanel1.Name = "SuperTabControlPanel1"
-        Me.SuperTabControlPanel1.Size = New System.Drawing.Size(1278, 612)
+        Me.SuperTabControlPanel1.Size = New System.Drawing.Size(1278, 610)
         Me.SuperTabControlPanel1.TabIndex = 1
         Me.SuperTabControlPanel1.TabItem = Me.Stammdaten
         '
@@ -266,10 +266,11 @@ Partial Class Patient
         Me.PatientDetails1.Dock = System.Windows.Forms.DockStyle.Fill
         Me.PatientDetails1.HasChanges = False
         Me.PatientDetails1.Location = New System.Drawing.Point(0, 0)
+        Me.PatientDetails1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.PatientDetails1.Name = "PatientDetails1"
         Me.PatientDetails1.Patientname = "0 Hutter Stefan Pfäffikon SZ"
         Me.PatientDetails1.PatientNr = 0
-        Me.PatientDetails1.Size = New System.Drawing.Size(1278, 612)
+        Me.PatientDetails1.Size = New System.Drawing.Size(1278, 610)
         Me.PatientDetails1.TabIndex = 17
         '
         'Stammdaten
@@ -293,6 +294,7 @@ Partial Class Patient
         '
         Me.Krankengeschichte1.Dock = System.Windows.Forms.DockStyle.Fill
         Me.Krankengeschichte1.Location = New System.Drawing.Point(0, 0)
+        Me.Krankengeschichte1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.Krankengeschichte1.Name = "Krankengeschichte1"
         Me.Krankengeschichte1.Patientnr = 0
         Me.Krankengeschichte1.Size = New System.Drawing.Size(1278, 612)
@@ -319,6 +321,7 @@ Partial Class Patient
         '
         Me.ClsDokumente1.Dock = System.Windows.Forms.DockStyle.Fill
         Me.ClsDokumente1.Location = New System.Drawing.Point(0, 0)
+        Me.ClsDokumente1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.ClsDokumente1.Name = "ClsDokumente1"
         Me.ClsDokumente1.Patientnr = 0
         Me.ClsDokumente1.Size = New System.Drawing.Size(1278, 612)
@@ -345,6 +348,7 @@ Partial Class Patient
         '
         Me.Recall1.Dock = System.Windows.Forms.DockStyle.Fill
         Me.Recall1.Location = New System.Drawing.Point(0, 0)
+        Me.Recall1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.Recall1.Name = "Recall1"
         Me.Recall1.Patientnr = 0
         Me.Recall1.Size = New System.Drawing.Size(1278, 612)
@@ -372,6 +376,7 @@ Partial Class Patient
         Me.Behandlung1.Dock = System.Windows.Forms.DockStyle.Fill
         Me.Behandlung1.HasChanges = False
         Me.Behandlung1.Location = New System.Drawing.Point(0, 0)
+        Me.Behandlung1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.Behandlung1.Name = "Behandlung1"
         Me.Behandlung1.PatientNr = 0
         Me.Behandlung1.Size = New System.Drawing.Size(1278, 612)
@@ -399,6 +404,7 @@ Partial Class Patient
         Me.PatientAbrechnung1.Dock = System.Windows.Forms.DockStyle.Fill
         Me.PatientAbrechnung1.HasChanges = False
         Me.PatientAbrechnung1.Location = New System.Drawing.Point(0, 0)
+        Me.PatientAbrechnung1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.PatientAbrechnung1.Name = "PatientAbrechnung1"
         Me.PatientAbrechnung1.PatientNr = 0
         Me.PatientAbrechnung1.Size = New System.Drawing.Size(1278, 612)
@@ -425,6 +431,7 @@ Partial Class Patient
         '
         Me.Finanzen1.Dock = System.Windows.Forms.DockStyle.Fill
         Me.Finanzen1.Location = New System.Drawing.Point(0, 0)
+        Me.Finanzen1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.Finanzen1.Name = "Finanzen1"
         Me.Finanzen1.Patientnr = 0
         Me.Finanzen1.Size = New System.Drawing.Size(1278, 612)
@@ -440,9 +447,11 @@ Partial Class Patient
         'MenuStrip1
         '
         Me.MenuStrip1.AllowMerge = False
+        Me.MenuStrip1.ImageScalingSize = New System.Drawing.Size(20, 20)
         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.Padding = New System.Windows.Forms.Padding(4, 2, 0, 2)
         Me.MenuStrip1.Size = New System.Drawing.Size(1278, 24)
         Me.MenuStrip1.TabIndex = 19
         Me.MenuStrip1.Text = "MenuStrip1"

DPM2016/Patient/Patient.resx

@@ -402,7 +402,7 @@
   <data name="btnVTX.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACEAAAAhCAYAAABX5MJvAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAADF1JREFUWEftV/lXk2ca7d8wM6c/zEgFhAQSSMK+iEurgrKH7Alh09bWdnSsrbZ1
+        wAAADsABataJCQAADF1JREFUWEftV/lXk2ca7d8wM6c/zEgFhAQSSMK+iEurgrKH7Alh09bWdnSsrbZ1
         4yhYBNlllbDvEBbZUdyqraitjB6XutUNrFSwUjdc5s79Ek7P/BGTc14Svu/9vve+z3Of+9z3nb+lWOGQ
         3AtndQ98TScgjeyDQjsEV00rJGs68J65GqLV9XDR10BmtmJBdDtk8UfgpD8KkfkEXLU9cNN0wU3bATGH
         xNANSXwPxMY+uOgOQmwYtA9jPwevmzohjm+F2NwAH1MO3hE+7ya1wSGhA/MiGuClG4Qitgd+hiE+2AFH

DPM2016/Program.vb

@@ -19,7 +19,7 @@ Module Program
                                                            Application.Run(splashForm)
                                                        End Sub))
         splashThread.SetApartmentState(ApartmentState.STA)
-        splashThread.Start()
+        'splashThread.Start()
 
         Application.Run(mainForm)
         mainForm.BringToFront()

DPM2016/Reporting/frmReportView.vb

@@ -259,15 +259,15 @@ Public Class frmReportView
                 Dim pdfexport As New FastReport.Export.Pdf.PDFExport
                 pdfexport.ShowProgress = False
                 pdfexport.Subject = "Export"
-                    pdfexport.Title = "Export"
+                pdfexport.Title = "Export"
-                    pdfexport.Compressed = UCase(db.Get_Option(50000)) = "TRUE"
+                pdfexport.Compressed = UCase(db.Get_Option(50000)) = "TRUE"
-                    pdfexport.AllowPrint = UCase(db.Get_Option(50002)) = "TRUE"
+                pdfexport.AllowPrint = UCase(db.Get_Option(50002)) = "TRUE"
-                    pdfexport.TextInCurves = UCase(db.Get_Option(50001)) = "TRUE"
+                pdfexport.TextInCurves = UCase(db.Get_Option(50001)) = "TRUE"
-                    'pdfexport.Compressed = False
+                'pdfexport.Compressed = False
-                    'pdfexport.AllowPrint = True
+                'pdfexport.AllowPrint = True
-                    'pdfexport.EmbeddingFonts = True
+                'pdfexport.EmbeddingFonts = True
-                    'pdfexport.TextInCurves = True
+                'pdfexport.TextInCurves = True
-                    freport.Prepare()
+                freport.Prepare()
                 freport.Export(pdfexport, s + ".PDF")
                 Dim pdfitem As New clspdfcollectionitem(Fakturanr.ToString, s + ".pdf")
                 Globals.pdfCollection.Add(pdfitem)
@@ -280,7 +280,7 @@ Public Class frmReportView
 
     End Sub
 
-    Public Sub Print_Rechnung(Optional vorschaue As Boolean = False, Optional design As Boolean = False, Optional Rate As Integer = 0, Optional kopie As Integer = 0, Optional Fakturanr As Integer = 0)
+    Public Sub Print_Rechnung(Optional vorschaue As Boolean = False, Optional design As Boolean = False, Optional Rate As Integer = 0, Optional kopie As Integer = 0, Optional Fakturanr As Integer = 0, Optional doktype As String = "")
 
         If Rate > 1 Then ReportNr = ReportNr + 1
         Dim kopien As Integer = 1
@@ -420,10 +420,10 @@ Public Class frmReportView
         freport.GetDataSource("Leistungen_LR").Enabled = True
         freport.GetDataSource("Leistungen_Dentotar").Enabled = True
         freport.GetDataSource("ESDaten").Enabled = True
-
+        If doktype <> "" Then freport.SetParameterValue("Doktype", doktype)
         freport.PrintSettings.ShowDialog = True
 
-        If Globals.ignoreprint Then Exit Sub
+        If Globals.IgnorePrint Then Exit Sub
 
 
         If design = True Then
@@ -651,15 +651,17 @@ Public Class frmReportView
 
             End If
 
-            Dim additionalInformation As SwissQrCode.AdditionalInformation = New SwissQrCode.AdditionalInformation(r("fakturanr"), "RG-Nr:")
+            Dim additionalInformation As SwissQrCode.AdditionalInformation = New SwissQrCode.AdditionalInformation(r("fakturanr"), "")
+            'Dim additionalInformation As SwissQrCode.AdditionalInformation = New SwissQrCode.AdditionalInformation(r("fakturanr"), "RG-Nr:")
             Dim currency As SwissQrCode.Currency = SwissQrCode.Currency.CHF
             Dim amount As Decimal = r("QR_Betrag")
             Dim generator As SwissQrCode = New SwissQrCode(iban, currency, contactdebitor, reference, additionalInformation, contactGeneral, amount, Nothing, Nothing)
 
 
+
             Dim payload As String = generator.ToString()
             Dim qrGenerator As QRCodeGenerator = New QRCodeGenerator()
-            Dim qrCodeData As QRCodeData = qrGenerator.CreateQrCode(payload, QRCodeGenerator.ECCLevel.M)
+            Dim qrCodeData As QRCodeData = qrGenerator.CreateQrCode(payload, QRCodeGenerator.ECCLevel.M, True)
             Dim qrCode As QRCode = New QRCode(qrCodeData)
             'Dim qrCodeAsBitmap = qrCode.GetGraphic(20, Color.Black, Color.White, CType(Bitmap.FromFile(Application.StartupPath & "\CH-Kreuz_7mm.png"), Bitmap), 14, 1)
             Dim qrCodeAsBitmap = qrCode.GetGraphic(20, Color.Black, Color.White, CType(Bitmap.FromFile(Application.StartupPath & "\CH-Kreuz_7mm.png"), Bitmap), 14, 1, False)

DPM2016/Sysadmin/TarifDetail_PADM.Designer.vb

@@ -0,0 +1,428 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class TarifDetail_PADM
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.txtfrankenwert = New System.Windows.Forms.TextBox()
+        Me.cbboxmitlabor = New System.Windows.Forms.CheckBox()
+        Me.txtmax = New System.Windows.Forms.TextBox()
+        Me.txtmin = New System.Windows.Forms.TextBox()
+        Me.txtsuva = New System.Windows.Forms.TextBox()
+        Me.txtprivat = New System.Windows.Forms.TextBox()
+        Me.txtBezi = New System.Windows.Forms.TextBox()
+        Me.txtBezd = New System.Windows.Forms.TextBox()
+        Me.txtNummer = New System.Windows.Forms.TextBox()
+        Me.cbboxTarifgruppe = New System.Windows.Forms.ComboBox()
+        Me.txtnrtarif = New System.Windows.Forms.TextBox()
+        Me.Label12 = New System.Windows.Forms.Label()
+        Me.Label11 = New System.Windows.Forms.Label()
+        Me.Label10 = New System.Windows.Forms.Label()
+        Me.Label9 = New System.Windows.Forms.Label()
+        Me.Label8 = New System.Windows.Forms.Label()
+        Me.Label7 = New System.Windows.Forms.Label()
+        Me.Label6 = New System.Windows.Forms.Label()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.Button2 = New System.Windows.Forms.Button()
+        Me.Button1 = New System.Windows.Forms.Button()
+        Me.txtBezF = New System.Windows.Forms.RichTextBox()
+        Me.richTextBoxExtended1 = New RichTextBoxExtended.RichTextBoxExtended()
+        Me.Label13 = New System.Windows.Forms.Label()
+        Me.SuspendLayout()
+        '
+        'txtfrankenwert
+        '
+        Me.txtfrankenwert.Location = New System.Drawing.Point(134, 409)
+        Me.txtfrankenwert.Margin = New System.Windows.Forms.Padding(4)
+        Me.txtfrankenwert.Name = "txtfrankenwert"
+        Me.txtfrankenwert.Size = New System.Drawing.Size(132, 22)
+        Me.txtfrankenwert.TabIndex = 51
+        '
+        'cbboxmitlabor
+        '
+        Me.cbboxmitlabor.AutoSize = True
+        Me.cbboxmitlabor.Location = New System.Drawing.Point(630, 334)
+        Me.cbboxmitlabor.Margin = New System.Windows.Forms.Padding(4)
+        Me.cbboxmitlabor.Name = "cbboxmitlabor"
+        Me.cbboxmitlabor.Size = New System.Drawing.Size(18, 17)
+        Me.cbboxmitlabor.TabIndex = 50
+        Me.cbboxmitlabor.UseVisualStyleBackColor = True
+        '
+        'txtmax
+        '
+        Me.txtmax.Location = New System.Drawing.Point(630, 300)
+        Me.txtmax.Margin = New System.Windows.Forms.Padding(4)
+        Me.txtmax.Name = "txtmax"
+        Me.txtmax.Size = New System.Drawing.Size(132, 22)
+        Me.txtmax.TabIndex = 49
+        '
+        'txtmin
+        '
+        Me.txtmin.Location = New System.Drawing.Point(630, 270)
+        Me.txtmin.Margin = New System.Windows.Forms.Padding(4)
+        Me.txtmin.Name = "txtmin"
+        Me.txtmin.Size = New System.Drawing.Size(132, 22)
+        Me.txtmin.TabIndex = 48
+        '
+        'txtsuva
+        '
+        Me.txtsuva.Location = New System.Drawing.Point(630, 240)
+        Me.txtsuva.Margin = New System.Windows.Forms.Padding(4)
+        Me.txtsuva.Name = "txtsuva"
+        Me.txtsuva.Size = New System.Drawing.Size(132, 22)
+        Me.txtsuva.TabIndex = 47
+        '
+        'txtprivat
+        '
+        Me.txtprivat.Location = New System.Drawing.Point(630, 210)
+        Me.txtprivat.Margin = New System.Windows.Forms.Padding(4)
+        Me.txtprivat.Name = "txtprivat"
+        Me.txtprivat.Size = New System.Drawing.Size(132, 22)
+        Me.txtprivat.TabIndex = 46
+        '
+        'txtBezi
+        '
+        Me.txtBezi.Location = New System.Drawing.Point(630, 164)
+        Me.txtBezi.Margin = New System.Windows.Forms.Padding(4)
+        Me.txtBezi.Name = "txtBezi"
+        Me.txtBezi.Size = New System.Drawing.Size(355, 22)
+        Me.txtBezi.TabIndex = 45
+        '
+        'txtBezd
+        '
+        Me.txtBezd.Location = New System.Drawing.Point(134, 102)
+        Me.txtBezd.Margin = New System.Windows.Forms.Padding(4)
+        Me.txtBezd.Multiline = True
+        Me.txtBezd.Name = "txtBezd"
+        Me.txtBezd.Size = New System.Drawing.Size(488, 61)
+        Me.txtBezd.TabIndex = 43
+        '
+        'txtNummer
+        '
+        Me.txtNummer.Location = New System.Drawing.Point(134, 70)
+        Me.txtNummer.Margin = New System.Windows.Forms.Padding(4)
+        Me.txtNummer.Name = "txtNummer"
+        Me.txtNummer.Size = New System.Drawing.Size(132, 22)
+        Me.txtNummer.TabIndex = 42
+        '
+        'cbboxTarifgruppe
+        '
+        Me.cbboxTarifgruppe.FormattingEnabled = True
+        Me.cbboxTarifgruppe.Location = New System.Drawing.Point(134, 42)
+        Me.cbboxTarifgruppe.Margin = New System.Windows.Forms.Padding(4)
+        Me.cbboxTarifgruppe.Name = "cbboxTarifgruppe"
+        Me.cbboxTarifgruppe.Size = New System.Drawing.Size(160, 24)
+        Me.cbboxTarifgruppe.TabIndex = 41
+        '
+        'txtnrtarif
+        '
+        Me.txtnrtarif.Location = New System.Drawing.Point(134, 13)
+        Me.txtnrtarif.Margin = New System.Windows.Forms.Padding(4)
+        Me.txtnrtarif.Name = "txtnrtarif"
+        Me.txtnrtarif.ReadOnly = True
+        Me.txtnrtarif.Size = New System.Drawing.Size(132, 22)
+        Me.txtnrtarif.TabIndex = 40
+        '
+        'Label12
+        '
+        Me.Label12.AutoSize = True
+        Me.Label12.Location = New System.Drawing.Point(19, 417)
+        Me.Label12.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label12.Name = "Label12"
+        Me.Label12.Size = New System.Drawing.Size(80, 16)
+        Me.Label12.TabIndex = 39
+        Me.Label12.Text = "Frankenwert"
+        '
+        'Label11
+        '
+        Me.Label11.AutoSize = True
+        Me.Label11.Location = New System.Drawing.Point(515, 334)
+        Me.Label11.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label11.Name = "Label11"
+        Me.Label11.Size = New System.Drawing.Size(62, 16)
+        Me.Label11.TabIndex = 38
+        Me.Label11.Text = "Mit Labor"
+        '
+        'Label10
+        '
+        Me.Label10.AutoSize = True
+        Me.Label10.Location = New System.Drawing.Point(515, 304)
+        Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label10.Name = "Label10"
+        Me.Label10.Size = New System.Drawing.Size(32, 16)
+        Me.Label10.TabIndex = 37
+        Me.Label10.Text = "Max"
+        '
+        'Label9
+        '
+        Me.Label9.AutoSize = True
+        Me.Label9.Location = New System.Drawing.Point(515, 273)
+        Me.Label9.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label9.Name = "Label9"
+        Me.Label9.Size = New System.Drawing.Size(28, 16)
+        Me.Label9.TabIndex = 36
+        Me.Label9.Text = "Min"
+        '
+        'Label8
+        '
+        Me.Label8.AutoSize = True
+        Me.Label8.Location = New System.Drawing.Point(514, 244)
+        Me.Label8.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label8.Name = "Label8"
+        Me.Label8.Size = New System.Drawing.Size(44, 16)
+        Me.Label8.TabIndex = 35
+        Me.Label8.Text = "SUVA"
+        '
+        'Label7
+        '
+        Me.Label7.AutoSize = True
+        Me.Label7.Location = New System.Drawing.Point(514, 214)
+        Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label7.Name = "Label7"
+        Me.Label7.Size = New System.Drawing.Size(41, 16)
+        Me.Label7.TabIndex = 34
+        Me.Label7.Text = "Privat"
+        '
+        'Label6
+        '
+        Me.Label6.AutoSize = True
+        Me.Label6.Location = New System.Drawing.Point(514, 167)
+        Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label6.Name = "Label6"
+        Me.Label6.Size = New System.Drawing.Size(90, 16)
+        Me.Label6.TabIndex = 33
+        Me.Label6.Text = "Bezeichnung I"
+        '
+        'Label5
+        '
+        Me.Label5.AutoSize = True
+        Me.Label5.Location = New System.Drawing.Point(514, 140)
+        Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(95, 16)
+        Me.Label5.TabIndex = 32
+        Me.Label5.Text = "Bezeichnung F"
+        '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.Location = New System.Drawing.Point(15, 106)
+        Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(84, 16)
+        Me.Label4.TabIndex = 31
+        Me.Label4.Text = "Bezeichnung"
+        '
+        'Label3
+        '
+        Me.Label3.AutoSize = True
+        Me.Label3.Location = New System.Drawing.Point(15, 74)
+        Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(58, 16)
+        Me.Label3.TabIndex = 30
+        Me.Label3.Text = "Nummer"
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Location = New System.Drawing.Point(16, 45)
+        Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(52, 16)
+        Me.Label2.TabIndex = 29
+        Me.Label2.Text = "Gruppe"
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(15, 17)
+        Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(89, 16)
+        Me.Label1.TabIndex = 28
+        Me.Label1.Text = "Tarif-Nummer"
+        '
+        'Button2
+        '
+        Me.Button2.Location = New System.Drawing.Point(523, 457)
+        Me.Button2.Margin = New System.Windows.Forms.Padding(4)
+        Me.Button2.Name = "Button2"
+        Me.Button2.Size = New System.Drawing.Size(100, 28)
+        Me.Button2.TabIndex = 27
+        Me.Button2.Text = "Abbruch"
+        Me.Button2.UseVisualStyleBackColor = True
+        '
+        'Button1
+        '
+        Me.Button1.Location = New System.Drawing.Point(18, 457)
+        Me.Button1.Margin = New System.Windows.Forms.Padding(4)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(100, 28)
+        Me.Button1.TabIndex = 26
+        Me.Button1.Text = "Speichern"
+        Me.Button1.UseVisualStyleBackColor = True
+        '
+        'txtBezF
+        '
+        Me.txtBezF.Location = New System.Drawing.Point(134, 226)
+        Me.txtBezF.Name = "txtBezF"
+        Me.txtBezF.Size = New System.Drawing.Size(488, 96)
+        Me.txtBezF.TabIndex = 52
+        Me.txtBezF.Text = ""
+        '
+        'richTextBoxExtended1
+        '
+        Me.richTextBoxExtended1.AcceptsTab = True
+        Me.richTextBoxExtended1.AutoWordSelection = True
+        Me.richTextBoxExtended1.DetectURLs = True
+        Me.richTextBoxExtended1.Location = New System.Drawing.Point(134, 193)
+        Me.richTextBoxExtended1.Name = "richTextBoxExtended1"
+        Me.richTextBoxExtended1.ReadOnly = False
+        '
+        '
+        '
+        Me.richTextBoxExtended1.RichTextBox.AcceptsTab = True
+        Me.richTextBoxExtended1.RichTextBox.AutoWordSelection = True
+        Me.richTextBoxExtended1.RichTextBox.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.richTextBoxExtended1.RichTextBox.Location = New System.Drawing.Point(0, 26)
+        Me.richTextBoxExtended1.RichTextBox.Name = "rtb1"
+        Me.richTextBoxExtended1.RichTextBox.Size = New System.Drawing.Size(794, 138)
+        Me.richTextBoxExtended1.RichTextBox.TabIndex = 1
+        Me.richTextBoxExtended1.ShowBold = True
+        Me.richTextBoxExtended1.ShowCenterJustify = True
+        Me.richTextBoxExtended1.ShowColors = True
+        Me.richTextBoxExtended1.ShowCopy = True
+        Me.richTextBoxExtended1.ShowCut = True
+        Me.richTextBoxExtended1.ShowFont = True
+        Me.richTextBoxExtended1.ShowFontSize = True
+        Me.richTextBoxExtended1.ShowItalic = True
+        Me.richTextBoxExtended1.ShowLeftJustify = True
+        Me.richTextBoxExtended1.ShowOpen = True
+        Me.richTextBoxExtended1.ShowPaste = True
+        Me.richTextBoxExtended1.ShowRedo = True
+        Me.richTextBoxExtended1.ShowRightJustify = True
+        Me.richTextBoxExtended1.ShowSave = True
+        Me.richTextBoxExtended1.ShowStamp = True
+        Me.richTextBoxExtended1.ShowStrikeout = True
+        Me.richTextBoxExtended1.ShowToolBarText = False
+        Me.richTextBoxExtended1.ShowUnderline = True
+        Me.richTextBoxExtended1.ShowUndo = True
+        Me.richTextBoxExtended1.Size = New System.Drawing.Size(489, 209)
+        Me.richTextBoxExtended1.StampAction = RichTextBoxExtended.StampActions.EditedBy
+        Me.richTextBoxExtended1.StampColor = System.Drawing.Color.Blue
+        Me.richTextBoxExtended1.TabIndex = 53
+        '
+        '
+        '
+        Me.richTextBoxExtended1.Toolbar.Appearance = System.Windows.Forms.ToolBarAppearance.Flat
+        Me.richTextBoxExtended1.Toolbar.ButtonSize = New System.Drawing.Size(16, 16)
+        Me.richTextBoxExtended1.Toolbar.Divider = False
+        Me.richTextBoxExtended1.Toolbar.DropDownArrows = True
+        Me.richTextBoxExtended1.Toolbar.Location = New System.Drawing.Point(0, 0)
+        Me.richTextBoxExtended1.Toolbar.Name = "tb1"
+        Me.richTextBoxExtended1.Toolbar.ShowToolTips = True
+        Me.richTextBoxExtended1.Toolbar.Size = New System.Drawing.Size(794, 26)
+        Me.richTextBoxExtended1.Toolbar.TabIndex = 0
+        '
+        'Label13
+        '
+        Me.Label13.AutoSize = True
+        Me.Label13.Location = New System.Drawing.Point(19, 226)
+        Me.Label13.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label13.Name = "Label13"
+        Me.Label13.Size = New System.Drawing.Size(90, 16)
+        Me.Label13.TabIndex = 54
+        Me.Label13.Text = "Artikel-Details"
+        '
+        'TarifDetail_PADM
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(652, 501)
+        Me.Controls.Add(Me.Label13)
+        Me.Controls.Add(Me.richTextBoxExtended1)
+        Me.Controls.Add(Me.txtBezF)
+        Me.Controls.Add(Me.txtfrankenwert)
+        Me.Controls.Add(Me.cbboxmitlabor)
+        Me.Controls.Add(Me.txtmax)
+        Me.Controls.Add(Me.txtmin)
+        Me.Controls.Add(Me.txtsuva)
+        Me.Controls.Add(Me.txtprivat)
+        Me.Controls.Add(Me.txtBezi)
+        Me.Controls.Add(Me.txtBezd)
+        Me.Controls.Add(Me.txtNummer)
+        Me.Controls.Add(Me.cbboxTarifgruppe)
+        Me.Controls.Add(Me.txtnrtarif)
+        Me.Controls.Add(Me.Label12)
+        Me.Controls.Add(Me.Label11)
+        Me.Controls.Add(Me.Label10)
+        Me.Controls.Add(Me.Label9)
+        Me.Controls.Add(Me.Label8)
+        Me.Controls.Add(Me.Label7)
+        Me.Controls.Add(Me.Label6)
+        Me.Controls.Add(Me.Label5)
+        Me.Controls.Add(Me.Label4)
+        Me.Controls.Add(Me.Label3)
+        Me.Controls.Add(Me.Label2)
+        Me.Controls.Add(Me.Label1)
+        Me.Controls.Add(Me.Button2)
+        Me.Controls.Add(Me.Button1)
+        Me.Name = "TarifDetail_PADM"
+        Me.Text = "TarifDetail_PADM"
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+
+    Friend WithEvents txtfrankenwert As TextBox
+    Friend WithEvents cbboxmitlabor As CheckBox
+    Friend WithEvents txtmax As TextBox
+    Friend WithEvents txtmin As TextBox
+    Friend WithEvents txtsuva As TextBox
+    Friend WithEvents txtprivat As TextBox
+    Friend WithEvents txtBezi As TextBox
+    Friend WithEvents txtBezd As TextBox
+    Friend WithEvents txtNummer As TextBox
+    Friend WithEvents cbboxTarifgruppe As ComboBox
+    Friend WithEvents txtnrtarif As TextBox
+    Friend WithEvents Label12 As Label
+    Friend WithEvents Label11 As Label
+    Friend WithEvents Label10 As Label
+    Friend WithEvents Label9 As Label
+    Friend WithEvents Label8 As Label
+    Friend WithEvents Label7 As Label
+    Friend WithEvents Label6 As Label
+    Friend WithEvents Label5 As Label
+    Friend WithEvents Label4 As Label
+    Friend WithEvents Label3 As Label
+    Friend WithEvents Label2 As Label
+    Friend WithEvents Label1 As Label
+    Friend WithEvents Button2 As Button
+    Friend WithEvents Button1 As Button
+    Friend WithEvents txtBezF As RichTextBox
+    Private WithEvents richTextBoxExtended1 As RichTextBoxExtended.RichTextBoxExtended
+    Friend WithEvents Label13 As Label
+End Class

DPM2016/Sysadmin/TarifDetail_PADM.resx

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

DPM2016/Sysadmin/TarifDetail_PADM.vb

@@ -0,0 +1,100 @@
+Public Class TarifDetail_PADM
+
+    Dim m_tarifnr As Integer
+    Property Tarifnr As Integer
+        Get
+            Return m_tarifnr
+        End Get
+        Set(value As Integer)
+            m_tarifnr = value
+        End Set
+    End Property
+
+    Sub New()
+
+        ' Dieser Aufruf ist für den Designer erforderlich.
+        InitializeComponent()
+        Dim db As New clsDB
+        db.Get_Tabledata("tarifgrp", "where aktiv=1")
+        Me.cbboxTarifgruppe.DataSource = db.dsDaten.Tables(0)
+        Me.cbboxTarifgruppe.DisplayMember = "Tarifgruppe"
+        Me.cbboxTarifgruppe.ValueMember = "nrtarifgruppe"
+        ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
+
+    End Sub
+    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
+        Me.DialogResult = DialogResult.Abort
+        Me.Close()
+    End Sub
+
+    Public Function Handle_RTF(ByVal fnkt As Integer, ByVal text As String) As String
+        If fnkt = 1 Then
+            Me.richTextBoxExtended1.RichTextBox.Rtf = text
+            Return ""
+        Else
+            Return Me.richTextBoxExtended1.RichTextBox.Rtf
+        End If
+    End Function
+    Private Sub frmTarifDetail_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        If My.Settings.SoftwareType = "PADM" Then
+            Me.Text = "Artikel-Detail"
+            Me.Label1.Text = "Key"
+            Me.Label7.Visible = False
+            Me.Label8.Visible = False
+            Me.Label9.Visible = False
+            Me.Label10.Visible = False
+            Me.Label11.Visible = False
+            '            Me.Label5.Visible = False
+            Me.Label6.Visible = False
+            Me.txtprivat.Visible = False
+            Me.txtsuva.Visible = False
+            Me.txtmin.Visible = False
+            Me.txtmax.Visible = False
+            Me.txtBezi.Visible = False
+            Me.cbboxmitlabor.Visible = False
+            Me.Label12.Text = "Preis"
+            Me.Label12.Top = Me.Label7.Top
+
+            'Me.txtfrankenwert.Top = Me.txtprivat.Top
+            'Me.Button1.Top = Me.txtfrankenwert.Top + Me.txtfrankenwert.Height + 15
+            'Me.Button2.Top = Me.txtfrankenwert.Top + Me.txtfrankenwert.Height + 15
+            'Me.Height = Me.Button1.Top + Me.Button1.Height + 50
+
+        End If
+    End Sub
+
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+
+        Me.DialogResult = DialogResult.OK
+        Me.Close()
+    End Sub
+
+    Public Function New_Tarif() As Integer
+
+        Dim db As New clsDB
+        Dim newkey As Integer = db.Get_DBKey("Tarif")
+        db.Get_Tabledata("User", "", "Select top 1 * from [tarif] where nrtarif=-1")
+        Dim dr As DataRow = db.dsDaten.Tables(0).NewRow
+        dr.Item(0) = newkey
+
+        dr.Item(1) = 0
+        dr.Item(2) = ""
+        dr.Item(3) = ""
+        dr.Item(4) = ""
+        dr.Item(5) = ""
+        dr.Item(6) = 0.00
+        dr.Item(7) = 0.00
+        dr.Item(8) = 0.00
+        dr.Item(9) = 0.00
+        dr.Item(10) = 0
+        dr.Item(11) = 0.00
+        dr.Item(12) = Now
+        dr.Item(13) = Now
+        dr.Item(14) = Globals.ActUser
+        dr.Item(15) = 1
+        db.dsDaten.Tables(0).Rows.Add(dr)
+        db.Update_Data()
+
+        Return newkey
+    End Function
+End Class

DPM2016/Sysadmin/frmStammdaten.Designer.vb

@@ -45,24 +45,25 @@ Partial Class frmStammdaten
         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("Rechnungstyp")
         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("Abrechnung", New System.Windows.Forms.TreeNode() {TreeNode18, TreeNode19, TreeNode20, TreeNode21, TreeNode22})
+        Dim TreeNode23 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Rechnungstexte")
-        Dim TreeNode24 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Behandlungsart")
+        Dim TreeNode24 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Abrechnung", New System.Windows.Forms.TreeNode() {TreeNode18, TreeNode19, TreeNode20, TreeNode21, TreeNode22, TreeNode23})
-        Dim TreeNode25 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Gesetz")
+        Dim TreeNode25 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Behandlungsart")
-        Dim TreeNode26 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Diverse Stammdaten", New System.Windows.Forms.TreeNode() {TreeNode24, TreeNode25})
+        Dim TreeNode26 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Gesetz")
-        Dim TreeNode27 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Auswertung")
+        Dim TreeNode27 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Diverse Stammdaten", New System.Windows.Forms.TreeNode() {TreeNode25, TreeNode26})
-        Dim TreeNode28 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Reporting")
+        Dim TreeNode28 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Auswertung")
-        Dim TreeNode29 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Auswertung_Statistiken", New System.Windows.Forms.TreeNode() {TreeNode27, TreeNode28})
+        Dim TreeNode29 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Reporting")
-        Dim TreeNode30 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Einstellungen")
+        Dim TreeNode30 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Auswertung_Statistiken", New System.Windows.Forms.TreeNode() {TreeNode28, TreeNode29})
-        Dim TreeNode31 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Struktur")
+        Dim TreeNode31 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Einstellungen")
-        Dim TreeNode32 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("DokumentManagement", New System.Windows.Forms.TreeNode() {TreeNode30, TreeNode31})
+        Dim TreeNode32 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Struktur")
-        Dim TreeNode33 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Spalten")
+        Dim TreeNode33 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("DokumentManagement", New System.Windows.Forms.TreeNode() {TreeNode31, TreeNode32})
-        Dim TreeNode34 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Options")
+        Dim TreeNode34 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Spalten")
-        Dim TreeNode35 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("User")
+        Dim TreeNode35 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Options")
-        Dim TreeNode36 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Absender")
+        Dim TreeNode36 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("User")
-        Dim TreeNode37 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Konto-Angaben")
+        Dim TreeNode37 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Absender")
-        Dim TreeNode38 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("MailTexte")
+        Dim TreeNode38 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Konto-Angaben")
-        Dim TreeNode39 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("MailTexte_Replacer")
+        Dim TreeNode39 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("MailTexte")
-        Dim TreeNode40 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Diverse", New System.Windows.Forms.TreeNode() {TreeNode33, TreeNode34, TreeNode35, TreeNode36, TreeNode37, TreeNode38, TreeNode39})
+        Dim TreeNode40 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("MailTexte_Replacer")
+        Dim TreeNode41 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Diverse", New System.Windows.Forms.TreeNode() {TreeNode34, TreeNode35, TreeNode36, TreeNode37, TreeNode38, TreeNode39, TreeNode40})
         Dim 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()
@@ -85,27 +86,28 @@ Partial Class frmStammdaten
         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.Padding = New System.Windows.Forms.Padding(4, 2, 0, 2)
+        Me.MenuStrip1.Padding = New System.Windows.Forms.Padding(5, 2, 0, 2)
-        Me.MenuStrip1.Size = New System.Drawing.Size(957, 24)
+        Me.MenuStrip1.Size = New System.Drawing.Size(1276, 28)
         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, 24)
         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, 24)
         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, 28)
+        Me.TreeView1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.TreeView1.Name = "TreeView1"
         TreeNode1.Name = "Konto"
         TreeNode1.Text = "Konto"
@@ -157,48 +159,50 @@ Partial Class frmStammdaten
         TreeNode21.Text = "Rechnungstyp"
         TreeNode22.Name = "Standards"
         TreeNode22.Text = "Standards"
-        TreeNode23.Name = "Knoten14"
+        TreeNode23.Name = "Rechtext"
-        TreeNode23.Text = "Abrechnung"
+        TreeNode23.Text = "Rechnungstexte"
-        TreeNode24.Name = "Behandlungsart"
+        TreeNode24.Name = "Knoten14"
-        TreeNode24.Text = "Behandlungsart"
+        TreeNode24.Text = "Abrechnung"
-        TreeNode25.Name = "Gesetz"
+        TreeNode25.Name = "Behandlungsart"
-        TreeNode25.Tag = "Demo"
+        TreeNode25.Text = "Behandlungsart"
-        TreeNode25.Text = "Gesetz"
+        TreeNode26.Name = "Gesetz"
-        TreeNode26.Name = "Diverse Stammdaten"
+        TreeNode26.Tag = "Demo"
-        TreeNode26.Text = "Diverse Stammdaten"
+        TreeNode26.Text = "Gesetz"
-        TreeNode27.Name = "Auswertung"
+        TreeNode27.Name = "Diverse Stammdaten"
-        TreeNode27.Text = "Auswertung"
+        TreeNode27.Text = "Diverse Stammdaten"
-        TreeNode28.Name = "Reporting"
+        TreeNode28.Name = "Auswertung"
-        TreeNode28.Text = "Reporting"
+        TreeNode28.Text = "Auswertung"
-        TreeNode29.Name = "Auswertung_Statistiken"
+        TreeNode29.Name = "Reporting"
-        TreeNode29.Text = "Auswertung_Statistiken"
+        TreeNode29.Text = "Reporting"
-        TreeNode30.Name = "dms_settings"
+        TreeNode30.Name = "Auswertung_Statistiken"
-        TreeNode30.Tag = "DMS"
+        TreeNode30.Text = "Auswertung_Statistiken"
-        TreeNode30.Text = "Einstellungen"
+        TreeNode31.Name = "dms_settings"
-        TreeNode31.Name = "DMS_Struktur"
         TreeNode31.Tag = "DMS"
-        TreeNode31.Text = "Struktur"
+        TreeNode31.Text = "Einstellungen"
-        TreeNode32.Name = "DokumentManagement"
+        TreeNode32.Name = "DMS_Struktur"
         TreeNode32.Tag = "DMS"
-        TreeNode32.Text = "DokumentManagement"
+        TreeNode32.Text = "Struktur"
-        TreeNode33.Name = "Spalten"
+        TreeNode33.Name = "DokumentManagement"
-        TreeNode33.Text = "Spalten"
+        TreeNode33.Tag = "DMS"
-        TreeNode34.Name = "Options"
+        TreeNode33.Text = "DokumentManagement"
-        TreeNode34.Text = "Options"
+        TreeNode34.Name = "Spalten"
-        TreeNode35.Name = "User"
+        TreeNode34.Text = "Spalten"
-        TreeNode35.Text = "User"
+        TreeNode35.Name = "Options"
-        TreeNode36.Name = "Absender"
+        TreeNode35.Text = "Options"
-        TreeNode36.Text = "Absender"
+        TreeNode36.Name = "User"
-        TreeNode37.Name = "vdkonti"
+        TreeNode36.Text = "User"
-        TreeNode37.Text = "Konto-Angaben"
+        TreeNode37.Name = "Absender"
-        TreeNode38.Name = "MailTexte"
+        TreeNode37.Text = "Absender"
-        TreeNode38.Text = "MailTexte"
+        TreeNode38.Name = "vdkonti"
-        TreeNode39.Name = "MailTexte_Replacer"
+        TreeNode38.Text = "Konto-Angaben"
-        TreeNode39.Text = "MailTexte_Replacer"
+        TreeNode39.Name = "MailTexte"
-        TreeNode40.Name = "Diverse"
+        TreeNode39.Text = "MailTexte"
-        TreeNode40.Text = "Diverse"
+        TreeNode40.Name = "MailTexte_Replacer"
-        Me.TreeView1.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode2, TreeNode7, TreeNode17, TreeNode23, TreeNode26, TreeNode29, TreeNode32, TreeNode40})
+        TreeNode40.Text = "MailTexte_Replacer"
-        Me.TreeView1.Size = New System.Drawing.Size(204, 425)
+        TreeNode41.Name = "Diverse"
+        TreeNode41.Text = "Diverse"
+        Me.TreeView1.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode2, TreeNode7, TreeNode17, TreeNode24, TreeNode27, TreeNode30, TreeNode33, TreeNode41})
+        Me.TreeView1.Size = New System.Drawing.Size(271, 525)
         Me.TreeView1.TabIndex = 1
         '
         'C1TrueDBGrid1
@@ -206,13 +210,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, 28)
+        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, 525)
         Me.C1TrueDBGrid1.TabIndex = 2
         Me.C1TrueDBGrid1.Text = "C1TrueDBGrid1"
         Me.C1TrueDBGrid1.PropBag = resources.GetString("C1TrueDBGrid1.PropBag")
@@ -241,10 +246,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(4)
+        Me.ClsStammdaten_Bez1.Margin = New System.Windows.Forms.Padding(5, 5, 5, 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
@@ -253,18 +258,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(4)
+        Me.ClsStammdaten_flat1.Margin = New System.Windows.Forms.Padding(5, 5, 5, 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)
@@ -272,6 +277,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{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{}&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;Style11{}Style10{}Style13{}Style12{}Footer{}Style2{}Style3{}FilterBar{}RecordSelector{AlignImage:Center;}Style15{}OddRow{}Caption{AlignHorz:Center;}EvenRow{BackColor:Aqua;}HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style1{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}Style9{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style5{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style8{}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;Wrap:True;BackColor:Control;ForeColor:ControlText;}Style6{}Normal{}Style7{}Editor{}Style4{}Style14{}Style16{}&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, 523&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, 523&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

@@ -92,8 +92,62 @@ Public Class frmStammdaten
     Private Sub frmStammdaten_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Me.TreeView1.ExpandAll()
         Me.TreeView1.SelectedNode = Me.TreeView1.Nodes(0)
+        If My.Settings.SoftwareType = "PADM" Then
+            Me.DentotarImportToolStripMenuItem.Visible = False
+            For Each n As TreeNode In TreeView1.Nodes
+                For Each nn As TreeNode In n.Nodes
+                    Try
+                        Select Case nn.Text
+                            Case "Tarif"
+                                nn.Text = "Artikel"
+                            Case "Tarife"
+                                nn.Text = "Artikel-Kategorien"
+                            Case "TarifGruppe"
+                                nn.Text = "Artikel-Gruppen"
+                            Case "Tarifpakete"
+                                nn.Text = "Artikel-Pakete"
+                        End Select
+                    Catch
+                    End Try
+
+                Next
+                If n.Text = "Tarif" Then n.Text = "Artikel"
+            Next
+
+            For i As Integer = 1 To 10
+                Try
+                    For Each n As TreeNode In TreeView1.Nodes
+                        For Each nn As TreeNode In n.Nodes
+                            If nn.Text = "Dentotar" Then
+                                nn.Remove()
+                            End If
+                            If nn.Text = "Dentotar_Parameter" Then
+                                nn.Remove()
+                            End If
+                            If nn.Text = "Taxpunkte" Then
+                                nn.Remove()
+                            End If
+                            If nn.Text = "Zahntechnik (223)" Then
+                                nn.Remove()
+                            End If
+                            If nn.Text = "Behandlungsart" Then
+                                nn.Remove()
+                            End If
+                            If nn.Text = "Gesetz" Then
+                                nn.Remove()
+                            End If
+
+                        Next
+                    Next
+                Catch
+                End Try
+            Next i
+        End If
+
     End Sub
 
+
+
     Private Sub DentotarImportToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DentotarImportToolStripMenuItem.Click
         If MsgBox("Sind Sie sicher, dass Dentotaf neu importier werden soll?", vbYesNo + vbQuestion) = vbYes Then
             If OpenFileDialog1.ShowDialog = DialogResult.OK Then

DPM2016/Sysadmin/frmTarifDetail.vb

@@ -28,7 +28,28 @@
     End Sub
 
     Private Sub frmTarifDetail_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        If My.Settings.SoftwareType = "PADM" Then
+            Me.Text = "Artikel-Detail"
+            Me.Label1.Text = "Key"
+            Me.Label7.Visible = False
+            Me.Label8.Visible = False
+            Me.Label9.Visible = False
+            Me.Label10.Visible = False
+            Me.Label11.Visible = False
+            Me.txtprivat.Visible = False
+            Me.txtsuva.Visible = False
+            Me.txtmin.Visible = False
+            Me.txtmax.Visible = False
+            Me.cbboxmitlabor.Visible = False
+            Me.Label12.Text = "Preis"
+            Me.Label12.Top = Me.Label7.Top
 
+            Me.txtfrankenwert.Top = Me.txtprivat.Top
+            Me.Button1.Top = Me.txtfrankenwert.Top + Me.txtfrankenwert.Height + 15
+            Me.Button2.Top = Me.txtfrankenwert.Top + Me.txtfrankenwert.Height + 15
+            Me.Height = Me.Button1.Top + Me.Button1.Height + 50
+
+        End If
     End Sub
 
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click

DPM2016/Utils/Globals.vb

@@ -7,8 +7,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.3.0.2214"
+    Public Version As String = "1.4.0.2215"
-    Public Versionastaum As String = "10.09.2021"
+    Public Versionastaum As String = "20.06.2022"
 
     Public RGCollection As New Collection
     Public Spaltendaten As New DataTable
@@ -43,6 +43,7 @@ Module Globals
     Public Hide_Gueltig_bis As Boolean = False
     Public MenuString As String = ""
     Public Recall_nach_Abschluss As Boolean = False
+    Public User_Lagerbestand As Boolean = False
 
     '20201231 - Security
     Public Set_ToolTips As Boolean = False
@@ -51,6 +52,7 @@ Module Globals
         DH = 1
         Zahnarzt = 2
         Projektabrechnung = 3
+        Auftragsadministration = 4
     End Enum
 
     Public Applicationtype As ApplicationTypes

DPM2016/Utils/frmLogin.Designer.vb

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

DPM2016/Utils/frmLogin.vb

@@ -113,4 +113,8 @@
         Me.DialogResult = DialogResult.Abort
         Me.Close()
     End Sub
+
+    Private Sub frmLogin_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown
+        Me.txtUserName.Select()
+    End Sub
 End Class

DPM2016/Utils/frmRichText.Designer.vb

@@ -0,0 +1,37 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class frmRichText
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()>
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()>
+    Private Sub InitializeComponent()
+        Me.SuspendLayout()
+        '
+        'frmRichText
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(800, 450)
+        Me.Name = "frmRichText"
+        Me.Text = "frmRichText"
+        Me.ResumeLayout(False)
+
+    End Sub
+End Class

DPM2016/Utils/frmRichText.resx

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

DPM2016/Utils/frmRichText.vb

@@ -0,0 +1,3 @@
+Public Class frmRichText
+
+End Class

DPM2016/Utils/frmrtf.Designer.vb

@@ -0,0 +1,96 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frmrtf
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.richTextBoxExtended1 = New RichTextBoxExtended.RichTextBoxExtended()
+        Me.SuspendLayout()
+        '
+        'richTextBoxExtended1
+        '
+        Me.richTextBoxExtended1.AcceptsTab = True
+        Me.richTextBoxExtended1.AutoWordSelection = True
+        Me.richTextBoxExtended1.DetectURLs = True
+        Me.richTextBoxExtended1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.richTextBoxExtended1.Location = New System.Drawing.Point(0, 0)
+        Me.richTextBoxExtended1.Name = "richTextBoxExtended1"
+        Me.richTextBoxExtended1.ReadOnly = False
+        '
+        '
+        '
+        Me.richTextBoxExtended1.RichTextBox.AcceptsTab = True
+        Me.richTextBoxExtended1.RichTextBox.AutoWordSelection = True
+        Me.richTextBoxExtended1.RichTextBox.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.richTextBoxExtended1.RichTextBox.Location = New System.Drawing.Point(0, 26)
+        Me.richTextBoxExtended1.RichTextBox.Name = "rtb1"
+        Me.richTextBoxExtended1.RichTextBox.Size = New System.Drawing.Size(800, 424)
+        Me.richTextBoxExtended1.RichTextBox.TabIndex = 1
+        Me.richTextBoxExtended1.ShowBold = True
+        Me.richTextBoxExtended1.ShowCenterJustify = True
+        Me.richTextBoxExtended1.ShowColors = True
+        Me.richTextBoxExtended1.ShowCopy = True
+        Me.richTextBoxExtended1.ShowCut = True
+        Me.richTextBoxExtended1.ShowFont = True
+        Me.richTextBoxExtended1.ShowFontSize = True
+        Me.richTextBoxExtended1.ShowItalic = True
+        Me.richTextBoxExtended1.ShowLeftJustify = True
+        Me.richTextBoxExtended1.ShowOpen = True
+        Me.richTextBoxExtended1.ShowPaste = True
+        Me.richTextBoxExtended1.ShowRedo = True
+        Me.richTextBoxExtended1.ShowRightJustify = True
+        Me.richTextBoxExtended1.ShowSave = True
+        Me.richTextBoxExtended1.ShowStamp = True
+        Me.richTextBoxExtended1.ShowStrikeout = True
+        Me.richTextBoxExtended1.ShowToolBarText = False
+        Me.richTextBoxExtended1.ShowUnderline = True
+        Me.richTextBoxExtended1.ShowUndo = True
+        Me.richTextBoxExtended1.Size = New System.Drawing.Size(800, 450)
+        Me.richTextBoxExtended1.StampAction = RichTextBoxExtended.StampActions.EditedBy
+        Me.richTextBoxExtended1.StampColor = System.Drawing.Color.Blue
+        Me.richTextBoxExtended1.TabIndex = 1
+        '
+        '
+        '
+        Me.richTextBoxExtended1.Toolbar.Appearance = System.Windows.Forms.ToolBarAppearance.Flat
+        Me.richTextBoxExtended1.Toolbar.ButtonSize = New System.Drawing.Size(16, 16)
+        Me.richTextBoxExtended1.Toolbar.Divider = False
+        Me.richTextBoxExtended1.Toolbar.DropDownArrows = True
+        Me.richTextBoxExtended1.Toolbar.Location = New System.Drawing.Point(0, 0)
+        Me.richTextBoxExtended1.Toolbar.Name = "tb1"
+        Me.richTextBoxExtended1.Toolbar.ShowToolTips = True
+        Me.richTextBoxExtended1.Toolbar.Size = New System.Drawing.Size(800, 26)
+        Me.richTextBoxExtended1.Toolbar.TabIndex = 0
+        '
+        'frmrtf
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(800, 450)
+        Me.Controls.Add(Me.richTextBoxExtended1)
+        Me.Name = "frmrtf"
+        Me.Text = "frmrtf"
+        Me.ResumeLayout(False)
+
+    End Sub
+
+    Private WithEvents richTextBoxExtended1 As RichTextBoxExtended.RichTextBoxExtended
+End Class

DPM2016/Utils/frmrtf.resx

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

DPM2016/Utils/frmrtf.vb

@@ -0,0 +1,3 @@
+Public Class frmrtf
+
+End Class

DPM2016/app.config

@@ -37,9 +37,6 @@
             <setting name="DocArchivPath" serializeAs="String">
                 <value>h:\dpm\docarchiv</value>
             </setting>
-            <setting name="SoftwareType" serializeAs="String">
-                <value>PADM</value>
-            </setting>
             <setting name="ConnectionString" serializeAs="String">
                 <value>data source=shu00;initial catalog=SHUB_PADM;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29</value>
             </setting>
@@ -58,6 +55,9 @@
             <setting name="WebAPI" serializeAs="String">
                 <value>http://192.168.111.67</value>
             </setting>
+            <setting name="SoftwareType" serializeAs="String">
+                <value>PADM</value>
+            </setting>
         </DPM2016.My.MySettings>
     </userSettings>
   <runtime>

DPM2016/bin/Debug/Connectionstrings.cfg

@@ -1,7 +1,9 @@
 ˜ª´µ·»¸µ¹³uÁúıª…À­Ãƒr€»¯½É·¨¤X“™Ä§­´­ƒ­°½Â¼Ç¤xq€z½Â¹·¼Àµ¹·²e»²¨ÃÅ«¹Ë~§¨žs¨•ªÃ¯´¹f¹®®ÄÀ¼È¾fª¼®Ä‘º¦¾È³¼ÁÀ°»Á¦Â¼±³rª¸’‰·™››Äf´®À«†‡‰º¹¦Àh¾¸‘¸³¾µ¸ÅÅ´º±‚xƪº„z
 §›ƒ­˜–˜¡¶¶ÂµeŽºº°ª‹Æªº‚q¾¼°¬¡‘¤p©¢¹§²¸²Œ¡›©‡¥‘Œ¢½³ÆºµÆ¦Æ³©hÀª±È´®Æº‘¨¡—s Â¹ª¸ºf¼°²ÃŽ¹¿a·¶»Ã‘«³ÁÁ¹€É½·³À¹¯Ç«´Àa½¹‹‚¨™“£µºa¸¯À®ˆƒ~ŒŠ€»´³ºu½¸‚Ŷ‰Ä¦ÅÁ¼·¿©‹}µ­Çs
+§¹¹¤¶¿º½Î¶¶ÂµeŽºº°ª‹Æªº‚q¾¼°¬¡‘¤p©¢¹§²¸²ŒÁÇǨ®¸³±Ï½³ÆºµÆ¦Æ³©hÀª±È´®Æº‘¨¡—s Â¹ª¸ºf¼°²ÃŽ¹¿a·¶»Ã‘«³ÁÁ¹€É½·³À¹¯Ç«´Àa½¹‹‚¨™“£µºa¸¯À®ˆƒ~ŒŠ€»´³ºu½¸‚Ŷ‰Ä¦ÅÁ¼·¿©‹}µ­Çs
+§¹¹¤¶¿º½Î¤ –¡Ž©³Â¦hÀ´ÃÅ¥ªr‡|xnp^iwo}w²¹¸Â¼µ±f¤¯¼¶ÀìÈÂǨºÅª±Ç€¾¸´¸»´ÈuÁ¬›­¢¡Ä¿a®´¬¸ˆµ¯¿Çª¸½ºÀÇȦƾ½Âe»²‚ƒ½¦±¾§¹r´½Ï³„lhin‹»´ª¸f²¯ŒÁ´µ§´Á¿ÄƸ‚¢•ÁǼÁÀ©y
 ˜ª´µ¯´‡§Á®¾ºˆ¸¦Æ¯e»¼ºÀ¶§‚Å©É…~‚¡¦™¬¹§­e©§½¬»½º‘©¶®­¬ºÂȦ¾‡ÁÁ®¾³€½ÀªÀs«©´µ¾¨««§§Âª~o¹®¾}ˆ
-˜‘­½¼ºÂŽ©³É¯t¸Á÷«²‚Á»·u‚|½Ã·»¡™œX³§µ¦²µ°ˆ³¾À³©®¬º·É¹Â€»Ã¹¬Ä¯¹­±eÁ¸¥ºÄªÈ΋š‹ˆysÀ«³¸¯¹½k³¶É·¯µÇh¾Âº´»¯À¸·‰¼·¿°ÁÇ£¹»°Âu·«us ™³±¦¹f¹²Å´‹‡„~||ûºÆt®¶’Áµ€Â¯¸»Ä´À·oũɇ‡
+˜‘­½¼ºÂŽ©³É¯t¸Á÷«²‚Á»·u‚|½Ã·»¡™œX³§µ¦²µ°ˆ³¾À³©® ¹´Äȹ³¾¼Èª¹À¦¼²©nƧ¨Ç³½ÉÇ„‹‹€‹¶¦·¹¯¼¿oÁ¸·º¸ªÂÁu½Â«Á’´µ±Å³€¿¼·¹Æ¶¦ÆªÃÃn°œuk¨±©¬ªºf¼´É³ˆuw‰½È¹Æe»¹‹Ç¦¾¦»À¼½Å¦‚|´¼Ê€€
 ¦´«­º±ÃŽ¸¦Æ¶nÇ´ÇÀ¨­Š¸¶ÈruªÂ¾Â°™¤P›±º¢±µ­†¯¿»²Æ´«­º±Ã³†u„†~‹xƒ‰®¶ÁªµÅ£¹·¥tȳª­ª™¬Éƒ”˜–„»´Àƽ¸ºaÁ­¸ÉÆ®ÆÎn½³¸½‚®®±Á¸}¼Á³¿È¨¬¡Ÿ¦p¯¥‚¶ª®º³Çt¸¯»³…‰„{ÊÁ¹·r·©…À¦‰Ã£¸Å¸ÃDz„b«˜­‚
 ˜Š“ˆ¬¶ÈµeÅÄÃƨ·‹¸°Âu~Ž«³»µ½¶ºg›™¤™¼µ¨‚ª¶¶ª³³ÁȦ²sÁµ¾À¹€»Ã¹¬Ä¯¹­±eÁ¸¥ºÄªÈ΋š‹ˆysÀ«³¸¯¹½k³¶É·¯µÇh¾Âº´»¯À¸·‰¼·¿°ÁÇ£¹»°Âu·«us ™³±¦¹f¹²Å´‹‡„~||ûºÆt®¶’Áµ€Â¯¸»Ä´À·oũɇ‡
 ¤·§¹·»¸µ¹³uÁúıª…À­Ãƒr€»¯½É·¨¤X“™Ä§­´­ƒ­»¼­£Æ¦¾ªÁƒ¾ÂȪ¹Ç¯Èª¶n¸­°ºÀ¼¶¾”§¥—‚¨¢«¹¹µe¹«¬ÀÁ·ÇÍe¯¯´·’ºµ±Åº‰Ë´Ä¹¸¼®¹·Â°e»¥‘¾¨›£•¬p¹ª¿«ƒ}{ˆ„ŽÉ¸«³n±¹‘ǦÅ¯Ç¸É½·¬ŠoÁ»·w‹

DPM2016/bin/Debug/Connectionstrings_DHKloten.cfg

@@ -0,0 +1 @@
+˜‘­½¼ºÂŽ©³É¯t¸Á÷«²‚Á»·u‚|½Ã·»¡™œX³§µ¦²µ°ˆ³¾À³©® ¹´Äȹ³¾¼Èª¹À¦¼²©nƧ¨Ç³½ÉÇ„‹‹€‹¶¦·¹¯¼¿oÁ¸·º¸ªÂÁu½Â«Á’´µ±Å³€¿¼·¹Æ¶¦ÆªÃÃn°œuk¨±©¬ªºf¼´É³ˆuw‰½È¹Æe»¹‹Ç¦¾¦»À¼½Å¦‚|´¼Ê€€