Update Version 1.2

CryptoEditor/obj/Release/.NETFramework,Version=v4.6.AssemblyAttributes.vb

@@ -0,0 +1,7 @@
+' <autogenerated/>
+            Option Strict Off
+            Option Explicit On
+
+            Imports System
+            Imports System.Reflection
+            <Assembly: Global.System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6", FrameworkDisplayName:=".NET Framework 4.6")>

DPM2016/Auswertungen/FremAuswertung.Designer.vb

@@ -24,6 +24,9 @@ Partial Class frmAuswertung
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAuswertung))
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
         Me.DateiToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.SchliessenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -55,10 +58,11 @@ Partial Class frmAuswertung
         '
         'MenuStrip1
         '
+        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.Size = New System.Drawing.Size(1077, 24)
+        Me.MenuStrip1.Size = New System.Drawing.Size(1077, 30)
         Me.MenuStrip1.TabIndex = 0
         Me.MenuStrip1.Text = "MenuStrip1"
         '
@@ -66,22 +70,23 @@ Partial Class frmAuswertung
         '
         Me.DateiToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SchliessenToolStripMenuItem})
         Me.DateiToolStripMenuItem.Name = "DateiToolStripMenuItem"
-        Me.DateiToolStripMenuItem.Size = New System.Drawing.Size(46, 20)
+        Me.DateiToolStripMenuItem.Size = New System.Drawing.Size(59, 26)
         Me.DateiToolStripMenuItem.Text = "&Datei"
         '
         'SchliessenToolStripMenuItem
         '
         Me.SchliessenToolStripMenuItem.Name = "SchliessenToolStripMenuItem"
-        Me.SchliessenToolStripMenuItem.Size = New System.Drawing.Size(128, 22)
+        Me.SchliessenToolStripMenuItem.Size = New System.Drawing.Size(159, 26)
         Me.SchliessenToolStripMenuItem.Text = "Schliessen"
         '
         '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.tsbtnSave})
-        Me.ToolStrip1.Location = New System.Drawing.Point(0, 24)
+        Me.ToolStrip1.Location = New System.Drawing.Point(0, 30)
         Me.ToolStrip1.Name = "ToolStrip1"
-        Me.ToolStrip1.Size = New System.Drawing.Size(1077, 25)
+        Me.ToolStrip1.Size = New System.Drawing.Size(1077, 31)
         Me.ToolStrip1.TabIndex = 17
         Me.ToolStrip1.Text = "ToolStrip1"
         '
@@ -91,7 +96,7 @@ Partial Class frmAuswertung
         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(29, 28)
         Me.tsbtnquit.Text = "Schliessen"
         '
         'tsbtnSave
@@ -100,7 +105,7 @@ Partial Class frmAuswertung
         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(29, 24)
         Me.tsbtnSave.Text = "Zahlungsdatei öffnen und verarbeiten"
         Me.tsbtnSave.Visible = False
         '
@@ -114,9 +119,9 @@ Partial Class frmAuswertung
         Me.GroupBox1.Controls.Add(Me.GroupBox3)
         Me.GroupBox1.Controls.Add(Me.GroupBox2)
         Me.GroupBox1.Dock = System.Windows.Forms.DockStyle.Left
-        Me.GroupBox1.Location = New System.Drawing.Point(0, 49)
+        Me.GroupBox1.Location = New System.Drawing.Point(0, 61)
         Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(297, 635)
+        Me.GroupBox1.Size = New System.Drawing.Size(297, 623)
         Me.GroupBox1.TabIndex = 18
         Me.GroupBox1.TabStop = False
         '
@@ -125,7 +130,7 @@ Partial Class frmAuswertung
         Me.CheckBox4.AutoSize = True
         Me.CheckBox4.Location = New System.Drawing.Point(146, 524)
         Me.CheckBox4.Name = "CheckBox4"
-        Me.CheckBox4.Size = New System.Drawing.Size(56, 17)
+        Me.CheckBox4.Size = New System.Drawing.Size(64, 19)
         Me.CheckBox4.TabIndex = 13
         Me.CheckBox4.Text = "Export"
         Me.CheckBox4.UseVisualStyleBackColor = True
@@ -135,7 +140,7 @@ Partial Class frmAuswertung
         Me.CheckBox3.AutoSize = True
         Me.CheckBox3.Location = New System.Drawing.Point(146, 501)
         Me.CheckBox3.Name = "CheckBox3"
-        Me.CheckBox3.Size = New System.Drawing.Size(72, 17)
+        Me.CheckBox3.Size = New System.Drawing.Size(82, 19)
         Me.CheckBox3.TabIndex = 12
         Me.CheckBox3.Text = "Datatable"
         Me.CheckBox3.UseVisualStyleBackColor = True
@@ -145,7 +150,7 @@ Partial Class frmAuswertung
         Me.CheckBox2.AutoSize = True
         Me.CheckBox2.Location = New System.Drawing.Point(12, 568)
         Me.CheckBox2.Name = "CheckBox2"
-        Me.CheckBox2.Size = New System.Drawing.Size(102, 17)
+        Me.CheckBox2.Size = New System.Drawing.Size(118, 19)
         Me.CheckBox2.TabIndex = 11
         Me.CheckBox2.Text = "Eigenes Fenster"
         Me.CheckBox2.UseVisualStyleBackColor = True
@@ -156,7 +161,7 @@ Partial Class frmAuswertung
         Me.CheckBox1.AutoSize = True
         Me.CheckBox1.Location = New System.Drawing.Point(146, 478)
         Me.CheckBox1.Name = "CheckBox1"
-        Me.CheckBox1.Size = New System.Drawing.Size(59, 17)
+        Me.CheckBox1.Size = New System.Drawing.Size(68, 19)
         Me.CheckBox1.TabIndex = 10
         Me.CheckBox1.Text = "Design"
         Me.CheckBox1.UseVisualStyleBackColor = True
@@ -196,7 +201,7 @@ Partial Class frmAuswertung
         Me.Properties.DocCommentDescription.ForeColor = System.Drawing.Color.WhiteSmoke
         Me.Properties.DocCommentDescription.Location = New System.Drawing.Point(3, 18)
         Me.Properties.DocCommentDescription.Name = ""
-        Me.Properties.DocCommentDescription.Size = New System.Drawing.Size(0, 52)
+        Me.Properties.DocCommentDescription.Size = New System.Drawing.Size(0, 50)
         Me.Properties.DocCommentDescription.TabIndex = 1
         Me.Properties.DocCommentImage = CType(resources.GetObject("Properties.DocCommentImage"), System.Drawing.Image)
         '
@@ -209,7 +214,7 @@ Partial Class frmAuswertung
         Me.Properties.DocCommentTitle.ForeColor = System.Drawing.Color.WhiteSmoke
         Me.Properties.DocCommentTitle.Location = New System.Drawing.Point(3, 3)
         Me.Properties.DocCommentTitle.Name = ""
-        Me.Properties.DocCommentTitle.Size = New System.Drawing.Size(110, 13)
+        Me.Properties.DocCommentTitle.Size = New System.Drawing.Size(139, 17)
         Me.Properties.DocCommentTitle.TabIndex = 0
         Me.Properties.DocCommentTitle.Text = "DocComment Title"
         Me.Properties.DocCommentTitle.UseMnemonic = False
@@ -235,7 +240,7 @@ Partial Class frmAuswertung
         Me.Properties.ToolStrip.Location = New System.Drawing.Point(0, 1)
         Me.Properties.ToolStrip.Name = ""
         Me.Properties.ToolStrip.Padding = New System.Windows.Forms.Padding(2, 0, 1, 0)
-        Me.Properties.ToolStrip.Size = New System.Drawing.Size(285, 25)
+        Me.Properties.ToolStrip.Size = New System.Drawing.Size(285, 31)
         Me.Properties.ToolStrip.TabIndex = 1
         Me.Properties.ToolStrip.TabStop = True
         Me.Properties.ToolStrip.Text = "PropertyGridToolBar"
@@ -274,34 +279,61 @@ Partial Class frmAuswertung
             Or FastReport.PreviewButtons.Navigator), FastReport.PreviewButtons)
         Me.previewControl1.Dock = System.Windows.Forms.DockStyle.Fill
         Me.previewControl1.Font = New System.Drawing.Font("Tahoma", 8.0!)
-        Me.previewControl1.Location = New System.Drawing.Point(297, 49)
+        Me.previewControl1.Location = New System.Drawing.Point(297, 61)
+        Me.previewControl1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.previewControl1.Name = "previewControl1"
         Me.previewControl1.PageOffset = New System.Drawing.Point(10, 10)
         Me.previewControl1.RightToLeft = System.Windows.Forms.RightToLeft.No
         Me.previewControl1.SaveInitialDirectory = Nothing
-        Me.previewControl1.Size = New System.Drawing.Size(780, 635)
+        Me.previewControl1.Size = New System.Drawing.Size(780, 623)
         Me.previewControl1.TabIndex = 25
         Me.previewControl1.UIStyle = FastReport.Utils.UIStyle.VisualStudio2005
         '
         'DataGridView1
         '
+        DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.6!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
         Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.6!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.DataGridView1.DefaultCellStyle = DataGridViewCellStyle2
         Me.DataGridView1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.DataGridView1.Location = New System.Drawing.Point(297, 49)
+        Me.DataGridView1.Location = New System.Drawing.Point(297, 61)
         Me.DataGridView1.Name = "DataGridView1"
-        Me.DataGridView1.Size = New System.Drawing.Size(780, 635)
+        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.6!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.DataGridView1.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
+        Me.DataGridView1.RowHeadersWidth = 51
+        Me.DataGridView1.Size = New System.Drawing.Size(780, 623)
         Me.DataGridView1.TabIndex = 26
         '
         'ContextMenuStrip1
         '
+        Me.ContextMenuStrip1.ImageScalingSize = New System.Drawing.Size(20, 20)
         Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.PatientenAuswahlToolStripMenuItem})
         Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
-        Me.ContextMenuStrip1.Size = New System.Drawing.Size(181, 48)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(201, 28)
         '
         'PatientenAuswahlToolStripMenuItem
         '
         Me.PatientenAuswahlToolStripMenuItem.Name = "PatientenAuswahlToolStripMenuItem"
-        Me.PatientenAuswahlToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.PatientenAuswahlToolStripMenuItem.Size = New System.Drawing.Size(200, 24)
         Me.PatientenAuswahlToolStripMenuItem.Text = "Patienten-Auswahl"
         '
         'frmAuswertung

DPM2016/Auswertungen/FremAuswertung.resx

@@ -127,7 +127,7 @@
   <data name="tsbtnquit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAK2SURBVDhPnZLdS1NhHMcfCPoDuummi+gyunJg0QviNrd5
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAK2SURBVDhPnZLdS1NhHMcfCPoDuummi+gyunJg0QviNrd5
         PDtzc7Z5ztl20pUzo6I3yFIrS9N8K7Qih6lUFJVaGWXZi6KRoZSFmCuyi+iiiCKILgo+HTUWu7QffOD5
         PfB8eL6/5xH/U1+mh4IzM+O/Ovdm8Hdrvi5X5PR2H86ht2oWKUnPEYkr5XYexXfyebKfTxO3+P5mkIv7
         ramCngqZtDV2Vq+zsWbDP9LXWVllWc+PRD+J3krGWv18TTzm8kFHqqC7TCbD6sRml7A7XEmsWU7S19t4
@@ -145,24 +145,24 @@
   <data name="tsbtnSave.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
 </value>
   </data>
   <data name="Properties.DocCommentImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

DPM2016/Behandlung/Behandlung.Designer.vb

@@ -48,6 +48,7 @@ Partial Class Behandlung
         Me.KopieErstellenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.AlsPDFToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ÜberDruckerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.AlsPDFPerMailToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripSeparator()
         Me.BehandlungLöschenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem5 = New System.Windows.Forms.ToolStripSeparator()
@@ -67,17 +68,17 @@ Partial Class Behandlung
         Me.SuperTabControl1 = New DevComponents.DotNetBar.SuperTabControl()
         Me.SuperTabControlPanel1 = New DevComponents.DotNetBar.SuperTabControlPanel()
         Me.Panel2 = New System.Windows.Forms.Panel()
+        Me.Behandungdetail1 = New DPM2016.Benhandungdetail()
         Me.STBehandlung = New DevComponents.DotNetBar.SuperTabItem()
         Me.SuperTabControlPanel2 = New DevComponents.DotNetBar.SuperTabControlPanel()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.Leistungen1 = New DPM2016.Leistungen()
         Me.STLeistung = New DevComponents.DotNetBar.SuperTabItem()
         Me.SuperTabControlPanel3 = New DevComponents.DotNetBar.SuperTabControlPanel()
         Me.tsbtnnew = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
         Me.tsbtnbehandlungdelete = New System.Windows.Forms.ToolStrip()
         Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.Leistungen1 = New DPM2016.Leistungen()
-        Me.Behandungdetail1 = New DPM2016.Benhandungdetail()
         Me.tsbtndelete.SuspendLayout()
         Me.GroupBox1.SuspendLayout()
         CType(Me.treebehandlungen, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -98,7 +99,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(1713, 31)
+        Me.tsbtndelete.Size = New System.Drawing.Size(1285, 27)
         Me.tsbtndelete.TabIndex = 1
         Me.tsbtndelete.Text = "ToolStrip1"
         '
@@ -108,7 +109,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(29, 28)
+        Me.tsbtnnewbehandlung.Size = New System.Drawing.Size(24, 24)
         Me.tsbtnnewbehandlung.Text = "Neue Behandlung"
         '
         'tsbtndeletebehandlung
@@ -117,7 +118,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(29, 28)
+        Me.tsbtndeletebehandlung.Size = New System.Drawing.Size(24, 24)
         Me.tsbtndeletebehandlung.Text = "Behandlung löschen"
         '
         'ToolStripButton2
@@ -126,18 +127,16 @@ 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(29, 28)
+        Me.ToolStripButton2.Size = New System.Drawing.Size(24, 24)
         Me.ToolStripButton2.Text = "Aktualisieren"
         '
         'GroupBox1
         '
         Me.GroupBox1.Controls.Add(Me.treebehandlungen)
         Me.GroupBox1.Dock = System.Windows.Forms.DockStyle.Left
-        Me.GroupBox1.Location = New System.Drawing.Point(0, 31)
-        Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4)
+        Me.GroupBox1.Location = New System.Drawing.Point(0, 27)
         Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4)
-        Me.GroupBox1.Size = New System.Drawing.Size(293, 1000)
+        Me.GroupBox1.Size = New System.Drawing.Size(220, 811)
         Me.GroupBox1.TabIndex = 2
         Me.GroupBox1.TabStop = False
         Me.GroupBox1.Text = "Behandlungen"
@@ -160,14 +159,13 @@ 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(4, 19)
-        Me.treebehandlungen.Margin = New System.Windows.Forms.Padding(4)
+        Me.treebehandlungen.Location = New System.Drawing.Point(3, 16)
         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(285, 977)
+        Me.treebehandlungen.Size = New System.Drawing.Size(214, 792)
         Me.treebehandlungen.Styles.Add(Me.ElementStyle1)
         Me.treebehandlungen.TabIndex = 0
         Me.treebehandlungen.Text = "AdvTree1"
@@ -177,136 +175,142 @@ Partial Class Behandlung
         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.ctxmenubehandlung.Name = "ContextMenuStrip1"
-        Me.ctxmenubehandlung.Size = New System.Drawing.Size(247, 244)
+        Me.ctxmenubehandlung.Size = New System.Drawing.Size(212, 226)
         '
         'NeueBehandlungToolStripMenuItem1
         '
         Me.NeueBehandlungToolStripMenuItem1.Name = "NeueBehandlungToolStripMenuItem1"
-        Me.NeueBehandlungToolStripMenuItem1.Size = New System.Drawing.Size(246, 24)
+        Me.NeueBehandlungToolStripMenuItem1.Size = New System.Drawing.Size(211, 22)
         Me.NeueBehandlungToolStripMenuItem1.Text = "&Neue Behandlung"
         '
         'ToolStripMenuItem2
         '
         Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2"
-        Me.ToolStripMenuItem2.Size = New System.Drawing.Size(243, 6)
+        Me.ToolStripMenuItem2.Size = New System.Drawing.Size(208, 6)
         '
         'BehandlungabschliessenToolStripMenuItem1
         '
         Me.BehandlungabschliessenToolStripMenuItem1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AbschlussMitRecallAnzeigeToolStripMenuItem, Me.AbshlussOhneRecallAnzeigeToolStripMenuItem})
         Me.BehandlungabschliessenToolStripMenuItem1.Name = "BehandlungabschliessenToolStripMenuItem1"
-        Me.BehandlungabschliessenToolStripMenuItem1.Size = New System.Drawing.Size(246, 24)
+        Me.BehandlungabschliessenToolStripMenuItem1.Size = New System.Drawing.Size(211, 22)
         Me.BehandlungabschliessenToolStripMenuItem1.Text = "Behandlung &abschliessen"
         '
         'AbschlussMitRecallAnzeigeToolStripMenuItem
         '
         Me.AbschlussMitRecallAnzeigeToolStripMenuItem.Name = "AbschlussMitRecallAnzeigeToolStripMenuItem"
-        Me.AbschlussMitRecallAnzeigeToolStripMenuItem.Size = New System.Drawing.Size(290, 26)
+        Me.AbschlussMitRecallAnzeigeToolStripMenuItem.Size = New System.Drawing.Size(232, 22)
         Me.AbschlussMitRecallAnzeigeToolStripMenuItem.Text = "Abschluss mit Recall-Anzeige"
         '
         'AbshlussOhneRecallAnzeigeToolStripMenuItem
         '
         Me.AbshlussOhneRecallAnzeigeToolStripMenuItem.Name = "AbshlussOhneRecallAnzeigeToolStripMenuItem"
-        Me.AbshlussOhneRecallAnzeigeToolStripMenuItem.Size = New System.Drawing.Size(290, 26)
+        Me.AbshlussOhneRecallAnzeigeToolStripMenuItem.Size = New System.Drawing.Size(232, 22)
         Me.AbshlussOhneRecallAnzeigeToolStripMenuItem.Text = "Abshluss ohne Recall-Anzeige"
         '
         'BehandlungZurücksetzenToolStripMenuItem
         '
         Me.BehandlungZurücksetzenToolStripMenuItem.Name = "BehandlungZurücksetzenToolStripMenuItem"
-        Me.BehandlungZurücksetzenToolStripMenuItem.Size = New System.Drawing.Size(246, 24)
+        Me.BehandlungZurücksetzenToolStripMenuItem.Size = New System.Drawing.Size(211, 22)
         Me.BehandlungZurücksetzenToolStripMenuItem.Text = "Behandlung zurücksetzen"
         '
         'BehandlungKopierenToolStripMenuItem
         '
         Me.BehandlungKopierenToolStripMenuItem.Name = "BehandlungKopierenToolStripMenuItem"
-        Me.BehandlungKopierenToolStripMenuItem.Size = New System.Drawing.Size(246, 24)
+        Me.BehandlungKopierenToolStripMenuItem.Size = New System.Drawing.Size(211, 22)
         Me.BehandlungKopierenToolStripMenuItem.Text = "Behandlung kopieren"
         '
         'ToolStripMenuItem4
         '
         Me.ToolStripMenuItem4.Name = "ToolStripMenuItem4"
-        Me.ToolStripMenuItem4.Size = New System.Drawing.Size(243, 6)
+        Me.ToolStripMenuItem4.Size = New System.Drawing.Size(208, 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(246, 24)
+        Me.SofortRechnungDruckenToolStripMenuItem.Size = New System.Drawing.Size(211, 22)
         Me.SofortRechnungDruckenToolStripMenuItem.Text = "Sofort-Rechnung drucken"
         '
         'VorschauToolStripMenuItem
         '
         Me.VorschauToolStripMenuItem.Name = "VorschauToolStripMenuItem"
-        Me.VorschauToolStripMenuItem.Size = New System.Drawing.Size(252, 26)
+        Me.VorschauToolStripMenuItem.Size = New System.Drawing.Size(202, 22)
         Me.VorschauToolStripMenuItem.Text = "Vorschau"
         '
         'EntwurfToolStripMenuItem
         '
         Me.EntwurfToolStripMenuItem.Name = "EntwurfToolStripMenuItem"
-        Me.EntwurfToolStripMenuItem.Size = New System.Drawing.Size(252, 26)
+        Me.EntwurfToolStripMenuItem.Size = New System.Drawing.Size(202, 22)
         Me.EntwurfToolStripMenuItem.Text = "Entwurf"
         '
         'ToolStripMenuItem6
         '
         Me.ToolStripMenuItem6.Name = "ToolStripMenuItem6"
-        Me.ToolStripMenuItem6.Size = New System.Drawing.Size(249, 6)
+        Me.ToolStripMenuItem6.Size = New System.Drawing.Size(199, 6)
         '
         'AlsPdfToolStripMenuItem1
         '
         Me.AlsPdfToolStripMenuItem1.Name = "AlsPdfToolStripMenuItem1"
-        Me.AlsPdfToolStripMenuItem1.Size = New System.Drawing.Size(252, 26)
+        Me.AlsPdfToolStripMenuItem1.Size = New System.Drawing.Size(202, 22)
         Me.AlsPdfToolStripMenuItem1.Text = "als PDF"
         '
         'AlsMailToolStripMenuItem
         '
         Me.AlsMailToolStripMenuItem.Name = "AlsMailToolStripMenuItem"
-        Me.AlsMailToolStripMenuItem.Size = New System.Drawing.Size(252, 26)
+        Me.AlsMailToolStripMenuItem.Size = New System.Drawing.Size(202, 22)
         Me.AlsMailToolStripMenuItem.Text = "als PDF an Outlook-Mail"
         '
         'KopieErstellenToolStripMenuItem
         '
-        Me.KopieErstellenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AlsPDFToolStripMenuItem, Me.ÜberDruckerToolStripMenuItem})
+        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(246, 24)
+        Me.KopieErstellenToolStripMenuItem.Size = New System.Drawing.Size(211, 22)
         Me.KopieErstellenToolStripMenuItem.Text = "Rechnungskopie erstellen"
         '
         'AlsPDFToolStripMenuItem
         '
         Me.AlsPDFToolStripMenuItem.Name = "AlsPDFToolStripMenuItem"
-        Me.AlsPDFToolStripMenuItem.Size = New System.Drawing.Size(177, 26)
+        Me.AlsPDFToolStripMenuItem.Size = New System.Drawing.Size(206, 22)
         Me.AlsPDFToolStripMenuItem.Text = "als PDF"
         '
         'ÜberDruckerToolStripMenuItem
         '
         Me.ÜberDruckerToolStripMenuItem.Name = "ÜberDruckerToolStripMenuItem"
-        Me.ÜberDruckerToolStripMenuItem.Size = New System.Drawing.Size(177, 26)
+        Me.ÜberDruckerToolStripMenuItem.Size = New System.Drawing.Size(206, 22)
         Me.ÜberDruckerToolStripMenuItem.Text = "über Drucker"
         '
+        'AlsPDFPerMailToolStripMenuItem
+        '
+        Me.AlsPDFPerMailToolStripMenuItem.Name = "AlsPDFPerMailToolStripMenuItem"
+        Me.AlsPDFPerMailToolStripMenuItem.Size = New System.Drawing.Size(206, 22)
+        Me.AlsPDFPerMailToolStripMenuItem.Text = "als PDF per Outlook-Mail"
+        '
         'ToolStripMenuItem3
         '
         Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3"
-        Me.ToolStripMenuItem3.Size = New System.Drawing.Size(243, 6)
+        Me.ToolStripMenuItem3.Size = New System.Drawing.Size(208, 6)
         '
         'BehandlungLöschenToolStripMenuItem1
         '
         Me.BehandlungLöschenToolStripMenuItem1.Name = "BehandlungLöschenToolStripMenuItem1"
-        Me.BehandlungLöschenToolStripMenuItem1.Size = New System.Drawing.Size(246, 24)
+        Me.BehandlungLöschenToolStripMenuItem1.Size = New System.Drawing.Size(211, 22)
         Me.BehandlungLöschenToolStripMenuItem1.Text = "&Behandlung löschen"
         '
         'ToolStripMenuItem5
         '
         Me.ToolStripMenuItem5.Name = "ToolStripMenuItem5"
-        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(243, 6)
+        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(208, 6)
         '
         'RechungKVVorschauToolStripMenuItem
         '
         Me.RechungKVVorschauToolStripMenuItem.Name = "RechungKVVorschauToolStripMenuItem"
-        Me.RechungKVVorschauToolStripMenuItem.Size = New System.Drawing.Size(246, 24)
+        Me.RechungKVVorschauToolStripMenuItem.Size = New System.Drawing.Size(211, 22)
         Me.RechungKVVorschauToolStripMenuItem.Text = "Rechung/KV Vorschau"
         '
         'RechnungKVEntwurfToolStripMenuItem
         '
         Me.RechnungKVEntwurfToolStripMenuItem.Name = "RechnungKVEntwurfToolStripMenuItem"
-        Me.RechnungKVEntwurfToolStripMenuItem.Size = New System.Drawing.Size(246, 24)
+        Me.RechnungKVEntwurfToolStripMenuItem.Size = New System.Drawing.Size(211, 22)
         Me.RechnungKVEntwurfToolStripMenuItem.Text = "Rechnung/KV Entwurf"
         '
         'ImageList1
@@ -336,42 +340,42 @@ Partial Class Behandlung
         'NeueBehandlungToolStripMenuItem
         '
         Me.NeueBehandlungToolStripMenuItem.Name = "NeueBehandlungToolStripMenuItem"
-        Me.NeueBehandlungToolStripMenuItem.Size = New System.Drawing.Size(288, 24)
+        Me.NeueBehandlungToolStripMenuItem.Size = New System.Drawing.Size(243, 22)
         Me.NeueBehandlungToolStripMenuItem.Text = "&Neue Behandlung"
         '
         'BehandlungAbschliessenToolStripMenuItem
         '
         Me.BehandlungAbschliessenToolStripMenuItem.Name = "BehandlungAbschliessenToolStripMenuItem"
-        Me.BehandlungAbschliessenToolStripMenuItem.Size = New System.Drawing.Size(288, 24)
+        Me.BehandlungAbschliessenToolStripMenuItem.Size = New System.Drawing.Size(243, 22)
         Me.BehandlungAbschliessenToolStripMenuItem.Text = "&Behandlung abschliessen"
         '
         'BehandlungLöschenToolStripMenuItem
         '
         Me.BehandlungLöschenToolStripMenuItem.Name = "BehandlungLöschenToolStripMenuItem"
-        Me.BehandlungLöschenToolStripMenuItem.Size = New System.Drawing.Size(288, 24)
+        Me.BehandlungLöschenToolStripMenuItem.Size = New System.Drawing.Size(243, 22)
         Me.BehandlungLöschenToolStripMenuItem.Text = "Behandlung &löschen"
         '
         'ToolStripMenuItem1
         '
         Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
-        Me.ToolStripMenuItem1.Size = New System.Drawing.Size(285, 6)
+        Me.ToolStripMenuItem1.Size = New System.Drawing.Size(240, 6)
         '
         'NeuerKostenvoranschlagToolStripMenuItem
         '
         Me.NeuerKostenvoranschlagToolStripMenuItem.Name = "NeuerKostenvoranschlagToolStripMenuItem"
-        Me.NeuerKostenvoranschlagToolStripMenuItem.Size = New System.Drawing.Size(288, 24)
+        Me.NeuerKostenvoranschlagToolStripMenuItem.Size = New System.Drawing.Size(243, 22)
         Me.NeuerKostenvoranschlagToolStripMenuItem.Text = "Neuer &Kostenvoranschlag"
         '
         'KostenvoranschlagAbschliessenToolStripMenuItem
         '
         Me.KostenvoranschlagAbschliessenToolStripMenuItem.Name = "KostenvoranschlagAbschliessenToolStripMenuItem"
-        Me.KostenvoranschlagAbschliessenToolStripMenuItem.Size = New System.Drawing.Size(288, 24)
+        Me.KostenvoranschlagAbschliessenToolStripMenuItem.Size = New System.Drawing.Size(243, 22)
         Me.KostenvoranschlagAbschliessenToolStripMenuItem.Text = "Kostenvoranschlag abschliessen"
         '
         'KostenvoranschlagLöschenToolStripMenuItem
         '
         Me.KostenvoranschlagLöschenToolStripMenuItem.Name = "KostenvoranschlagLöschenToolStripMenuItem"
-        Me.KostenvoranschlagLöschenToolStripMenuItem.Size = New System.Drawing.Size(288, 24)
+        Me.KostenvoranschlagLöschenToolStripMenuItem.Size = New System.Drawing.Size(243, 22)
         Me.KostenvoranschlagLöschenToolStripMenuItem.Text = "Kostenvoranschlag löschen"
         '
         'SuperTabControl1
@@ -393,13 +397,12 @@ 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(293, 31)
-        Me.SuperTabControl1.Margin = New System.Windows.Forms.Padding(4)
+        Me.SuperTabControl1.Location = New System.Drawing.Point(220, 27)
         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(1420, 1000)
+        Me.SuperTabControl1.Size = New System.Drawing.Size(1065, 811)
         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})
@@ -409,10 +412,9 @@ 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, 28)
-        Me.SuperTabControlPanel1.Margin = New System.Windows.Forms.Padding(4)
+        Me.SuperTabControlPanel1.Location = New System.Drawing.Point(0, 25)
         Me.SuperTabControlPanel1.Name = "SuperTabControlPanel1"
-        Me.SuperTabControlPanel1.Size = New System.Drawing.Size(1420, 972)
+        Me.SuperTabControlPanel1.Size = New System.Drawing.Size(1065, 786)
         Me.SuperTabControlPanel1.TabIndex = 1
         Me.SuperTabControlPanel1.TabItem = Me.STBehandlung
         '
@@ -420,11 +422,22 @@ 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(1416, 970)
+        Me.Panel2.Size = New System.Drawing.Size(1062, 788)
         Me.Panel2.TabIndex = 9
         '
+        'Behandungdetail1
+        '
+        Me.Behandungdetail1.Behandlungsnr = 0
+        Me.Behandungdetail1.Behandlungsstatus = 0
+        Me.Behandungdetail1.HasChanges = False
+        Me.Behandungdetail1.Location = New System.Drawing.Point(3, 6)
+        Me.Behandungdetail1.Margin = New System.Windows.Forms.Padding(4)
+        Me.Behandungdetail1.Name = "Behandungdetail1"
+        Me.Behandungdetail1.Patientnr = 0
+        Me.Behandungdetail1.Size = New System.Drawing.Size(1059, 779)
+        Me.Behandungdetail1.TabIndex = 0
+        '
         'STBehandlung
         '
         Me.STBehandlung.AttachedControl = Me.SuperTabControlPanel1
@@ -436,10 +449,9 @@ 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, 28)
-        Me.SuperTabControlPanel2.Margin = New System.Windows.Forms.Padding(4)
+        Me.SuperTabControlPanel2.Location = New System.Drawing.Point(0, 23)
         Me.SuperTabControlPanel2.Name = "SuperTabControlPanel2"
-        Me.SuperTabControlPanel2.Size = New System.Drawing.Size(1420, 972)
+        Me.SuperTabControlPanel2.Size = New System.Drawing.Size(1065, 790)
         Me.SuperTabControlPanel2.TabIndex = 0
         Me.SuperTabControlPanel2.TabItem = Me.STLeistung
         '
@@ -448,11 +460,24 @@ 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(1420, 972)
+        Me.Panel1.Size = New System.Drawing.Size(1065, 790)
         Me.Panel1.TabIndex = 1
         '
+        'Leistungen1
+        '
+        Me.Leistungen1.behandler = 0
+        Me.Leistungen1.Behandlungnr = 0
+        Me.Leistungen1.Behandlungsstatus = 0
+        Me.Leistungen1.Dentotar = False
+        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.Name = "Leistungen1"
+        Me.Leistungen1.Size = New System.Drawing.Size(1065, 790)
+        Me.Leistungen1.TabIndex = 0
+        '
         'STLeistung
         '
         Me.STLeistung.AttachedControl = Me.SuperTabControlPanel2
@@ -464,9 +489,8 @@ 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(1420, 1000)
+        Me.SuperTabControlPanel3.Size = New System.Drawing.Size(1065, 811)
         Me.SuperTabControlPanel3.TabIndex = 0
         '
         'tsbtnnew
@@ -475,7 +499,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(29, 22)
+        Me.tsbtnnew.Size = New System.Drawing.Size(24, 22)
         Me.tsbtnnew.Text = "Neue Behandlung"
         '
         'ToolStripButton1
@@ -484,7 +508,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(29, 22)
+        Me.ToolStripButton1.Size = New System.Drawing.Size(24, 22)
         Me.ToolStripButton1.Text = "ToolStripButton1"
         '
         'tsbtnbehandlungdelete
@@ -502,44 +526,17 @@ 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(289, 154)
-        '
-        'Leistungen1
-        '
-        Me.Leistungen1.behandler = 0
-        Me.Leistungen1.Behandlungnr = 0
-        Me.Leistungen1.Behandlungsstatus = 0
-        Me.Leistungen1.Dentotar = False
-        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(5)
-        Me.Leistungen1.Name = "Leistungen1"
-        Me.Leistungen1.Size = New System.Drawing.Size(1420, 972)
-        Me.Leistungen1.TabIndex = 0
-        '
-        'Behandungdetail1
-        '
-        Me.Behandungdetail1.Behandlungsnr = 0
-        Me.Behandungdetail1.Behandlungsstatus = 0
-        Me.Behandungdetail1.HasChanges = False
-        Me.Behandungdetail1.Location = New System.Drawing.Point(4, 7)
-        Me.Behandungdetail1.Margin = New System.Windows.Forms.Padding(5)
-        Me.Behandungdetail1.Name = "Behandungdetail1"
-        Me.Behandungdetail1.Patientnr = 0
-        Me.Behandungdetail1.Size = New System.Drawing.Size(1412, 959)
-        Me.Behandungdetail1.TabIndex = 0
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(244, 142)
         '
         'Behandlung
         '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.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(1713, 1031)
+        Me.Size = New System.Drawing.Size(1285, 838)
         Me.tsbtndelete.ResumeLayout(False)
         Me.tsbtndelete.PerformLayout()
         Me.GroupBox1.ResumeLayout(False)
@@ -612,4 +609,5 @@ Partial Class Behandlung
     Friend WithEvents AlsMailToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents AbschlussMitRecallAnzeigeToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents AbshlussOhneRecallAnzeigeToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents AlsPDFPerMailToolStripMenuItem 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
-        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAINSURBVDhPY6AVYAyc67K/+XD1/SYg9p3quAQqTiQIZWAO
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAINSURBVDhPY6AVYAyc67K/+XD1/SYg9p3quAQqTiQIZWAO
         Wu75Zu6Nuf9nX5/9322S/TmoDJEAaIDnctc3k69M/D/hSt9/p0nm56EyRAKwATZveq+0/O++0gg0wAiP
         AfUMTOYLtWx81tnYB0CxZZ+ak88myw9dV8v/d1wp+e88T++2/XxtB591FvYeQOyyzsTeYJGyFVi/cAGn
         Se6J5P99V5v+T7ze8H/Szbr/U27V/O++kfe/43rm/9Zr6f87r+f+775e9L/tSsH/hot5/yvPZf8P2Ov6
@@ -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
-        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAJASURBVDhPfZNLSxtRFMdn5Suah0oChhiJmlGj8RGfiKIi
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJASURBVDhPfZNLSxtRFMdn5Suah0oChhiJmlGj8RGfiKIi
         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
-        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAA+oSURBVHhe7Z0J8H5THcYp2cJky5IpCqP8LSnrVBSViBiy
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAA+oSURBVHhe7Z0J8H5THcYp2cJky5IpCqP8LSnrVBSViBiy
         VfaQrMkSypYskbQRZQuhKSRbY6eikq1sWcJEEWXLlup5+P/G6/W87+++7znn3nvOfT4zn2nS796cc+/7
         vvee812mMcYYY4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOMKZN54FJwVbgR
         3BHuAw+Ah8Aj4Dfh4VP/2V5wZ7gZXB3yWJ7jddCYLJkWLgY/DQ+FP4U3wafg/yL5PLwdngsPg1vC98A3
@@ -236,7 +236,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABO
-        DQAAAk1TRnQBSQFMAgEBBQEAAWABAwFgAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        DQAAAk1TRnQBSQFMAgEBBQEAAbABAwGwAQMBEAEAARABAAT/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
-        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAINSURBVDhPY6AVYAyc67K/+XD1/SYg9p3quAQqTiQIZWAO
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAINSURBVDhPY6AVYAyc67K/+XD1/SYg9p3quAQqTiQIZWAO
         Wu75Zu6Nuf9nX5/9322S/TmoDJEAaIDnctc3k69M/D/hSt9/p0nm56EyRAKwATZveq+0/O++0gg0wAiP
         AfUMTOYLtWx81tnYB0CxZZ+ak88myw9dV8v/d1wp+e88T++2/XxtB591FvYeQOyyzsTeYJGyFVi/cAGn
         Se6J5P99V5v+T7ze8H/Szbr/U27V/O++kfe/43rm/9Zr6f87r+f+775e9L/tSsH/hot5/yvPZf8P2Ov6
@@ -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
-        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAJASURBVDhPfZNLSxtRFMdn5Suah0oChhiJmlGj8RGfiKIi
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJASURBVDhPfZNLSxtRFMdn5Suah0oChhiJmlGj8RGfiKIi
         gouAEPULuMlSxe+Rrbt8hKEWGfJobNq5k0ZaJ7Vgq90ILW5auiiFLv8955oJiU37hwPDPfd3/ufMvVex
         VTk4SF0mEprmcrmrS39JCwbdpZ0dzdjeTlWXHvUhmUw/nJ7i7e4uspGIxRurqZqqsPXp5ATG4iJyo6Np
         mWBnCScSMNfXIVZXoatqQ5EafHwMMTcHY2ZGRkZVUwq3zc42LJaXYSwtQQ+HZZEafHQEEYtBTE3VQh8a

DPM2016/Behandlung/Behandlung.vb

@@ -206,7 +206,18 @@ Public Class Behandlung
         Dim kvoffen As New DevComponents.AdvTree.Node
         Dim kvabgeschlossen As New DevComponents.AdvTree.Node
 
-        BH.Text = "Behandlungen"
+        If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then
+            BH.Text = "Projekte"
+            Me.AbschlussMitRecallAnzeigeToolStripMenuItem.Visible = False
+            Me.AbshlussOhneRecallAnzeigeToolStripMenuItem.Visible = False
+            Me.RechnungKVEntwurfToolStripMenuItem.Text = "Rechnung/Offerte Vorschau"
+            Me.RechnungKVEntwurfToolStripMenuItem.Text = "Rechnung/Offerte Entwurf"
+            Me.GroupBox1.Width = 350
+        Else
+            BH.Text = "Behandlungen"
+
+        End If
+        '        BH.Text = "Behandlungen"
         BH.Tag = -1
         BH.ImageIndex = 0
         BHoffen.Text = "Offen"
@@ -221,7 +232,13 @@ Public Class Behandlung
         BH.Nodes.Add(BHoffen)
         BH.Nodes.Add(BHabgeshlossen)
         BH.Nodes.Add(BHFakturiert)
-        kv.Text = "Kostenvoranschlag"
+        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"
@@ -241,7 +258,11 @@ Public Class Behandlung
             Dim tn As New DevComponents.AdvTree.Node
             tn.Tag = r("nrbehandlung")
             Dim total As Double = r("Total")
-            tn.Text = r("behandlungsbeginn") + " / " + total.ToString("N2")
+            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
@@ -314,7 +335,9 @@ Public Class Behandlung
         Me.SuperTabControl1.Tabs(1).Enabled = enable
         Me.SuperTabControl1.Tabs(0).Enabled = enable
         Me.SuperTabControl1.Visible = enable
-
+        If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then
+            Me.SuperTabControl1.Tabs(0).Text = "Projekt"
+        End If
     End Sub
 
 
@@ -634,7 +657,8 @@ Public Class Behandlung
             Me.BehandlungKopierenToolStripMenuItem.Visible = True
             Me.SofortRechnungDruckenToolStripMenuItem.Text = "Sofort-Rechnung drucken"
 
-            '            Me.ctxmenubehandlung.Enabled = True
+            '  
+            Me.ctxmenubehandlung.Enabled = True
             Select Case i
                 Case -11
                     Me.BehandlungZurücksetzenToolStripMenuItem.Enabled = False
@@ -654,49 +678,96 @@ Public Class Behandlung
                     Me.KopieErstellenToolStripMenuItem.Enabled = True
 
             End Select
-            Select Case i
-                Case -23
-                    Me.BehandlungabschliessenToolStripMenuItem1.Text = "Kostenvoranschlag abschliessen"
-                    BehandlungabschliessenToolStripMenuItem1.Enabled = False
-                    Me.NeueBehandlungToolStripMenuItem1.Text = "Neuer Kostenvoranschlag"
-                    Me.BehandlungZurücksetzenToolStripMenuItem.Text = "Kostenvoranschlag zurücksetzen"
-                    Me.BehandlungZurücksetzenToolStripMenuItem.Visible = True
-                    Me.BehandlungLöschenToolStripMenuItem1.Text = "Kostenvoranschlag löschen"
-                    Me.BehandlungKopierenToolStripMenuItem.Text = "Kostenvoranschlag kopieren"
-                    Me.SofortRechnungDruckenToolStripMenuItem.Enabled = False
-                    Me.KopieErstellenToolStripMenuItem.Enabled = False
-                    Me.SofortRechnungDruckenToolStripMenuItem.Text = "Kostenvoranschlag drucken"
-                    Me.SofortRechnungDruckenToolStripMenuItem.Enabled = True
-                Case -2
-                    Me.BehandlungabschliessenToolStripMenuItem1.Text = "Kostenvoranschlag abschliessen"
-                    Me.BehandlungabschliessenToolStripMenuItem1.Enabled = False
-                    BehandlungabschliessenToolStripMenuItem1.Enabled = False
-                    Me.NeueBehandlungToolStripMenuItem1.Text = "Neuer Kostenvoranschlag"
-                    Me.BehandlungZurücksetzenToolStripMenuItem.Text = "Kostenvoranschlag zurücksetzen"
-                    Me.BehandlungZurücksetzenToolStripMenuItem.Enabled = False
-                    Me.BehandlungLöschenToolStripMenuItem1.Text = "Kostenvoranschlag löschen"
-                    Me.BehandlungLöschenToolStripMenuItem1.Enabled = False
-                    Me.BehandlungKopierenToolStripMenuItem.Text = "Kostenvoranschlag kopieren"
-
-                Case > -20
-                    Me.BehandlungabschliessenToolStripMenuItem1.Text = "Behandlung abschliessen"
-                    Me.NeueBehandlungToolStripMenuItem1.Text = "Neue Behandlung"
-                    Me.BehandlungZurücksetzenToolStripMenuItem.Text = "Behandlung zurücksetzen"
-                    Me.BehandlungZurücksetzenToolStripMenuItem.Visible = True
-                    Me.BehandlungLöschenToolStripMenuItem1.Text = "Behandlung löschen"
-                    Me.BehandlungKopierenToolStripMenuItem.Text = "Behandlung kopieren"
-                Case < -20 And
+            If Globals.Applicationtype = Globals.ApplicationTypes.Projektabrechnung Then
+                Select Case i
+                    Case -23
+                        Me.BehandlungabschliessenToolStripMenuItem1.Text = "Offerte abschliessen"
+                        BehandlungabschliessenToolStripMenuItem1.Enabled = False
+                        Me.NeueBehandlungToolStripMenuItem1.Text = "Neue Offerte"
+                        Me.BehandlungZurücksetzenToolStripMenuItem.Text = "Offerte zurücksetzen"
+                        Me.BehandlungZurücksetzenToolStripMenuItem.Visible = True
+                        Me.BehandlungLöschenToolStripMenuItem1.Text = "Offerte löschen"
+                        Me.BehandlungKopierenToolStripMenuItem.Text = "Offerte kopieren"
+                        Me.SofortRechnungDruckenToolStripMenuItem.Enabled = False
+                        Me.KopieErstellenToolStripMenuItem.Enabled = False
+                        Me.SofortRechnungDruckenToolStripMenuItem.Text = "Offerte drucken"
+                        Me.SofortRechnungDruckenToolStripMenuItem.Enabled = True
+                    Case -2
+                        Me.BehandlungabschliessenToolStripMenuItem1.Text = "Offerte abschliessen"
+                        Me.BehandlungabschliessenToolStripMenuItem1.Enabled = False
+                        BehandlungabschliessenToolStripMenuItem1.Enabled = False
+                        Me.NeueBehandlungToolStripMenuItem1.Text = "Neuer Offerte"
+                        Me.BehandlungZurücksetzenToolStripMenuItem.Text = "Offerte zurücksetzen"
+                        Me.BehandlungZurücksetzenToolStripMenuItem.Enabled = False
+                        Me.BehandlungLöschenToolStripMenuItem1.Text = "Offerte löschen"
+                        Me.BehandlungLöschenToolStripMenuItem1.Enabled = False
+                        Me.BehandlungKopierenToolStripMenuItem.Text = "Offerte kopieren"
+
+                    Case > -20
+                        Me.BehandlungabschliessenToolStripMenuItem1.Text = "Projekt abschliessen"
+                        Me.NeueBehandlungToolStripMenuItem1.Text = "Neues Projekt"
+                        Me.BehandlungZurücksetzenToolStripMenuItem.Text = "Projek 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"
+                        BehandlungabschliessenToolStripMenuItem1.Enabled = True
+                        Me.BehandlungabschliessenToolStripMenuItem1.Text = "Offerte abschliessen"
+                        Me.NeueBehandlungToolStripMenuItem1.Text = "Neue Offerte"
+                        Me.BehandlungZurücksetzenToolStripMenuItem.Text = "Offerte zurücksetzen"
+                        Me.BehandlungZurücksetzenToolStripMenuItem.Visible = False
+                        Me.BehandlungLöschenToolStripMenuItem1.Text = "Offerte löschen"
+                        Me.BehandlungKopierenToolStripMenuItem.Text = "Offerte kopieren"
+                        Me.SofortRechnungDruckenToolStripMenuItem.Enabled = False
+                Me.KopieErstellenToolStripMenuItem.Enabled = False
+                End Select
+
+            Else
+                Select Case i
+                    Case -23
+                        Me.BehandlungabschliessenToolStripMenuItem1.Text = "Kostenvoranschlag abschliessen"
+                        BehandlungabschliessenToolStripMenuItem1.Enabled = False
+                        Me.NeueBehandlungToolStripMenuItem1.Text = "Neuer Kostenvoranschlag"
+                        Me.BehandlungZurücksetzenToolStripMenuItem.Text = "Kostenvoranschlag zurücksetzen"
+                        Me.BehandlungZurücksetzenToolStripMenuItem.Visible = True
+                        Me.BehandlungLöschenToolStripMenuItem1.Text = "Kostenvoranschlag löschen"
+                        Me.BehandlungKopierenToolStripMenuItem.Text = "Kostenvoranschlag kopieren"
+                        Me.SofortRechnungDruckenToolStripMenuItem.Enabled = False
+                        Me.KopieErstellenToolStripMenuItem.Enabled = False
+                        Me.SofortRechnungDruckenToolStripMenuItem.Text = "Kostenvoranschlag drucken"
+                        Me.SofortRechnungDruckenToolStripMenuItem.Enabled = True
+                    Case -2
+                        Me.BehandlungabschliessenToolStripMenuItem1.Text = "Kostenvoranschlag abschliessen"
+                        Me.BehandlungabschliessenToolStripMenuItem1.Enabled = False
+                        BehandlungabschliessenToolStripMenuItem1.Enabled = False
+                        Me.NeueBehandlungToolStripMenuItem1.Text = "Neuer Kostenvoranschlag"
+                        Me.BehandlungZurücksetzenToolStripMenuItem.Text = "Kostenvoranschlag zurücksetzen"
+                        Me.BehandlungZurücksetzenToolStripMenuItem.Enabled = False
+                        Me.BehandlungLöschenToolStripMenuItem1.Text = "Kostenvoranschlag löschen"
+                        Me.BehandlungLöschenToolStripMenuItem1.Enabled = False
+                        Me.BehandlungKopierenToolStripMenuItem.Text = "Kostenvoranschlag kopieren"
+
+                    Case > -20
+                        Me.BehandlungabschliessenToolStripMenuItem1.Text = "Behandlung abschliessen"
+                        Me.NeueBehandlungToolStripMenuItem1.Text = "Neue Behandlung"
+                        Me.BehandlungZurücksetzenToolStripMenuItem.Text = "Behandlung zurücksetzen"
+                        Me.BehandlungZurücksetzenToolStripMenuItem.Visible = True
+                        Me.BehandlungLöschenToolStripMenuItem1.Text = "Behandlung löschen"
+                        Me.BehandlungKopierenToolStripMenuItem.Text = "Behandlung kopieren"
+                    Case < -20 And
                 Me.BehandlungabschliessenToolStripMenuItem1.Text = "Kostenvoranschlag abschliessen"
-                    BehandlungabschliessenToolStripMenuItem1.Enabled = True
-                    Me.BehandlungabschliessenToolStripMenuItem1.Text = "Kostenvoranschlag abschliessen"
-                    Me.NeueBehandlungToolStripMenuItem1.Text = "Neuer Kostenvoranschlag"
-                    Me.BehandlungZurücksetzenToolStripMenuItem.Text = "Kostenvoranschlag zurücksetzen"
-                    Me.BehandlungZurücksetzenToolStripMenuItem.Visible = False
-                    Me.BehandlungLöschenToolStripMenuItem1.Text = "Kostenvoranschlag löschen"
-                    Me.BehandlungKopierenToolStripMenuItem.Text = "Kostenvoranschlag kopieren"
-                    Me.SofortRechnungDruckenToolStripMenuItem.Enabled = False
-                    Me.KopieErstellenToolStripMenuItem.Enabled = False
-            End Select
+                        BehandlungabschliessenToolStripMenuItem1.Enabled = True
+                        Me.BehandlungabschliessenToolStripMenuItem1.Text = "Kostenvoranschlag abschliessen"
+                        Me.NeueBehandlungToolStripMenuItem1.Text = "Neuer Kostenvoranschlag"
+                        Me.BehandlungZurücksetzenToolStripMenuItem.Text = "Kostenvoranschlag zurücksetzen"
+                        Me.BehandlungZurücksetzenToolStripMenuItem.Visible = False
+                        Me.BehandlungLöschenToolStripMenuItem1.Text = "Kostenvoranschlag löschen"
+                        Me.BehandlungKopierenToolStripMenuItem.Text = "Kostenvoranschlag kopieren"
+                        Me.SofortRechnungDruckenToolStripMenuItem.Enabled = False
+                        Me.KopieErstellenToolStripMenuItem.Enabled = False
+                End Select
+            End If
 
 
         Catch ex As Exception
@@ -774,12 +845,13 @@ Public Class Behandlung
         Dim key As Integer = Me.treebehandlungen.SelectedNode.Tag
         db.Get_Tabledata("Behandlu", "where nrbehandlung=" + nrbehandlung.ToString)
         If db.dsDaten.Tables(0).Rows(0).Item("Status") = 1 Then
-
             Messagetext = "Behandlung "
+            If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then Messagetext = "Projekt"
         Else
 
             istKV = True
             Messagetext = "Kostenvoranschlag"
+            If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then Messagetext = "Offerte"
         End If
         If db.dsDaten.Tables(0).Rows(0).Item("rgdatum").ToString < Now.ToString And db.dsDaten.Tables(0).Rows(0).Item("rgdatum").ToString <> "" Then
             Dim d As New frmMsgbox
@@ -1036,7 +1108,7 @@ Public Class Behandlung
     End Sub
 
     Private Sub AlsMailToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AlsMailToolStripMenuItem.Click
-        Behandungdetail1.Sofortrechnung_als_pdf(True)
+        Behandungdetail1.Sofortrechnung_als_pdf(True, 1)
     End Sub
 
     Private Sub AbschlussMitRecallAnzeigeToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AbschlussMitRecallAnzeigeToolStripMenuItem.Click
@@ -1047,6 +1119,10 @@ Public Class Behandlung
         Behandlung_Abschliessen(Me.treebehandlungen.SelectedNode.Tag.ToString, False)
     End Sub
 
+    Private Sub AlsPDFPerMailToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AlsPDFPerMailToolStripMenuItem.Click
+        Globals.Rg_Funktionen.Rechnungskopie(Me.treebehandlungen.SelectedNode.Tag.ToString, False, True, True)
+    End Sub
+
 
 
 

DPM2016/Behandlung/Benhandungdetail.Designer.vb

@@ -24,11 +24,14 @@ Partial Class Benhandungdetail
     Private Sub InitializeComponent()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Benhandungdetail))
         Me.GrpPatient = New System.Windows.Forms.GroupBox()
+        Me.txtProjekt = New System.Windows.Forms.TextBox()
+        Me.lblProjekt = New System.Windows.Forms.Label()
         Me.cbboxNRESTyp = New DPM2016.MyCombobox()
         Me.Label6 = New System.Windows.Forms.Label()
         Me.cbboxnrbehandler = New DPM2016.MyCombobox()
         Me.Label7 = New System.Windows.Forms.Label()
         Me.grpZusammenfassugn = New System.Windows.Forms.GroupBox()
+        Me.lblMailKommunikaton = New System.Windows.Forms.Label()
         Me.txtcTotal = New System.Windows.Forms.Label()
         Me.lblTotal = New System.Windows.Forms.Label()
         Me.txtcRabatt = New System.Windows.Forms.Label()
@@ -160,6 +163,8 @@ Partial Class Benhandungdetail
         '
         'GrpPatient
         '
+        Me.GrpPatient.Controls.Add(Me.txtProjekt)
+        Me.GrpPatient.Controls.Add(Me.lblProjekt)
         Me.GrpPatient.Controls.Add(Me.cbboxNRESTyp)
         Me.GrpPatient.Controls.Add(Me.Label6)
         Me.GrpPatient.Controls.Add(Me.cbboxnrbehandler)
@@ -171,6 +176,24 @@ Partial Class Benhandungdetail
         Me.GrpPatient.TabStop = False
         Me.GrpPatient.Text = "Patient / Behandler"
         '
+        'txtProjekt
+        '
+        Me.txtProjekt.Location = New System.Drawing.Point(72, 24)
+        Me.txtProjekt.Name = "txtProjekt"
+        Me.txtProjekt.Size = New System.Drawing.Size(216, 20)
+        Me.txtProjekt.TabIndex = 23
+        Me.txtProjekt.Visible = False
+        '
+        'lblProjekt
+        '
+        Me.lblProjekt.AutoSize = True
+        Me.lblProjekt.Location = New System.Drawing.Point(7, 28)
+        Me.lblProjekt.Name = "lblProjekt"
+        Me.lblProjekt.Size = New System.Drawing.Size(40, 13)
+        Me.lblProjekt.TabIndex = 22
+        Me.lblProjekt.Text = "Projekt"
+        Me.lblProjekt.Visible = False
+        '
         'cbboxNRESTyp
         '
         Me.cbboxNRESTyp.Dataselection = Nothing
@@ -215,6 +238,7 @@ Partial Class Benhandungdetail
         '
         'grpZusammenfassugn
         '
+        Me.grpZusammenfassugn.Controls.Add(Me.lblMailKommunikaton)
         Me.grpZusammenfassugn.Controls.Add(Me.txtcTotal)
         Me.grpZusammenfassugn.Controls.Add(Me.lblTotal)
         Me.grpZusammenfassugn.Controls.Add(Me.txtcRabatt)
@@ -234,6 +258,17 @@ Partial Class Benhandungdetail
         Me.grpZusammenfassugn.TabStop = False
         Me.grpZusammenfassugn.Text = "Zusammenfassung"
         '
+        'lblMailKommunikaton
+        '
+        Me.lblMailKommunikaton.AutoSize = True
+        Me.lblMailKommunikaton.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblMailKommunikaton.ForeColor = System.Drawing.Color.Red
+        Me.lblMailKommunikaton.Location = New System.Drawing.Point(152, 7)
+        Me.lblMailKommunikaton.Name = "lblMailKommunikaton"
+        Me.lblMailKommunikaton.Size = New System.Drawing.Size(151, 20)
+        Me.lblMailKommunikaton.TabIndex = 224
+        Me.lblMailKommunikaton.Text = "RG per Mail möglich"
+        '
         'txtcTotal
         '
         Me.txtcTotal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -1707,4 +1742,7 @@ Partial Class Benhandungdetail
     Friend WithEvents lblRGDatum As Label
     Friend WithEvents lblahvnr As Label
     Friend WithEvents Label10 As Label
+    Friend WithEvents lblMailKommunikaton As Label
+    Friend WithEvents txtProjekt As TextBox
+    Friend WithEvents lblProjekt As Label
 End Class

DPM2016/Behandlung/Benhandungdetail.vb

@@ -29,6 +29,29 @@
                 Globals.OnLoad = False
                 Recalc_Totale()
 
+                If Globals.Applicationtype = ApplicationTypes.Projektabrechnung And Me.lblProjekt.Visible = False And GrpPatient.Height < 100 Then
+                    GrpGaramt.Visible = False
+                    grpglndiagnose.Visible = False
+                    grpBehandlungsdaten.Text = "Projektdaten"
+                    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
+                    Me.grpBehandlungsdaten.Top = Me.grpBehandlungsdaten.Top + 20
+                    Me.GrpPatient.Height = Me.GrpPatient.Height + 20
+                    Me.Label7.Top = Label7.Top + 20
+                    Me.cbboxnrbehandler.Top = Me.cbboxnrbehandler.Top + 20
+                    Me.Label6.Top = Label6.Top + 20
+                    Me.cbboxNRESTyp.Top = Me.cbboxNRESTyp.Top + 20
+                    Me.lblProjekt.Visible = True
+                    Me.txtProjekt.Visible = True
+                End If
+
             End If
         End Set
     End Property
@@ -263,12 +286,26 @@
             Me.txtrgnummer.Visible = False
 
         End Try
-
+        Try
+            If r("nrgarant") > 0 Then check_mailversand(r("nrgarant")) Else check_mailversand(r("nrpatient"))
+        Catch
+        End Try
 
         AddChanges(Me)
         Me.HasChanges = False
     End Sub
 
+    Sub check_mailversand(ByVal key As Integer)
+
+        Me.lblMailKommunikaton.Visible = False
+        Dim db As New clsDB
+        If key > 49999 Then
+            db.Get_Tabledata("firma", " where nrfirma=" + key.ToString)
+        Else
+            db.Get_Tabledata("privat", " where nrprivat=" + key.ToString)
+        End If
+        If db.dsDaten.Tables(0).Rows(0).Item("Mail_Kommunikation") = True Then Me.lblMailKommunikaton.Visible = True
+    End Sub
     Sub Get_Data_Controls(ByVal ictl As Control, ByRef R As DataRow)
         For Each ctl As Control In ictl.Controls
 
@@ -363,6 +400,10 @@
 
         Next
 
+        If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then
+            Me.txtProjekt.Text = Me.txtBehandlungsgrund.Text
+        End If
+
     End Sub
 
     Sub Get_Garantdata(ByVal Key As Integer)
@@ -420,6 +461,10 @@
 
     Sub Save_Data()
         If Globals.OnLoad = True Then Exit Sub
+        If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then
+            Me.txtBehandlungsgrund.Text = Me.txtProjekt.Text
+        End If
+
         If Me.Behandlungsstatus <> 1 And Me.Behandlungsstatus <> 4 Then Exit Sub
         db.Get_Tabledata("behandlu", " where nrbehandlung=" + Me.Behandlungsnr.ToString)
         Dim r As DataRow = db.dsDaten.Tables(0).Rows(0)
@@ -434,6 +479,7 @@
         r("total") = Me.txtcTotal.Text
 
         db.Update_Data()
+
         Me.HasChanges = False
 
     End Sub
@@ -750,7 +796,7 @@
                 End If
             Next
         Catch ex As Exception
-
+            MsgBox(ex.Message)
         End Try
     End Sub
 
@@ -895,9 +941,14 @@
 
     Private Sub cbboxNrGarant_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbboxNrGarant.SelectedIndexChanged
         Try
+            Try
+                check_mailversand(Me.cbboxNrGarant.SelectedValue)
+            Catch
+            End Try
+
             get_ansprechpartner(Me.cbboxNrGarant.SelectedValue)
-        Catch
-        End Try
+            Catch
+            End Try
     End Sub
 
     Private Sub mtxtTaxpunktwert_TextChanged(sender As Object, e As EventArgs) Handles mtxtTaxpunktwert.Leave
@@ -920,15 +971,15 @@
 
     End Sub
 
-    Public Sub Sofortrechnung_als_pdf(Optional alsMail As Boolean = False)
-        Sofortrechnung(True, alsMail)
+    Public Sub Sofortrechnung_als_pdf(Optional alsMail As Boolean = False, Optional Mailtext As Integer = 0)
+        Sofortrechnung(True, alsMail, Mailtext)
     End Sub
 
     Public Sub Sofortrechung_normal()
         Sofortrechnung(False)
     End Sub
     'Public Sub ToolStripDropDownButton1_Click(sender As Object, e As EventArgs) Handles ToolStripDropDownButton1.Click
-    Public Sub Sofortrechnung(ByVal alsPDF As Boolean, Optional alsMail As Boolean = False)
+    Public Sub Sofortrechnung(ByVal alsPDF As Boolean, Optional alsMail As Boolean = False, Optional Mailtext As Integer = 0)
         Globals.pdfCollection.Clear()
         Me.Save_Data()
         Dim result As String = db.Get_Datavalue("Select status from behandlu where nrbehandlung=" + Me.Behandlungsnr.ToString, "")
@@ -940,7 +991,7 @@
             End If
         End If
         Dim Meldung As String
-
+        If result = 5 And Mailtext = 1 Then Mailtext = 3
         If result = 5 Then Meldung = "Kostenvoranschlag drucken?" Else Meldung = "Rechnung drucken und verbuchen?"
         If MsgBox(Meldung, vbYesNo + vbQuestion) = vbYes Then
             Dim buchen As Boolean = True
@@ -975,25 +1026,25 @@
                     End If
                     Dim f As New frmReportView(reportnr, False, "Vorschau Rechung", " where nrbehandlung = " + Me.Behandlungsnr.ToString, Me.Behandlungsnr.ToString, alsPDF)
                     f.Visible = False
-                        f.Show()
-                        f.Visible = False
-                        f.Fakturierung(reportnr, Me.Behandlungsnr, "", i, buchen:=buchen)
-                        f.Close()
-                        If anzahlraten > 1 And i < 2 And Folgeauswertung > 0 Then
-                            buchen = False
-                            reportnr = Folgeauswertung
-                            db.Get_Tabledata("Auswertung", "where auswertungnr=" + Folgeauswertung.ToString)
-                            Folgeauswertung = db.dsDaten.Tables(0).Rows(0).Item("Folge_Report")
-                            Separater_Druckjob = db.dsDaten.Tables(0).Rows(0).Item("Folgereport_Sep_Druckjob")
-                            Dim f1 As New frmReportView(reportnr, False, "Vorschau Rechung", " where nrbehandlung = " + Me.Behandlungsnr.ToString, Me.Behandlungsnr.ToString, alsPDF)
-                            f1.Visible = False
-                            f1.Show()
-                            f1.Visible = False
-                            f1.Fakturierung(reportnr, Me.Behandlungsnr, "", i, buchen:=buchen)
-                            f1.Close()
-                            buchen = True
-                            reportnr = db.Get_ReportNr(Me.cbboxNRESTyp.Text)
-                        End If
+                    f.Show()
+                    f.Visible = False
+                    f.Fakturierung(reportnr, Me.Behandlungsnr, "", i, buchen:=buchen)
+                    f.Close()
+                    If anzahlraten > 1 And i < 2 And Folgeauswertung > 0 Then
+                        buchen = False
+                        reportnr = Folgeauswertung
+                        db.Get_Tabledata("Auswertung", "where auswertungnr=" + Folgeauswertung.ToString)
+                        Folgeauswertung = db.dsDaten.Tables(0).Rows(0).Item("Folge_Report")
+                        Separater_Druckjob = db.dsDaten.Tables(0).Rows(0).Item("Folgereport_Sep_Druckjob")
+                        Dim f1 As New frmReportView(reportnr, False, "Vorschau Rechung", " where nrbehandlung = " + Me.Behandlungsnr.ToString, Me.Behandlungsnr.ToString, alsPDF)
+                        f1.Visible = False
+                        f1.Show()
+                        f1.Visible = False
+                        f1.Fakturierung(reportnr, Me.Behandlungsnr, "", i, buchen:=buchen)
+                        f1.Close()
+                        buchen = True
+                        reportnr = db.Get_ReportNr(Me.cbboxNRESTyp.Text)
+                    End If
                 Next i
                 If Folgeauswertung > 0 And anzahlraten < 2 Then
                     buchen = False
@@ -1015,7 +1066,7 @@
             End If
 
 
-            pdfh.HandlePDF(alsPDF, alsMail)
+            pdfh.HandlePDF(alsPDF, alsMail, Mailtext, clsMailClient.EmpfangerFrom.Behandlung, Me.Behandlungsnr)
             pdfh = Nothing
             evh.Refresh_Behandlungen(Me.Behandlungsnr, Me.Patientnr)
 

DPM2016/Behandlung/Leistungen.Designer.vb

@@ -105,14 +105,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(1439, 25)
+        Me.ToolStrip1.Size = New System.Drawing.Size(1079, 25)
         Me.ToolStrip1.TabIndex = 0
         Me.ToolStrip1.Text = "ToolStrip1"
         '
         'tslabelbhtotal
         '
         Me.tslabelbhtotal.Name = "tslabelbhtotal"
-        Me.tslabelbhtotal.Size = New System.Drawing.Size(113, 22)
+        Me.tslabelbhtotal.Size = New System.Drawing.Size(87, 22)
         Me.tslabelbhtotal.Text = "ToolStripLabel1"
         '
         'GrpTarif
@@ -120,10 +120,8 @@ 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, 4, 4, 4)
         Me.GrpTarif.Name = "GrpTarif"
-        Me.GrpTarif.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
-        Me.GrpTarif.Size = New System.Drawing.Size(972, 350)
+        Me.GrpTarif.Size = New System.Drawing.Size(729, 284)
         Me.GrpTarif.TabIndex = 1
         Me.GrpTarif.TabStop = False
         Me.GrpTarif.Text = "Tarife"
@@ -133,11 +131,10 @@ 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(4, 19)
-        Me.TabTarife.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.TabTarife.Location = New System.Drawing.Point(3, 16)
         Me.TabTarife.Name = "TabTarife"
         Me.TabTarife.SelectedIndex = 0
-        Me.TabTarife.Size = New System.Drawing.Size(960, 327)
+        Me.TabTarife.Size = New System.Drawing.Size(720, 265)
         Me.TabTarife.TabIndex = 0
         '
         'TabPage1
@@ -146,11 +143,10 @@ 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, 25)
-        Me.TabPage1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.TabPage1.Location = New System.Drawing.Point(4, 22)
         Me.TabPage1.Name = "TabPage1"
-        Me.TabPage1.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
-        Me.TabPage1.Size = New System.Drawing.Size(952, 298)
+        Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
+        Me.TabPage1.Size = New System.Drawing.Size(712, 239)
         Me.TabPage1.TabIndex = 0
         Me.TabPage1.Text = "Tarif"
         Me.TabPage1.UseVisualStyleBackColor = True
@@ -163,16 +159,13 @@ Partial Class Leistungen
         '
         Me.lbtarif1.BackgroundStyle.Class = "ListBoxAdv"
         Me.lbtarif1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
-        Me.lbtarif1.CheckStateMember = Nothing
         Me.lbtarif1.ContainerControlProcessDialogKey = True
         Me.lbtarif1.ContextMenuStrip = Me.ContextMenuStrip1
-        Me.lbtarif1.Dock = System.Windows.Forms.DockStyle.Fill
         Me.lbtarif1.DragDropSupport = True
         Me.lbtarif1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"
-        Me.lbtarif1.Location = New System.Drawing.Point(261, 31)
-        Me.lbtarif1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.lbtarif1.Location = New System.Drawing.Point(196, 28)
         Me.lbtarif1.Name = "lbtarif1"
-        Me.lbtarif1.Size = New System.Drawing.Size(687, 263)
+        Me.lbtarif1.Size = New System.Drawing.Size(513, 208)
         Me.lbtarif1.TabIndex = 5
         Me.lbtarif1.Text = "ListBoxAdv1"
         '
@@ -181,21 +174,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(151, 28)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(131, 26)
         '
         'TarifdetailsToolStripMenuItem
         '
         Me.TarifdetailsToolStripMenuItem.Name = "TarifdetailsToolStripMenuItem"
-        Me.TarifdetailsToolStripMenuItem.Size = New System.Drawing.Size(150, 24)
+        Me.TarifdetailsToolStripMenuItem.Size = New System.Drawing.Size(130, 22)
         Me.TarifdetailsToolStripMenuItem.Text = "Tarifdetails"
         '
         'ToolStrip2
         '
         Me.ToolStrip2.ImageScalingSize = New System.Drawing.Size(20, 20)
         Me.ToolStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsDown, Me.tsUp, Me.ToolStripLabel1, Me.txtfilter})
-        Me.ToolStrip2.Location = New System.Drawing.Point(261, 4)
+        Me.ToolStrip2.Location = New System.Drawing.Point(196, 3)
         Me.ToolStrip2.Name = "ToolStrip2"
-        Me.ToolStrip2.Size = New System.Drawing.Size(687, 27)
+        Me.ToolStrip2.Size = New System.Drawing.Size(513, 25)
         Me.ToolStrip2.TabIndex = 6
         Me.ToolStrip2.Text = "ToolStrip2"
         '
@@ -205,7 +198,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(29, 24)
+        Me.tsDown.Size = New System.Drawing.Size(24, 24)
         Me.tsDown.Text = "ToolStripButton2"
         Me.tsDown.Visible = False
         '
@@ -215,29 +208,28 @@ 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(29, 24)
+        Me.tsUp.Size = New System.Drawing.Size(24, 24)
         Me.tsUp.Text = "ToolStripButton1"
         Me.tsUp.Visible = False
         '
         'ToolStripLabel1
         '
         Me.ToolStripLabel1.Name = "ToolStripLabel1"
-        Me.ToolStripLabel1.Size = New System.Drawing.Size(56, 24)
+        Me.ToolStripLabel1.Size = New System.Drawing.Size(46, 22)
         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(132, 27)
+        Me.txtfilter.Size = New System.Drawing.Size(100, 25)
         '
         'Panel4
         '
         Me.Panel4.Dock = System.Windows.Forms.DockStyle.Left
-        Me.Panel4.Location = New System.Drawing.Point(241, 4)
-        Me.Panel4.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Panel4.Location = New System.Drawing.Point(181, 3)
         Me.Panel4.Name = "Panel4"
-        Me.Panel4.Size = New System.Drawing.Size(20, 290)
+        Me.Panel4.Size = New System.Drawing.Size(15, 233)
         Me.Panel4.TabIndex = 5
         '
         'TreeTarifGruppen
@@ -252,14 +244,13 @@ 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(4, 4)
-        Me.TreeTarifGruppen.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.TreeTarifGruppen.Location = New System.Drawing.Point(3, 3)
         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(237, 290)
+        Me.TreeTarifGruppen.Size = New System.Drawing.Size(178, 233)
         Me.TreeTarifGruppen.Styles.Add(Me.ElementStyle1)
         Me.TreeTarifGruppen.TabIndex = 7
         Me.TreeTarifGruppen.Text = "AdvTree1"
@@ -284,11 +275,10 @@ Partial Class Leistungen
         '
         Me.TabPage2.Controls.Add(Me.lbPakete)
         Me.TabPage2.Controls.Add(Me.Panel1)
-        Me.TabPage2.Location = New System.Drawing.Point(4, 25)
-        Me.TabPage2.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.TabPage2.Location = New System.Drawing.Point(4, 22)
         Me.TabPage2.Name = "TabPage2"
-        Me.TabPage2.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
-        Me.TabPage2.Size = New System.Drawing.Size(952, 295)
+        Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
+        Me.TabPage2.Size = New System.Drawing.Size(712, 239)
         Me.TabPage2.TabIndex = 1
         Me.TabPage2.Text = "Leistungspaket"
         Me.TabPage2.UseVisualStyleBackColor = True
@@ -306,10 +296,9 @@ Partial Class Leistungen
         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(4, 41)
-        Me.lbPakete.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.lbPakete.Location = New System.Drawing.Point(3, 33)
         Me.lbPakete.Name = "lbPakete"
-        Me.lbPakete.Size = New System.Drawing.Size(944, 250)
+        Me.lbPakete.Size = New System.Drawing.Size(706, 203)
         Me.lbPakete.TabIndex = 2
         Me.lbPakete.Text = "ListBoxAdv1"
         '
@@ -319,18 +308,16 @@ 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(4, 4)
-        Me.Panel1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Panel1.Location = New System.Drawing.Point(3, 3)
         Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(944, 37)
+        Me.Panel1.Size = New System.Drawing.Size(706, 30)
         Me.Panel1.TabIndex = 1
         '
         'btnPaketeinfuegen
         '
-        Me.btnPaketeinfuegen.Location = New System.Drawing.Point(263, 4)
-        Me.btnPaketeinfuegen.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.btnPaketeinfuegen.Location = New System.Drawing.Point(197, 3)
         Me.btnPaketeinfuegen.Name = "btnPaketeinfuegen"
-        Me.btnPaketeinfuegen.Size = New System.Drawing.Size(100, 28)
+        Me.btnPaketeinfuegen.Size = New System.Drawing.Size(75, 23)
         Me.btnPaketeinfuegen.TabIndex = 1
         Me.btnPaketeinfuegen.Text = "Einfügen"
         Me.btnPaketeinfuegen.UseVisualStyleBackColor = True
@@ -343,21 +330,19 @@ 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(65, 6)
-        Me.intAnzahl.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.intAnzahl.Location = New System.Drawing.Point(49, 5)
         Me.intAnzahl.Name = "intAnzahl"
         Me.intAnzahl.ShowUpDown = True
-        Me.intAnzahl.Size = New System.Drawing.Size(189, 22)
+        Me.intAnzahl.Size = New System.Drawing.Size(142, 20)
         Me.intAnzahl.TabIndex = 0
         Me.intAnzahl.Value = 1
         '
         'lblAnzahl
         '
         Me.lblAnzahl.AutoSize = True
-        Me.lblAnzahl.Location = New System.Drawing.Point(5, 10)
-        Me.lblAnzahl.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblAnzahl.Location = New System.Drawing.Point(4, 8)
         Me.lblAnzahl.Name = "lblAnzahl"
-        Me.lblAnzahl.Size = New System.Drawing.Size(51, 17)
+        Me.lblAnzahl.Size = New System.Drawing.Size(39, 13)
         Me.lblAnzahl.TabIndex = 0
         Me.lblAnzahl.Text = "Anzahl"
         '
@@ -382,50 +367,44 @@ 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(980, 4)
-        Me.grpLeistungsdetails.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.grpLeistungsdetails.Location = New System.Drawing.Point(735, 3)
         Me.grpLeistungsdetails.Name = "grpLeistungsdetails"
-        Me.grpLeistungsdetails.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
-        Me.grpLeistungsdetails.Size = New System.Drawing.Size(455, 338)
+        Me.grpLeistungsdetails.Size = New System.Drawing.Size(341, 275)
         Me.grpLeistungsdetails.TabIndex = 2
         Me.grpLeistungsdetails.TabStop = False
         Me.grpLeistungsdetails.Text = "Leistungsdetails"
         '
         'txtErgänzung
         '
-        Me.txtErgänzung.Location = New System.Drawing.Point(113, 204)
-        Me.txtErgänzung.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.txtErgänzung.Location = New System.Drawing.Point(85, 166)
         Me.txtErgänzung.Multiline = True
         Me.txtErgänzung.Name = "txtErgänzung"
-        Me.txtErgänzung.Size = New System.Drawing.Size(235, 21)
+        Me.txtErgänzung.Size = New System.Drawing.Size(177, 18)
         Me.txtErgänzung.TabIndex = 4
         '
         'Label2
         '
         Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(15, 208)
-        Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label2.Location = New System.Drawing.Point(11, 169)
         Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(77, 17)
+        Me.Label2.Size = New System.Drawing.Size(58, 13)
         Me.Label2.TabIndex = 24
         Me.Label2.Text = "Ergänzung"
         '
         'txtBezD
         '
-        Me.txtBezD.Location = New System.Drawing.Point(113, 142)
-        Me.txtBezD.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.txtBezD.Location = New System.Drawing.Point(85, 115)
         Me.txtBezD.Multiline = True
         Me.txtBezD.Name = "txtBezD"
-        Me.txtBezD.Size = New System.Drawing.Size(235, 54)
+        Me.txtBezD.Size = New System.Drawing.Size(177, 45)
         Me.txtBezD.TabIndex = 3
         '
         'lblBeschreibung
         '
         Me.lblBeschreibung.AutoSize = True
-        Me.lblBeschreibung.Location = New System.Drawing.Point(15, 145)
-        Me.lblBeschreibung.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblBeschreibung.Location = New System.Drawing.Point(11, 118)
         Me.lblBeschreibung.Name = "lblBeschreibung"
-        Me.lblBeschreibung.Size = New System.Drawing.Size(95, 17)
+        Me.lblBeschreibung.Size = New System.Drawing.Size(72, 13)
         Me.lblBeschreibung.TabIndex = 22
         Me.lblBeschreibung.Text = "Beschreibung"
         '
@@ -433,10 +412,9 @@ Partial Class Leistungen
         '
         Me.cbboxnrbehandler.Dataselection = Nothing
         Me.cbboxnrbehandler.Displaymember = Nothing
-        Me.cbboxnrbehandler.Location = New System.Drawing.Point(113, 75)
-        Me.cbboxnrbehandler.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.cbboxnrbehandler.Location = New System.Drawing.Point(85, 61)
         Me.cbboxnrbehandler.Name = "cbboxnrbehandler"
-        Me.cbboxnrbehandler.Size = New System.Drawing.Size(235, 24)
+        Me.cbboxnrbehandler.Size = New System.Drawing.Size(177, 21)
         Me.cbboxnrbehandler.TabIndex = 1
         Me.cbboxnrbehandler.Table = Nothing
         Me.cbboxnrbehandler.TableAlias = ""
@@ -445,19 +423,17 @@ Partial Class Leistungen
         'lblbehandler
         '
         Me.lblbehandler.AutoSize = True
-        Me.lblbehandler.Location = New System.Drawing.Point(15, 78)
-        Me.lblbehandler.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblbehandler.Location = New System.Drawing.Point(11, 63)
         Me.lblbehandler.Name = "lblbehandler"
-        Me.lblbehandler.Size = New System.Drawing.Size(73, 17)
+        Me.lblbehandler.Size = New System.Drawing.Size(55, 13)
         Me.lblbehandler.TabIndex = 14
         Me.lblbehandler.Text = "Behandler"
         '
         'BtnInsertLeistung
         '
-        Me.BtnInsertLeistung.Location = New System.Drawing.Point(259, 303)
-        Me.BtnInsertLeistung.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.BtnInsertLeistung.Location = New System.Drawing.Point(194, 246)
         Me.BtnInsertLeistung.Name = "BtnInsertLeistung"
-        Me.BtnInsertLeistung.Size = New System.Drawing.Size(160, 28)
+        Me.BtnInsertLeistung.Size = New System.Drawing.Size(120, 23)
         Me.BtnInsertLeistung.TabIndex = 8
         Me.BtnInsertLeistung.Text = "Leistung einfügen"
         Me.BtnInsertLeistung.UseVisualStyleBackColor = True
@@ -465,11 +441,10 @@ 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(65, 303)
-        Me.txtTotal.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.txtTotal.Location = New System.Drawing.Point(49, 246)
         Me.txtTotal.Name = "txtTotal"
         Me.txtTotal.RightToLeft = System.Windows.Forms.RightToLeft.No
-        Me.txtTotal.Size = New System.Drawing.Size(123, 16)
+        Me.txtTotal.Size = New System.Drawing.Size(92, 13)
         Me.txtTotal.TabIndex = 12
         Me.txtTotal.Text = "0.00www"
         Me.txtTotal.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -478,20 +453,18 @@ 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(15, 303)
-        Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label1.Location = New System.Drawing.Point(11, 246)
         Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(45, 17)
+        Me.Label1.Size = New System.Drawing.Size(36, 13)
         Me.Label1.TabIndex = 10
         Me.Label1.Text = "Total"
         '
         'lblWert
         '
         Me.lblWert.AutoSize = True
-        Me.lblWert.Location = New System.Drawing.Point(15, 271)
-        Me.lblWert.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblWert.Location = New System.Drawing.Point(11, 220)
         Me.lblWert.Name = "lblWert"
-        Me.lblWert.Size = New System.Drawing.Size(38, 17)
+        Me.lblWert.Size = New System.Drawing.Size(30, 13)
         Me.lblWert.TabIndex = 9
         Me.lblWert.Text = "Wert"
         '
@@ -504,20 +477,18 @@ 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(113, 266)
-        Me.diwert.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.diwert.Location = New System.Drawing.Point(85, 216)
         Me.diwert.Name = "diwert"
         Me.diwert.ShowUpDown = True
-        Me.diwert.Size = New System.Drawing.Size(91, 22)
+        Me.diwert.Size = New System.Drawing.Size(68, 20)
         Me.diwert.TabIndex = 7
         '
         'lblMenge
         '
         Me.lblMenge.AutoSize = True
-        Me.lblMenge.Location = New System.Drawing.Point(15, 238)
-        Me.lblMenge.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblMenge.Location = New System.Drawing.Point(11, 193)
         Me.lblMenge.Name = "lblMenge"
-        Me.lblMenge.Size = New System.Drawing.Size(51, 17)
+        Me.lblMenge.Size = New System.Drawing.Size(40, 13)
         Me.lblMenge.TabIndex = 7
         Me.lblMenge.Text = "Menge"
         '
@@ -530,20 +501,18 @@ 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(113, 234)
-        Me.DIMenge.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.DIMenge.Location = New System.Drawing.Point(85, 190)
         Me.DIMenge.Name = "DIMenge"
         Me.DIMenge.ShowUpDown = True
-        Me.DIMenge.Size = New System.Drawing.Size(91, 22)
+        Me.DIMenge.Size = New System.Drawing.Size(68, 20)
         Me.DIMenge.TabIndex = 5
         '
         'lblTaxpunkte
         '
         Me.lblTaxpunkte.AutoSize = True
-        Me.lblTaxpunkte.Location = New System.Drawing.Point(212, 238)
-        Me.lblTaxpunkte.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblTaxpunkte.Location = New System.Drawing.Point(159, 193)
         Me.lblTaxpunkte.Name = "lblTaxpunkte"
-        Me.lblTaxpunkte.Size = New System.Drawing.Size(52, 17)
+        Me.lblTaxpunkte.Size = New System.Drawing.Size(41, 13)
         Me.lblTaxpunkte.TabIndex = 5
         Me.lblTaxpunkte.Text = "Punkte"
         '
@@ -555,38 +524,34 @@ 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(275, 234)
-        Me.DIPunkte.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.DIPunkte.Location = New System.Drawing.Point(206, 190)
         Me.DIPunkte.Name = "DIPunkte"
         Me.DIPunkte.ShowUpDown = True
-        Me.DIPunkte.Size = New System.Drawing.Size(75, 22)
+        Me.DIPunkte.Size = New System.Drawing.Size(56, 20)
         Me.DIPunkte.TabIndex = 6
         '
         'txtPosition
         '
-        Me.txtPosition.Location = New System.Drawing.Point(113, 110)
-        Me.txtPosition.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.txtPosition.Location = New System.Drawing.Point(85, 89)
         Me.txtPosition.Name = "txtPosition"
-        Me.txtPosition.Size = New System.Drawing.Size(73, 22)
+        Me.txtPosition.Size = New System.Drawing.Size(56, 20)
         Me.txtPosition.TabIndex = 2
         '
         'lblPosition
         '
         Me.lblPosition.AutoSize = True
-        Me.lblPosition.Location = New System.Drawing.Point(15, 113)
-        Me.lblPosition.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblPosition.Location = New System.Drawing.Point(11, 92)
         Me.lblPosition.Name = "lblPosition"
-        Me.lblPosition.Size = New System.Drawing.Size(58, 17)
+        Me.lblPosition.Size = New System.Drawing.Size(44, 13)
         Me.lblPosition.TabIndex = 2
         Me.lblPosition.Text = "Position"
         '
         'lbldatum
         '
         Me.lbldatum.AutoSize = True
-        Me.lbldatum.Location = New System.Drawing.Point(15, 47)
-        Me.lbldatum.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lbldatum.Location = New System.Drawing.Point(11, 38)
         Me.lbldatum.Name = "lbldatum"
-        Me.lbldatum.Size = New System.Drawing.Size(49, 17)
+        Me.lbldatum.Size = New System.Drawing.Size(38, 13)
         Me.lbldatum.TabIndex = 1
         Me.lbldatum.Text = "Datum"
         '
@@ -600,8 +565,7 @@ 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(113, 43)
-        Me.dtdatum.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.dtdatum.Location = New System.Drawing.Point(85, 35)
         '
         '
         '
@@ -632,7 +596,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(236, 22)
+        Me.dtdatum.Size = New System.Drawing.Size(177, 20)
         Me.dtdatum.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled
         Me.dtdatum.TabIndex = 0
         '
@@ -641,10 +605,8 @@ 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, 4, 4, 4)
         Me.GrpLeistungen.Name = "GrpLeistungen"
-        Me.GrpLeistungen.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
-        Me.GrpLeistungen.Size = New System.Drawing.Size(1439, 200)
+        Me.GrpLeistungen.Size = New System.Drawing.Size(1079, 158)
         Me.GrpLeistungen.TabIndex = 3
         Me.GrpLeistungen.TabStop = False
         Me.GrpLeistungen.Text = "Leistungen"
@@ -657,14 +619,13 @@ 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(4, 19)
-        Me.C1Leistungen.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.C1Leistungen.Location = New System.Drawing.Point(3, 16)
         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(1431, 177)
+        Me.C1Leistungen.Size = New System.Drawing.Size(1073, 139)
         Me.C1Leistungen.TabIndex = 2
         Me.C1Leistungen.Text = "C1TrueDBGrid1"
         Me.C1Leistungen.PropBag = resources.GetString("C1Leistungen.PropBag")
@@ -674,30 +635,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(233, 100)
+        Me.ctxMenuLeistung.Size = New System.Drawing.Size(200, 92)
         '
         'BearbeitenToolStripMenuItem
         '
         Me.BearbeitenToolStripMenuItem.Name = "BearbeitenToolStripMenuItem"
-        Me.BearbeitenToolStripMenuItem.Size = New System.Drawing.Size(232, 24)
+        Me.BearbeitenToolStripMenuItem.Size = New System.Drawing.Size(199, 22)
         Me.BearbeitenToolStripMenuItem.Text = "&Bearbeiten"
         '
         'LöschenToolStripMenuItem
         '
         Me.LöschenToolStripMenuItem.Name = "LöschenToolStripMenuItem"
-        Me.LöschenToolStripMenuItem.Size = New System.Drawing.Size(232, 24)
+        Me.LöschenToolStripMenuItem.Size = New System.Drawing.Size(199, 22)
         Me.LöschenToolStripMenuItem.Text = "&Löschen"
         '
         'AnzeigenToolStripMenuItem
         '
         Me.AnzeigenToolStripMenuItem.Name = "AnzeigenToolStripMenuItem"
-        Me.AnzeigenToolStripMenuItem.Size = New System.Drawing.Size(232, 24)
+        Me.AnzeigenToolStripMenuItem.Size = New System.Drawing.Size(199, 22)
         Me.AnzeigenToolStripMenuItem.Text = "Anzeigen"
         '
         'LeistungsdatumÄndernToolStripMenuItem
         '
         Me.LeistungsdatumÄndernToolStripMenuItem.Name = "LeistungsdatumÄndernToolStripMenuItem"
-        Me.LeistungsdatumÄndernToolStripMenuItem.Size = New System.Drawing.Size(232, 24)
+        Me.LeistungsdatumÄndernToolStripMenuItem.Size = New System.Drawing.Size(199, 22)
         Me.LeistungsdatumÄndernToolStripMenuItem.Text = "Leistungsdatum ändern"
         '
         'Panel2
@@ -706,31 +667,28 @@ 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, 4, 4, 4)
         Me.Panel2.Name = "Panel2"
-        Me.Panel2.Size = New System.Drawing.Size(1439, 350)
+        Me.Panel2.Size = New System.Drawing.Size(1079, 284)
         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, 375)
-        Me.Panel3.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Panel3.Location = New System.Drawing.Point(0, 309)
         Me.Panel3.Name = "Panel3"
-        Me.Panel3.Size = New System.Drawing.Size(1439, 200)
+        Me.Panel3.Size = New System.Drawing.Size(1079, 158)
         Me.Panel3.TabIndex = 5
         '
         'Leistungen
         '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.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, 4, 4, 4)
         Me.Name = "Leistungen"
-        Me.Size = New System.Drawing.Size(1439, 575)
+        Me.Size = New System.Drawing.Size(1079, 467)
         Me.ToolStrip1.ResumeLayout(False)
         Me.ToolStrip1.PerformLayout()
         Me.GrpTarif.ResumeLayout(False)

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
-        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
         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
-        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
         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
-        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAA0SURBVChTdYkBCgAgDAL9/6eLIsd0eSCKhw/r9aCLtC88
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAA0SURBVChTdYkBCgAgDAL9/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{Wrap:True;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{BackColor:Info;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="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, 175&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, 175&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
+    <value>&lt;?xml version="1.0"?&gt;&lt;Blob&gt;&lt;Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"&gt;&lt;Data&gt;HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}Heading{ForeColor:ControlText;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{BackColor:Info;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"&gt;&lt;CaptionStyle parent="Style2" me="Style10" /&gt;&lt;EditorStyle parent="Editor" me="Style5" /&gt;&lt;EvenRowStyle parent="EvenRow" me="Style8" /&gt;&lt;FilterBarStyle parent="FilterBar" me="Style13" /&gt;&lt;FilterWatermarkStyle parent="FilterWatermark" me="Style14" /&gt;&lt;FooterStyle parent="Footer" me="Style3" /&gt;&lt;GroupStyle parent="Group" me="Style12" /&gt;&lt;HeadingStyle parent="Heading" me="Style2" /&gt;&lt;HighLightRowStyle parent="HighlightRow" me="Style7" /&gt;&lt;InactiveStyle parent="Inactive" me="Style4" /&gt;&lt;OddRowStyle parent="OddRow" me="Style9" /&gt;&lt;RecordSelectorStyle parent="RecordSelector" me="Style11" /&gt;&lt;SelectedStyle parent="Selected" me="Style6" /&gt;&lt;Style parent="Normal" me="Style1" /&gt;&lt;ClientRect&gt;0, 0, 1071, 137&lt;/ClientRect&gt;&lt;BorderSide&gt;0&lt;/BorderSide&gt;&lt;/C1.Win.C1TrueDBGrid.MergeView&gt;&lt;/Splits&gt;&lt;NamedStyles&gt;&lt;Style parent="" me="Normal" /&gt;&lt;Style parent="Normal" me="Heading" /&gt;&lt;Style parent="Heading" me="Footer" /&gt;&lt;Style parent="Heading" me="Caption" /&gt;&lt;Style parent="Heading" me="Inactive" /&gt;&lt;Style parent="Normal" me="Selected" /&gt;&lt;Style parent="Normal" me="Editor" /&gt;&lt;Style parent="Normal" me="HighlightRow" /&gt;&lt;Style parent="Normal" me="EvenRow" /&gt;&lt;Style parent="Normal" me="OddRow" /&gt;&lt;Style parent="Heading" me="RecordSelector" /&gt;&lt;Style parent="Normal" me="FilterBar" /&gt;&lt;Style parent="FilterBar" me="FilterWatermark" /&gt;&lt;Style parent="Caption" me="Group" /&gt;&lt;/NamedStyles&gt;&lt;vertSplits&gt;1&lt;/vertSplits&gt;&lt;horzSplits&gt;1&lt;/horzSplits&gt;&lt;Layout&gt;None&lt;/Layout&gt;&lt;DefaultRecSelWidth&gt;17&lt;/DefaultRecSelWidth&gt;&lt;ClientArea&gt;0, 0, 1071, 137&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
   </data>
 </root>

DPM2016/Behandlung/Leistungen.vb

@@ -97,7 +97,28 @@ Public Class Leistungen
 
     Sub load_data()
         Try
+            If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then
+                GrpTarif.Width = 550
+                'GrpLeistungen.Left = GrpTarif.Left + GrpTarif.Width + 4
+                grpLeistungsdetails.Left = GrpTarif.Left + GrpTarif.Width + 4
+                Me.lblbehandler.Text = "Erbringer"
 
+
+                Me.lblBeschreibung.Top = Me.lblbehandler.Top + Me.cbboxnrbehandler.Height + 2
+                Me.txtBezD.Left = lblBeschreibung.Left
+                Me.txtBezD.Top = lblBeschreibung.Top + lblBeschreibung.Height + 2
+                Me.txtBezD.Width = 320
+                Me.txtBezD.Height = 78
+
+                Me.Label2.Visible = False
+                Me.txtErgänzung.Visible = False
+
+                lblPosition.Left = lblTaxpunkte.Left
+                lblPosition.Top = lblWert.Top
+                txtPosition.Left = DIPunkte.Left
+                txtPosition.Top = diwert.Top
+
+            End If
             db.Get_Tarife()
             Me.TreeTarifGruppen.Nodes.Clear()
             If Dentotar = True Then
@@ -736,6 +757,7 @@ Public Class Leistungen
     End Sub
 
     Private Sub diwert_KeyDown(sender As Object, e As KeyEventArgs) Handles txtPosition.KeyDown, txtBezD.KeyDown, diwert.KeyDown, DIPunkte.KeyDown, DIMenge.KeyDown
+        If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then Exit Sub
         If e.KeyCode = Keys.Enter Then
 
             If sender.name = "txtPosition" Then Me.txtPosition_TextChanged(sender, e)

DPM2016/Behandlung/clsFakturaFunktionen.vb

@@ -48,10 +48,11 @@
         End While
     End Sub
 
-    Public Sub Rechnungskopie(ByVal nrbehandlung As String, Optional preview As Boolean = False, Optional asPDF As Boolean = False)
+    Public Sub Rechnungskopie(ByVal nrbehandlung As String, Optional preview 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
+        Dim db2 As New clsDB
         Globals.RGCollection.Clear()
         Dim anzahlraten As Integer = 0
         Dim Empfaenger As String = ""
@@ -69,8 +70,8 @@
 
         Dim fakturanr As Integer
         Try
-            db.Get_Tabledata("Faktura", "", "Select top 1 nrfaktura from faktura where nrbehandlung=" + behandlungsnr.ToString + " and status <> 9 order by erstellt_am asc ")
-            fakturanr = db.dsDaten.Tables(0).Rows(0).Item(0)
+            db2.Get_Tabledata("Faktura", "", "Select top 10 nrfaktura from faktura where nrbehandlung=" + behandlungsnr.ToString + " and status <> 9 order by erstellt_am asc ")
+            fakturanr = db2.dsDaten.Tables(0).Rows(0).Item(0)
         Catch
             fakturanr = 0
         End Try
@@ -85,6 +86,9 @@
         Dim hauptfaktura As Integer
         While doloop = True
             For i As Integer = 1 To anzahlraten
+                fakturanr = db2.dsDaten.Tables(0).Rows(i - 1).Item(0)
+                Globals.FakturaNr = fakturanr
+
                 If i = 1 And Empfaenger <> "" Then
                     Dim f0 As New frmReportView(9999, False, "Vorschau Rechung", " where nrbehandlung = " + nrbehandlung.ToString, nrbehandlung.ToString, asPDF)
                     f0.Visible = False
@@ -137,10 +141,11 @@
         End While
         If preview = False Then
             Dim pdfh As New clspdfhelper
-            pdfh.HandlePDF(asPDF, False)
+            pdfh.HandlePDF(asPDF, PerMail, 2, clsMailClient.EmpfangerFrom.Behandlung, nrbehandlung)
         End If
 
 
+
     End Sub
 
     Public Sub Mahnung(ByVal Fakturanr As String, ByVal Stufe As Integer, Optional Preview As Boolean = False, Optional Design As Boolean = False)

DPM2016/Behandlung/frmLeistungDetail.Designer.vb

@@ -56,6 +56,7 @@ Partial Class frmLeistungDetail
         Me.ToolStrip1.Size = New System.Drawing.Size(388, 25)
         Me.ToolStrip1.TabIndex = 1
         Me.ToolStrip1.Text = "ToolStrip1"
+        Me.ToolStrip1.Visible = False
         '
         'grpLeistungsdetails
         '
@@ -77,9 +78,9 @@ Partial Class frmLeistungDetail
         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, 25)
+        Me.grpLeistungsdetails.Location = New System.Drawing.Point(0, 0)
         Me.grpLeistungsdetails.Name = "grpLeistungsdetails"
-        Me.grpLeistungsdetails.Size = New System.Drawing.Size(388, 324)
+        Me.grpLeistungsdetails.Size = New System.Drawing.Size(388, 389)
         Me.grpLeistungsdetails.TabIndex = 3
         Me.grpLeistungsdetails.TabStop = False
         Me.grpLeistungsdetails.Text = "Leistungsdetails"
@@ -116,14 +117,14 @@ Partial Class frmLeistungDetail
         Me.txtBezD.Location = New System.Drawing.Point(80, 52)
         Me.txtBezD.Multiline = True
         Me.txtBezD.Name = "txtBezD"
-        Me.txtBezD.Size = New System.Drawing.Size(281, 45)
+        Me.txtBezD.Size = New System.Drawing.Size(281, 120)
         Me.txtBezD.TabIndex = 1
         '
         'cbboxnrbehandler
         '
         Me.cbboxnrbehandler.Dataselection = Nothing
         Me.cbboxnrbehandler.Displaymember = Nothing
-        Me.cbboxnrbehandler.Location = New System.Drawing.Point(80, 129)
+        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
@@ -134,7 +135,7 @@ Partial Class frmLeistungDetail
         'lblbehandler
         '
         Me.lblbehandler.AutoSize = True
-        Me.lblbehandler.Location = New System.Drawing.Point(6, 131)
+        Me.lblbehandler.Location = New System.Drawing.Point(6, 206)
         Me.lblbehandler.Name = "lblbehandler"
         Me.lblbehandler.Size = New System.Drawing.Size(55, 13)
         Me.lblbehandler.TabIndex = 14
@@ -142,7 +143,7 @@ Partial Class frmLeistungDetail
         '
         'btnSave
         '
-        Me.btnSave.Location = New System.Drawing.Point(137, 254)
+        Me.btnSave.Location = New System.Drawing.Point(137, 329)
         Me.btnSave.Name = "btnSave"
         Me.btnSave.Size = New System.Drawing.Size(120, 23)
         Me.btnSave.TabIndex = 8
@@ -152,7 +153,7 @@ 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, 216)
+        Me.txtTotal.Location = New System.Drawing.Point(44, 291)
         Me.txtTotal.Name = "txtTotal"
         Me.txtTotal.RightToLeft = System.Windows.Forms.RightToLeft.No
         Me.txtTotal.Size = New System.Drawing.Size(92, 13)
@@ -164,7 +165,7 @@ 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, 216)
+        Me.Label1.Location = New System.Drawing.Point(6, 291)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(36, 13)
         Me.Label1.TabIndex = 10
@@ -173,7 +174,7 @@ Partial Class frmLeistungDetail
         'lblWert
         '
         Me.lblWert.AutoSize = True
-        Me.lblWert.Location = New System.Drawing.Point(6, 191)
+        Me.lblWert.Location = New System.Drawing.Point(6, 266)
         Me.lblWert.Name = "lblWert"
         Me.lblWert.Size = New System.Drawing.Size(30, 13)
         Me.lblWert.TabIndex = 9
@@ -188,7 +189,7 @@ 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, 187)
+        Me.diwert.Location = New System.Drawing.Point(80, 262)
         Me.diwert.Name = "diwert"
         Me.diwert.ShowUpDown = True
         Me.diwert.Size = New System.Drawing.Size(56, 20)
@@ -197,7 +198,7 @@ Partial Class frmLeistungDetail
         'lblMenge
         '
         Me.lblMenge.AutoSize = True
-        Me.lblMenge.Location = New System.Drawing.Point(6, 164)
+        Me.lblMenge.Location = New System.Drawing.Point(6, 239)
         Me.lblMenge.Name = "lblMenge"
         Me.lblMenge.Size = New System.Drawing.Size(40, 13)
         Me.lblMenge.TabIndex = 7
@@ -212,7 +213,7 @@ 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, 161)
+        Me.DIMenge.Location = New System.Drawing.Point(80, 236)
         Me.DIMenge.Name = "DIMenge"
         Me.DIMenge.ShowUpDown = True
         Me.DIMenge.Size = New System.Drawing.Size(56, 20)
@@ -221,7 +222,7 @@ Partial Class frmLeistungDetail
         'lblTaxpunkte
         '
         Me.lblTaxpunkte.AutoSize = True
-        Me.lblTaxpunkte.Location = New System.Drawing.Point(154, 164)
+        Me.lblTaxpunkte.Location = New System.Drawing.Point(154, 239)
         Me.lblTaxpunkte.Name = "lblTaxpunkte"
         Me.lblTaxpunkte.Size = New System.Drawing.Size(41, 13)
         Me.lblTaxpunkte.TabIndex = 5
@@ -235,7 +236,7 @@ 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, 161)
+        Me.DIPunkte.Location = New System.Drawing.Point(201, 236)
         Me.DIPunkte.Name = "DIPunkte"
         Me.DIPunkte.ShowUpDown = True
         Me.DIPunkte.Size = New System.Drawing.Size(56, 20)
@@ -244,7 +245,7 @@ Partial Class frmLeistungDetail
         'lbldatum
         '
         Me.lbldatum.AutoSize = True
-        Me.lbldatum.Location = New System.Drawing.Point(6, 106)
+        Me.lbldatum.Location = New System.Drawing.Point(6, 181)
         Me.lbldatum.Name = "lbldatum"
         Me.lbldatum.Size = New System.Drawing.Size(38, 13)
         Me.lbldatum.TabIndex = 1
@@ -260,7 +261,7 @@ 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, 103)
+        Me.dtdatum.Location = New System.Drawing.Point(80, 178)
         '
         '
         '
@@ -299,7 +300,7 @@ Partial Class frmLeistungDetail
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(388, 349)
+        Me.ClientSize = New System.Drawing.Size(388, 389)
         Me.Controls.Add(Me.grpLeistungsdetails)
         Me.Controls.Add(Me.ToolStrip1)
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)

DPM2016/Behandlung/frmLeistungDetail.vb

@@ -23,7 +23,9 @@
     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

DPM2016/DPM2016.vbproj

@@ -171,6 +171,9 @@
     <Reference Include="PropertyGridEx">
       <HintPath>..\..\DPM_Reporting\_PropertyGrid\Source\PropertyGridEx\bin\Debug\PropertyGridEx.dll</HintPath>
     </Reference>
+    <Reference Include="QRCoder">
+      <HintPath>..\..\QR-Rechnung\QRCoder-master\QRCoder\bin\Debug\QRCoder.dll</HintPath>
+    </Reference>
     <Reference Include="RtfPipe">
       <HintPath>..\..\ThirtPartyKlassen\MsgViewer\bin\Debug\RtfPipe.dll</HintPath>
     </Reference>
@@ -431,6 +434,7 @@
     <Compile Include="Klassen\clsNullableDatetimePicker.vb" />
     <Compile Include="Klassen\clspdfhelper.vb" />
     <Compile Include="Klassen\clsPrinter.vb" />
+    <Compile Include="Klassen\MapiMail.vb" />
     <Compile Include="Klassen\MyCombobox.vb">
       <SubType>Component</SubType>
     </Compile>
@@ -627,6 +631,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Behandlung\Behandlung.resx">
       <DependentUpon>Behandlung.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Behandlung\Benhandungdetail.resx">
       <DependentUpon>Benhandungdetail.vb</DependentUpon>
@@ -657,6 +662,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Dokumente\clsDokumente.resx">
       <DependentUpon>clsDokumente.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Dokumente\dmstest.resx">
       <DependentUpon>dmstest.vb</DependentUpon>
@@ -666,6 +672,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Dokumente\frmdokumentvorlagen.resx">
       <DependentUpon>frmdokumentvorlagen.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Dokumente\frmImportVorlage.resx">
       <DependentUpon>frmImportVorlage.vb</DependentUpon>
@@ -675,6 +682,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Fakturierung\frmFakturierung.resx">
       <DependentUpon>frmFakturierung.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Fakturierung\frmOffeneBehandlungen.resx">
       <DependentUpon>frmOffeneBehandlungen.vb</DependentUpon>
@@ -830,6 +838,9 @@
   <ItemGroup>
     <WCFMetadata Include="Connected Services\" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Projekt\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

DPM2016/Diverses/frmDemoMode.vb

@@ -6,7 +6,7 @@
     Public Sub New(Optional Formulartitel As String = "")
         InitializeComponent()
         Me.Text = Formulartitel
-        If Formulartitel = "" Then Me.Text = "DPM"
+        If Formulartitel = "" Then Me.Text = My.Settings.SoftwareType
     End Sub
 
 

DPM2016/Dokumente/Thumbviewer/ThumbViewer.vb

@@ -131,79 +131,82 @@ Class ThumbViewer
 
     Private Sub ListView1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListView1.SelectedIndexChanged
         If InitLIst Then Exit Sub
-        Dim key As Integer
-        key = ListView1.FocusedItem.Tag
-        Dim previewfilename As String = ""
-        If Globals.PreViewDir = "" Then
-            Dim db As New clsDB
-            db.Get_Tabledata("dms", "", "Select * from dms_Settings where nreintrag=6")
-            Globals.PreViewDir = db.dsDaten.Tables(0).Rows(0).Item(2)
-            If Not System.IO.Directory.Exists(Globals.PreViewDir) Then
-                System.IO.Directory.CreateDirectory(Globals.PreViewDir)
+        Try
+            Dim key As Integer
+            key = ListView1.FocusedItem.Tag
+            Dim previewfilename As String = ""
+            If Globals.PreViewDir = "" Then
+                Dim db As New clsDB
+                db.Get_Tabledata("dms", "", "Select * from dms_Settings where nreintrag=6")
+                Globals.PreViewDir = db.dsDaten.Tables(0).Rows(0).Item(2)
+                If Not System.IO.Directory.Exists(Globals.PreViewDir) Then
+                    System.IO.Directory.CreateDirectory(Globals.PreViewDir)
+                End If
             End If
-        End If
-        Dim txt As String
-        txt = ListView1.FocusedItem.ToolTipText
-        Select Case txt
-            Case ".PDF"
-                previewfilename = d.Get_Dokument(key, Globals.PreViewDir, True, True)
-                Me.KpImageViewer1.Visible = False
-                Me.grpdokumentvorschau.Visible = False
-                Me.grpdokumentvorschaupdf.Visible = True
-                Me.GrpDokumentvorschauMail.Visible = False
-                Me.grpdokumentvorschaupdf.Dock = DockStyle.Fill
-
-                Me.pdfViewerControl1.RenderingEngine = Syncfusion.Windows.Forms.PdfViewer.PdfRenderingEngine.Pdfium
-                Me.pdfViewerControl1.ReferencePath = Application.StartupPath + ""
-                Me.pdfViewerControl1.Load(previewfilename)
-            Case ".MSG"
-                Me.KpImageViewer1.Visible = False
-                Me.grpdokumentvorschaupdf.Visible = False
-                Me.grpdokumentvorschau.Visible = False
-                Me.GrpDokumentvorschauMail.Visible = True
-                Me.GrpDokumentvorschauMail.Dock = DockStyle.Fill
-
-                previewfilename = d.Get_Dokument(key, Globals.PreViewDir, True, True)
-                Dim msgreader As New MsgReader.Reader
-                Dim files = msgreader.ExtractToFolder(previewfilename, Globals.PreViewDir)
-                Dim err = msgreader.GetErrorMessage
-                webBrowser1.Navigate(files(0))
-            Case ".TIF", ".TIFF", ".JPG", ".PNG", ".BMP"
-                Me.KpImageViewer1.Visible = True
-                Me.grpdokumentvorschaupdf.Visible = False
-                Me.grpdokumentvorschau.Visible = False
-                Me.GrpDokumentvorschauMail.Visible = False
-
-                Me.KpImageViewer1.Dock = DockStyle.Fill
-                Me.KpImageViewer1.DoResize()
-
-                For Each r As DataRow In Data.Rows
-                    If r.Item(0) = key Then
-                        Me.KpImageViewer1.Image = GetImagefromDB(r.Item("dokumentfile"))
-                    End If
-                Next
-            Case Else
-                previewfilename = d.Get_Dokument(key, Globals.PreViewDir, True, True)
-                Me.KpImageViewer1.Visible = False
-                Me.grpdokumentvorschaupdf.Visible = False
-                Me.grpdokumentvorschau.Visible = True
-                Me.GrpDokumentvorschauMail.Visible = False
-                Me.grpdokumentvorschau.Dock = DockStyle.Fill
-
-                Try
-                    'Threading.Thread.CurrentThread.Sleep(1000)
-                    Try
-                        DocumentViewer1.CloseDocument()
-                    Catch
-                    End Try
-                    Try
-                        Me.DocumentViewer1.LoadDocument(previewfilename)
-                    Catch
-                    End Try
+            Dim txt As String
+            txt = ListView1.FocusedItem.ToolTipText
+            Select Case txt
+                Case ".PDF"
+                    previewfilename = d.Get_Dokument(key, Globals.PreViewDir, True, True)
+                    Me.KpImageViewer1.Visible = False
+                    Me.grpdokumentvorschau.Visible = False
+                    Me.grpdokumentvorschaupdf.Visible = True
+                    Me.GrpDokumentvorschauMail.Visible = False
+                    Me.grpdokumentvorschaupdf.Dock = DockStyle.Fill
+
+                    Me.pdfViewerControl1.RenderingEngine = Syncfusion.Windows.Forms.PdfViewer.PdfRenderingEngine.Pdfium
+                    Me.pdfViewerControl1.ReferencePath = Application.StartupPath + ""
+                    Me.pdfViewerControl1.Load(previewfilename)
+                Case ".MSG"
+                    Me.KpImageViewer1.Visible = False
+                    Me.grpdokumentvorschaupdf.Visible = False
+                    Me.grpdokumentvorschau.Visible = False
+                    Me.GrpDokumentvorschauMail.Visible = True
+                    Me.GrpDokumentvorschauMail.Dock = DockStyle.Fill
+
+                    previewfilename = d.Get_Dokument(key, Globals.PreViewDir, True, True)
+                    Dim msgreader As New MsgReader.Reader
+                    Dim files = msgreader.ExtractToFolder(previewfilename, Globals.PreViewDir)
+                    Dim err = msgreader.GetErrorMessage
+                    webBrowser1.Navigate(files(0))
+                Case ".TIF", ".TIFF", ".JPG", ".PNG", ".BMP"
+                    Me.KpImageViewer1.Visible = True
+                    Me.grpdokumentvorschaupdf.Visible = False
+                    Me.grpdokumentvorschau.Visible = False
+                    Me.GrpDokumentvorschauMail.Visible = False
+
+                    Me.KpImageViewer1.Dock = DockStyle.Fill
+                    Me.KpImageViewer1.DoResize()
+
+                    For Each r As DataRow In Data.Rows
+                        If r.Item(0) = key Then
+                            Me.KpImageViewer1.Image = GetImagefromDB(r.Item("dokumentfile"))
+                        End If
+                    Next
+                Case Else
+                    previewfilename = d.Get_Dokument(key, Globals.PreViewDir, True, True)
+                    Me.KpImageViewer1.Visible = False
+                    Me.grpdokumentvorschaupdf.Visible = False
+                    Me.grpdokumentvorschau.Visible = True
+                    Me.GrpDokumentvorschauMail.Visible = False
+                    Me.grpdokumentvorschau.Dock = DockStyle.Fill
 
-                Catch es As Gnostice.Core.XDocException
+                    Try
+                        'Threading.Thread.CurrentThread.Sleep(1000)
+                        Try
+                            DocumentViewer1.CloseDocument()
+                        Catch
+                        End Try
+                        Try
+                            Me.DocumentViewer1.LoadDocument(previewfilename)
+                        Catch
+                        End Try
+
+                    Catch es As Gnostice.Core.XDocException
                     End Try
-        End Select
+            End Select
+        Catch
+        End Try
 
     End Sub
 

DPM2016/Dokumente/clsDok.vb

@@ -358,6 +358,7 @@ Public Class clsDok
 
     Public Sub Delete_Doks(ByVal nrbehandlung As String)
         Dim db As New clsDB
+        Dim db1 As New clsDB
         Try
             Dim Hauptfaktura As Integer
             db.Get_Tabledata("Doks", "", "Select nrhauptfaktura from faktura where nrbehandlung=" + nrbehandlung.ToString + " order by erstellt_am desc")
@@ -365,8 +366,10 @@ Public Class clsDok
             db.Get_Tabledata("Doks", "", "Select * from dms_dokument where nrfaktura=" + Hauptfaktura.ToString + " and aktiv=1")
             If db.dsDaten.Tables(0).Rows.Count > 0 Then
                 If MsgBox("Möchten Sie die vorhandenen Dokumente löschen?", vbYesNo + vbQuestion) = vbNo Then Exit Sub
+                db.Get_Tabledata("fakturen", "", "Select nrfaktura from faktura where nrhauptfaktura=" + Hauptfaktura.ToString + " order by erstellt_am desc")
                 For Each r As DataRow In db.dsDaten.Tables(0).Rows
-                    Delete_Dok(r.Item(0))
+                    db1.Get_Tabledata("doks", "", "Select * from dms_dokument where nrfaktura=" + r.Item(0).ToString)
+                    Delete_Dok(db1.dsDaten.Tables(0).Rows(0).Item(0))
                 Next
             End If
         Catch

DPM2016/Dokumente/clsDokumente.Designer.vb

@@ -629,7 +629,7 @@ Partial Class clsDokumente
         '
         Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeuesDokumentHinzufügenToolStripMenuItem, Me.DokumentinformationenBearbeitenToolStripMenuItem, Me.DokumentBearbeitenToolStripMenuItem, Me.DokumentEinemAnderenPartnerZuordnenToolStripMenuItem, Me.DokumentLöschenToolStripMenuItem, Me.ToolStripMenuItem1, Me.DokumentExportierenToolStripMenuItem, Me.PerMailVersendenToolStripMenuItem, Me.DokumentAnzeigenToolStripMenuItem, Me.ToolStripMenuItem2, Me.NeuesDokumentAusVorlageErstellenToolStripMenuItem})
         Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
-        Me.ContextMenuStrip1.Size = New System.Drawing.Size(307, 214)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(307, 236)
         '
         'NeuesDokumentHinzufügenToolStripMenuItem
         '
@@ -676,8 +676,7 @@ Partial Class clsDokumente
         '
         Me.PerMailVersendenToolStripMenuItem.Name = "PerMailVersendenToolStripMenuItem"
         Me.PerMailVersendenToolStripMenuItem.Size = New System.Drawing.Size(306, 22)
-        Me.PerMailVersendenToolStripMenuItem.Text = "Per Mail versenden"
-        Me.PerMailVersendenToolStripMenuItem.Visible = False
+        Me.PerMailVersendenToolStripMenuItem.Text = "Per Outlook-Mail versenden"
         '
         'DokumentAnzeigenToolStripMenuItem
         '

DPM2016/Dokumente/clsDokumente.resx

@@ -198,7 +198,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACU
-        CgAAAk1TRnQBSQFMAgEBAwEAAfgBAAH4AQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CgAAAk1TRnQBSQFMAgEBAwEAARABAQEQAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -301,14 +301,14 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHGSURBVDhPYxhcoGH1q/8gXLfyxf/SpU/3Q4XhILj3ZntA
-        /c0vUC4maFj94v+Wc5/+Lzr47n/BgocoBnh3Xm/3qp/6z7Xlxn+oECYoX/bs/4bTH/7P3ffmf+pMhAGe
+        /c0vUC4maFj94v+Wc5/+Lzr47n/BgocoBnh3Xm/3qp/0z7Xlxn+oECYoX/bs/4bTH/7P3ffmf+pMhAGe
         LVf7Mufe/z9hy/P/ltWXcBtQsODR/9Un3v+ftvPV/5iJd8EGuLdcm5c26/7//q3P//duevZfp+Q8bgNS
         Zz/8v/TI2//9W178D+y8ud+x/vKSlOl3/0/Y+gwYLo/+t6598l8u+yxuA2Im3f8/78Dr/zN2v/xvVn/i
         R/Gih//7Nj/7X7n84f/sOXf/1614+F8q6QRuA4K6b4I1gzRZVl94kzvv3v+2dU/+Fy68/z9p+u3/ZYvv
         /5eIPIbbAFAIT9z24n/5kof/tYrPH5DNPL3GpfHy/6rlD/4nT7/1v2D+vf/iQQdwGwAK4a6NT//nzr33
         XzbzLDgQJaOOrLQtv/A/b/7d/1mz7/wX89qL2wBQCDevefw/FehcycQT8GgU89i9yCL7FNgVIo67cRsA
         CuFqYEDFTbwB9OtRlIQkYrd1gXHKsf/CNttxGwAKYcmYY/8lQo/8Fw08gGIACAgZbpwtZLkNtwEDABgY
-        ANX+DH3oaov/AAAAAElFTkSuQmCC
+        AMykDHr8NDAaAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="btnPrvPage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -338,15 +338,15 @@
   <data name="btnLastPage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHJSURBVDhPzZDfS1phGMfP37BsWRf9AbF/wBiDogYVBTVi
-        SBFRa1DBaC2KEtJW5kwaJTYryYWVWKeGNUj6+R5YhTeyakM0MqdH7eTWuumiq76ddxyEMd7r9YX34vnC
-        +3kePtz9ip6Xrvs9kkkZM2mZipHGiSi0YxHUWMJQ6n9j4CXo9PO3r13xvyD14xFi+XyO6e00SodCbECP
-        O4UV/xXeeSU0fTh7r9RctTlMhj4lYPNJ0OiO2YCO2Th4GeD+8ht97iQqzSEn7eWtROcRMbqWwqOur2xA
-        iyOGhb1L2DfTcO6m0ToThab3cF7Te0TeuH7AuJJAfnuADai3RuEUfsLkTcG8moJVPvmVDCno9N8M8HH0
-        e2LIa/KzAdTw5NYF9Esi3vIiLGtJvJyKIP9F4FfXXBTd8lNrD9gAanh8XYJ+UZQvSKDCFERes39Z3io0
-        WMPo+HiGnBqBDaCGR1aTGJaNPzUGkdu4v0h7tXafPLcE0eY4xcPyHTaAGh5cFlEy8A25dQcupeayqwXy
-        zPgdzfYTqIq22ABquJh+1u7NKtWfZJftkCrDMRpsIWQ99rEB1LC6VnAoYyaqog2ierKBrEIfHmjW2YD/
-        EI67A7B7C+MKaEv0AAAAAElFTkSuQmCC
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHISURBVDhPzZBLSxtRGIbnN2is0YU/QPwDkSIoVWhFQUVK
+        UES8FKpQtIqiAaPWNE2DosFrQ1ONNkRHxQsYvPUMeCEb8VZCIk3SZJI4plU3Llz5OkcGQeSs9YWz+F44
+        z/fxcM8rel666nBKRmW8T+1YiFQOBaHt96PY7INSP04nL0Gnn7hptIcfQMoH/MS8fIpvG3Hk9njZgFZH
+        DHPuS3xZkFA1HOhTaq7I5CM98xEMuiRodEdsQMN4GLwMcGxdoN0RRYHJa6O9vJXonCJ6l2LIaN5nA2qt
+        IfzcPsfIWhy2X3G8/x6Epu1gStN2SJrsf2GYiyCtfo8NKLcEYRP+wbgQg2kxBot88gcZkv7Rfd3Fh9Hh
+        DCG1ys0GUMOj62fQz4jo5kWYl6J4N+ZHWs3e/+bJIFrkp9busgHU8MCKBP20KF8QQb7Rg9Rq96y8Vaiw
+        +NDwI4DkYoENoIa/LkbxWTaeZ/AgpXJnmvZq7Q55a/agzvoHL95ssgHU8KdZEa+6jpFStmtXai6pSCAl
+        ht+oHjmBKnudDaCGc+hn7fa4Ut0l6fUmKew8QsWgF4kvXWwANawuFazKeB9V9ipRZa0iMdOFBM0KG/AE
+        4bhbps0L4CPmzssAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="tsActSize.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -494,7 +494,7 @@
 </value>
   </data>
   <data name="C1Dokumente.PropBag" xml:space="preserve">
-    <value>&lt;?xml version="1.0"?&gt;&lt;Blob&gt;&lt;Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"&gt;&lt;Data&gt;HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}Heading{ForeColor:ControlText;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{BackColor:Info;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"&gt;&lt;CaptionStyle parent="Style2" me="Style10" /&gt;&lt;EditorStyle parent="Editor" me="Style5" /&gt;&lt;EvenRowStyle parent="EvenRow" me="Style8" /&gt;&lt;FilterBarStyle parent="FilterBar" me="Style13" /&gt;&lt;FilterWatermarkStyle parent="FilterWatermark" me="Style14" /&gt;&lt;FooterStyle parent="Footer" me="Style3" /&gt;&lt;GroupStyle parent="Group" me="Style12" /&gt;&lt;HeadingStyle parent="Heading" me="Style2" /&gt;&lt;HighLightRowStyle parent="HighlightRow" me="Style7" /&gt;&lt;InactiveStyle parent="Inactive" me="Style4" /&gt;&lt;OddRowStyle parent="OddRow" me="Style9" /&gt;&lt;RecordSelectorStyle parent="RecordSelector" me="Style11" /&gt;&lt;SelectedStyle parent="Selected" me="Style6" /&gt;&lt;Style parent="Normal" me="Style1" /&gt;&lt;ClientRect&gt;0, 0, 895, 172&lt;/ClientRect&gt;&lt;BorderSide&gt;0&lt;/BorderSide&gt;&lt;/C1.Win.C1TrueDBGrid.MergeView&gt;&lt;/Splits&gt;&lt;NamedStyles&gt;&lt;Style parent="" me="Normal" /&gt;&lt;Style parent="Normal" me="Heading" /&gt;&lt;Style parent="Heading" me="Footer" /&gt;&lt;Style parent="Heading" me="Caption" /&gt;&lt;Style parent="Heading" me="Inactive" /&gt;&lt;Style parent="Normal" me="Selected" /&gt;&lt;Style parent="Normal" me="Editor" /&gt;&lt;Style parent="Normal" me="HighlightRow" /&gt;&lt;Style parent="Normal" me="EvenRow" /&gt;&lt;Style parent="Normal" me="OddRow" /&gt;&lt;Style parent="Heading" me="RecordSelector" /&gt;&lt;Style parent="Normal" me="FilterBar" /&gt;&lt;Style parent="FilterBar" me="FilterWatermark" /&gt;&lt;Style parent="Caption" me="Group" /&gt;&lt;/NamedStyles&gt;&lt;vertSplits&gt;1&lt;/vertSplits&gt;&lt;horzSplits&gt;1&lt;/horzSplits&gt;&lt;Layout&gt;None&lt;/Layout&gt;&lt;DefaultRecSelWidth&gt;17&lt;/DefaultRecSelWidth&gt;&lt;ClientArea&gt;0, 0, 895, 172&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
+    <value>&lt;?xml version="1.0"?&gt;&lt;Blob&gt;&lt;Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"&gt;&lt;Data&gt;HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;Wrap:True;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style6{}Style1{}Caption{AlignHorz:Center;}Style2{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"&gt;&lt;CaptionStyle parent="Style2" me="Style10" /&gt;&lt;EditorStyle parent="Editor" me="Style5" /&gt;&lt;EvenRowStyle parent="EvenRow" me="Style8" /&gt;&lt;FilterBarStyle parent="FilterBar" me="Style13" /&gt;&lt;FilterWatermarkStyle parent="FilterWatermark" me="Style14" /&gt;&lt;FooterStyle parent="Footer" me="Style3" /&gt;&lt;GroupStyle parent="Group" me="Style12" /&gt;&lt;HeadingStyle parent="Heading" me="Style2" /&gt;&lt;HighLightRowStyle parent="HighlightRow" me="Style7" /&gt;&lt;InactiveStyle parent="Inactive" me="Style4" /&gt;&lt;OddRowStyle parent="OddRow" me="Style9" /&gt;&lt;RecordSelectorStyle parent="RecordSelector" me="Style11" /&gt;&lt;SelectedStyle parent="Selected" me="Style6" /&gt;&lt;Style parent="Normal" me="Style1" /&gt;&lt;ClientRect&gt;0, 0, 895, 172&lt;/ClientRect&gt;&lt;BorderSide&gt;0&lt;/BorderSide&gt;&lt;/C1.Win.C1TrueDBGrid.MergeView&gt;&lt;/Splits&gt;&lt;NamedStyles&gt;&lt;Style parent="" me="Normal" /&gt;&lt;Style parent="Normal" me="Heading" /&gt;&lt;Style parent="Heading" me="Footer" /&gt;&lt;Style parent="Heading" me="Caption" /&gt;&lt;Style parent="Heading" me="Inactive" /&gt;&lt;Style parent="Normal" me="Selected" /&gt;&lt;Style parent="Normal" me="Editor" /&gt;&lt;Style parent="Normal" me="HighlightRow" /&gt;&lt;Style parent="Normal" me="EvenRow" /&gt;&lt;Style parent="Normal" me="OddRow" /&gt;&lt;Style parent="Heading" me="RecordSelector" /&gt;&lt;Style parent="Normal" me="FilterBar" /&gt;&lt;Style parent="FilterBar" me="FilterWatermark" /&gt;&lt;Style parent="Caption" me="Group" /&gt;&lt;/NamedStyles&gt;&lt;vertSplits&gt;1&lt;/vertSplits&gt;&lt;horzSplits&gt;1&lt;/horzSplits&gt;&lt;Layout&gt;None&lt;/Layout&gt;&lt;DefaultRecSelWidth&gt;17&lt;/DefaultRecSelWidth&gt;&lt;ClientArea&gt;0, 0, 895, 172&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
   </data>
   <metadata name="SaveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>498, 17</value>

DPM2016/Dokumente/clsDokumente.vb

@@ -694,6 +694,14 @@ Public Class clsDokumente
     Private Sub C1Dokumente_MouseDown(sender As Object, e As MouseEventArgs) Handles C1Dokumente.MouseDown
         Me.C1Dokumente.Bookmark = Me.C1Dokumente.RowContaining(e.Y)
     End Sub
+
+    Private Sub PerMailVersendenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PerMailVersendenToolStripMenuItem.Click
+        Dim fn As String
+        Dim dok As New clsDok
+        fn = dok.Get_Dokument(Me.C1Dokumente.Columns("nreintrag").Value)
+        Dim om As New clsMailClient
+        om.CreateOutlookMail(clsMailClient.EmpfangerFrom.Dokument, Me.C1Dokumente.Columns("nreintrag").Value, fn, 100)
+    End Sub
 End Class
 
 Public Class DocumentNotLoadedException

DPM2016/Fakturierung/frmFakturierung.vb

@@ -106,7 +106,7 @@
         While doloop = True
             For i As Integer = 1 To anzahlraten
                 If i = 1 And Empfaenger <> "" Then
-                    Dim f0 As New frmReportView(9999, False, "Vorschau Rechung", " where nrbehandlung = " + r.Item("nrbehandlung").ToString, r.Item("nrbehandlung").ToString)
+                    Dim f0 As New frmReportView(9999, False, "Vorschau Rechung", " where nrbehandlung = " + r.Item("nrbehandlung").ToString, r.Item("nrbehandlung").ToString, r.Item("permail"))
                     f0.Visible = False
                     f0.Show()
                     f0.Visible = False
@@ -114,7 +114,7 @@
                     f0.Close()
                     Globals.FakturaNr = 0
                 End If
-                Dim f As New frmReportView(reportnr, False, "Vorschau Rechung", " where nrbehandlung = " + r.Item("nrbehandlung").ToString, r.Item("nrbehandlung").ToString)
+                Dim f As New frmReportView(reportnr, False, "Vorschau Rechung", " where nrbehandlung = " + r.Item("nrbehandlung").ToString, r.Item("nrbehandlung").ToString, r.Item("permail"))
                 f.Visible = False
                 f.Show()
                 f.Visible = False
@@ -125,7 +125,7 @@
                     db.Get_Tabledata("Auswertung", "where auswertungnr=" + Folgeauswertung.ToString)
                     Folgeauswertung = db.dsDaten.Tables(0).Rows(0).Item("Folge_Report")
                     Separater_Druckjob = db.dsDaten.Tables(0).Rows(0).Item("Folgereport_Sep_Druckjob")
-                    Dim f1 As New frmReportView(reportnr, False, "Vorschau Rechung", " where nrbehandlung = " + r.Item("nrbehandlung").ToString, r.Item("nrbehandlung").ToString)
+                    Dim f1 As New frmReportView(reportnr, False, "Vorschau Rechung", " where nrbehandlung = " + r.Item("nrbehandlung").ToString, r.Item("nrbehandlung").ToString, r.Item("permail"))
                     f1.Visible = False
                     f1.Show()
                     f1.Fakturierung(reportnr, r.Item("nrbehandlung"), "", i, buchen:=buchen)
@@ -148,6 +148,11 @@
 
         Dim pdfh As New clspdfhelper
         pdfh.Create_Archivdoc(clspdfhelper.GetEmpfaengerType.FromLastFaktura, "", "Rechnung:")
+
+
+        If r.Item("permail") = True Then
+            pdfh.HandlePDF(True, True, 2, clspdfhelper.GetEmpfaengerType.FromLastFaktura, 0)
+        End If
         pdfh = Nothing
         Globals.pdfCollection.Clear()
         Globals.FakturaNr = 0

DPM2016/Finanzaen/Finanzen.Designer.vb

@@ -82,9 +82,10 @@ Partial Class Finanzen
         '
         '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(990, 25)
+        Me.ToolStrip1.Size = New System.Drawing.Size(1320, 31)
         Me.ToolStrip1.TabIndex = 0
         Me.ToolStrip1.Text = "ToolStrip1"
         '
@@ -103,26 +104,30 @@ Partial Class Finanzen
         Me.GrpZahlung.Controls.Add(Me.txtRGNummer)
         Me.GrpZahlung.Controls.Add(Me.lblRechnungsnummer)
         Me.GrpZahlung.Dock = System.Windows.Forms.DockStyle.Left
-        Me.GrpZahlung.Location = New System.Drawing.Point(0, 25)
+        Me.GrpZahlung.Location = New System.Drawing.Point(0, 31)
+        Me.GrpZahlung.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.GrpZahlung.Name = "GrpZahlung"
-        Me.GrpZahlung.Size = New System.Drawing.Size(345, 562)
+        Me.GrpZahlung.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.GrpZahlung.Size = New System.Drawing.Size(575, 691)
         Me.GrpZahlung.TabIndex = 1
         Me.GrpZahlung.TabStop = False
         Me.GrpZahlung.Text = "Zahlung"
         '
         'Button1
         '
-        Me.Button1.Location = New System.Drawing.Point(309, 30)
+        Me.Button1.Location = New System.Drawing.Point(412, 37)
+        Me.Button1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(15, 23)
+        Me.Button1.Size = New System.Drawing.Size(20, 28)
         Me.Button1.TabIndex = 20
         Me.Button1.UseVisualStyleBackColor = True
         '
         'btnBuchen
         '
-        Me.btnBuchen.Location = New System.Drawing.Point(22, 165)
+        Me.btnBuchen.Location = New System.Drawing.Point(29, 203)
+        Me.btnBuchen.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.btnBuchen.Name = "btnBuchen"
-        Me.btnBuchen.Size = New System.Drawing.Size(75, 23)
+        Me.btnBuchen.Size = New System.Drawing.Size(100, 28)
         Me.btnBuchen.TabIndex = 19
         Me.btnBuchen.Text = "Buchen"
         Me.btnBuchen.UseVisualStyleBackColor = True
@@ -130,7 +135,8 @@ Partial Class Finanzen
         'chkVorauszahlung
         '
         Me.chkVorauszahlung.AutoSize = True
-        Me.chkVorauszahlung.Location = New System.Drawing.Point(147, 139)
+        Me.chkVorauszahlung.Location = New System.Drawing.Point(196, 171)
+        Me.chkVorauszahlung.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.chkVorauszahlung.Name = "chkVorauszahlung"
         Me.chkVorauszahlung.Size = New System.Drawing.Size(15, 14)
         Me.chkVorauszahlung.TabIndex = 18
@@ -139,9 +145,10 @@ Partial Class Finanzen
         'lblVorauszahlung
         '
         Me.lblVorauszahlung.AutoSize = True
-        Me.lblVorauszahlung.Location = New System.Drawing.Point(20, 139)
+        Me.lblVorauszahlung.Location = New System.Drawing.Point(27, 171)
+        Me.lblVorauszahlung.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblVorauszahlung.Name = "lblVorauszahlung"
-        Me.lblVorauszahlung.Size = New System.Drawing.Size(77, 13)
+        Me.lblVorauszahlung.Size = New System.Drawing.Size(103, 17)
         Me.lblVorauszahlung.TabIndex = 17
         Me.lblVorauszahlung.Text = "Vorauszahlung"
         '
@@ -149,9 +156,10 @@ Partial Class Finanzen
         '
         Me.cbboxKonto.Dataselection = Nothing
         Me.cbboxKonto.Displaymember = Nothing
-        Me.cbboxKonto.Location = New System.Drawing.Point(147, 109)
+        Me.cbboxKonto.Location = New System.Drawing.Point(196, 134)
+        Me.cbboxKonto.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.cbboxKonto.Name = "cbboxKonto"
-        Me.cbboxKonto.Size = New System.Drawing.Size(177, 21)
+        Me.cbboxKonto.Size = New System.Drawing.Size(235, 24)
         Me.cbboxKonto.TabIndex = 15
         Me.cbboxKonto.Table = Nothing
         Me.cbboxKonto.TableAlias = ""
@@ -160,18 +168,20 @@ Partial Class Finanzen
         'lblKonto
         '
         Me.lblKonto.AutoSize = True
-        Me.lblKonto.Location = New System.Drawing.Point(20, 112)
+        Me.lblKonto.Location = New System.Drawing.Point(27, 138)
+        Me.lblKonto.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblKonto.Name = "lblKonto"
-        Me.lblKonto.Size = New System.Drawing.Size(66, 13)
+        Me.lblKonto.Size = New System.Drawing.Size(86, 17)
         Me.lblKonto.TabIndex = 16
         Me.lblKonto.Text = "Gegenkonto"
         '
         'lblBetrag
         '
         Me.lblBetrag.AutoSize = True
-        Me.lblBetrag.Location = New System.Drawing.Point(20, 87)
+        Me.lblBetrag.Location = New System.Drawing.Point(27, 107)
+        Me.lblBetrag.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblBetrag.Name = "lblBetrag"
-        Me.lblBetrag.Size = New System.Drawing.Size(38, 13)
+        Me.lblBetrag.Size = New System.Drawing.Size(50, 17)
         Me.lblBetrag.TabIndex = 11
         Me.lblBetrag.Text = "Betrag"
         '
@@ -184,18 +194,20 @@ Partial Class Finanzen
         Me.diBetrag.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
         Me.diBetrag.ButtonFreeText.Shortcut = DevComponents.DotNetBar.eShortcut.F2
         Me.diBetrag.Increment = 1.0R
-        Me.diBetrag.Location = New System.Drawing.Point(147, 81)
+        Me.diBetrag.Location = New System.Drawing.Point(196, 100)
+        Me.diBetrag.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.diBetrag.Name = "diBetrag"
         Me.diBetrag.ShowUpDown = True
-        Me.diBetrag.Size = New System.Drawing.Size(86, 20)
+        Me.diBetrag.Size = New System.Drawing.Size(115, 22)
         Me.diBetrag.TabIndex = 10
         '
         'lbldatum
         '
         Me.lbldatum.AutoSize = True
-        Me.lbldatum.Location = New System.Drawing.Point(20, 62)
+        Me.lbldatum.Location = New System.Drawing.Point(27, 76)
+        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(49, 17)
         Me.lbldatum.TabIndex = 3
         Me.lbldatum.Text = "Datum"
         '
@@ -209,7 +221,8 @@ Partial Class Finanzen
         Me.dtdatum.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown
         Me.dtdatum.ButtonDropDown.Visible = True
         Me.dtdatum.IsPopupCalendarOpen = False
-        Me.dtdatum.Location = New System.Drawing.Point(147, 55)
+        Me.dtdatum.Location = New System.Drawing.Point(196, 68)
+        Me.dtdatum.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         '
         '
         '
@@ -240,23 +253,25 @@ Partial Class Finanzen
         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 = 2
         '
         'txtRGNummer
         '
-        Me.txtRGNummer.Location = New System.Drawing.Point(147, 32)
+        Me.txtRGNummer.Location = New System.Drawing.Point(196, 39)
+        Me.txtRGNummer.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.txtRGNummer.Name = "txtRGNummer"
-        Me.txtRGNummer.Size = New System.Drawing.Size(161, 20)
+        Me.txtRGNummer.Size = New System.Drawing.Size(213, 22)
         Me.txtRGNummer.TabIndex = 1
         '
         'lblRechnungsnummer
         '
         Me.lblRechnungsnummer.AutoSize = True
-        Me.lblRechnungsnummer.Location = New System.Drawing.Point(20, 35)
+        Me.lblRechnungsnummer.Location = New System.Drawing.Point(27, 43)
+        Me.lblRechnungsnummer.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblRechnungsnummer.Name = "lblRechnungsnummer"
-        Me.lblRechnungsnummer.Size = New System.Drawing.Size(99, 13)
+        Me.lblRechnungsnummer.Size = New System.Drawing.Size(131, 17)
         Me.lblRechnungsnummer.TabIndex = 0
         Me.lblRechnungsnummer.Text = "Rechnungsnummer"
         '
@@ -264,9 +279,11 @@ Partial Class Finanzen
         '
         Me.GrpZahlungen.Controls.Add(Me.C1Zahlungen)
         Me.GrpZahlungen.Dock = System.Windows.Forms.DockStyle.Top
-        Me.GrpZahlungen.Location = New System.Drawing.Point(345, 25)
+        Me.GrpZahlungen.Location = New System.Drawing.Point(575, 31)
+        Me.GrpZahlungen.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.GrpZahlungen.Name = "GrpZahlungen"
-        Me.GrpZahlungen.Size = New System.Drawing.Size(645, 302)
+        Me.GrpZahlungen.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.GrpZahlungen.Size = New System.Drawing.Size(745, 465)
         Me.GrpZahlungen.TabIndex = 2
         Me.GrpZahlungen.TabStop = False
         Me.GrpZahlungen.Text = "Verbuchte Zahlungen"
@@ -279,48 +296,52 @@ Partial Class Finanzen
         Me.C1Zahlungen.FilterBar = True
         Me.C1Zahlungen.GroupByCaption = "Drag a column header here to group by that column"
         Me.C1Zahlungen.Images.Add(CType(resources.GetObject("C1Zahlungen.Images"), System.Drawing.Image))
-        Me.C1Zahlungen.Location = New System.Drawing.Point(3, 16)
+        Me.C1Zahlungen.Location = New System.Drawing.Point(4, 19)
+        Me.C1Zahlungen.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.C1Zahlungen.Name = "C1Zahlungen"
         Me.C1Zahlungen.PreviewInfo.Location = New System.Drawing.Point(0, 0)
         Me.C1Zahlungen.PreviewInfo.Size = New System.Drawing.Size(0, 0)
         Me.C1Zahlungen.PreviewInfo.ZoomFactor = 75.0R
         Me.C1Zahlungen.PrintInfo.PageSettings = CType(resources.GetObject("C1Zahlungen.PrintInfo.PageSettings"), System.Drawing.Printing.PageSettings)
-        Me.C1Zahlungen.Size = New System.Drawing.Size(639, 283)
+        Me.C1Zahlungen.Size = New System.Drawing.Size(737, 442)
         Me.C1Zahlungen.TabIndex = 3
         Me.C1Zahlungen.Text = "C1TrueDBGrid1"
         Me.C1Zahlungen.PropBag = resources.GetString("C1Zahlungen.PropBag")
         '
         'ContextMenuStrip2
         '
+        Me.ContextMenuStrip2.ImageScalingSize = New System.Drawing.Size(20, 20)
         Me.ContextMenuStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ZahlungStornierenToolStripMenuItem, Me.VorauszahlungAnBehandlungZuweisenToolStripMenuItem, Me.VorauszahlungVonBehandlungLösenToolStripMenuItem})
         Me.ContextMenuStrip2.Name = "ContextMenuStrip2"
-        Me.ContextMenuStrip2.Size = New System.Drawing.Size(286, 70)
+        Me.ContextMenuStrip2.Size = New System.Drawing.Size(342, 76)
         '
         'ZahlungStornierenToolStripMenuItem
         '
         Me.ZahlungStornierenToolStripMenuItem.Name = "ZahlungStornierenToolStripMenuItem"
-        Me.ZahlungStornierenToolStripMenuItem.Size = New System.Drawing.Size(285, 22)
+        Me.ZahlungStornierenToolStripMenuItem.Size = New System.Drawing.Size(341, 24)
         Me.ZahlungStornierenToolStripMenuItem.Text = "&Zahlung stornieren"
         '
         'VorauszahlungAnBehandlungZuweisenToolStripMenuItem
         '
         Me.VorauszahlungAnBehandlungZuweisenToolStripMenuItem.Name = "VorauszahlungAnBehandlungZuweisenToolStripMenuItem"
-        Me.VorauszahlungAnBehandlungZuweisenToolStripMenuItem.Size = New System.Drawing.Size(285, 22)
+        Me.VorauszahlungAnBehandlungZuweisenToolStripMenuItem.Size = New System.Drawing.Size(341, 24)
         Me.VorauszahlungAnBehandlungZuweisenToolStripMenuItem.Text = "Vorauszahlung an Behandlung zuweisen"
         '
         'VorauszahlungVonBehandlungLösenToolStripMenuItem
         '
         Me.VorauszahlungVonBehandlungLösenToolStripMenuItem.Name = "VorauszahlungVonBehandlungLösenToolStripMenuItem"
-        Me.VorauszahlungVonBehandlungLösenToolStripMenuItem.Size = New System.Drawing.Size(285, 22)
+        Me.VorauszahlungVonBehandlungLösenToolStripMenuItem.Size = New System.Drawing.Size(341, 24)
         Me.VorauszahlungVonBehandlungLösenToolStripMenuItem.Text = "Vorauszahlung von Behandlung lösen"
         '
         'GrpBehandlungen
         '
         Me.GrpBehandlungen.Controls.Add(Me.C1OffeneRechnungen)
         Me.GrpBehandlungen.Dock = System.Windows.Forms.DockStyle.Top
-        Me.GrpBehandlungen.Location = New System.Drawing.Point(345, 327)
+        Me.GrpBehandlungen.Location = New System.Drawing.Point(575, 496)
+        Me.GrpBehandlungen.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.GrpBehandlungen.Name = "GrpBehandlungen"
-        Me.GrpBehandlungen.Size = New System.Drawing.Size(645, 139)
+        Me.GrpBehandlungen.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.GrpBehandlungen.Size = New System.Drawing.Size(745, 214)
         Me.GrpBehandlungen.TabIndex = 3
         Me.GrpBehandlungen.TabStop = False
         Me.GrpBehandlungen.Text = "Offene Rechnungen"
@@ -333,27 +354,29 @@ Partial Class Finanzen
         Me.C1OffeneRechnungen.FilterBar = True
         Me.C1OffeneRechnungen.GroupByCaption = "Drag a column header here to group by that column"
         Me.C1OffeneRechnungen.Images.Add(CType(resources.GetObject("C1OffeneRechnungen.Images"), System.Drawing.Image))
-        Me.C1OffeneRechnungen.Location = New System.Drawing.Point(3, 16)
+        Me.C1OffeneRechnungen.Location = New System.Drawing.Point(4, 19)
+        Me.C1OffeneRechnungen.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.C1OffeneRechnungen.Name = "C1OffeneRechnungen"
         Me.C1OffeneRechnungen.PreviewInfo.Location = New System.Drawing.Point(0, 0)
         Me.C1OffeneRechnungen.PreviewInfo.Size = New System.Drawing.Size(0, 0)
         Me.C1OffeneRechnungen.PreviewInfo.ZoomFactor = 75.0R
         Me.C1OffeneRechnungen.PrintInfo.PageSettings = CType(resources.GetObject("C1OffeneRechnungen.PrintInfo.PageSettings"), System.Drawing.Printing.PageSettings)
-        Me.C1OffeneRechnungen.Size = New System.Drawing.Size(639, 120)
+        Me.C1OffeneRechnungen.Size = New System.Drawing.Size(737, 191)
         Me.C1OffeneRechnungen.TabIndex = 4
         Me.C1OffeneRechnungen.Text = "C1OffeneRechnungen"
         Me.C1OffeneRechnungen.PropBag = resources.GetString("C1OffeneRechnungen.PropBag")
         '
         'ContextMenuStrip1
         '
+        Me.ContextMenuStrip1.ImageScalingSize = New System.Drawing.Size(20, 20)
         Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ZahlungBuchenToolStripMenuItem})
         Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
-        Me.ContextMenuStrip1.Size = New System.Drawing.Size(162, 26)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(185, 28)
         '
         'ZahlungBuchenToolStripMenuItem
         '
         Me.ZahlungBuchenToolStripMenuItem.Name = "ZahlungBuchenToolStripMenuItem"
-        Me.ZahlungBuchenToolStripMenuItem.Size = New System.Drawing.Size(161, 22)
+        Me.ZahlungBuchenToolStripMenuItem.Size = New System.Drawing.Size(184, 24)
         Me.ZahlungBuchenToolStripMenuItem.Text = "&Zahlung buchen"
         '
         'GroupBox1
@@ -378,36 +401,41 @@ Partial Class Finanzen
         Me.GroupBox1.Controls.Add(Me.Label2)
         Me.GroupBox1.Controls.Add(Me.Label1)
         Me.GroupBox1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GroupBox1.Location = New System.Drawing.Point(345, 466)
+        Me.GroupBox1.Location = New System.Drawing.Point(575, 710)
+        Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(645, 121)
+        Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.GroupBox1.Size = New System.Drawing.Size(745, 12)
         Me.GroupBox1.TabIndex = 4
         Me.GroupBox1.TabStop = False
         Me.GroupBox1.Text = "Mahnungen"
         '
         'btnzurücksetzen3
         '
-        Me.btnzurücksetzen3.Location = New System.Drawing.Point(379, 85)
+        Me.btnzurücksetzen3.Location = New System.Drawing.Point(505, 105)
+        Me.btnzurücksetzen3.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.btnzurücksetzen3.Name = "btnzurücksetzen3"
-        Me.btnzurücksetzen3.Size = New System.Drawing.Size(98, 23)
+        Me.btnzurücksetzen3.Size = New System.Drawing.Size(131, 28)
         Me.btnzurücksetzen3.TabIndex = 18
         Me.btnzurücksetzen3.Text = "Zurücksetzen"
         Me.btnzurücksetzen3.UseVisualStyleBackColor = True
         '
         'btnzurücksetzen2
         '
-        Me.btnzurücksetzen2.Location = New System.Drawing.Point(379, 62)
+        Me.btnzurücksetzen2.Location = New System.Drawing.Point(505, 76)
+        Me.btnzurücksetzen2.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.btnzurücksetzen2.Name = "btnzurücksetzen2"
-        Me.btnzurücksetzen2.Size = New System.Drawing.Size(98, 23)
+        Me.btnzurücksetzen2.Size = New System.Drawing.Size(131, 28)
         Me.btnzurücksetzen2.TabIndex = 17
         Me.btnzurücksetzen2.Text = "Zurücksetzen"
         Me.btnzurücksetzen2.UseVisualStyleBackColor = True
         '
         'btnZurücksetzen1
         '
-        Me.btnZurücksetzen1.Location = New System.Drawing.Point(379, 39)
+        Me.btnZurücksetzen1.Location = New System.Drawing.Point(505, 48)
+        Me.btnZurücksetzen1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.btnZurücksetzen1.Name = "btnZurücksetzen1"
-        Me.btnZurücksetzen1.Size = New System.Drawing.Size(98, 23)
+        Me.btnZurücksetzen1.Size = New System.Drawing.Size(131, 28)
         Me.btnZurücksetzen1.TabIndex = 16
         Me.btnZurücksetzen1.Text = "Zurücksetzen"
         Me.btnZurücksetzen1.UseVisualStyleBackColor = True
@@ -415,108 +443,120 @@ Partial Class Finanzen
         'Label10
         '
         Me.Label10.AutoSize = True
-        Me.Label10.Location = New System.Drawing.Point(7, 90)
+        Me.Label10.Location = New System.Drawing.Point(9, 111)
+        Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label10.Name = "Label10"
-        Me.Label10.Size = New System.Drawing.Size(13, 13)
+        Me.Label10.Size = New System.Drawing.Size(16, 17)
         Me.Label10.TabIndex = 15
         Me.Label10.Text = "3"
         '
         'Mahngebühr3
         '
         Me.Mahngebühr3.AutoSize = True
-        Me.Mahngebühr3.Location = New System.Drawing.Point(292, 90)
+        Me.Mahngebühr3.Location = New System.Drawing.Point(389, 111)
+        Me.Mahngebühr3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Mahngebühr3.Name = "Mahngebühr3"
-        Me.Mahngebühr3.Size = New System.Drawing.Size(39, 13)
+        Me.Mahngebühr3.Size = New System.Drawing.Size(51, 17)
         Me.Mahngebühr3.TabIndex = 14
         Me.Mahngebühr3.Text = "Label8"
         '
         'Mahnfaelligkeit3
         '
         Me.Mahnfaelligkeit3.AutoSize = True
-        Me.Mahnfaelligkeit3.Location = New System.Drawing.Point(175, 89)
+        Me.Mahnfaelligkeit3.Location = New System.Drawing.Point(233, 110)
+        Me.Mahnfaelligkeit3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Mahnfaelligkeit3.Name = "Mahnfaelligkeit3"
-        Me.Mahnfaelligkeit3.Size = New System.Drawing.Size(45, 13)
+        Me.Mahnfaelligkeit3.Size = New System.Drawing.Size(59, 17)
         Me.Mahnfaelligkeit3.TabIndex = 13
         Me.Mahnfaelligkeit3.Text = "Label12"
         '
         'Mahndatum3
         '
         Me.Mahndatum3.AutoSize = True
-        Me.Mahndatum3.Location = New System.Drawing.Point(77, 89)
+        Me.Mahndatum3.Location = New System.Drawing.Point(103, 110)
+        Me.Mahndatum3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Mahndatum3.Name = "Mahndatum3"
-        Me.Mahndatum3.Size = New System.Drawing.Size(39, 13)
+        Me.Mahndatum3.Size = New System.Drawing.Size(51, 17)
         Me.Mahndatum3.TabIndex = 12
         Me.Mahndatum3.Text = "Label5"
         '
         'Label9
         '
         Me.Label9.AutoSize = True
-        Me.Label9.Location = New System.Drawing.Point(7, 67)
+        Me.Label9.Location = New System.Drawing.Point(9, 82)
+        Me.Label9.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label9.Name = "Label9"
-        Me.Label9.Size = New System.Drawing.Size(13, 13)
+        Me.Label9.Size = New System.Drawing.Size(16, 17)
         Me.Label9.TabIndex = 11
         Me.Label9.Text = "2"
         '
         'Mahngebühr2
         '
         Me.Mahngebühr2.AutoSize = True
-        Me.Mahngebühr2.Location = New System.Drawing.Point(292, 67)
+        Me.Mahngebühr2.Location = New System.Drawing.Point(389, 82)
+        Me.Mahngebühr2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Mahngebühr2.Name = "Mahngebühr2"
-        Me.Mahngebühr2.Size = New System.Drawing.Size(39, 13)
+        Me.Mahngebühr2.Size = New System.Drawing.Size(51, 17)
         Me.Mahngebühr2.TabIndex = 10
         Me.Mahngebühr2.Text = "Label8"
         '
         'Mahnfaelligkeit2
         '
         Me.Mahnfaelligkeit2.AutoSize = True
-        Me.Mahnfaelligkeit2.Location = New System.Drawing.Point(175, 66)
+        Me.Mahnfaelligkeit2.Location = New System.Drawing.Point(233, 81)
+        Me.Mahnfaelligkeit2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Mahnfaelligkeit2.Name = "Mahnfaelligkeit2"
-        Me.Mahnfaelligkeit2.Size = New System.Drawing.Size(39, 13)
+        Me.Mahnfaelligkeit2.Size = New System.Drawing.Size(51, 17)
         Me.Mahnfaelligkeit2.TabIndex = 9
         Me.Mahnfaelligkeit2.Text = "Label7"
         '
         'Mahndatum2
         '
         Me.Mahndatum2.AutoSize = True
-        Me.Mahndatum2.Location = New System.Drawing.Point(77, 66)
+        Me.Mahndatum2.Location = New System.Drawing.Point(103, 81)
+        Me.Mahndatum2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Mahndatum2.Name = "Mahndatum2"
-        Me.Mahndatum2.Size = New System.Drawing.Size(39, 13)
+        Me.Mahndatum2.Size = New System.Drawing.Size(51, 17)
         Me.Mahndatum2.TabIndex = 8
         Me.Mahndatum2.Text = "Label5"
         '
         'Mahngebühr1
         '
         Me.Mahngebühr1.AutoSize = True
-        Me.Mahngebühr1.Location = New System.Drawing.Point(292, 44)
+        Me.Mahngebühr1.Location = New System.Drawing.Point(389, 54)
+        Me.Mahngebühr1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Mahngebühr1.Name = "Mahngebühr1"
-        Me.Mahngebühr1.Size = New System.Drawing.Size(39, 13)
+        Me.Mahngebühr1.Size = New System.Drawing.Size(51, 17)
         Me.Mahngebühr1.TabIndex = 7
         Me.Mahngebühr1.Text = "Label8"
         '
         'Mahnfaelligkeit1
         '
         Me.Mahnfaelligkeit1.AutoSize = True
-        Me.Mahnfaelligkeit1.Location = New System.Drawing.Point(175, 44)
+        Me.Mahnfaelligkeit1.Location = New System.Drawing.Point(233, 54)
+        Me.Mahnfaelligkeit1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Mahnfaelligkeit1.Name = "Mahnfaelligkeit1"
-        Me.Mahnfaelligkeit1.Size = New System.Drawing.Size(39, 13)
+        Me.Mahnfaelligkeit1.Size = New System.Drawing.Size(51, 17)
         Me.Mahnfaelligkeit1.TabIndex = 6
         Me.Mahnfaelligkeit1.Text = "Label7"
         '
         'Label6
         '
         Me.Label6.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(7, 44)
+        Me.Label6.Location = New System.Drawing.Point(9, 54)
+        Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(13, 13)
+        Me.Label6.Size = New System.Drawing.Size(16, 17)
         Me.Label6.TabIndex = 5
         Me.Label6.Text = "1"
         '
         'Mahndatum1
         '
         Me.Mahndatum1.AutoSize = True
-        Me.Mahndatum1.Location = New System.Drawing.Point(77, 44)
+        Me.Mahndatum1.Location = New System.Drawing.Point(103, 54)
+        Me.Mahndatum1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Mahndatum1.Name = "Mahndatum1"
-        Me.Mahndatum1.Size = New System.Drawing.Size(39, 13)
+        Me.Mahndatum1.Size = New System.Drawing.Size(51, 17)
         Me.Mahndatum1.TabIndex = 4
         Me.Mahndatum1.Text = "Label5"
         '
@@ -524,9 +564,10 @@ Partial Class Finanzen
         '
         Me.Label4.AutoSize = True
         Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label4.Location = New System.Drawing.Point(7, 16)
+        Me.Label4.Location = New System.Drawing.Point(9, 20)
+        Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(37, 13)
+        Me.Label4.Size = New System.Drawing.Size(46, 17)
         Me.Label4.TabIndex = 3
         Me.Label4.Text = "Stufe"
         '
@@ -534,9 +575,10 @@ Partial Class Finanzen
         '
         Me.Label3.AutoSize = True
         Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label3.Location = New System.Drawing.Point(292, 16)
+        Me.Label3.Location = New System.Drawing.Point(389, 20)
+        Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(77, 13)
+        Me.Label3.Size = New System.Drawing.Size(98, 17)
         Me.Label3.TabIndex = 2
         Me.Label3.Text = "Mahngebühr"
         '
@@ -544,9 +586,10 @@ Partial Class Finanzen
         '
         Me.Label2.AutoSize = True
         Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label2.Location = New System.Drawing.Point(175, 16)
+        Me.Label2.Location = New System.Drawing.Point(233, 20)
+        Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(86, 13)
+        Me.Label2.Size = New System.Drawing.Size(108, 17)
         Me.Label2.TabIndex = 1
         Me.Label2.Text = "Mahnfälligkeit"
         '
@@ -554,23 +597,25 @@ Partial Class Finanzen
         '
         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(77, 16)
+        Me.Label1.Location = New System.Drawing.Point(103, 20)
+        Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(72, 13)
+        Me.Label1.Size = New System.Drawing.Size(91, 17)
         Me.Label1.TabIndex = 0
         Me.Label1.Text = "Mahndatum"
         '
         'Finanzen
         '
-        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.GroupBox1)
         Me.Controls.Add(Me.GrpBehandlungen)
         Me.Controls.Add(Me.GrpZahlungen)
         Me.Controls.Add(Me.GrpZahlung)
         Me.Controls.Add(Me.ToolStrip1)
+        Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.Name = "Finanzen"
-        Me.Size = New System.Drawing.Size(990, 587)
+        Me.Size = New System.Drawing.Size(1320, 722)
         Me.GrpZahlung.ResumeLayout(False)
         Me.GrpZahlung.PerformLayout()
         CType(Me.diBetrag, System.ComponentModel.ISupportInitialize).EndInit()

DPM2016/Finanzaen/Finanzen.resx

@@ -127,7 +127,7 @@
   <data name="C1Zahlungen.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>
@@ -161,7 +161,7 @@
 </value>
   </data>
   <data name="C1Zahlungen.PropBag" xml:space="preserve">
-    <value>&lt;?xml version="1.0"?&gt;&lt;Blob&gt;&lt;Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"&gt;&lt;Data&gt;HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;Wrap:True;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style6{}Style1{}Caption{AlignHorz:Center;}Style2{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"&gt;&lt;CaptionStyle parent="Style2" me="Style10" /&gt;&lt;EditorStyle parent="Editor" me="Style5" /&gt;&lt;EvenRowStyle parent="EvenRow" me="Style8" /&gt;&lt;FilterBarStyle parent="FilterBar" me="Style13" /&gt;&lt;FilterWatermarkStyle parent="FilterWatermark" me="Style14" /&gt;&lt;FooterStyle parent="Footer" me="Style3" /&gt;&lt;GroupStyle parent="Group" me="Style12" /&gt;&lt;HeadingStyle parent="Heading" me="Style2" /&gt;&lt;HighLightRowStyle parent="HighlightRow" me="Style7" /&gt;&lt;InactiveStyle parent="Inactive" me="Style4" /&gt;&lt;OddRowStyle parent="OddRow" me="Style9" /&gt;&lt;RecordSelectorStyle parent="RecordSelector" me="Style11" /&gt;&lt;SelectedStyle parent="Selected" me="Style6" /&gt;&lt;Style parent="Normal" me="Style1" /&gt;&lt;ClientRect&gt;0, 0, 637, 281&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, 637, 281&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
+    <value>&lt;?xml version="1.0"?&gt;&lt;Blob&gt;&lt;Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"&gt;&lt;Data&gt;HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}Heading{ForeColor:ControlText;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{BackColor:Info;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="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, 735, 440&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, 735, 440&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
   </data>
   <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>124, 17</value>
@@ -169,7 +169,7 @@
   <data name="C1OffeneRechnungen.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>
@@ -203,6 +203,6 @@
 </value>
   </data>
   <data name="C1OffeneRechnungen.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, 637, 118&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, 637, 118&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
+    <value>&lt;?xml version="1.0"?&gt;&lt;Blob&gt;&lt;Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"&gt;&lt;Data&gt;HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style6{}Style1{}Caption{AlignHorz:Center;}Style2{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" 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, 735, 189&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, 735, 189&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
   </data>
 </root>

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;HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style6{}Style1{}Caption{AlignHorz:Center;}Style2{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FetchRowStyles="True" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"&gt;&lt;CaptionStyle parent="Style2" me="Style10" /&gt;&lt;EditorStyle parent="Editor" me="Style5" /&gt;&lt;EvenRowStyle parent="EvenRow" me="Style8" /&gt;&lt;FilterBarStyle parent="FilterBar" me="Style13" /&gt;&lt;FilterWatermarkStyle parent="FilterWatermark" me="Style14" /&gt;&lt;FooterStyle parent="Footer" me="Style3" /&gt;&lt;GroupStyle parent="Group" me="Style12" /&gt;&lt;HeadingStyle parent="Heading" me="Style2" /&gt;&lt;HighLightRowStyle parent="HighlightRow" me="Style7" /&gt;&lt;InactiveStyle parent="Inactive" me="Style4" /&gt;&lt;OddRowStyle parent="OddRow" me="Style9" /&gt;&lt;RecordSelectorStyle parent="RecordSelector" me="Style11" /&gt;&lt;SelectedStyle parent="Selected" me="Style6" /&gt;&lt;Style parent="Normal" me="Style1" /&gt;&lt;ClientRect&gt;0, 0, 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;HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}Heading{ForeColor:ControlText;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{BackColor:Info;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FetchRowStyles="True" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"&gt;&lt;CaptionStyle parent="Style2" me="Style10" /&gt;&lt;EditorStyle parent="Editor" me="Style5" /&gt;&lt;EvenRowStyle parent="EvenRow" me="Style8" /&gt;&lt;FilterBarStyle parent="FilterBar" me="Style13" /&gt;&lt;FilterWatermarkStyle parent="FilterWatermark" me="Style14" /&gt;&lt;FooterStyle parent="Footer" me="Style3" /&gt;&lt;GroupStyle parent="Group" me="Style12" /&gt;&lt;HeadingStyle parent="Heading" me="Style2" /&gt;&lt;HighLightRowStyle parent="HighlightRow" me="Style7" /&gt;&lt;InactiveStyle parent="Inactive" me="Style4" /&gt;&lt;OddRowStyle parent="OddRow" me="Style9" /&gt;&lt;RecordSelectorStyle parent="RecordSelector" me="Style11" /&gt;&lt;SelectedStyle parent="Selected" me="Style6" /&gt;&lt;Style parent="Normal" me="Style1" /&gt;&lt;ClientRect&gt;0, 0, 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;HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}Heading{ForeColor:ControlText;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{BackColor:Info;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FetchRowStyles="True" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"&gt;&lt;CaptionStyle parent="Style2" me="Style10" /&gt;&lt;EditorStyle parent="Editor" me="Style5" /&gt;&lt;EvenRowStyle parent="EvenRow" me="Style8" /&gt;&lt;FilterBarStyle parent="FilterBar" me="Style13" /&gt;&lt;FilterWatermarkStyle parent="FilterWatermark" me="Style14" /&gt;&lt;FooterStyle parent="Footer" me="Style3" /&gt;&lt;GroupStyle parent="Group" me="Style12" /&gt;&lt;HeadingStyle parent="Heading" me="Style2" /&gt;&lt;HighLightRowStyle parent="HighlightRow" me="Style7" /&gt;&lt;InactiveStyle parent="Inactive" me="Style4" /&gt;&lt;OddRowStyle parent="OddRow" me="Style9" /&gt;&lt;RecordSelectorStyle parent="RecordSelector" me="Style11" /&gt;&lt;SelectedStyle parent="Selected" me="Style6" /&gt;&lt;Style parent="Normal" me="Style1" /&gt;&lt;ClientRect&gt;0, 0, 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;HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;Wrap:True;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style6{}Style1{}Caption{AlignHorz:Center;}Style2{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" 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>
@@ -557,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;HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}Heading{Wrap:True;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{BackColor:Info;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FetchRowStyles="True" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"&gt;&lt;CaptionStyle parent="Style2" me="Style10" /&gt;&lt;EditorStyle parent="Editor" me="Style5" /&gt;&lt;EvenRowStyle parent="EvenRow" me="Style8" /&gt;&lt;FilterBarStyle parent="FilterBar" me="Style13" /&gt;&lt;FilterWatermarkStyle parent="FilterWatermark" me="Style14" /&gt;&lt;FooterStyle parent="Footer" me="Style3" /&gt;&lt;GroupStyle parent="Group" me="Style12" /&gt;&lt;HeadingStyle parent="Heading" me="Style2" /&gt;&lt;HighLightRowStyle parent="HighlightRow" me="Style7" /&gt;&lt;InactiveStyle parent="Inactive" me="Style4" /&gt;&lt;OddRowStyle parent="OddRow" me="Style9" /&gt;&lt;RecordSelectorStyle parent="RecordSelector" me="Style11" /&gt;&lt;SelectedStyle parent="Selected" me="Style6" /&gt;&lt;Style parent="Normal" me="Style1" /&gt;&lt;ClientRect&gt;0, 0, 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;HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style6{}Style1{}Caption{AlignHorz:Center;}Style2{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FetchRowStyles="True" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"&gt;&lt;CaptionStyle parent="Style2" me="Style10" /&gt;&lt;EditorStyle parent="Editor" me="Style5" /&gt;&lt;EvenRowStyle parent="EvenRow" me="Style8" /&gt;&lt;FilterBarStyle parent="FilterBar" me="Style13" /&gt;&lt;FilterWatermarkStyle parent="FilterWatermark" me="Style14" /&gt;&lt;FooterStyle parent="Footer" me="Style3" /&gt;&lt;GroupStyle parent="Group" me="Style12" /&gt;&lt;HeadingStyle parent="Heading" me="Style2" /&gt;&lt;HighLightRowStyle parent="HighlightRow" me="Style7" /&gt;&lt;InactiveStyle parent="Inactive" me="Style4" /&gt;&lt;OddRowStyle parent="OddRow" me="Style9" /&gt;&lt;RecordSelectorStyle parent="RecordSelector" me="Style11" /&gt;&lt;SelectedStyle parent="Selected" me="Style6" /&gt;&lt;Style parent="Normal" me="Style1" /&gt;&lt;ClientRect&gt;0, 0, 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>
@@ -617,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;HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;Wrap:True;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style6{}Style1{}Caption{AlignHorz:Center;}Style2{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" 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;HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}Heading{Wrap:True;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{BackColor:Info;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FetchRowStyles="True" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"&gt;&lt;CaptionStyle parent="Style2" me="Style10" /&gt;&lt;EditorStyle parent="Editor" me="Style5" /&gt;&lt;EvenRowStyle parent="EvenRow" me="Style8" /&gt;&lt;FilterBarStyle parent="FilterBar" me="Style13" /&gt;&lt;FilterWatermarkStyle parent="FilterWatermark" me="Style14" /&gt;&lt;FooterStyle parent="Footer" me="Style3" /&gt;&lt;GroupStyle parent="Group" me="Style12" /&gt;&lt;HeadingStyle parent="Heading" me="Style2" /&gt;&lt;HighLightRowStyle parent="HighlightRow" me="Style7" /&gt;&lt;InactiveStyle parent="Inactive" me="Style4" /&gt;&lt;OddRowStyle parent="OddRow" me="Style9" /&gt;&lt;RecordSelectorStyle parent="RecordSelector" me="Style11" /&gt;&lt;SelectedStyle parent="Selected" me="Style6" /&gt;&lt;Style parent="Normal" me="Style1" /&gt;&lt;ClientRect&gt;0, 0, 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/Firmen/frmFirma.Designer.vb

@@ -107,6 +107,8 @@ Partial Class frmFirma
         Me.Dokumente = New DevComponents.DotNetBar.SuperTabItem()
         Me.SuperTabControlPanel2 = New DevComponents.DotNetBar.SuperTabControlPanel()
         Me.Finanzen = New DevComponents.DotNetBar.SuperTabItem()
+        Me.chkMail_Kommunikation = New System.Windows.Forms.CheckBox()
+        Me.Label4 = New System.Windows.Forms.Label()
         Me.MenuStrip1.SuspendLayout()
         Me.ToolStrip1.SuspendLayout()
         Me.GroupBox1.SuspendLayout()
@@ -228,6 +230,7 @@ Partial Class frmFirma
         '
         '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)
         '
@@ -678,6 +681,7 @@ Partial Class frmFirma
         '
         'ToolStripTextBox1
         '
+        Me.ToolStripTextBox1.Font = New System.Drawing.Font("Segoe UI", 9.0!)
         Me.ToolStripTextBox1.Name = "ToolStripTextBox1"
         Me.ToolStripTextBox1.Size = New System.Drawing.Size(100, 25)
         Me.ToolStripTextBox1.Visible = False
@@ -839,6 +843,8 @@ Partial Class frmFirma
         '
         'Panel1
         '
+        Me.Panel1.Controls.Add(Me.chkMail_Kommunikation)
+        Me.Panel1.Controls.Add(Me.Label4)
         Me.Panel1.Controls.Add(Me.txtnrfirma)
         Me.Panel1.Controls.Add(Me.lblNr)
         Me.Panel1.Controls.Add(Me.txtnatel)
@@ -937,6 +943,25 @@ Partial Class frmFirma
         Me.Finanzen.Name = "Finanzen"
         Me.Finanzen.Text = "Finanzen"
         '
+        'chkMail_Kommunikation
+        '
+        Me.chkMail_Kommunikation.AutoSize = True
+        Me.chkMail_Kommunikation.Location = New System.Drawing.Point(906, 322)
+        Me.chkMail_Kommunikation.Name = "chkMail_Kommunikation"
+        Me.chkMail_Kommunikation.Size = New System.Drawing.Size(15, 14)
+        Me.chkMail_Kommunikation.TabIndex = 223
+        Me.chkMail_Kommunikation.UseVisualStyleBackColor = True
+        '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.BackColor = System.Drawing.Color.Transparent
+        Me.Label4.Location = New System.Drawing.Point(728, 322)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(101, 13)
+        Me.Label4.TabIndex = 222
+        Me.Label4.Text = "Mail-Kommunikation"
+        '
         'frmFirma
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1053,4 +1078,6 @@ Partial Class frmFirma
     Friend WithEvents SuperTabControlPanel3 As DevComponents.DotNetBar.SuperTabControlPanel
     Friend WithEvents Dokumente As DevComponents.DotNetBar.SuperTabItem
     Friend WithEvents ClsDokumente1 As clsDokumente
+    Friend WithEvents chkMail_Kommunikation As CheckBox
+    Friend WithEvents Label4 As Label
 End Class

DPM2016/Firmen/frmFirma.resx

@@ -354,6 +354,9 @@
         QviZc3RGgMWe4BX01u/8xujp/R8+75YoB9R89wAAAABJRU5ErkJggg==
 </value>
   </data>
+  <metadata name="ToolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>231, 17</value>
+  </metadata>
   <data name="c1daten.Images" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -391,7 +394,7 @@
 </value>
   </data>
   <data name="c1daten.PropBag" xml:space="preserve">
-    <value>&lt;?xml version="1.0"?&gt;&lt;Blob&gt;&lt;Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"&gt;&lt;Data&gt;HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style6{}Style1{}Caption{AlignHorz:Center;}Style2{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FetchRowStyles="True" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"&gt;&lt;CaptionStyle parent="Style2" me="Style10" /&gt;&lt;EditorStyle parent="Editor" me="Style5" /&gt;&lt;EvenRowStyle parent="EvenRow" me="Style8" /&gt;&lt;FilterBarStyle parent="FilterBar" me="Style13" /&gt;&lt;FilterWatermarkStyle parent="FilterWatermark" me="Style14" /&gt;&lt;FooterStyle parent="Footer" me="Style3" /&gt;&lt;GroupStyle parent="Group" me="Style12" /&gt;&lt;HeadingStyle parent="Heading" me="Style2" /&gt;&lt;HighLightRowStyle parent="HighlightRow" me="Style7" /&gt;&lt;InactiveStyle parent="Inactive" me="Style4" /&gt;&lt;OddRowStyle parent="OddRow" me="Style9" /&gt;&lt;RecordSelectorStyle parent="RecordSelector" me="Style11" /&gt;&lt;SelectedStyle parent="Selected" me="Style6" /&gt;&lt;Style parent="Normal" me="Style1" /&gt;&lt;ClientRect&gt;0, 0, 908, 140&lt;/ClientRect&gt;&lt;BorderSide&gt;0&lt;/BorderSide&gt;&lt;/C1.Win.C1TrueDBGrid.MergeView&gt;&lt;/Splits&gt;&lt;NamedStyles&gt;&lt;Style parent="" me="Normal" /&gt;&lt;Style parent="Normal" me="Heading" /&gt;&lt;Style parent="Heading" me="Footer" /&gt;&lt;Style parent="Heading" me="Caption" /&gt;&lt;Style parent="Heading" me="Inactive" /&gt;&lt;Style parent="Normal" me="Selected" /&gt;&lt;Style parent="Normal" me="Editor" /&gt;&lt;Style parent="Normal" me="HighlightRow" /&gt;&lt;Style parent="Normal" me="EvenRow" /&gt;&lt;Style parent="Normal" me="OddRow" /&gt;&lt;Style parent="Heading" me="RecordSelector" /&gt;&lt;Style parent="Normal" me="FilterBar" /&gt;&lt;Style parent="FilterBar" me="FilterWatermark" /&gt;&lt;Style parent="Caption" me="Group" /&gt;&lt;/NamedStyles&gt;&lt;vertSplits&gt;1&lt;/vertSplits&gt;&lt;horzSplits&gt;1&lt;/horzSplits&gt;&lt;Layout&gt;None&lt;/Layout&gt;&lt;DefaultRecSelWidth&gt;17&lt;/DefaultRecSelWidth&gt;&lt;ClientArea&gt;0, 0, 908, 140&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
+    <value>&lt;?xml version="1.0"?&gt;&lt;Blob&gt;&lt;Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"&gt;&lt;Data&gt;HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}Heading{Wrap:True;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{BackColor:Info;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FetchRowStyles="True" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"&gt;&lt;CaptionStyle parent="Style2" me="Style10" /&gt;&lt;EditorStyle parent="Editor" me="Style5" /&gt;&lt;EvenRowStyle parent="EvenRow" me="Style8" /&gt;&lt;FilterBarStyle parent="FilterBar" me="Style13" /&gt;&lt;FilterWatermarkStyle parent="FilterWatermark" me="Style14" /&gt;&lt;FooterStyle parent="Footer" me="Style3" /&gt;&lt;GroupStyle parent="Group" me="Style12" /&gt;&lt;HeadingStyle parent="Heading" me="Style2" /&gt;&lt;HighLightRowStyle parent="HighlightRow" me="Style7" /&gt;&lt;InactiveStyle parent="Inactive" me="Style4" /&gt;&lt;OddRowStyle parent="OddRow" me="Style9" /&gt;&lt;RecordSelectorStyle parent="RecordSelector" me="Style11" /&gt;&lt;SelectedStyle parent="Selected" me="Style6" /&gt;&lt;Style parent="Normal" me="Style1" /&gt;&lt;ClientRect&gt;0, 0, 908, 140&lt;/ClientRect&gt;&lt;BorderSide&gt;0&lt;/BorderSide&gt;&lt;/C1.Win.C1TrueDBGrid.MergeView&gt;&lt;/Splits&gt;&lt;NamedStyles&gt;&lt;Style parent="" me="Normal" /&gt;&lt;Style parent="Normal" me="Heading" /&gt;&lt;Style parent="Heading" me="Footer" /&gt;&lt;Style parent="Heading" me="Caption" /&gt;&lt;Style parent="Heading" me="Inactive" /&gt;&lt;Style parent="Normal" me="Selected" /&gt;&lt;Style parent="Normal" me="Editor" /&gt;&lt;Style parent="Normal" me="HighlightRow" /&gt;&lt;Style parent="Normal" me="EvenRow" /&gt;&lt;Style parent="Normal" me="OddRow" /&gt;&lt;Style parent="Heading" me="RecordSelector" /&gt;&lt;Style parent="Normal" me="FilterBar" /&gt;&lt;Style parent="FilterBar" me="FilterWatermark" /&gt;&lt;Style parent="Caption" me="Group" /&gt;&lt;/NamedStyles&gt;&lt;vertSplits&gt;1&lt;/vertSplits&gt;&lt;horzSplits&gt;1&lt;/horzSplits&gt;&lt;Layout&gt;None&lt;/Layout&gt;&lt;DefaultRecSelWidth&gt;17&lt;/DefaultRecSelWidth&gt;&lt;ClientArea&gt;0, 0, 908, 140&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
   </data>
   <metadata name="ToolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>231, 17</value>

DPM2016/Firmen/frmFirma.vb

@@ -283,6 +283,17 @@ Public Class frmFirma
 
                         Exit For
                     End If
+                    If UCase(Ctl.Name) = "CHK" + UCase(c.ColumnName) Then
+                        Dim cb As CheckBox
+                        cb = Ctl
+
+                        Try
+                            cb.Checked = r(c.ColumnName)
+                        Catch ex As Exception
+
+                        End Try
+                        Exit For
+                    End If
                 Next
 
                 Select Case UCase(c.ColumnName)
@@ -403,6 +414,12 @@ Public Class frmFirma
                     End If
                     Exit For
                 End If
+                If UCase(Ctl.Name) = "CHK" + UCase(c.ColumnName) Then
+                    Dim cb As CheckBox
+                    cb = Ctl
+                    r(c.ColumnName) = cb.Checked
+                    Exit For
+                End If
             Next
             Select Case UCase(c.ColumnName)
                 Case "AG"

DPM2016/Klassen/MapiMail.vb

@@ -0,0 +1,206 @@
+Imports System
+Imports System.Runtime.InteropServices
+Imports System.IO
+Imports System.Collections.Generic
+Imports System.Windows.Forms
+Public Class MapiMail
+
+    Public Function AddRecipientTo(ByVal email As String) As Boolean
+        Return AddRecipient(email, howTo.MAPI_TO)
+    End Function
+
+    Public Function AddRecipientCC(ByVal email As String) As Boolean
+        Return AddRecipient(email, howTo.MAPI_TO)
+    End Function
+
+    Public Function AddRecipientBCC(ByVal email As String) As Boolean
+        Return AddRecipient(email, howTo.MAPI_TO)
+    End Function
+
+    Public Sub AddAttachment(ByVal strAttachmentFileName As String)
+        m_attachments.Add(strAttachmentFileName)
+    End Sub
+
+    Public Function SendMailPopup(ByVal strSubject As String, ByVal strBody As String) As Integer
+        Return SendMail(strSubject, strBody, MAPI_LOGON_UI Or MAPI_DIALOG)
+    End Function
+
+    Public Function SendMailDirect(ByVal strSubject As String, ByVal strBody As String) As Integer
+        Return SendMail(strSubject, strBody, MAPI_LOGON_UI)
+    End Function
+
+
+    <DllImport("MAPI32.DLL")>
+    Private Shared Function MAPISendMail(ByVal sess As IntPtr, ByVal hwnd As IntPtr, ByVal message As MapiMessage, ByVal flg As Integer, ByVal rsv As Integer) As Integer
+    End Function
+
+    Private Function SendMail(ByVal strSubject As String, ByVal strBody As String, ByVal how As Integer) As Integer
+        Dim msg As MapiMessage = New MapiMessage()
+        msg.subject = strSubject
+        msg.noteText = strBody
+
+        msg.recips = GetRecipients(msg.recipCount)
+        msg.files = GetAttachments(msg.fileCount)
+
+        m_lastError = MAPISendMail(New IntPtr(0), New IntPtr(0), msg, how, 0)
+        If m_lastError > 1 Then
+            MessageBox.Show("MAPISendMail failed! " + GetLastError(), "MAPISendMail")
+        End If
+
+        Cleanup(msg)
+        Return m_lastError
+    End Function
+
+    Private Function AddRecipient(ByVal email As String, ByVal howTo As howTo) As Boolean
+        Dim recipient As MapiRecipDesc = New MapiRecipDesc()
+
+        recipient.recipClass = CType(howTo, Integer)
+        recipient.name = email
+        m_recipients.Add(recipient)
+
+        Return True
+    End Function
+
+    Private Function GetRecipients(ByRef recipCount As Integer) As IntPtr
+        recipCount = 0
+        If m_recipients.Count = 0 Then
+            Return 0
+        End If
+
+        Dim size As Integer = Marshal.SizeOf(GetType(MapiRecipDesc))
+        Dim intPtr As IntPtr = Marshal.AllocHGlobal(m_recipients.Count * size)
+
+        'Dim ptr As Integer = CType(intPtr, Integer)
+        Dim ptr As Long = intPtr.ToInt64()
+        Dim mapiDesc As MapiRecipDesc
+        For Each mapiDesc In m_recipients
+            Marshal.StructureToPtr(mapiDesc, CType(ptr, IntPtr), False)
+            ptr += size
+        Next
+
+        recipCount = m_recipients.Count
+        Return intPtr
+    End Function
+
+    Private Function GetAttachments(ByRef fileCount As Integer) As IntPtr
+        fileCount = 0
+        If m_attachments Is Nothing Then
+            Return 0
+        End If
+
+        If (m_attachments.Count <= 0) Or (m_attachments.Count > maxAttachments) Then
+            Return 0
+        End If
+
+        Dim size As Integer = Marshal.SizeOf(GetType(MapiFileDesc))
+        Dim intPtr As IntPtr = Marshal.AllocHGlobal(m_attachments.Count * size)
+
+        Dim mapiFileDesc As MapiFileDesc = New MapiFileDesc()
+        mapiFileDesc.position = -1
+        'Dim ptr As Integer = CType(intPtr, Integer)
+        Dim ptr As Long = intPtr.ToInt64()
+
+        Dim strAttachment As String
+        For Each strAttachment In m_attachments
+            mapiFileDesc.name = Path.GetFileName(strAttachment)
+            mapiFileDesc.path = strAttachment
+            Marshal.StructureToPtr(mapiFileDesc, CType(ptr, IntPtr), False)
+            ptr += size
+        Next
+
+        fileCount = m_attachments.Count
+        Return intPtr
+    End Function
+
+    Private Sub Cleanup(ByRef msg As MapiMessage)
+        Dim size As Integer = Marshal.SizeOf(GetType(MapiRecipDesc))
+        'Dim ptr As Integer = 0
+        Dim ptr As Long = 0
+        If msg.recips <> IntPtr.Zero Then
+            ptr = CType(msg.recips, Long)
+            Dim i As Integer
+            For i = 0 To msg.recipCount - 1 Step i + 1
+                Marshal.DestroyStructure(CType(ptr, IntPtr), GetType(MapiRecipDesc))
+                ptr += size
+            Next
+            Marshal.FreeHGlobal(msg.recips)
+        End If
+
+        If msg.files <> IntPtr.Zero Then
+            size = Marshal.SizeOf(GetType(MapiFileDesc))
+
+            ptr = CType(msg.files, Long)
+            Dim i As Integer
+            For i = 0 To msg.fileCount - 1 Step i + 1
+                Marshal.DestroyStructure(CType(ptr, IntPtr), GetType(MapiFileDesc))
+                ptr += size
+            Next
+            Marshal.FreeHGlobal(msg.files)
+        End If
+
+        m_recipients.Clear()
+        m_attachments.Clear()
+        m_lastError = 0
+    End Sub
+
+    Public Function GetLastError() As String
+        If m_lastError <= 26 Then
+            Return errors(m_lastError)
+        End If
+        Return "MAPI error [" + m_lastError.ToString() + "]"
+    End Function
+
+    ReadOnly errors() As String = New String() {"OK [0]", "User abort [1]", "General MAPI failure [2]", "MAPI login failure [3]", "Disk full [4]", "Insufficient memory [5]", "Access denied [6]", "-unknown- [7]", "Too many sessions [8]", "Too many files were specified [9]", "Too many recipients were specified [10]", "A specified attachment was not found [11]", "Attachment open failure [12]", "Attachment write failure [13]", "Unknown recipient [14]", "Bad recipient type [15]", "No messages [16]", "Invalid message [17]", "Text too large [18]", "Invalid session [19]", "Type not supported [20]", "A recipient was specified ambiguously [21]", "Message in use [22]", "Network failure [23]", "Invalid edit fields [24]", "Invalid recipients [25]", "Not supported [26]"}
+
+    Dim m_recipients As New List(Of MapiRecipDesc)
+    Dim m_attachments As New List(Of String)
+    Dim m_lastError As Integer = 0
+
+    Private Const MAPI_LOGON_UI As Integer = &H1
+    Private Const MAPI_DIALOG As Integer = &H8
+    Private Const maxAttachments As Integer = 20
+
+    Enum howTo
+        MAPI_ORIG = 0
+        MAPI_TO
+        MAPI_CC
+        MAPI_BCC
+    End Enum
+
+End Class
+
+<StructLayout(LayoutKind.Sequential)>
+Public Class MapiMessage
+    Public reserved As Integer
+    Public subject As String
+    Public noteText As String
+    Public messageType As String
+    Public dateReceived As String
+    Public conversationID As String
+    Public flags As Integer
+    Public originator As IntPtr
+    Public recipCount As Integer
+    Public recips As IntPtr
+    Public fileCount As Integer
+    Public files As IntPtr
+End Class
+
+<StructLayout(LayoutKind.Sequential)>
+Public Class MapiFileDesc
+    Public reserved As Integer
+    Public flags As Integer
+    Public position As Integer
+    Public path As String
+    Public name As String
+    Public type As IntPtr
+End Class
+
+<StructLayout(LayoutKind.Sequential)>
+Public Class MapiRecipDesc
+    Public reserved As Integer
+    Public recipClass As Integer
+    Public name As String
+    Public address As String
+    Public eIDSize As Integer
+    Public enTryID As IntPtr
+End Class

DPM2016/Klassen/clsMailClient.vb

@@ -5,6 +5,7 @@
         Get
             Return m_empfaenger
         End Get
+
         Set(value As String)
             m_empfaenger = value
         End Set
@@ -17,57 +18,152 @@
         Dokument
     End Enum
 
-    Public Function Read_Empfaenger(ByVal Behandlungsnr As String, ByVal Fakturanr As String, ByVal FromLastFaktura As Boolean)
+    Public Function Read_Empfaenger(ByVal Behandlungsnr As String, ByVal Fakturanr As String, ByVal FromLastFaktura As Boolean) As Integer
         Try
+            Dim msgfirma As Integer = 0
+            Dim debitor As Integer
             Dim db As New clsDB
             If FromLastFaktura = True Then
                 db.Get_Tabledata("fak", "", "select top 1 nrdebitor from faktura order by nrfaktura desc")
+                debitor = db.dsDaten.Tables(0).Rows(0).Item(0)
             End If
             If Behandlungsnr <> "" Then
-                db.Get_Tabledata("fak", "", "select top 1 nrdebitor from behandlu where nrbehandlung=" + Behandlungsnr)
+                db.Get_Tabledata("fak", "", "select top 1 * from behandlu where nrbehandlung=" + Behandlungsnr)
+                If db.dsDaten.Tables(0).Rows(0).Item("nrgarant") > 0 Then
+                    debitor = db.dsDaten.Tables(0).Rows(0).Item("nrgarant")
+                Else
+                    debitor = db.dsDaten.Tables(0).Rows(0).Item("nrpatient")
+                End If
             End If
+
             If Fakturanr <> "" Then
                 db.Get_Tabledata("fak", "", "select top 1 nrdebitor from faktura where nrfaktura=" + Fakturanr)
             End If
-            Dim debitor As Integer
-            debitor = db.dsDaten.Tables(0).Rows(0).Item(0)
             If debitor > 49000 Then
                 db.Get_Tabledata("fak", "", "Select isnull(e_mail,'') from firma where nrfirma=" + debitor.ToString)
+                msgfirma = 1
             Else
                 db.Get_Tabledata("fak", "", "select isnull(e_mail,'') from privat where nrprivat=" + debitor.ToString)
+
             End If
             Me.Empfaenger = db.dsDaten.Tables(0).Rows(0).Item(0)
+            Return msgfirma
         Catch ex As Exception
             MsgBox(ex.Message)
             Me.Empfaenger = ""
         End Try
     End Function
 
-    Public Sub CreateOutlookMail(type As EmpfangerFrom, ByVal keyvalue As String, ByVal Attachment As String)
+    Public Sub CreateOutlookMail(type As EmpfangerFrom, ByVal keyvalue As String, ByVal Attachment As String, Optional Mailtext As Integer = 0)
+        Dim msgnrfirma As Integer
         Select Case type
             Case EmpfangerFrom.Behandlung
-                Read_Empfaenger(keyvalue, "", False)
+                msgnrfirma = Read_Empfaenger(keyvalue, "", False)
             Case EmpfangerFrom.Rechnung
-                Read_Empfaenger("", keyvalue, False)
+                msgnrfirma = Read_Empfaenger("", keyvalue, False)
             Case EmpfangerFrom.LetzteRechnung
-                Read_Empfaenger("", "", True)
+                msgnrfirma = Read_Empfaenger("", "", True)
             Case Else
                 Me.Empfaenger = ""
         End Select
         If type = 1 Then
         End If
-        Dim Outl As Object
-        Outl = CreateObject("Outlook.Application")
-        If Outl IsNot Nothing Then
-            Dim omsg As Object
-            omsg = Outl.CreateItem(0)
-            omsg.To = Me.Empfaenger
-            omsg.bcc = ""
-            omsg.subject = "Rechnung"
-            omsg.body = "Gute Tag"
-            omsg.Attachments.Add(Attachment)
-            omsg.Display(True)
-        End If
+        If msgnrfirma = 1 And (Mailtext = 1 Or Mailtext = 2 Or Mailtext = 3) Then Mailtext = Mailtext + 10
+        Dim db As New clsDB
+        Dim Mailclient As String = UCase(db.Get_Option(9805))
+        Select Case Mailclient
+            Case "OUTLOOK"
+                Dim Outl As Object
+                Outl = CreateObject("Outlook.Application")
+                If Outl IsNot Nothing Then
+                    Dim omsg As Object
+                    omsg = Outl.CreateItem(0)
+                    omsg.To = Me.Empfaenger
+                    omsg.bcc = ""
+
+                    Dim betreff As String = ""
+                    Dim inhalt As String = ""
+                    If Mailtext <> 0 Then
+                        omsg.body = Get_Mail_Text(Mailtext, betreff, inhalt, keyvalue)
+                    End If
+                    omsg.subject = betreff
+                    omsg.body = inhalt
+                    omsg.Attachments.Add(Attachment)
+                    omsg.Display(True)
+                End If
+            Case "MAPI"
+                Dim betreff As String = ""
+                Dim inhalt As String = ""
+                If Mailtext <> 0 Then
+                    Get_Mail_Text(Mailtext, betreff, inhalt, keyvalue)
+                End If
+                Dim mapi As New MapiMail
+                mapi.AddAttachment(Attachment)
+                mapi.AddRecipientTo(Me.Empfaenger)
+                mapi.SendMailPopup(betreff, inhalt)
+            Case Else
+
+                MsgBox("Kein Mail-Client verfügbar.")
+
+        End Select
+
 
     End Sub
+
+    Public Function Get_Mail_Text(ByVal Mailtext As Integer, ByRef betreff As String, ByRef inhalt As String, ByVal keyvalue As String)
+        Dim db As New clsDB
+        Try
+            betreff = Get_Mailtext(Mailtext, 1, keyvalue)
+            inhalt = Get_Mailtext(Mailtext, 2, keyvalue)
+            Return ""
+            db.Get_Tabledata("Mailtext", "", "Select betreff,Inhalt from mailtexte where eintragnr=" + Mailtext.ToString)
+            betreff = db.dsDaten.Tables(0).Rows(0).Item(0)
+            inhalt = db.dsDaten.Tables(0).Rows(0).Item(1)
+            db.Get_Tabledata("Behandlu", " where nrbehandlung=" + keyvalue.ToString)
+            If db.dsDaten.Tables(0).Rows.Count > 0 Then
+                'replace_text(inhalt, db.dsDaten.Tables(0).Rows(0), Mailtext)
+                'replace_text(betreff, db.dsDaten.Tables(0).Rows(0), Mailtext)
+            End If
+            Return db.dsDaten.Tables(0).Rows(0).Item(0)
+        Catch
+            Return ""
+        Finally
+            db.Dispose()
+        End Try
+
+
+    End Function
+
+    Public Function Get_Mailtext(ByVal nr As Integer, typ As Integer, keyvalue As Integer) As String
+        Dim paramdaten As New DataTable
+        Dim dbr As DataRow = paramdaten.NewRow
+        Dim db As New clsDB
+
+        paramdaten.Columns.Clear()
+        paramdaten.Rows.Clear()
+        dbr = paramdaten.NewRow
+        paramdaten.Columns.Add("Paramname")
+        paramdaten.Columns.Add("Paramvalue")
+        dbr(0) = "@behandlungsnr"
+        dbr(1) = keyvalue
+        paramdaten.Rows.Add(dbr)
+        dbr = paramdaten.NewRow
+        dbr(0) = "@typ"
+        dbr(1) = typ
+        paramdaten.Rows.Add(dbr)
+        dbr = paramdaten.NewRow
+        dbr(0) = "@mailtextnr"
+        dbr(1) = nr
+        paramdaten.Rows.Add(dbr)
+        db.Get_Tabledata("sp_get_mailtexte", "", "", "", True, paramdaten)
+        Try
+            Return db.dsDaten.Tables(0).Rows(0).Item(0)
+        Catch ex As Exception
+            Return ""
+        End Try
+    End Function
+
+
+
+
 End Class

DPM2016/Klassen/clspdfhelper.vb

@@ -6,20 +6,29 @@ Public Class clspdfhelper
         FromFaktura
         FromLastFaktura
         Andere
+        FromCollection
     End Enum
     Public Function ConCatPDF(Optional DeleteSource As Boolean = True) As String
         Dim document As New PdfDocument
         document.EnableMemoryOptimization = False
         Dim newfi As String
         Dim newfn As String
+        Dim pdfitem As clspdfcollectionitem
+
         For i = 1 To Globals.pdfCollection.Count
+            pdfitem = Globals.pdfCollection.Item(i)
             If i = 1 Then
-                newfn = System.IO.Path.GetDirectoryName(Globals.pdfCollection.Item(i).ToString)
-                newfi = System.IO.Path.GetFileName(Globals.pdfCollection.Item(i).ToString)
+                newfn = System.IO.Path.GetDirectoryName(pdfitem.Path)
+                newfi = System.IO.Path.GetFileName(pdfitem.Path)
+                'newfn = System.IO.Path.GetDirectoryName(Globals.pdfCollection.Item(i).ToString)
+                'newfi = System.IO.Path.GetFileName(Globals.pdfCollection.Item(i).ToString)
+
                 newfi = newfi.Replace(".pdf", "_concat.pdf")
                 newfn = newfn + "\" + newfi
             End If
-            Dim loadeddocument As New PdfLoadedDocument(Globals.pdfCollection.Item(i).ToString)
+            Dim loadeddocument As New PdfLoadedDocument(pdfitem.Path)
+            'Dim loadeddocument As New PdfLoadedDocument(Globals.pdfCollection.Item(i).ToString)
+
             loadeddocument.EnableMemoryOptimization = False
             document.ImportPageRange(loadeddocument, 0, loadeddocument.Pages.Count - 1)
             loadeddocument = Nothing
@@ -29,7 +38,9 @@ Public Class clspdfhelper
         document.Dispose()
         If DeleteSource Then
             For i = 1 To Globals.pdfCollection.Count
-                System.IO.File.Delete(Globals.pdfCollection.Item(i))
+                pdfitem = Globals.pdfCollection.Item(i)
+                '                System.IO.File.Delete(Globals.pdfCollection.Item(i))
+                System.IO.File.Delete(pdfitem.Path)
             Next
         End If
 
@@ -37,20 +48,24 @@ Public Class clspdfhelper
 
     End Function
 
-    Public Sub HandlePDF(ByVal alsPDF As Boolean, ByVal alsMail As Boolean)
+    Public Sub HandlePDF(ByVal alsPDF As Boolean, ByVal alsMail As Boolean, Optional Mailtext As Integer = 0, Optional empfaengertyp As clsMailClient.EmpfangerFrom = clsMailClient.EmpfangerFrom.Behandlung, Optional keyvalue As Integer = 0)
+        Dim pdfitem As clspdfcollectionitem
         If alsPDF = True Then
             If Globals.pdfCollection.Count > 1 Then
                 If alsMail = False Then Process.Start(ConCatPDF())
                 If alsMail = True Then
                     Dim em As New clsMailClient
-                    em.CreateOutlookMail(em.EmpfangerFrom.LetzteRechnung, "", ConCatPDF())
-
+                    em.CreateOutlookMail(empfaengertyp, keyvalue, ConCatPDF(), Mailtext)
                 End If
             Else
-                If alsMail = False Then Process.Start(Globals.pdfCollection.Item(1))
+                pdfitem = Globals.pdfCollection.Item(1)
+                If alsMail = False Then Process.Start(pdfitem.Path)
+                'If alsMail = False Then Process.Start(Globals.pdfCollection.Item(1))
+
                 If alsMail = True Then
                     Dim email As New clsMailClient
-                    email.CreateOutlookMail(email.EmpfangerFrom.LetzteRechnung, "", Globals.pdfCollection.Item(1))
+                    '                    email.CreateOutlookMail(empfaengertyp, keyvalue, Globals.pdfCollection.Item(1), Mailtext)
+                    email.CreateOutlookMail(empfaengertyp, keyvalue, pdfitem.Path, Mailtext)
                 End If
             End If
             pdfCollection.Clear()
@@ -58,6 +73,53 @@ Public Class clspdfhelper
     End Sub
 
     Public Sub Create_Archivdoc(ByVal From As GetEmpfaengerType, Optional keyvalue As String = "", Optional Bezeichnung As String = "")
+        If Globals.License.DMS = False Then Exit Sub
+
+
+
+
+
+
+        Dim s As String
+        Dim tmpcollection As New Collection
+        For i = 1 To Globals.pdfCollection.Count
+            tmpcollection.Add(Globals.pdfCollection.Item(i))
+        Next i
+        Globals.pdfCollection.Clear()
+
+        Dim tmpcolitem As clspdfcollectionitem
+        Dim fakturanralt As Integer
+        tmpcolitem = tmpcollection.Item(1)
+        fakturanralt = tmpcolitem.fakturanr
+        Globals.pdfCollection.Add(tmpcollection.Item(1))
+
+        If tmpcollection.Count > 1 Then
+            For i = 2 To tmpcollection.Count
+                tmpcolitem = tmpcollection.Item(i)
+                If tmpcolitem.fakturanr <> fakturanralt Then
+                    fakturanralt = tmpcolitem.fakturanr
+                    s = ConCatPDF(False)
+                    save_doc_to_db(s, Bezeichnung, 0, 0)
+                    Globals.pdfCollection.Clear()
+                    Globals.pdfCollection.Add(tmpcollection.Item(i))
+                Else
+                    Globals.pdfCollection.Add(tmpcollection.Item(i))
+                End If
+            Next
+        End If
+        If Globals.pdfCollection.Count > 0 Then
+            s = ConCatPDF(False)
+            save_doc_to_db(s, Bezeichnung, 0, 0)
+        End If
+
+
+        Globals.pdfCollection.Clear()
+        For i = 1 To tmpcollection.Count
+            Globals.pdfCollection.Add(tmpcollection.Item(i))
+        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)
         Dim s As String
         Dim db As New clsDB
         Dim Fakturadb As New clsDB
@@ -65,35 +127,18 @@ Public Class clspdfhelper
         Dim StrukturEintrag_Patient As Integer
         Dim StrukturEintrag_Garant As Integer
         Dim CopyDocToGarant As String
-        Dim Patient As Integer
-        Dim Debitor As Integer
         Dim nrfaktura As Integer
         Dim Patientname As String
         Dim Fakturanr As String
+        Dim pcolitem As clspdfcollectionitem
 
+        pcolitem = Globals.pdfCollection.Item(1)
+        Fakturadb.Get_Tabledata("Faktura", "", "Select top 1 * from faktura WHeRE NRFAKTURA=" + pcolitem.fakturanr.ToString + " order by nrfaktura desc")
+        patient = Fakturadb.dsDaten.Tables(0).Rows(0).Item("nrpatient")
+        debitor = Fakturadb.dsDaten.Tables(0).Rows(0).Item("nrdebitor")
+        FakturaNr = pcolitem.fakturanr
 
-        If Globals.pdfCollection.Count > 1 Then
-            s = ConCatPDF(False)
-        Else
-            s = Globals.pdfCollection.Item(1)
-        End If
-
-
-        Select Case From
-            Case GetEmpfaengerType.FromFaktura
-                Fakturadb.Get_Tabledata("Faktura", "", "Select top 1 * from faktura WHeRE NRFAKTURA=" + keyvalue.ToString + " order by nrfaktura desc")
-                Patient = Fakturadb.dsDaten.Tables(0).Rows(0).Item("nrpatient")
-                Debitor = Fakturadb.dsDaten.Tables(0).Rows(0).Item("nrdebitor")
-                Fakturanr = Fakturadb.dsDaten.Tables(0).Rows(0).Item("nrhauptfaktura")
-            Case GetEmpfaengerType.FromLastFaktura
-                Fakturadb.Get_Tabledata("Faktura", "", "Select top 1 * from faktura order by nrfaktura desc")
-                Patient = Fakturadb.dsDaten.Tables(0).Rows(0).Item("nrpatient")
-                Debitor = Fakturadb.dsDaten.Tables(0).Rows(0).Item("nrdebitor")
-                Fakturanr = Fakturadb.dsDaten.Tables(0).Rows(0).Item("nrhauptfaktura")
-            Case GetEmpfaengerType.Andere
-        End Select
-
-        Bezeichnung = Bezeichnung + " " + Fakturanr
+        bezeichnung = bezeichnung + " " + Fakturanr.ToString
         If Globals.License.DMS = True Then
 
             db.Get_Tabledata("DMS", "", "Select wert from dms_settings where nreintrag=8")
@@ -107,17 +152,17 @@ Public Class clspdfhelper
 
             'Patienten-Dokumente
             Dim dok As New clsDok
-            Dim Directoryname As String = System.IO.Path.GetDirectoryName(s)
-            Dim Filename As String = System.IO.Path.GetFileName(s)
+            Dim Directoryname As String = System.IO.Path.GetDirectoryName(ifilename)
+            Dim Filename As String = System.IO.Path.GetFileName(ifilename)
             Dim DestFilename As String
-            DestFilename = System.IO.Path.GetFileNameWithoutExtension(Filename) + "_" + Patient.ToString + System.IO.Path.GetExtension(Filename)
+            DestFilename = System.IO.Path.GetFileNameWithoutExtension(Filename) + "_" + patient.ToString + System.IO.Path.GetExtension(Filename)
             System.IO.File.Copy(Directoryname + "\" + Filename, Directoryname + "\" + DestFilename)
-            dok.Create_Doc(StrukturEintrag_Patient, Bezeichnung, Directoryname + "\" + DestFilename, Patient, Fakturanr)
+            dok.Create_Doc(StrukturEintrag_Patient, bezeichnung, Directoryname + "\" + DestFilename, patient, FakturaNr)
             System.IO.File.Delete(Directoryname + "\" + DestFilename)
-            If CopyDocToGarant = True And Patient <> Debitor Then
-                DestFilename = System.IO.Path.GetFileNameWithoutExtension(Filename) + "_fuer_" + Patient.ToString + System.IO.Path.GetExtension(Filename)
+            If CopyDocToGarant = True And patient <> debitor Then
+                DestFilename = System.IO.Path.GetFileNameWithoutExtension(Filename) + "_fuer_" + patient.ToString + System.IO.Path.GetExtension(Filename)
                 System.IO.File.Copy(Directoryname + "\" + Filename, Directoryname + "\" + DestFilename)
-                dok.Create_Doc(StrukturEintrag_Garant, Bezeichnung, Directoryname + "\" + DestFilename, Debitor, Fakturanr)
+                dok.Create_Doc(StrukturEintrag_Garant, bezeichnung, Directoryname + "\" + DestFilename, debitor, FakturaNr)
                 System.IO.File.Delete(Directoryname + "\" + DestFilename)
             End If
             dok = Nothing
@@ -125,3 +170,30 @@ Public Class clspdfhelper
         End If
     End Sub
 End Class
+
+Public Class clspdfcollectionitem
+    Dim m_fakturanr As String
+    Property fakturanr As String
+        Get
+            Return m_fakturanr
+        End Get
+        Set(value As String)
+            m_fakturanr = value
+        End Set
+    End Property
+
+    Dim m_path As String
+    Property Path As String
+        Get
+            Return m_path
+        End Get
+        Set(value As String)
+            m_path = value
+        End Set
+    End Property
+
+    Sub New(ByVal fakturanr As String, path As String)
+        Me.fakturanr = fakturanr
+        Me.Path = path
+    End Sub
+End Class

DPM2016/My Project/AssemblyInfo.vb

@@ -8,12 +8,12 @@ Imports System.Runtime.InteropServices
 
 ' Die Werte der Assemblyattribute überprüfen
 
-<Assembly: AssemblyTitle("DPM2016")> 
+<Assembly: AssemblyTitle("DPM2018")>
 <Assembly: AssemblyDescription("")> 
 <Assembly: AssemblyCompany("")> 
-<Assembly: AssemblyProduct("DPM2016")> 
-<Assembly: AssemblyCopyright("Copyright ©  2015")> 
-<Assembly: AssemblyTrademark("")> 
+<Assembly: AssemblyProduct("DPM2016")>
+<Assembly: AssemblyCopyright("Copyright ©  20")>
+<Assembly: AssemblyTrademark("Stefan Hutter Unternehmensberatung")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.0.0.0")> 
-<Assembly: AssemblyFileVersion("1.0.0.0")> 
+<Assembly: AssemblyVersion("1.0.0.0")>
+<Assembly: AssemblyFileVersion("3.0.0.0")>

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", "15.6.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.6.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -102,6 +102,18 @@ Namespace My
                 Me("ConnectionString") = 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

@@ -14,5 +14,8 @@
     <Setting Name="ConnectionString" Type="System.String" Scope="User">
       <Value Profile="(Default)">data source=shu00;initial catalog=dpm2018_1;integrated security=SSPI;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29</Value>
     </Setting>
+    <Setting Name="SoftwareType" Type="System.String" Scope="User">
+      <Value Profile="(Default)">PADM</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

DPM2016/Patient/Patient.Designer.vb

@@ -153,6 +153,7 @@ Partial Class Patient
         '
         '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)
         '

DPM2016/Patient/Patient.vb

@@ -74,6 +74,15 @@
             Me.tsbtnVTX.Visible = True
             Me.btnVTX.Visible = True
         End If
+        Dim db1 As New clsDB
+        If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then
+            'Me.PatientDetails1.chklbAdresstyp.Visible = False
+            Me.PatientDetails1.Label13.Visible = False
+            Me.SuperTabControl1.Tabs("Behandlungen").Text = "Projekte"
+            Me.SuperTabControl1.Tabs("Recall").Visible = False
+            Me.SuperTabControl1.Tabs("Abrechnung").Visible = False
+            Me.PatientDetails1.lblName.Text = "Name/Firma"
+        End If
     End Sub
 
     Private Sub ToolStripButton6_Click(sender As Object, e As EventArgs) Handles tsbtnSave.Click

DPM2016/Patient/PatientDetails.Designer.vb

@@ -82,6 +82,8 @@ Partial Class PatientDetails
         Me.lblGLN = New System.Windows.Forms.Label()
         Me.txtGLN = New System.Windows.Forms.TextBox()
         Me.txtZSR = New System.Windows.Forms.TextBox()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.chkMail_Kommunikation = New System.Windows.Forms.CheckBox()
         Me.cbboxNRArbeitgeber = New DPM2016.MyCombobox()
         Me.cbboxGeschlecht = New DPM2016.MyCombobox()
         Me.cbboxSprache = New DPM2016.MyCombobox()
@@ -621,6 +623,25 @@ Partial Class PatientDetails
         Me.txtZSR.Size = New System.Drawing.Size(49, 20)
         Me.txtZSR.TabIndex = 24
         '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.BackColor = System.Drawing.Color.Transparent
+        Me.Label4.Location = New System.Drawing.Point(528, 308)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(101, 13)
+        Me.Label4.TabIndex = 211
+        Me.Label4.Text = "Mail-Kommunikation"
+        '
+        'chkMail_Kommunikation
+        '
+        Me.chkMail_Kommunikation.AutoSize = True
+        Me.chkMail_Kommunikation.Location = New System.Drawing.Point(706, 308)
+        Me.chkMail_Kommunikation.Name = "chkMail_Kommunikation"
+        Me.chkMail_Kommunikation.Size = New System.Drawing.Size(15, 14)
+        Me.chkMail_Kommunikation.TabIndex = 212
+        Me.chkMail_Kommunikation.UseVisualStyleBackColor = True
+        '
         'cbboxNRArbeitgeber
         '
         Me.cbboxNRArbeitgeber.Dataselection = Nothing
@@ -697,6 +718,8 @@ Partial Class PatientDetails
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.Controls.Add(Me.chkMail_Kommunikation)
+        Me.Controls.Add(Me.Label4)
         Me.Controls.Add(Me.txtZSR)
         Me.Controls.Add(Me.txtGLN)
         Me.Controls.Add(Me.lblGLN)
@@ -835,4 +858,6 @@ Partial Class PatientDetails
     Friend WithEvents lblGLN As Label
     Friend WithEvents txtGLN As TextBox
     Friend WithEvents txtZSR As TextBox
+    Friend WithEvents Label4 As Label
+    Friend WithEvents chkMail_Kommunikation As CheckBox
 End Class

DPM2016/Patient/PatientDetails.vb

@@ -205,6 +205,11 @@ Public Class PatientDetails
 #Region "Daten_Laden"
 
     Public Sub Fill_Stammdaten()
+        If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then
+            chklbAdresstyp.Items.Clear()
+            chklbAdresstyp.Items.Add("Leistungserbringer")
+
+        End If
         log.Writelog("PartnerDetails: Fill_Stammdaten", clsLog.Logtype.Information)
         Me.cbboxNrAnrede.Table = "Anrede"
         Me.cbboxNrAnrede.Displaymember = "Anrede_D"
@@ -242,7 +247,9 @@ Public Class PatientDetails
             DB.Get_Tabledata("privat", " where nrprivat=" + Me.PatientNr.ToString)
             Dim r As DataRow = DB.dsDaten.Tables(0).Rows(0)
             For Each c As DataColumn In DB.dsDaten.Tables(0).Columns
+
                 colname = c.ColumnName
+                Debug.Print(colname)
                 For Each Ctl As Control In Me.Controls
                     'Dim objtype As System.Type = Ctl.GetType
                     'If objtype.Name = "Label" Then
@@ -303,40 +310,64 @@ Public Class PatientDetails
 
                         Exit For
                     End If
-                Next
+                    'If UCase(Ctl.Name) = "CHKMAIL_KOMMUNIKATION" Then
+                    '    MsgBox("Hallo")
+                    'End If
+                    'If UCase(r(c.ColumnName)) = "MAIL_KOMMUNIKATION" Then
+                    '    MsgBox("Bello")
+                    'End If
+                    If UCase(Ctl.Name) = "CHK" + UCase(c.ColumnName) Then
+                        Dim cb As CheckBox
+                        cb = Ctl
 
-                Select Case LCase(c.ColumnName)
-                    Case "patient"
-                        Set_Adresstype(c.ColumnName, r(c.ColumnName).ToString)
-                        log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
-                    Case "garant"
-                        Set_Adresstype(c.ColumnName, r(c.ColumnName).ToString)
-                        log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
-                    Case "gesvertreter"
-                        Set_Adresstype("Ges. Vertreter", r(c.ColumnName).ToString)
-                        log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
-                    Case "hausarzt"
-                        Set_Adresstype(c.ColumnName, r(c.ColumnName).ToString)
-                        log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
-                    Case "zahnarzt"
-                        Set_Adresstype(c.ColumnName, r(c.ColumnName).ToString)
-                        log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
-                    Case "behandler"
+                        Try
+                            cb.Checked = r(c.ColumnName)
+                        Catch ex As Exception
+
+                        End Try
+                        Exit For
+                    End If
+                Next
+                If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then
+                    If LCase(c.ColumnName) = "behandler" Then
                         Set_Adresstype(c.ColumnName, r(c.ColumnName).ToString)
-                        log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
-                    Case "dhpat"
-                        Set_Adresstype("DH-Patient", r(c.ColumnName).ToString)
-                        log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
-                    Case "nichtaufbieten"
-                        Set_Adresstype("Nicht Aufbieten", r(c.ColumnName).ToString)
-                        log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
-                    Case "nichtannehmen"
-                        Set_Adresstype("Nicht annehmen", r(c.ColumnName).ToString)
-                        log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
-                    Case "betreibung"
-                        Set_Adresstype("Betreibung vorhanden", r(c.ColumnName).ToString)
-                        log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
-                End Select
+                    End If
+                Else
+
+                        Select Case LCase(c.ColumnName)
+                        Case "patient"
+                            Set_Adresstype(c.ColumnName, r(c.ColumnName).ToString)
+                            log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
+                        Case "garant"
+                            Set_Adresstype(c.ColumnName, r(c.ColumnName).ToString)
+                            log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
+                        Case "gesvertreter"
+                            Set_Adresstype("Ges. Vertreter", r(c.ColumnName).ToString)
+                            log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
+                        Case "hausarzt"
+                            Set_Adresstype(c.ColumnName, r(c.ColumnName).ToString)
+                            log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
+                        Case "zahnarzt"
+                            Set_Adresstype(c.ColumnName, r(c.ColumnName).ToString)
+                            log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
+                        Case "behandler"
+                            Set_Adresstype(c.ColumnName, r(c.ColumnName).ToString)
+                            log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
+                        Case "dhpat"
+                            Set_Adresstype("DH-Patient", r(c.ColumnName).ToString)
+                            log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
+                        Case "nichtaufbieten"
+                            Set_Adresstype("Nicht Aufbieten", r(c.ColumnName).ToString)
+                            log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
+                        Case "nichtannehmen"
+                            Set_Adresstype("Nicht annehmen", r(c.ColumnName).ToString)
+                            log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
+                        Case "betreibung"
+                            Set_Adresstype("Betreibung vorhanden", r(c.ColumnName).ToString)
+                            log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
+                    End Select
+                End If
+
             Next
         Catch ex As Exception
             log.Writelog("Privatdetails: Get_Data: " + ctlname + " / " + colname + " " + ex.Message, clsLog.Logtype.ApplError)
@@ -344,6 +375,10 @@ Public Class PatientDetails
     End Sub
 
     Private Sub Set_Adresstype(ByVal feldname, value)
+        If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then
+            If value <> False Then chklbAdresstyp.SetItemCheckState(0, CheckState.Checked) Else chklbAdresstyp.SetItemCheckState(0, CheckState.Unchecked)
+
+        End If
         Dim i As Integer
         For i = 0 To Me.chklbAdresstyp.Items.Count - 1
             If UCase(chklbAdresstyp.Items(i).ToString) = UCase(feldname) Then
@@ -400,29 +435,44 @@ Public Class PatientDetails
                     r(c.ColumnName) = dt.Value
                     Exit For
                 End If
+
+                If UCase(Ctl.Name) = "CHK" + UCase(c.ColumnName) Then
+                    Dim cb As CheckBox
+                    cb = Ctl
+                    r(c.ColumnName) = cb.Checked
+                    Exit For
+                End If
             Next
-            Select Case LCase(c.ColumnName)
-                Case "patient"
-                    r(c.ColumnName) = Get_Adresstype(c.ColumnName, r(c.ColumnName))
-                Case "garant"
-                    r(c.ColumnName) = Get_Adresstype(c.ColumnName, r(c.ColumnName))
-                Case "gesvertreter"
-                    r(c.ColumnName) = Get_Adresstype("Ges. Vertreter", r(c.ColumnName))
-                Case "hausarzt"
-                    r(c.ColumnName) = Get_Adresstype(c.ColumnName, r(c.ColumnName))
-                Case "zahnarzt"
-                    r(c.ColumnName) = Get_Adresstype(c.ColumnName, r(c.ColumnName))
-                Case "behandler"
-                    r(c.ColumnName) = Get_Adresstype(c.ColumnName, r(c.ColumnName))
-                Case "dhpat"
-                    r(c.ColumnName) = Get_Adresstype("DH-Patient", r(c.ColumnName))
-                Case "nichtaufbieten"
-                    r(c.ColumnName) = Get_Adresstype("nicht aufbieten", r(c.ColumnName))
-                Case "nichtannehmen"
-                    r(c.ColumnName) = Get_Adresstype("nicht annehmen", r(c.ColumnName))
-                Case "betreibung"
-                    r(c.ColumnName) = Get_Adresstype("Betreibung vorhanden", r(c.ColumnName))
-            End Select
+            If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then
+                Select Case LCase(c.ColumnName)
+                    Case "behandler"
+                        r(c.ColumnName) = Get_Adresstype(c.ColumnName, r(c.ColumnName))
+                End Select
+            Else
+                Select Case LCase(c.ColumnName)
+                    Case "patient"
+                        r(c.ColumnName) = Get_Adresstype(c.ColumnName, r(c.ColumnName))
+                    Case "garant"
+                        r(c.ColumnName) = Get_Adresstype(c.ColumnName, r(c.ColumnName))
+                    Case "gesvertreter"
+                        r(c.ColumnName) = Get_Adresstype("Ges. Vertreter", r(c.ColumnName))
+                    Case "hausarzt"
+                        r(c.ColumnName) = Get_Adresstype(c.ColumnName, r(c.ColumnName))
+                    Case "zahnarzt"
+                        r(c.ColumnName) = Get_Adresstype(c.ColumnName, r(c.ColumnName))
+                    Case "behandler"
+                        r(c.ColumnName) = Get_Adresstype(c.ColumnName, r(c.ColumnName))
+                    Case "dhpat"
+                        r(c.ColumnName) = Get_Adresstype("DH-Patient", r(c.ColumnName))
+                    Case "nichtaufbieten"
+                        r(c.ColumnName) = Get_Adresstype("nicht aufbieten", r(c.ColumnName))
+                    Case "nichtannehmen"
+                        r(c.ColumnName) = Get_Adresstype("nicht annehmen", r(c.ColumnName))
+                    Case "betreibung"
+                        r(c.ColumnName) = Get_Adresstype("Betreibung vorhanden", r(c.ColumnName))
+                End Select
+            End If
+
         Next
         r("Mutiert_am") = Now
         r("mutierer") = Globals.ActUser
@@ -433,12 +483,16 @@ Public Class PatientDetails
 
     Private Function Get_Adresstype(ByVal feldname, value) As Integer
         Try
-            Dim i As Integer
-            For i = 0 To Me.chklbAdresstyp.Items.Count - 1
-                If UCase(chklbAdresstyp.Items(i).ToString) = UCase(feldname) Then
-                    Return chklbAdresstyp.GetItemChecked(i)
-                End If
-            Next
+            If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then
+                If UCase(feldname) = "BEHANDLER" Then Return chklbAdresstyp.GetItemChecked(0)
+            Else
+                Dim i As Integer
+                For i = 0 To Me.chklbAdresstyp.Items.Count - 1
+                    If UCase(chklbAdresstyp.Items(i).ToString) = UCase(feldname) Then
+                        Return chklbAdresstyp.GetItemChecked(i)
+                    End If
+                Next
+            End If
         Catch
             Return -1
         End Try

DPM2016/Reporting/frmReportView.vb

@@ -1,6 +1,8 @@
 Imports Syncfusion.DocToPDFConverter
 Imports Syncfusion.Pdf
 Imports Syncfusion.XPS
+Imports QRCoder
+Imports QRCoder.PayloadGenerator
 
 Public Class frmReportView
     Dim splitter() As String
@@ -13,8 +15,11 @@ Public Class frmReportView
     Dim daten As New DataSet
     Dim AsPDF As Boolean = False
 
+
+
     Sub New()
         InitializeComponent()
+
     End Sub
 
     Sub New(ByVal Reportnr As Integer, ByVal design As Boolean, ByVal Titel As String, Optional Parameter As String = "", Optional NrBehandlung As String = "", Optional asPDF As Boolean = False)
@@ -254,13 +259,19 @@ Public Class frmReportView
                 Dim pdfexport As New FastReport.Export.Pdf.PDFExport
                 pdfexport.ShowProgress = False
                 pdfexport.Subject = "Export"
-                pdfexport.Title = "Export"
-                pdfexport.Compressed = False
-                pdfexport.AllowPrint = True
-                pdfexport.EmbeddingFonts = False
-                freport.Prepare()
+                    pdfexport.Title = "Export"
+                    pdfexport.Compressed = UCase(db.Get_Option(50000)) = "TRUE"
+                    pdfexport.AllowPrint = UCase(db.Get_Option(50002)) = "TRUE"
+                    pdfexport.TextInCurves = UCase(db.Get_Option(50001)) = "TRUE"
+                    'pdfexport.Compressed = False
+                    'pdfexport.AllowPrint = True
+                    'pdfexport.EmbeddingFonts = True
+                    'pdfexport.TextInCurves = True
+                    freport.Prepare()
                 freport.Export(pdfexport, s + ".PDF")
-                Globals.pdfCollection.Add(s + ".pdf")
+                Dim pdfitem As New clspdfcollectionitem(Fakturanr.ToString, s + ".pdf")
+                Globals.pdfCollection.Add(pdfitem)
+                'Globals.pdfCollection.Add(s + ".pdf")
             Catch ex As Exception
 
             End Try
@@ -461,13 +472,23 @@ Public Class frmReportView
                 pdfexport.ShowProgress = False
                 pdfexport.Subject = "Export"
                 pdfexport.Title = "Export"
-                pdfexport.Compressed = False
-                pdfexport.AllowPrint = True
-                pdfexport.EmbeddingFonts = False
+                pdfexport.Compressed = UCase(db.Get_Option(50000)) = "TRUE"
+                pdfexport.AllowPrint = UCase(db.Get_Option(50002)) = "TRUE"
+                pdfexport.TextInCurves = UCase(db.Get_Option(50001)) = "TRUE"
+
+                'pdfexport.Compressed = False
+                'pdfexport.AllowPrint = True
+                ' pdfexport.EmbeddingFonts = True
+                'pdfexport.TextInCurves = True
+                'pdfexport.Compressed = True
+                'pdfexport.PdfCompliance = FastReport.Export.Pdf.PDFExport.PdfStandard.PdfA_2a
                 freport.Prepare()
                 freport.Export(pdfexport, s + ".PDF")
+
                 'Process.Start(s + ".pdf")
-                Globals.pdfCollection.Add(s + ".pdf")
+                Dim pdfitem As New clspdfcollectionitem(Globals.FakturaNr.ToString, s + ".pdf")
+                Globals.pdfCollection.Add(pdfitem)
+                '                Globals.pdfCollection.Add(s + ".pdf")
                 Exit Sub
             End If
 
@@ -485,12 +506,20 @@ Public Class frmReportView
                 pdfexport.ShowProgress = False
                 pdfexport.Subject = "Export"
                 pdfexport.Title = "Export"
-                pdfexport.Compressed = False
-                pdfexport.AllowPrint = True
-                pdfexport.EmbeddingFonts = False
+                pdfexport.Compressed = UCase(db.Get_Option(50000)) = "TRUE"
+                pdfexport.AllowPrint = UCase(db.Get_Option(50002)) = "TRUE"
+                pdfexport.TextInCurves = UCase(db.Get_Option(50001)) = "TRUE"
+
+                ' pdfexport.Compressed = False
+                'pdfexport.AllowPrint = True
+                'pdfexport.EmbeddingFonts = True
+                'pdfexport.TextInCurves = True
+
                 freport.Prepare()
                 freport.Export(pdfexport, s + ".PDF")
-                Globals.pdfCollection.Add(s + ".pdf")
+                Dim pdfitem As New clspdfcollectionitem(Fakturanr.ToString, s + ".pdf")
+                Globals.pdfCollection.Add(pdfitem)
+                'Globals.pdfCollection.Add(s + ".pdf")
             Catch ex As Exception
 
             End Try
@@ -580,7 +609,8 @@ Public Class frmReportView
         s = s + Trim(Pruefziffer(s))
         Dim ref1 As String
         ref1 = s.Substring(0, 2) + " " + s.Substring(2, 5) + " " + s.Substring(7, 5) + " " + s.Substring(12, 5) + " " + s.Substring(17, 5) + " " + s.Substring(22, 5)
-
+        db.dsDaten.Tables(0).Rows(0).Item("qr_referenz_aufbereitet") = ref1
+        db.dsDaten.Tables(0).Rows(0).Item("qr_referenz") = ref1.Replace(" ", "")
         Referenznr = Referenznr + s + "+"
 
         db.dsDaten.Tables(0).Rows(0).Item("referenzzeile1") = ref1
@@ -589,8 +619,64 @@ Public Class frmReportView
         s = s + Trim(Pruefziffer(s)) + ">"
         Referenznr = Referenznr + " " + s
         db.dsDaten.Tables(0).Rows(0).Item("Referenzzeile2") = Referenznr
+        Try
+            Generate_QRImage(db.dsDaten.Tables(0).Rows(0))
+        Catch
+        End Try
 
     End Sub
+
+    Sub Generate_QRImage(r As DataRow)
+        Try
+            Dim intdb As New clsDB
+            If UCase(intdb.Get_Option(20000)) <> "TRUE" Then Exit Sub
+
+            Dim contactGeneral As SwissQrCode.Contact = New SwissQrCode.Contact(r("QR_Name"), r("QR_PLZ"), r("QR_Ort"), r("QR_Land"), r("QR_Strasse"), r("QR_Hausnummer"))
+            Dim contactdebitor As SwissQrCode.Contact = New SwissQrCode.Contact(r("QR_debitor_Name"), r("QR_debitor_PLZ"), r("QR_debitor_Ort"), r("QR_debitor_Land"), r("QR_debitor_Strasse"), r("QR_debitor_Hausnummer"))
+
+            Dim reference As SwissQrCode.Reference
+            Dim iban As SwissQrCode.Iban
+            If intdb.Get_Option(20003) = "QRR" Then
+                iban = New SwissQrCode.Iban(r("QR_IBAN"), PayloadGenerator.SwissQrCode.Iban.IbanType.QrIban)
+                reference = New SwissQrCode.Reference(SwissQrCode.Reference.ReferenceType.QRR, r("qr_referenz"), SwissQrCode.Reference.ReferenceTextType.QrReference)
+            End If
+            If intdb.Get_Option(20003) = "NON" Then
+                iban = New SwissQrCode.Iban(r("QR_IBAN"), PayloadGenerator.SwissQrCode.Iban.IbanType.Iban)
+                '                reference = New SwissQrCode.Reference(SwissQrCode.Reference.ReferenceType.NON, Nothing, SwissQrCode.Reference.ReferenceTextType.QrReference)
+                reference = New SwissQrCode.Reference(SwissQrCode.Reference.ReferenceType.NON, Nothing, Nothing)
+
+            End If
+
+            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 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)
+
+            Dim qrfilename As String = intdb.Get_Option(20002) + Me.NrBehandlung.ToString + "_" + Now.ToString("yyyymmddHHmmss") + "_" + Get_Unique_ID() + "_QR.png"
+            qrCodeAsBitmap.Save(qrfilename)
+            r("QR_Image") = qrfilename
+        Catch ex As Exception
+            MsgBox(ex.Message)
+        End Try
+
+    End Sub
+
+    Public Function Get_Unique_ID() As String
+        Dim id As String
+        Dim Startdate As DateTime = #1/1/1970#
+        Dim Spanne As TimeSpan
+        Spanne = DateTime.Now.Subtract(Startdate)
+        id = CType(Math.Abs(Spanne.TotalSeconds()), Integer) & "" & Int(99999 * Rnd()) + 1111
+        Return id
+    End Function
     Public Function Pruefziffer(ByVal zahl As String) As String
         Dim ptab(9, 9) As Integer
         Dim pz(9) As Integer

DPM2016/Utils/Globals.vb

@@ -5,8 +5,8 @@ Module Globals
     Public Seriennummer As String = "1.001.2018"
     Public Productname As String = "Dental Practice Manager"
     Public Lizenzgeber As String = "Stefan Hutter Unternehmensberatung, 8808 Pfäffikon"
-    Public Version As String = "1.2.0.1921"
-    Public Versionastaum As String = "21.09.2019"
+    Public Version As String = "1.3.0.1214"
+    Public Versionastaum As String = "20.10.2020"
 
     Public RGCollection As New Collection
     Public Spaltendaten As New DataTable
@@ -37,6 +37,14 @@ Module Globals
     Public License As New SHUKeyGen.clsKeyGen("", "", "", "", "", ":DPMKEY:", "Steafn Hutter Unternehmensberatung, 8808 Pfäffikon SZ")
     Public Recall_Bei_Abschluss As Boolean = True
 
+    Public Enum ApplicationTypes
+        DH = 1
+        Zahnarzt = 2
+        Projektabrechnung = 3
+    End Enum
+
+    Public Applicationtype As ApplicationTypes
+
     Public Enum Taxpunkttyp
         Privat = 1
         Suva = 2

DPM2016/Utils/SplashForm.Designer.vb

@@ -31,7 +31,9 @@ Partial Class SplashForm
         Me.C1PictureBox1 = New C1.Win.C1Input.C1PictureBox()
         Me.Label6 = New System.Windows.Forms.Label()
         Me.Label7 = New System.Windows.Forms.Label()
+        Me.C1PictureBox2 = New C1.Win.C1Input.C1PictureBox()
         CType(Me.C1PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.C1PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'Label1
@@ -108,12 +110,24 @@ Partial Class SplashForm
         Me.Label7.TabIndex = 8
         Me.Label7.Text = "Label7"
         '
+        'C1PictureBox2
+        '
+        Me.C1PictureBox2.Image = CType(resources.GetObject("C1PictureBox2.Image"), System.Drawing.Image)
+        Me.C1PictureBox2.InitialImage = CType(resources.GetObject("C1PictureBox2.InitialImage"), System.Drawing.Image)
+        Me.C1PictureBox2.Location = New System.Drawing.Point(12, 12)
+        Me.C1PictureBox2.Name = "C1PictureBox2"
+        Me.C1PictureBox2.Size = New System.Drawing.Size(343, 158)
+        Me.C1PictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
+        Me.C1PictureBox2.TabIndex = 9
+        Me.C1PictureBox2.TabStop = False
+        '
         'SplashForm
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.White
         Me.ClientSize = New System.Drawing.Size(368, 339)
+        Me.Controls.Add(Me.C1PictureBox2)
         Me.Controls.Add(Me.Label7)
         Me.Controls.Add(Me.Label6)
         Me.Controls.Add(Me.C1PictureBox1)
@@ -131,6 +145,7 @@ Partial Class SplashForm
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "SplashForm"
         CType(Me.C1PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.C1PictureBox2, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -144,4 +159,5 @@ Partial Class SplashForm
     Friend WithEvents C1PictureBox1 As C1.Win.C1Input.C1PictureBox
     Friend WithEvents Label6 As Label
     Friend WithEvents Label7 As Label
+    Friend WithEvents C1PictureBox2 As C1.Win.C1Input.C1PictureBox
 End Class

DPM2016/Utils/SplashForm.resx

@@ -552,6 +552,651 @@
         CiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKA
         CiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKA
         CiiigAooooA//9k=
+</value>
+  </data>
+  <data name="C1PictureBox2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+</value>
+  </data>
+  <data name="C1PictureBox2.InitialImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        /9j/4AAQSkZJRgABAQEAYABgAAD/4QDWRXhpZgAATU0AKgAAAAgAAwE7AAIAAAAUAAAAModpAAQAAAAB
+        AAAARpydAAEAAAAoAAAApgAAAABTdGVmYW4gSHV0dGVyIGxva2FsAAAEkAMAAgAAABQAAAB8kAQAAgAA
+        ABQAAACQkpEAAgAAAAMzNAAAkpIAAgAAAAMzNAAAAAAAADIwMTg6MDE6MTUgMTM6MTQ6NTkAMjAxODow
+        MToxNSAxMzoxNDo1OQAAAFMAdABlAGYAYQBuACAASAB1AHQAdABlAHIAIABsAG8AawBhAGwAAAD/2wBD
+        AAcFBQYFBAcGBQYIBwcIChELCgkJChUPEAwRGBUaGRgVGBcbHichGx0lHRcYIi4iJSgpKywrGiAvMy8q
+        MicqKyr/2wBDAQcICAoJChQLCxQqHBgcKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
+        KioqKioqKioqKioqKir/wAARCADYAaEDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQF
+        BgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAk
+        M2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWG
+        h4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx
+        8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQA
+        AQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5
+        OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmq
+        srO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD6
+        RooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiijNABRRmjNABRRRQAUUUUAFFFFABRRRQAUU
+        UUAFFGaM0AFFGaKACiiigAooooAKKKKACiijNABRRmigAooooAKKKKACijNFABRRRQAUUUUAFFFFABRR
+        RQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQBS1LU4NLt1muM4ZtoAxyfxrF/4TzSvVv8Avtf8ao/FD/kV
+        1/66j+Rr5+zXp4TCRrRbZnKTTPo//hPNK9W/77X/ABo/4TzSfVv++1/xr5vz/nNJuB7/AK11/wBn0urF
+        zs+kl8daUx5LD8V/xq3B4u0idgv2kIT/AHxj9elfMYbHQ/0qeK8uITmKZ1+jUv7Og9mHOz6sinimjDxO
+        rq3Qqcg0/NfOnh/x5qei3AZZN6fxox+Vvwr3Hw34ls/Emmpc2jjJ4ePPKn0NebiMJOjruilJM26KKK5C
+        wooooAKxdT8T2Ol3LQ3BbcuM8gYyM9zW1Xhfxcz/AMJG/wBFx/3zXThqSq1OVkydkem/8J5pXq3/AH2v
+        +NH/AAnmk+rf99r/AI18354o3D1/WvV/s6n1Znzs+kP+E80r1b/vtf8AGpF8b6U3VnH5f41817vf9aUE
+        g8Ej6Uv7PpPqPnZ9P23ijSbpwkd0qsez8VrBwy5U5HqK+UYb+6gI8uZ+DwCxNeheBviRPZ3sVhq0pe2k
+        IVHY8xk9vpXPWy6UY80Bqfc9toqOKVZYw6HIYZBFSV5RoFFFFACFgqknoK5yTxxpcT7W3Z/3l/xroJ/+
+        PaT/AHT/ACr5e17/AJC8v1ruwmHjXbuRJtHv3/CeaV6t/wB9r/jTT8QNFSWJJJCnnSCNTlSNx+hr5yya
+        a7FQHUnchDA57jpXoPLqaRPMz62SRZIwynIPQ06ud8FakNT8M2s+clo1J/Kuirw5x5ZNGi2GvIscbO/C
+        qCSa52XxvpcMhRt24dty/wCNW/FV4LLw7cvnBddg/Hr+ma+atQnNzqE0pP3nOOe1d2EwyrXciZSsfQ//
+        AAnmlerf99r/AI03/hYGjLcwQO7K1xII4+VOWP0NfOWam04ka9ppBP8Ax8LXbLL6cY3J5mfVyOHjDLyC
+        MinVT0rnSrcn+4KuV4b0djUKKKKQBRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAcV8UP+RXX
+        /rqP5Gvn09a+gvih/wAiuv8A11H8jXz6ete/lv8ADZlPc0vC+gw+I9cltLhd4VFK8kY6+leg/wDClbVl
+        H7sj/gbf41zHwu/5HOX/AK5r/M19Er9wfSuXGVZQqaDikzxab4KRhcwmWNv9mRq5HX/BGreG1Msga4tQ
+        eW2/Mg9T619M4qlqOnQajZyQ3EYdWUryPWuani5xldjcT5UyDXTeBvEsnh7xDCWci2uGCSLnj2P4Vn+I
+        9HOh67dWRBCRyEKfbtWQ+TGccHHHtX0LtVp37oy6n1pbzLPAkinIYZqWuS+HerNqvhO1kc5fyxn611tf
+        K1I8kmjdaoKKKKgYV4X8XP8AkZH+i/8AoNe6V4X8XP8AkZH+i/8AoNd+A/jET2PO2+6fpXX+C/h7beJ9
+        IS5lQs7Z3Hcwzz9a5BvuH6V7V8GP+RYj/H+denjpOMU0REyW+Clrt/1Z/B2/xrN1H4N3FrAz6dLIjqMh
+        WO5fyr3akIBByM14yxNRO5pyo+TZ7a4s7h7e8jMc0bYZTUTDK8ZB/wA816F8WLGC38QSTRKFLhQwHrjN
+        efV9FQqc9NMxe59A/DDW31fwnb+c+6WNdjZ9uK7avI/gjIx0mVT081sfnXrlfOYiKVR2No7BRRRXOURX
+        H/HtJ/un+VfL+vf8haX6/wBa+oLj/j2k/wB0/wAq+X9e/wCQtL9f616+W7yMp9DM3fMAOtKRnrT7RPN1
+        W1jxnzCVP4qaWdDHMynjFeypJtog9g+DOqeboz2TtzA5UD27V6ka+ffhVqf2DxY9uThLhAfxBr6CByoI
+        9K+cxsOWqaxZwHxV1P7No6QK2CVZiP0H9a8HZtq7j0616P8AFjU/tGrNCpyAwUfQD/GvNjGbi5trZRky
+        yqp+mcn9K9XBx9nRuyJbkhDD7wI+tS6f/wAh3Tv+vhas6vGIrxVA/h/rVbT/APkO6d/18LXVN3psk+pd
+        K/5BNv8A7gq5VPSf+QTb/wC4KuV8pL4mdHQKKKKQBRmis/WUun02T7C2JQOKAL+aWvPvDXj+RdV/sTxW
+        i2t4WxbznhJvY+jV6BuFAC0UUUAFFFFABRRRQAUUUUAFFFFABRRRQBxXxQ/5Fdf+uo/ka+fT1r6C+KH/
+        ACK6/wDXUfyNfPp617+W/wAN+plPc6z4Xf8AI5y/9c1/ma+iU+4PpXzt8Lv+Rzl/65r/ADNfRKfcH0rg
+        x/8AEKgOpKWkrzyzwv4t2wj8TPIoxvRc/rXnpr0v4w/8hpf91f615pX0+EbdJXMHuex/BW5L6AYyfuOw
+        H/fVeqV5B8Es/wBmy+nmv/6FXr9eFiv4rNY7BRRRXKUFeF/Fz/kY3+i/+g17pXhfxc/5GR/ov/oNd+A/
+        jET2PO2GUNexfCnULfS/DsaXr7DzxjPfNePVKlzOihUmkA7AMRj8q9uvRVZcrM07H02fFGlD/luf++TW
+        bqXjrS7K3ZxMoIH8ZA/TrXzsbq4I5nk/77qMuz8s5b8c1wrLoJ6srnZu+LPEJ1/VDKmfKUkgnqT61zs8
+        nlQsx644HqaSW4iiHzsAewzk/lXQeEvCl5r2qQ3FzCyW6tujjI+8fU12SnClCyZO7PU/hDpT2Hh+MyLh
+        mG5vqea9JrO0bTk03TkhUdBk1o183VlzTbNkrIKKKKzGRXH/AB7Sf7p/lXy/r3/IWl+v9a+oLj/j2k/3
+        T/Kvl/Xv+QvL9f616+WfFIzmV9GG7xNpwPeX+hrQ8VWBsNdnjxgFty/Q1R0P/katM/67f0Ndz8U9N8q4
+        sbxRgTQ7SfcdP0Nd7mo10n1IscNot7/Z3iCxu842SgN9DxX03BfJ/Y32onhYyx/CvlWQExnbweo+te36
+        d4hE/wAMUlL/ADyIqHn8/wCRrlx9JycWVFnl3iy9N5r0rE529fqeTVfwlZHUfFsS4ysMZb8ScfyzVG6l
+        M91LK3VmJrtvhFpv2m9ur1gcM5APsB/+uums1TopE7nMeIV26s49B/U1R0//AJDunf8AXwtaPif/AJDk
+        w9GP/oRrO0//AJDunf8AXwta70Q6n1LpP/IJt/8AcFXKp6T/AMgm3/3BVyvlpfEzfoFFFFIAoxRRQB5b
+        8ZPC6aroDTRWu+RPmDr1BHfiuW+F3xhlspofDnjWYquRFa6hJ1B6COT8OjH8a91uLaO6t2hlUMjDBBFf
+        PPxT+Hn9nXMl7bRE28mdwA6etaQaejEz6KDqVBByD0Ip1fOHwz+LVz4Wli0LxXM02knCW92eWt/QN6p+
+        or6KguYbq3jntpFlhkUMkiHKsD0INKpTdN2YXJaKKKgYUUUUAFFFFABRRRQAUUUUAcV8UP8AkV1/66j+
+        Rr59PWvoL4of8iuv/XUfyNfPp617+W/w36mU9zrPhd/yOcv/AFzX+Zr6JX7g+lfO3wu/5HKX/rmv9a+i
+        V+6PpXBj/wCIVDYdSZozWZq+s2+m2crtIvmKvAz933PpXAouTsizxv4r3Sz+IGCkHDY/IY/nXnznbGzH
+        sM1seJNU/tXWJZlbcinCn196xXie8uIbKLJe4bbx2Hc19RTXsqKTMHqz2n4MWZh8PxuRjeC5z7nNepVz
+        PgfTBp2gxIFx8oA+ldNXzlaXNNs2WwUUUViMK8L+Ln/IyP8ARf8A0GvdK8L+Ln/IyP8ARf8A0Gu/Afxi
+        J7HnbcKTXR+F/AMvibTUuknnVmzkK3Fc433D9K9q+DAz4Yj/AB/ma9THTcIpozicoPg1c97i5/77FTxf
+        Bhm/1rzv/vSmvccUYrxfrMzXlR5Xo/wgs7OYSNEoI7nJP6mvQtK0K00uMCCNQcdcVp0VnKrKe47IMUUU
+        VkMKKKKAIrj/AI9pP90/yr5f17/kLS/X+tfUE/8Ax7Sf7p/lXy/r3/IWl+v9a9fLN5GcyHQ/+Rp0z/rt
+        /Q17N8R9O+2eBYrhVy9uyt06DGDXjOif8jVpn/Xb+hr6P1CyGo+EZrVhnzLcjHvirxk+SrGXmKOx8yEY
+        JHvXRWGpPbeCZrVpMYdvLXPODWHdRNDcOjDBUkH8KiycYzx6V6koqaRBHO/l27t6Lmvb/hLpRs/Dcbuu
+        GMeT9TzXiPkm6u7W1XkzTKCPbOT+lfTXhazFp4fjUDGU/pXm5hO2hUUeAeKv+Q9P/vN/6EazNP8A+Q7p
+        3/Xwtafin/kPT/7zf+hGszT/APkO6d/18LXb/wAuRdT6l0n/AJBNv/uCrlU9J/5BNv8A7gq5Xy8viZv0
+        CiiikAUUUUAFUNX0qDV9PktrlAwcY5FX6KAPlPx54Ubw1rMltdIfscxJjfH3D6Z9Ku/Dz4mX3w/vE03W
+        C93oMjYHdrXtlf8AZ9R+Ve5+P/CNv4q8OzwSIDKq7kbHINfMi2skbz6XqK/v7ZjFlupGeK7qE41F7Kfy
+        JatqfXun6laarp8N9p06XFrOoeOWM5VhVrNfKXgnx3qvw21LZte80SZ8zWxPKf7SdgfXsa+m9C1/TvEm
+        kQ6no9ylxbTLlWU8g9wR2I9K561GVKVmNO6NKikpaxGFFFFABRRRQAUUUUAcT8UD/wAUuv8A11H8jXz9
+        3r6C+KEV1N4TP2G2e5kWQExoecdM14F/Z+rf9AqXP+8P8a9vAVIwp+8zKW5e0LWW0O7a4ii3SMMZBxXT
+        /wDC0tU/uyf9/mrif7P1f/oFS/8AfQ/xo/s/V/8AoFy/99D/ABrrnKhN3ZOp2knxR1VlICt/wKVj/Wue
+        1XxPqesLsuZisXXy1GB/9es0aZrLYC6XJz6sKt23hXxBesALeOAHqT8xqeahDVINTLmmSFMsfovc/Su6
+        +G3hC4vdQGoX0RVm+6pH3F/xrS8K/ClhOlzfbpXzndJ2PsK9f0rSYNLthHAgHHJxXFicZzLlRSiW7eFY
+        IVjXgKMVLSZozXkGotFJmlpAFeF/Fz/kZH+i/wDoNe6V4b8W7TUpfErNa6fJNEyqfMUjGcYxXdgZKNW7
+        Ilsect9w/Sva/gv/AMizH/wL+deMnT9XKkf2XL/30P8AGvavg/a3Fp4dSK6iaOQZyp7V346pGcNCY7np
+        NFJmjNeGahS0UUAFFFFABRSZozQBHP8A8e0n+6f5V8va8f8AibS/5719RTc27gf3T/KvmHXLDWTrE+dK
+        mADEDkc4r1MunGLdzOZW0P8A5GnTP+u39DX1BYjdpsQ9UxXzR4e0vUz4msJJ7CSKOOTLMSOK+mNPGLCI
+        EY+UUsfNSaaHA+dPHFh/Z3iy+hxgGUso9m5rna9R+MOh3r6rb3un2b3CyIVk2cbSOleZf2fq/wD0Cpf+
+        +h/jXpYfEQdKN2Ztaml4NsjqPjKAYysCbuncnH8q+l7aMQ6eqDsn9K8W+Eug3KanNdX1u0UjuMKfQdK9
+        wbiI/SvIxlTnqaGkVofMnio/8T+f/eb/ANCNZmn/APId07/r4WtbxRYaufEN1/xKptokYK2R8w3dao6V
+        peqtrli0mnyRokwZmOOBXr+1h7K1zO2p9O6T/wAgm3/3BVyqelZGl24Ix8gq5XzkviZutgoooqQCiiig
+        AooooAQjPWvnb4uaLDpHjy3vceXbXw8uU9lJ6N+Br6KryL466at3osMhGSp9KuCvJITPI7uzeOWS0vUx
+        IhwQe9L4X8U6x8OtZ+2aWWn0+VgbmxY4WQeo9GHrXS6fYnxj4Fj1CDnVtL/0e6HUsAPlb8Rx+dcwyeYr
+        Ryrhhwynsa9mlKNdOlU+JGb01R9PeFPFuleMdEj1LRpxJGx2yRn78T/3WHY1t5zXyBo2r6t4F11dX8Py
+        HB4nt2+5Mn91v8etfS/gXx5pXjvRRd6c/l3EeFuLRyN8LY/UehrzMRh5UZWsWnc6mikzS1zFBRRRQAUl
+        LRQByHxE8XReDtCt7uXTX1H7VdLapAjhSSwJHJB9K5C48cjSF+0eKfAOraZZAgvdKFmRB6nHQVd+OfPh
+        3Qf+w5bfj96vSZoYrmB4Z41kjkUq6sMhgeMEV2RcIUoyavdv8Lf5ku7Zk6bZaHq2nQX2neVcW06b45Ew
+        Qwq1/YOm/wDPuv5V4TpHiq68FfDfW9P0y5a3RfED6fZ3TAyfZo2OWYKBzgA8eppmt694X0bSF1TwZ4t1
+        q41+2dJALkXDJd8jcrK6beRmtXhZc2j0e3/B7biuj3n+wtOUZ+zr+VWItOs4f9XCoP8Au15Jqh1Txb8Y
+        NO0621q+0eyvPDiXc8Vs2GYGQ5UZ+6xyBu64GO9WtH0u68G/F6Hwxa6tf3mk6xpkkxS7mMjxSKSMqx6c
+        fzrL2DtrLW17en/DBc7vwx4tsvE11q9vZQyxHSrxrSUvj5mHcYPSuh3CvB/hj4Htr/XPE7PrGrxf2drD
+        RqIrwr5oU5zJ/eJx14rQ8WL4FHiq9XVfFGvz6m8hY2unSyuLc9lARSB9Cauphoe05It7dr9EHMekeOPE
+        UvhXwXqWt28CzyWcYcRO2A3zAckfWtXTLpr7SbS7ZQjTwpKVHQFlB/rXhsGvXut/s5+K47+4nujYXDW0
+        M1yMSvGJE2hx/eGa9r8O/wDIs6Z/16Rf+gCsq1H2UbPe9vwRSd2c/wCN/Hc3hPUtK06z0WbV7rVDIIoo
+        pQhyoB7/AFqjpfxRD6/aaN4o8P3/AIfur0lbZrnDRysP4Qw71i/FbV7XQviL4I1K/Mgt4JbgyGOMu33R
+        0Uc9xVTXNXf4reItAs/Del3i6dpt8t7daldQGJFCH7i56k/4V0U6MHTi5R0a1fYm+p7JuGKq3Wn214R9
+        oiDemRXj+laRr3jLx94108eKb/TdMtL9A0Vsf3jZDYCsT8ijGeOv4VP4us/Bena79n8SeLdcmvvJjRbK
+        znkZkCoq7iI1OCcZ57msFh0ny82vkrjvoeof2Dp3/Puv5VbtbS3s1K26BPUCvFfCvjy60LwP40lS7u76
+        30WUf2a2oIRMPMHyq+ecAkda3NF+F8+s+HrbVtY8U62NbvIVuGuIboqsLMNwUJ0IGce+O1VUw7hf2krL
+        +mCfY7iPxZaSeOpvC6xS/a4rMXZkONhUttx65yfSnnWtQHjMaR/Y0/2A23nHUt37sNn7mMda8oPgmPUP
+        jte6fc6zqqs2krcPPBclHZi4BGecL7dq3obifQvjVbaX9uu5tPs/DpcpLKW3FW++fVsA81ToU9OV62uJ
+        N9T1XcKNwrxvwf4cuvijpEnivxJrWpwrezOLK1srowpbxoxUdOpyDUPjDWP+EXu9C8Fat4ov4NPaKW5v
+        NTCu9xLHvOyLKAsOoBb0FZ/V1zcnNr1/Udz2ncKXNeC6Z4o0TRPiBoEXgXXNTv7HUbj7LfWV35zKu7hJ
+        FMijnJ7GveqyrUXSt5jTuef+HfirZ698QL/wrJYSWktrLNFFO8gKztGcFQMcHHNWviP8SLT4e2NpLPaP
+        ez3TNtgjfaQq4yxOOnIH415dDpdy9p4y8Q6UudR8P+J5b2HHBeMf6xD7Fc/lT/F14njjwX4t8ahXFjFb
+        QWGliRcEL5qNK/Pcscf8BrvWGpOcX00v6u3+ZHM7Hu+lXy6po9pfCMoLqBJQhOdoZQcZpk2j2M8heWBW
+        Y+1ee+IU8Pf8K98NS+KfEN7o9tHaR4S0mZHuCY14woLHGOw71zvgzWbOw+Kumad4U1PWrjR9Qt5fPg1R
+        X2h1GQyFwD+Vc6w7lzOLta/4eY7nsSaJp0bB1gRT1zitBdqrgDgdK8W8O+Hb3xv4v8ZW+p+I9Vg02z1V
+        0S0tZymScjO7rgDjaK2Ph1LdWv8AwmfhnUtXuJrTSLgxwXs7/vIo3QnlvUdc1M6Fov3rtJO3rb/Mdz0u
+        5tYLyPbOgZe4NU/7A07/AJ91/IV4H4hvPCWm6NeXfhHxV4mvNYtBujuVkmkhZlI+8xXbt967TWda1fxh
+        deD/AA1a30unLrFh/aGpXNsdshjCj5VPbJ7/AE/G/qskk1LT8uor3Z6ja6fa2Z/0eNV+gq0WGOa8a1nw
+        yfBHjnwZFpOt6vJb3+oGOa3ubxpEYBc9D9aoat4v0DXvHGtQeM/EN/Y2Gmzm1s7CxEwDlfvyO0SnJz2z
+        xU/Vua0oyurX287D5j2WbSLG5cvLCpOe4pi6Hp6sGFumR3xXjOheK2XS/HOj6Jq99qGl2mlSXenXdyJF
+        liOwhl3MA3BIwa6j4b+Gda1DSvD/AIl1vxTfXJW0RobFMLCEKYAfu7YIJJ70SoOmm5S7fiFz1BFCIFXg
+        DpTqSlrjKCiiigAooooAKKKKACuB+LVt53hV367Tmu+rlviDb/aPCV0MZIXNVF2kmB4N8PteXwt4+hF0
+        cabqY+zXQPRT/A34N+hNdZ8SfBD6XdtqenRkwscyKB0rzPUbb7TasvQgZB+lfQPw412Lx38O4otQIkvL
+        UfZboHruA4b8VwfrmvTxsHTmqsSI6qx4P8sieoNUrabU/DGtRa14duGt7qLkgcq691Ydwa7Txx4Tm8M6
+        q8kaE2kjZBxwtczww9c130akMXTs9yGnFn0B8OviXp3jzTio22uqwj/SLJm5H+0vqvvXb7hXxw8N5peo
+        xarolxJa3kDBkkjOCP8AEe3Q17/8MvivaeMoBp2q7LPXIlG+Hosw/vJ/UV4+Jw0qTutjRSuek0Um6lrj
+        KCiiikB5z8ZtJ1TVvDOmDRNPm1Ce21OG4aGLGSqhietVrzxZ8RNdtmsdB8FSaPLINhvtRukKw5/iCjqa
+        9OxSYrojWSiouN7CseW33wnks/hfa6Nod0H1ixu11FLmUcT3CnJ3e2DgfQVOnjzxe9utrH8OdQGqEbC8
+        kiC2Df3t/p3xXpmKMVX1hy+NX1uK3Y88h0XVm+OltrU1k62Q8PC3knGNgm83JQfgan1bR9Rn+N+havDa
+        SNYW+mTRS3AxtRySQDXd4owfwqPbO9/Jr7/+HHY8l0L/AISDwJ418Q23/CM3+q2WsaiLq3vLUrsQP135
+        6Yz+hqn4Tk8TeAJNU0RfBV3qs9xfSTwajAyrFMHPBdz0xXs22jFaLE3Wsd7X+WwrHh+n+FPEp+D3jWwv
+        dJkTU9R1CSaK3TnzMuhyvtwcE+lexaHDJb6BYQzIUkjto0dT1UhRkVeApelRVryqrVf1sNKxwPjLRNQ1
+        D4l+Db+0s3mtLKWc3Mq4xGCgxn8RXeBAOnFOxS1nKo5RUX0Cx5/4D0bUdN8deOLu+s5IIL+/je2kbGJV
+        Ctkj8xXOaaviDwD428RsPCV5ryavdfaLe+syuQD/AAOT0A/SvYsUmK1WId22r3SX3W/yCx49ovgvXfEV
+        n49tvE9gNNm1x43gIbegYLkYPfBC5q5pHizxtoehW+h3fgS+vNStYhbx3MMii2l2rgOW7e4r1UDFLiql
+        iXL4o3Xb5WFynlWuQ+IvDvxMtvFsOgXOsW93pa2lzBY4Z4ZQ2eh7cDmrFppWqat8YLbXr3R7i1sLnQPJ
+        mEuD5bs2TGxHfHpXpmOaMUvrDttra1wseQ+GZ/FPwws5vDkvhW/17T4ZnfT7ywZWyjMW2uD905P61Y1j
+        TfF9xe6J47tNFT+17SOSG90bzhueBmJUK543AY/GvVsUbaf1l83MkrvfzCxwel+MvEus6za2sHga/wBN
+        tjIPtd1qDqgjTvtA5Y13uKTFOrCclLZWGjz74b6FqGmaj4wOq2TwxX2syzQ+YARLG3ce1SfEPwv/AMWg
+        1PQfCumgExoILS3GM/vVZsc/U13mMUmKv20vaKfa34BY8e13Q9c0bWfBviWDQ59Zi0zTRbXOnxYMkLlA
+        N6jucnH4VYgXxP4j+KvhzXb7wzNpWmWsE6DzXVpFyvV8cLk4wK9YwDS7a1+tStqtdV9//Di5Tgfh3oup
+        aV4l8Z3Go2clvFfaqZrZnx+9Tn5hWBP4M1vUV+JdrHbyWx1iWM2MjkKs2FOcH07c+teu80Yz1rP6xJNy
+        01t+Fv8AIdjxG+v/ABbqvwxn8K6f4BvLOdLEW8sszokeAAD5YH3icdPfrWpe+FfEun2Xg/xJ4es1uNV0
+        ewFrdadNIE86NkGV3HgEHP6eletYNYHivwvL4lt7ZbbWtQ0ea2kMiTWUm0tkYww6EVssVra1lfXruLlP
+        MNd1PxRrPxB8DP4i0SHRohqLmG3FwJpWwuWZscAYArbMHiP4feMNYu9O0GfX9E1if7Vts2XzreYgBgVP
+        UHFdDoPw5g0zxAmu6trGoa5qUSFIJb1xtgB67FAwCRxmuyIp1MRFWjBJq1n+Ycp51dal4j8W+EPElvP4
+        UuNJik06WKzjnkUzzysh42jp2rpfAVjc6Z8P9Dsr6FoLm3sYo5Ym6owUZBroMGlxxXNOrzLlSstx2Foo
+        orIYUUUUAFFFFABRRRQAVk+JYfP8P3Sf7BrWqrqKeZp86nuhoA+VZk2TOp7Eitv4X+I/+ET+IUUM77NP
+        1bEEuTwr/wADfmdv41m6tF5OsXSf3ZCKyNRtzNbEoSrr8ykdQa+mcFWoL0MdpH1R4j0G21/S5Le4QFiO
+        DivnPxBodz4d1aS0uVIj3ZRz39q91+GHiweLfBFpdTMDe24+z3Q771A+b8Rg/jT/ABz4Qg8R6U+EAnQZ
+        VgOa+fp1JYepfsatXPnbqKzbyxkWaO8sJHt7qFt8csbYZWHQg9q17yyn02+ktLtSsiHAJ7ioq+khKGIh
+        dGOzPXPhd8Xk8QlND8UMltrKjbHMcKl1/g3qO/avWs18c6hpouAJYiUmQgqynBBHcV6v8LvjC7zReHfG
+        04S6OEtb5+BN6K57H0NeLicJKm7rY0Uj3CimhgRkcg9MU6vPLCkxS0UAFGKKKACiiigAooooAKMUUUAG
+        KMUUUAFFGaTNAC0UmaMikAtJVK+1nTNMhMuo6hbWsY6tNMqj9TXH6l8bPAmmSGNtZF04/htYmk/UDH60
+        1FvYDvfrRXiup/tH6amV0LQb28PZ7hliU/gMmuYvfjz41v1K2GmafYg9H2NIw/M4/Sto0KktkK6PpHNV
+        7rUbOxjL3t1DbqOrSyBR+pr5SvPGPj/VmLXfiW8iVuqW7+So/BcVoeCrO0u9cS38VXk08c7bUnmkLFX9
+        CT2rZ4Kqo81hcyPfb34keE7FcvrNvMf7tufNP/juawJ/jHYMxXS9F1K8H99lWMH+ZrWsPhroNnhhbq/1
+        FdBb6BptqoEVrGMdOK47FGV4X8UXevqWutNayHYM2f1rp6ZHDHFxGiqPYU+gAooooAKMUUUAFFFFABRR
+        RQAUUUUAFFFFABRRRQAUUUUAFRyruhcHuKkpCMrigD5k8YQfZ/FV6mMDfkViHnNdd8SrfyPGExxjcAa5
+        Gvp8HK9CJhLc6T4TeJP+EX8fixuX22OsYhO48LL/AAH8c4/GvpHOeDXx9qMLPCJIiVljO9GHBBByK+mP
+        hz4oXxd4Ks9QYj7UiiG6UdpVHzH8eD+NeXj6PJPnRpFmB8SvAq6patf2Ee24jGflHWvEiHR2jlUrIhwy
+        ntX1q6LIhVxkEcivF/ib4Fa3lbVdNj46uqjrWGExDoy12HJXPMqpahp0d7CQRgn0q4rBhkfj7UtfR+7U
+        j5Mx2Z2fwx+Ls+hzweHvGcxe0JWO1v36x/3Vf1XHRu3evoGOVJY1kjYOjgMrKcgg9DmvkG9sY7yFlkXk
+        jrXVfDf4pXvgi5j0bxI8lxojMBFMclrT/Ffbt2rxMVg3F80DVSPpeioLS8t761iubOVJoJVDxyIcqwPc
+        Gp68ssKKM0lAC0UZpCwAyTgetAC0Zrn9W8c+F9DDf2prtjbleqGYMw/4CMn9K5DUPj/4JtFP2Oe71B+y
+        wW7D9WxVKLewHp+aM14Hf/tH3cj40Xwv8nZ7qc5/75Uf1rmtQ+MPxC1bK2txb6XE3QW8ALD/AIE2f0xW
+        scPVl0FdH1DmsnUfFOg6SxXU9YsbVh1WW4VW/LOa+Ubu98VaupXVfEGoTo33kadtp/DOKpReGrdeXyT3
+        966Y4CpLcnmR9F6t8dfA+mblh1GXUJF/gtIGYf8AfRAX9a5O/wD2kYCpXRfDV1O/ZrmYRqPwAOa8th0m
+        1ixtjXjpx0qytvEg+VAK6oZavtMnnOhvfjb4/v2zZR2WnoeipBvI/Fia53UNf8aa9n+1vEd86N1jR/LX
+        8lwKlAA7fpR9a6o4GlHcTkzEXw6jyb7mR5W/vMxJP51ci0e1jXAjBq/25FNMiDqy/nWypUodEK7YxLWK
+        P7iKPwqQKOwA/CmG4iH8WfoM0LKzf6qCV/otDrUYbtBZknWipIrHUbg4h0+Y/UVpW/g7xHdYKWOwH1FZ
+        Sx1GPUfKz1H4XeO/7QhTQ9VlzdRri3kY8yqOxPqK9Qrwzwf8PtUg1eGfVrbeqNuGGK4I6Hg17iudoz6V
+        4eJlSlU5qexqr2HUUUVzDCiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKAPC/i/b+X4hh
+        k/vqf6V55XrHxnt/mtZgO+D+VeT19Dl7vRt2MZbgRkEV1Xwe8S/8I545fSLp9tlrACxgnhZgfl/PJH5V
+        ytU7+NwiXFuxSeBxJG68EMDkH866cTS9rTaFHRn2Fmobq0jvLd4ZlDIwwQRWF4D8Tx+LfBtjqiEecybL
+        lf7kq8MP6/Qiukr5Zqzszc+d/iB4Om8O6k93bITayHLY6CuQByMjmvqXW9Ht9Z06S2uUDBhwSK+cvFPh
+        u48M6s8EqnyGbKMR0r08DiuR+znsRKN9jHqC6tI7qMpIoPGBmp6K95pNWZkaPgH4iaj8OL8Wl75l5oMr
+        ZeLq0B/vJnj6jv7V7vL8VfA8Nil0/ibTyjqGCRzB3GRnlFyR+VfOc0KTxlZBkdvaqC6FaK24pn615NbA
+        c0rxLUj3K/8A2h/CNqzLZQalfkDhoYAqn8WINcrqX7ROsXOV0Lw5FAD0e7kLn8lxXAJZWkf8CD8qkD28
+        fQqD7VCwNKPxSHzNmve/Fb4jashT+0YbFD/z626qfzOT+tc3dx65q8hk1fWr66Zuvmzs36ZxV9Zs/cil
+        b6Rmpora+uD+4sZnz0ytaKGEhuxe8zGh8O2ycsCx9WFXI9MtowNsYP4VuQ+F/ENxgx6fgH1BrUtPhv4l
+        u8boxED/ALJqvreFjsg5WcusKKPlUD8Kdwo7Cu/tvgxqkwBuLllz1wcVsWnwQiBBurlm+pzWbzKC+GIc
+        jPJmnjXq6/nTftMZ+6S30Br3iz+EGiW4HmLvPvWxbfDnQLYgi1U49RWMszn0Q/ZnznGlzNxDaTP/AMBq
+        3Do2szkeTp0nPrmvpmDw5pduP3dpGP8AgNXEsbWP7kEY/wCA1g8fXezK5EfN1r4C8S3eMWwjz/smta3+
+        EevTEebMVz1wMV9AhFUcKB+FLWDxFaW8h8qPFbP4Iyvg3lyx9s1uW3wW0mMDzW3GvTqWsnKT3YzirP4X
+        aDa/8u6sfXFbMHhDRrdcJZx/lW5mjNSBRg0ixgGI7aMY9qtLBGn3Y1H0FOPHP507NACbfSloooAKKKKA
+        CiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKAPNvjFbb9Bjlxyrf1rxGvoP4oW3n+EZz1
+        KjP8q+fK9vLJXjJGcwpCMqQe9LRXr6mZ2PwX8SHQfGU+g3T7bTVPmhLHhZgOP++hn8QK+hc18e3wmiMN
+        5aMY7i2cSxOvVWByD+gr6P8AD3xN8Oan4ZstRv8AWLGymmj/AHsMs6qyOOGGCc9RXz2PouFTmXU1iztK
+        5rxj4Wt/EekyRug80L8rYqncfFrwLa583xLZH/rmxf8A9BBrMm+Ovw+iJX+2nkI7JaTH/wBlrg5Zdizx
+        698M6zY30lqtk8u04DgEZFT2/gnxJd8paBAfUV6RcfHf4eq29Wu7h/8AYs2z+uKoS/tGeGIgfsmj6lLj
+        p8iL/wCzV1KviOXlRNkc3bfCvxFOf3j7B7Ctq0+Cl1Jg3l03uN1RT/tKRc/Y/Cty/p5l0F/kprPl/aN1
+        xm/0bwtboP8AppdM38lFT/tEt7hoddbfBLT0IM0pb8a27P4U6Da43Qhj715ZL+0H4ulB8nQtNj+u9v61
+        Rm+NnxCuAREun2+f7tvn+ZNL6vWfQLo96g8EaHbgbbOPj1UVpQaJp1uP3VrGP+A18yTfE74l3X/McEIP
+        /PK2iH/stUZvFfj+7/13inUB7JLs/lirWDrPoHMj60W3hUfLGo/4DTsonUqtfH76j4um/wBb4l1Nvrdv
+        /jVSWw1S6/4+9WvJv9+4Y/1q1garFzI+w59Ssbbm5vLeH/rpKq/zNZlx448LWn/Hx4h0tD6fa0J/Q18k
+        DwzExzI5Y+pNSr4btR94ZrRZdUe4cx9SSfFDwTF9/wAS6f8AhKD/ACrPn+NXgG3znX4pMf8APKJ3/kK+
+        bx4ftB/DUq6LaL/Bn61ay2XVi5z3ef8AaD8DRE+VPfXH/XK0bn/vrFZk/wC0h4cXP2XSNVm9NyIuf/Hj
+        XkC6ZbL0jH5VItnAvSNfyrRZaurDnPTJP2lLb/lj4Yu2/wB6dR/Sqk/7SN6w/wBE8KDPrLdH+QWuB+zx
+        DpGPypwiQdEH5Vay2PcXOdcf2gfF1xKiWuhabCGbGX8x8fkRXXjxB8TLyMNHFZQgjI22+f5k15IgVXUg
+        Ywc19T6LKtzolnMMfPCrZx7Vx4zDRopOJUZXPNBN8UJet9En+7boP6Uf2L8SLv8A13iGeMekaqv8hXrW
+        KWvOLPOfD/hXxTaakk+qa5eXUYPMcszFT+HSvRFzsGeuKdiigAooooAKKKKACiiigAooooAKKKKACiii
+        gAooooAKKKKACiiigAooooAKKKKAMHxjam78M3UajLFDgV80y2t7FMyGxmODjIFfWTosilXGQeoqkdE0
+        5mJNrGc/7Nb0a86N+QTSZ8r+Vef8+M35UeVef8+M35V9T/2Hp3/PrH/3yKP7D07/AJ9Y/wDvkVv9fr9x
+        cqPldobtlINhN+VZUnht5JS7afPk+wr69/sPTv8An1j/AO+RR/Yenf8APrH/AN8ipljKslZhyo+RV8OM
+        v/MNnP1WpF0Ir002b8hX1t/YWnf8+kf/AHzR/Yenf8+sf/fIqfrVRdvuDlR8mDR3Xppsv5VKNNmGMabN
+        +VfV39h6d/z6x/8AfIo/sLTv+fSP/vmq+uVVtYOVHyoLO4HTTpfyFOFvdD/mHzfkK+qf7D07/n1j/wC+
+        RR/Yenf8+sf/AHyKr69WDlR8r+RdjpYTfkKXybv/AJ8JvyFfU/8AYenf8+sf/fIo/sPTv+fWP/vkUfXq
+        wcqPljyrz/nxm/Kjyrz/AJ8Zvyr6n/sPTv8An1j/AO+RR/Yenf8APrH/AN8ij6/X7hyo+WPLvP8Anxm/
+        Kjyrz/nxm/Kvqf8AsPTv+fWP/vkUf2Hp3/PrH/3yKf1+v3DkR8seVef8+M/5UeVef8+M35V9T/2Hp3/P
+        rH/3yKP7D07/AJ9Y/wDvkUfX6/cOVHyx5V5/z4zflR5V5/z4zflX1P8A2Hp3/PrH/wB8ij+w9O/59Y/+
+        +RR9fr9w5UfLHlXn/PjN+VHlXn/PjN+VfU/9h6d/z6x/98ij+w9O/wCfWP8A75FH1+v3DlR8seVef8+M
+        35UeVef8+M35V9T/ANh6d/z6x/8AfIo/sPTv+fWP/vkUf2hX7hyo+XILW9nmSP7HMu44yR0r6a8Jwy2/
+        hXT4ZzmSOBUY/QVaGiacDkWsYOf7tXURY1CoAAOgrGtialZWmNJIdRRRXMMKKKKACiiigAooooAKKKKA
+        CiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKA
+        CiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKA
+        CiiigAooooA//9k=
 </value>
   </data>
 </root>

DPM2016/Utils/SplashForm.vb

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

DPM2016/Utils/frmDBConnection.Designer.vb

@@ -77,7 +77,7 @@ Partial Class frmDBConnection
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
         Me.Name = "frmDBConnection"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
-        Me.Text = "DPM-Datenbankverbindung"
+        Me.Text = My.Settings.SoftwareType + "-Datenbankverbindung"
         Me.TopMost = True
         Me.ResumeLayout(False)
         Me.PerformLayout()

DPM2016/Zahlung/frmZahlung.Designer.vb

@@ -35,10 +35,11 @@ Partial Class frmZahlung
         '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.tsbtnSave})
         Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
         Me.ToolStrip1.Name = "ToolStrip1"
-        Me.ToolStrip1.Size = New System.Drawing.Size(950, 25)
+        Me.ToolStrip1.Size = New System.Drawing.Size(950, 31)
         Me.ToolStrip1.TabIndex = 16
         Me.ToolStrip1.Text = "ToolStrip1"
         '
@@ -48,7 +49,7 @@ Partial Class frmZahlung
         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(29, 28)
         Me.tsbtnquit.Text = "Schliessen"
         '
         'tsbtnSave
@@ -57,7 +58,7 @@ Partial Class frmZahlung
         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(29, 24)
         Me.tsbtnSave.Text = "Zahlungsdatei öffnen und verarbeiten"
         '
         'OpenFileDialog1
@@ -67,20 +68,20 @@ Partial Class frmZahlung
         'txtProtokoll
         '
         Me.txtProtokoll.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.txtProtokoll.Location = New System.Drawing.Point(0, 38)
+        Me.txtProtokoll.Location = New System.Drawing.Point(0, 46)
         Me.txtProtokoll.Multiline = True
         Me.txtProtokoll.Name = "txtProtokoll"
         Me.txtProtokoll.ScrollBars = System.Windows.Forms.ScrollBars.Both
-        Me.txtProtokoll.Size = New System.Drawing.Size(950, 498)
+        Me.txtProtokoll.Size = New System.Drawing.Size(950, 490)
         Me.txtProtokoll.TabIndex = 17
         '
         'Label1
         '
         Me.Label1.AutoSize = True
         Me.Label1.Dock = System.Windows.Forms.DockStyle.Top
-        Me.Label1.Location = New System.Drawing.Point(0, 25)
+        Me.Label1.Location = New System.Drawing.Point(0, 31)
         Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(48, 13)
+        Me.Label1.Size = New System.Drawing.Size(55, 15)
         Me.Label1.TabIndex = 18
         Me.Label1.Text = "Protokoll"
         '

DPM2016/Zahlung/frmZahlung.resx

@@ -124,7 +124,7 @@
   <data name="tsbtnquit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAK2SURBVDhPnZLdS1NhHMcfCPoDuummi+gyunJg0QviNrd5
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAK2SURBVDhPnZLdS1NhHMcfCPoDuummi+gyunJg0QviNrd5
         PDtzc7Z5ztl20pUzo6I3yFIrS9N8K7Qih6lUFJVaGWXZi6KRoZSFmCuyi+iiiCKILgo+HTUWu7QffOD5
         PfB8eL6/5xH/U1+mh4IzM+O/Ovdm8Hdrvi5X5PR2H86ht2oWKUnPEYkr5XYexXfyebKfTxO3+P5mkIv7
         ramCngqZtDV2Vq+zsWbDP9LXWVllWc+PRD+J3krGWv18TTzm8kFHqqC7TCbD6sRml7A7XEmsWU7S19t4
@@ -142,24 +142,24 @@
   <data name="tsbtnSave.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAP4SURBVEhLnZVtbFN1FMaZGl8hzPjJmKDxE2owxkRZlrrb
-        dl2cOBMlThdnJCQmyId9MaCJUUdkCESqvATBdTFCN0ZoqNtcphNUIiBQSgM1ow3apu0GG7ixdmW9fbn3
-        Pp5ze//l0gEj+ydPztbc+/zOc87t7Txx+vv7n5Rl+SppMpPJJP+9OKasP/0fpIELqjQYUaWBsLrsQEhb
-        NjCCpgN/a7Hh4VQ8Hj/R3d39hCRJ97DIpqLodpPjdrufBp2pqSmtoGr4/Ggci3b5sXDrKSwgcV3sDqO5
-        8xjcB/u0dDqN8fFxhMNhxel0Sg6HY2Fra+tdht3M43K5nhWAK9MFNPfE8Oi2ICq3nEXlVwFUOs/B7kng
-        y+27MTExgUKhoCuZTDJE7ejo+JggiyjJ/WQ3I0lFe3v7cwzgk5QVrPktiSWuy3jquzEs3j2KZ76/ivc8
-        cTi3boOqqroYwElSqRRCoZBKHmsZ0tDQ8GB5Gh2gaVrxRkVDe0CBvVOBZU8BL+0twLofWO0dJsCOUvcs
-        2pcOEJCWlpa37Hb7Y/X19feZISWAoijgejCk4XUPYHUDtZ2AgwE9l7Dpm526cT6fRyKRwNDQEAKBAILB
-        oP63z+cbqampeaG2tvaRxsbGuw3/6wChXyMa3u0BpL2gJIBtH7CydxKbtrv0JoR4B7xs3ks0GoXf71co
-        wSqbzfY4Ae41/G9MwGPyX1KxeoASGABrF9DkTWPzLrfePUsk4ZrL5XQYQ8h8DaVYUlVV9YDhXwSI5bGi
-        KQ2f/UnjIWMbJ6D6dq8Gp6u7NH+zBJTHRuNZRymer6ure8jwLwKuZRVcy8iQs1mcH5nEhuM5vEKz5z0w
-        pOlnYOcPHt2IO2ZjruL/LN1nANp4DzMAKVmFL5GBc/AfbDk0go8O5/AGLVoyAMt7gW+9R5GRs5iWyTBP
-        T1G2CGDzcgB9J+Yb/tdHlC8o8I1p2HgK+PAw8M6PBoDk6NTw/k9ZbDypYkdAQ99QGmOTmdJ4WLcF8II5
-        NtczFxV8cQz44JfiY8oQHtWrlGjVH8CnnrMIxy/rXd9xAjbmi0UNjubRRntY7gVq9gAv0z5WDAJfe09g
-        9Mp4yVjMn16UswNECqHj5y7gk9+n8CZ9J1b2ZdDjS5S6ZuNy3VEC8XQIHTl9HhtOavgrmi51LTrnrkWd
-        NYEwLgdMTxcXWf7ECGNR5wQQ4yg3NRvz5/zSY80KYLObSQDNElCzbgsQRlzNN/Fn5V2bOxd11gTmjgWs
-        XGawWQJ6S0BXV9drZtNbmYhaLnMC+lXbTC+7F6urqxcY/vMq6D3eHIvF9AvmqkgkoovM11ut1qU3ACwW
-        y8MUyUJqI+2nC/rmqH10/7riiKT5/wMmgjgINmBXqgAAAABJRU5ErkJggg==
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAPzSURBVEhLnZVtaFt1FMZXFV83VvGTCFP8NJWJCGopsTdJ
+        U6yzgg6rxYpjIGz70C9jKoja4Tq34aJ7YW42RezSroVgTGvprG4q7j3LwhpILBsNSVrbbrZrYtbcvNx7
+        H8+5uf/sLt3W0T88nDbc+/zOc87NzRJxBgYGnpRl+SppNpPJJC+OTShbz/0LaXBElYYuqdJgRF3dG9ZW
+        D46jqXdYi42NpeLx+Omenp4nJEm6h0U2FUW3mxy32/006CSTSa2gavj8eBwrDgSwfPdZLCNxXekeQXPX
+        CXR6fFo6ncb09DQikYjidDolh8OxvLW19S7Dbv5xuVzPCsCVuQKafTE8uieEyl0XUPlVEJXOYdg9CXy5
+        9yBmZmZQKBR00fUMUTs6Oj4myApKcj/ZzUtS0d7e/hwD+CRlBZuPJbHKdRlPfTeFlQcn8cz3V/G+Jw7n
+        7j1QVVUXAzhJKpVCOBxWyeNDhjQ0NDxYnkYHaJpWvFHR0B5UYO9SYOks4OVDBVh7gY3eMQLsK3XPon3p
+        AAFpaWl52263P1ZfX3+fGVICKIoCrj/+reEND2B1A7VdgIMBvgns+Ga/bpzP55FIJNgUwWAQoVBI/9vv
+        94/X1NS8UFtb+0hjY+Pdhv91gNCvoxre8wHSIVASwHYYWNc3ix17XXoTQrwDXjbvJRqNIhAIKJRgvc1m
+        e5wA9xr+NybgMQUmVGwcpAQGwNoNNHnT2HnArXfPEkm45nI5HcYQMt9MKVZVVVU9YPgXAWJ5rGhKw2d/
+        0XjI2MYJqL7Tp8Hp6inN3ywB5bHReLZQiufr6uoeMvyLgGtZBdcyMuRsFpHxWWw7mcOrNHveA0OajgD7
+        f/DoRtwxG3MV/2fpPgPQxnuYB0jJKvyJDJxDl7Drt3F8dDSHN2nRkgFY0wd86z2OjJzFnEyGeXqKskUA
+        m5cD6Dux1PC/PqJ8QYF/SsP2s8Cmo8C7PxkAkqNLwwc/Z7H9jIp9QQ394TSmZjOl8bBuC+AFc2yu5/9R
+        8MUJYMMvxceUITyq1yjR+j+ATz0XMBK/rHd9xwnYmC8WNTSZRxvtYY0XqOkEXqF9rB0CvvaexuSV6ZKx
+        mD+9KBcGiBRCJ4cv4pPf/8Nb9J1Y15+Bz58odc3G5bqjBOLpEPrzXATbzmg4FU2Xuhadc9eiLphAGJcD
+        5uaKiyx/YoSxqIsCiHGUm5qN+XN+6bEWBLDZzSSAZgmoWbcFCCOu5pv4s/KuzZ2LumACc8cCVi4z2CwB
+        vSWgu7v7dbPprUxELZc5Af2q7aSX3YvV1dXLDP8lFfQeb47FYvoFi9Xo6KguMt9qtVpfugFgsVgepkgW
+        Uhuply7oX6QO0/1biiOSlv4PHl43yqiDhuMAAAAASUVORK5CYII=
 </value>
   </data>
   <metadata name="OpenFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

DPM2016/Zahlung/frmZahlung.vb

@@ -29,7 +29,7 @@ Public Class frmZahlung
     Private Sub tsbtnSave_Click(sender As Object, e As EventArgs) Handles tsbtnSave.Click
         fehler = 0
         Me.txtProtokoll.Text = ""
-        Me.OpenFileDialog1.Filter = "ZIP-Dateien|*.zip|Zahlungsdateien (XML-Dateien|*.xml|*.v11)|*.v11|Alle Dateien|*.*"
+        Me.OpenFileDialog1.Filter = "ZIP/V11-Dateien|*.ZIP;*.V11|ZIP-Dateien|*.zip|Zahlungsdateien (XML-Dateien|*.xml|*.v11|*.v11|Alle Dateien|*.*"
         Me.OpenFileDialog1.FileName = ""
         Me.OpenFileDialog1.FilterIndex = 0
         Insert_Protokoll("Zahlungsdatei:" + Me.OpenFileDialog1.FileName)

DPM2016/app.config

@@ -40,6 +40,9 @@
             <setting name="ConnectionString" serializeAs="String">
                 <value>data source=shu00;initial catalog=dpm2018_1;integrated security=SSPI;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29</value>
             </setting>
+            <setting name="SoftwareType" serializeAs="String">
+                <value>PADM</value>
+            </setting>
         </DPM2016.My.MySettings>
     </userSettings>
 </configuration>

DPM2016/bin/Debug/Connectionstrings.cfg

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