Aktualisierung März 2018

2019-03-29 10:29:17 +01:00
parent f2d011ff07
commit 2418a68590
68 changed files with 166 additions and 103 deletions
--- a/.vs/DPM2016/v15/.suo
+++ b/.vs/DPM2016/v15/.suo
--- a/.vs/DPM2016/v15/Server/sqlite3/storage.ide
+++ b/.vs/DPM2016/v15/Server/sqlite3/storage.ide
--- a/DPM2016/Auswertungen/FremAuswertung.vb
+++ b/DPM2016/Auswertungen/FremAuswertung.vb
@@ -69,7 +69,7 @@ Public Class frmAuswertung
        Next
        Me.TreeReporting.ExpandAll()
        'Fill_Parameter()
-
+        Me.TreeReporting.SelectedNode = Me.TreeReporting.Nodes(0)
    End Sub

    Private Sub TreeReporting_AfterSelect(sender As Object, e As TreeViewEventArgs) Handles TreeReporting.AfterSelect
--- a/DPM2016/Behandlung/Behandlung.vb
+++ b/DPM2016/Behandlung/Behandlung.vb
@@ -272,6 +272,7 @@ Public Class Behandlung
 #End Region

    Private Sub treebehandlungen_Click(sender As Object, e As EventArgs) Handles treebehandlungen.Click
+        Globals.InAbschluss = 0
        nodeselected()
    End Sub
    Sub nodeselected()
@@ -285,6 +286,7 @@ Public Class Behandlung
                Me.Behandungdetail1.SuspendLayout()
                Me.Behandungdetail1.Patientnr = Me.PatientNr
                Me.Behandungdetail1.Behandlungsnr = Me.treebehandlungen.SelectedNode.Tag
+                Me.Behandungdetail1.Behandlungsnr = Me.treebehandlungen.SelectedNode.Tag

                Me.Leistungen1.Behandlungnr = Me.treebehandlungen.SelectedNode.Tag
                Me.Leistungen1.Behandlungsstatus = Behandungdetail1.Behandlungsstatus
@@ -392,7 +394,7 @@ Public Class Behandlung

        r.Item("nrbehandlung") = newkey
        r.Item("nrpatient") = Me.PatientNr
-        r.Item("nrbehandler") = 1
+        'r.Item("nrbehandler") = 1
        r.Item("nrrgtyp") = pat.dsDaten.Tables(0).Rows(0).Item("nrrgtyp")
        r.Item("rabatt") = pat.dsDaten.Tables(0).Rows(0).Item("rabatt")
        Try
@@ -493,6 +495,7 @@ Public Class Behandlung

    Private Sub BehandlungabschliessenToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles BehandlungabschliessenToolStripMenuItem1.Click
        ' If MsgBox("Behandlung/KV abschliessen?", vbYesNo + vbQuestion) = vbYes Then
+
        Behandlung_Abschliessen(Me.treebehandlungen.SelectedNode.Tag.ToString)
        'End If
    End Sub
@@ -687,6 +690,7 @@ Public Class Behandlung
    End Sub

    Sub Behandlung_Abschliessen(ByVal nrbehandlung)
+        Globals.InAbschluss = 0
        Dim istKV As Boolean = False
        Dim db As New clsDB
        Dim Messagetext As String
@@ -737,7 +741,7 @@ Public Class Behandlung

            End Try
        End If
-
+        Globals.InAbschluss = 0
    End Sub

 #Region "EVH"
--- a/DPM2016/Behandlung/Benhandungdetail.vb
+++ b/DPM2016/Behandlung/Benhandungdetail.vb
@@ -26,6 +26,7 @@
                Me.OnLoad = False
                Me.HasChanges = False
                'Me.Enabled = True
+                Globals.OnLoad = False
                Recalc_Totale()

            End If
--- a/DPM2016/Behandlung/Leistungen.Designer.vb
+++ b/DPM2016/Behandlung/Leistungen.Designer.vb
@@ -158,6 +158,7 @@ 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
@@ -288,6 +289,7 @@ Partial Class Leistungen
        '
        Me.lbPakete.BackgroundStyle.Class = "ListBoxAdv"
        Me.lbPakete.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.lbPakete.CheckStateMember = Nothing
        Me.lbPakete.ContainerControlProcessDialogKey = True
        Me.lbPakete.Dock = System.Windows.Forms.DockStyle.Fill
        Me.lbPakete.DragDropSupport = True
--- a/DPM2016/Behandlung/Leistungen.resx
+++ b/DPM2016/Behandlung/Leistungen.resx
@@ -120,6 +120,9 @@
  <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
+  <metadata name="ToolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>124, 17</value>
+  </metadata>
  <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>524, 17</value>
  </metadata>
--- a/DPM2016/Behandlung/Leistungen.vb
+++ b/DPM2016/Behandlung/Leistungen.vb
@@ -190,7 +190,7 @@ Public Class Leistungen
            Me.cbboxnrbehandler.Valuemember = "nrprivat"
            Load_Tarif()
        Catch ex As Exception
-            MsgBox(ex.Message)
+            'MsgBox(ex.Message)
        End Try


@@ -702,6 +702,9 @@ Public Class Leistungen

    Sub Leistung_Einfuegen(Optional ssonummer As String = "", Optional anzahl As Integer = 1)
        ' If ssonummer = "" Then Exit Sub
+        If ssonummer = "7006" Then
+            MsgBox("Hallo")
+        End If
        If interror > 0 Then
            interror = 0
            Exit Sub
@@ -775,10 +778,14 @@ Public Class Leistungen
        Else
            r.Item("menge") = anzahl
        End If
+
+        Dim leistungsbetrag As Double
        If ssonummer = "" Then
            r.Item("frankenprotaxpunkt") = Me.diwert.Value
+            leistungsbetrag = Me.diwert.Value
        Else
            r.Item("frankenprotaxpunkt") = Frankenwert
+            leistungsbetrag = Frankenwert
        End If

        If ssonummer = "" Then
@@ -786,10 +793,10 @@ Public Class Leistungen
        Else
            Dim total As Double
            If drv.Item("frankenbetrag") < 0.1 Then
-                total = r.Item("taxpunkte") * anzahl * r.Item("Frankenprotaxpunkt")
+                total = r.Item("taxpunkte") * anzahl * leistungsbetrag
                r.Item("total") = total.ToString("N2")
            Else
-                total = anzahl * r.Item("frankenprotaxpunkt").value
+                total = anzahl * drv.Item("frankenbetrag")
                r.Item("total") = total.ToString("N2")

            End If
--- a/DPM2016/DPM2016.vbproj
+++ b/DPM2016/DPM2016.vbproj
@@ -154,7 +154,9 @@
    </Reference>
    <Reference Include="Syncfusion.Compression.Base, Version=16.2350.0.41, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" />
    <Reference Include="Syncfusion.Pdf.Base, Version=16.2350.0.41, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89" />
-    <Reference Include="Syncfusion.PdfViewer.Windows, Version=16.2350.0.41, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" />
+    <Reference Include="Syncfusion.PdfViewer.Windows, Version=16.2350.0.41, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
+      <Private>True</Private>
+    </Reference>
    <Reference Include="Syncfusion.Shared.Base, Version=16.2350.0.41, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" />
    <Reference Include="Syncfusion.Shared.Windows, Version=16.2350.0.41, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" />
    <Reference Include="System" />
--- a/DPM2016/Database/clsDB.vb
+++ b/DPM2016/Database/clsDB.vb
@@ -551,7 +551,7 @@ Public Class clsDB
            End If
        Next
        If Not found Then
-            Me.Get_Tabledata("Tarife", "where aktiv=1 order by nummervon")
+            Me.Get_Tabledata("Tarife", "where aktiv=1 order by sort, nummervon desc")
            IntTables.Inttables.Tables.Add(dsDaten.Tables(0).Copy)
        End If

@@ -621,7 +621,10 @@ Public Class clsDB
    End Function


+
    Public Sub Recalc_Leistungen(ByVal nrbehandlung As Integer, taxpunktwert As Double)
+        If Globals.OnLoad Then Exit Sub
+
        Dim scmCmdToExecute As SqlCommand = New SqlCommand()

        scmCmdToExecute.CommandText = "dbo.[sp_recalc_leistungen]"
--- a/DPM2016/Sysadmin/frmStammdaten.Designer.vb
+++ b/DPM2016/Sysadmin/frmStammdaten.Designer.vb
@@ -55,7 +55,8 @@ Partial Class frmStammdaten
        Dim TreeNode30 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Spalten")
        Dim TreeNode31 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Options")
        Dim TreeNode32 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("User")
-        Dim TreeNode33 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Diverse", New System.Windows.Forms.TreeNode() {TreeNode30, TreeNode31, TreeNode32})
+        Dim TreeNode33 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Absender")
+        Dim TreeNode34 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Diverse", New System.Windows.Forms.TreeNode() {TreeNode30, TreeNode31, TreeNode32, TreeNode33})
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmStammdaten))
        Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
        Me.SchliessenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -172,9 +173,11 @@ Partial Class frmStammdaten
        TreeNode31.Text = "Options"
        TreeNode32.Name = "User"
        TreeNode32.Text = "User"
-        TreeNode33.Name = "Diverse"
-        TreeNode33.Text = "Diverse"
-        Me.TreeView1.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode2, TreeNode7, TreeNode16, TreeNode21, TreeNode24, TreeNode26, TreeNode29, TreeNode33})
+        TreeNode33.Name = "Absender"
+        TreeNode33.Text = "Absender"
+        TreeNode34.Name = "Diverse"
+        TreeNode34.Text = "Diverse"
+        Me.TreeView1.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode2, TreeNode7, TreeNode16, TreeNode21, TreeNode24, TreeNode26, TreeNode29, TreeNode34})
        Me.TreeView1.Size = New System.Drawing.Size(204, 425)
        Me.TreeView1.TabIndex = 1
        '
--- a/DPM2016/Sysadmin/frmStammdaten.resx
+++ b/DPM2016/Sysadmin/frmStammdaten.resx
@@ -158,7 +158,7 @@
 </value>
  </data>
  <data name="C1TrueDBGrid1.PropBag" xml:space="preserve">
-    <value>&lt;?xml version="1.0"?&gt;&lt;Blob&gt;&lt;Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"&gt;&lt;Data&gt;HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}EvenRow{BackColor:Aqua;}Normal{}RecordSelector{AlignImage:Center;}OddRow{}Style3{}Footer{}Style14{}FilterBar{}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="" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"&gt;&lt;CaptionStyle parent="Style2" me="Style10" /&gt;&lt;EditorStyle parent="Editor" me="Style5" /&gt;&lt;EvenRowStyle parent="EvenRow" me="Style8" /&gt;&lt;FilterBarStyle parent="FilterBar" me="Style13" /&gt;&lt;FilterWatermarkStyle parent="FilterWatermark" me="Style14" /&gt;&lt;FooterStyle parent="Footer" me="Style3" /&gt;&lt;GroupStyle parent="Group" me="Style12" /&gt;&lt;HeadingStyle parent="Heading" me="Style2" /&gt;&lt;HighLightRowStyle parent="HighlightRow" me="Style7" /&gt;&lt;InactiveStyle parent="Inactive" me="Style4" /&gt;&lt;OddRowStyle parent="OddRow" me="Style9" /&gt;&lt;RecordSelectorStyle parent="RecordSelector" me="Style11" /&gt;&lt;SelectedStyle parent="Selected" me="Style6" /&gt;&lt;Style parent="Normal" me="Style1" /&gt;&lt;ClientRect&gt;0, 0, 751, 423&lt;/ClientRect&gt;&lt;BorderSide&gt;0&lt;/BorderSide&gt;&lt;/C1.Win.C1TrueDBGrid.MergeView&gt;&lt;/Splits&gt;&lt;NamedStyles&gt;&lt;Style parent="" me="Normal" /&gt;&lt;Style parent="Normal" me="Heading" /&gt;&lt;Style parent="Heading" me="Footer" /&gt;&lt;Style parent="Heading" me="Caption" /&gt;&lt;Style parent="Heading" me="Inactive" /&gt;&lt;Style parent="Normal" me="Selected" /&gt;&lt;Style parent="Normal" me="Editor" /&gt;&lt;Style parent="Normal" me="HighlightRow" /&gt;&lt;Style parent="Normal" me="EvenRow" /&gt;&lt;Style parent="Normal" me="OddRow" /&gt;&lt;Style parent="Heading" me="RecordSelector" /&gt;&lt;Style parent="Normal" me="FilterBar" /&gt;&lt;Style parent="FilterBar" me="FilterWatermark" /&gt;&lt;Style parent="Caption" me="Group" /&gt;&lt;/NamedStyles&gt;&lt;vertSplits&gt;1&lt;/vertSplits&gt;&lt;horzSplits&gt;1&lt;/horzSplits&gt;&lt;Layout&gt;None&lt;/Layout&gt;&lt;DefaultRecSelWidth&gt;17&lt;/DefaultRecSelWidth&gt;&lt;ClientArea&gt;0, 0, 751, 423&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
+    <value>&lt;?xml version="1.0"?&gt;&lt;Blob&gt;&lt;Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"&gt;&lt;Data&gt;HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:Aqua;}Normal{}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{}Style3{}Footer{}Style14{}Heading{ForeColor:ControlText;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"&gt;&lt;CaptionStyle parent="Style2" me="Style10" /&gt;&lt;EditorStyle parent="Editor" me="Style5" /&gt;&lt;EvenRowStyle parent="EvenRow" me="Style8" /&gt;&lt;FilterBarStyle parent="FilterBar" me="Style13" /&gt;&lt;FilterWatermarkStyle parent="FilterWatermark" me="Style14" /&gt;&lt;FooterStyle parent="Footer" me="Style3" /&gt;&lt;GroupStyle parent="Group" me="Style12" /&gt;&lt;HeadingStyle parent="Heading" me="Style2" /&gt;&lt;HighLightRowStyle parent="HighlightRow" me="Style7" /&gt;&lt;InactiveStyle parent="Inactive" me="Style4" /&gt;&lt;OddRowStyle parent="OddRow" me="Style9" /&gt;&lt;RecordSelectorStyle parent="RecordSelector" me="Style11" /&gt;&lt;SelectedStyle parent="Selected" me="Style6" /&gt;&lt;Style parent="Normal" me="Style1" /&gt;&lt;ClientRect&gt;0, 0, 751, 423&lt;/ClientRect&gt;&lt;BorderSide&gt;0&lt;/BorderSide&gt;&lt;/C1.Win.C1TrueDBGrid.MergeView&gt;&lt;/Splits&gt;&lt;NamedStyles&gt;&lt;Style parent="" me="Normal" /&gt;&lt;Style parent="Normal" me="Heading" /&gt;&lt;Style parent="Heading" me="Footer" /&gt;&lt;Style parent="Heading" me="Caption" /&gt;&lt;Style parent="Heading" me="Inactive" /&gt;&lt;Style parent="Normal" me="Selected" /&gt;&lt;Style parent="Normal" me="Editor" /&gt;&lt;Style parent="Normal" me="HighlightRow" /&gt;&lt;Style parent="Normal" me="EvenRow" /&gt;&lt;Style parent="Normal" me="OddRow" /&gt;&lt;Style parent="Heading" me="RecordSelector" /&gt;&lt;Style parent="Normal" me="FilterBar" /&gt;&lt;Style parent="FilterBar" me="FilterWatermark" /&gt;&lt;Style parent="Caption" me="Group" /&gt;&lt;/NamedStyles&gt;&lt;vertSplits&gt;1&lt;/vertSplits&gt;&lt;horzSplits&gt;1&lt;/horzSplits&gt;&lt;Layout&gt;None&lt;/Layout&gt;&lt;DefaultRecSelWidth&gt;17&lt;/DefaultRecSelWidth&gt;&lt;ClientArea&gt;0, 0, 751, 423&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
  </data>
  <metadata name="OpenFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>239, 17</value>
--- a/DPM2016/Utils/Globals.vb
+++ b/DPM2016/Utils/Globals.vb
@@ -33,7 +33,7 @@ Module Globals
    Public SaveDir As String = ""
    Public DokumentDir As String = ""
    Public pdfCollection As New Collection
-
+    Public InAbschluss As Integer = 0
    Public License As New SHUKeyGen.clsKeyGen("", "", "", "", "", ":DPMKEY:", "Steafn Hutter Unternehmensberatung, 8808 Pfäffikon SZ")

    Public Enum Taxpunkttyp
--- a/DPM2016/bin/Debug/Connectionstrings.cfg
+++ b/DPM2016/bin/Debug/Connectionstrings.cfg
@@ -1,4 +1,5 @@
-˜Š“ˆ¬¶ÈµeÅÄÃÆ¨·‹¸°Âu~Ž«³»µ½¶ºg›™¤™¼µ¨‚ª¶¶ª³³ÁÈ¦²sÁµ¾À¹€»ÃÂ¹¬Ä¯¹±eÁ¸¥ºÄªÈÎ‹š‹ˆysÀ«³¸¯¹½kÂ³¶É·¯µÇh¾Âº´»¯À¸·‰¼·¿°ÁÇ£¹»°Âu·«us ™³±¦¹f¹²Å´‹‡„~||Ã»ºÆt®¶’Áµ€Â¯¸»Ä´À·oÅ©É‡‡
+¦´«º±ÃŽ¸¦Æ¶nÇ´ÇÀ¨Š¸¶ÈruªÂ¾Â°™¤P›±º¢±µ†¯¿»²Æ´«º±Ã½³ÆºµÆ¦Æ³©hÀª±È´®Æº‘¨¡—s Â¹ª¸ºf¼°²ÃÅ½¹¿a·¶»Ã‘«³ÁÁ¹€É½·³À¹¯Ç«´Àa½¹‹‚¨™“£µºa¸¯À®ˆƒ~ŒŠ€»´³ºu½¸‚Å¶‰Ä¦ÅÁ¼·¿©‹}µÇs
+˜Š“ˆ¬¶ÈµeÅÄÃÆ¨·‹¸°Âu~Ž«³»µ½¶ºg›™¤™¼µ¨‚ª¶¶ª³³ÁÈ¦²sÁµ¾À¹€»ÃÂ¹¬Ä¯¹±eÁ¸¥ºÄªÈÎ‹š‹ˆysÀ«³¸¯¹½kÂ³¶É·¯µÇh¾Âº´»¯À¸·‰¼·¿°ÁÇ£¹»°Âu·«us ™³±¦¹f¹²Å´‹‡„~||Ã»ºÆt®¶’Áµ€Â¯¸»Ä´À·oÅ©É‡‡
 ˜ª´µ·»¸µ¹³uÁÃºÄ±ª…ÀÃƒr€»¯½É·¨¤X“™Ä§´ƒ»¼€ƒ…}¥r‰±ÃÈ¹¬Ä¶Â¹©rÁª«Â··Ç»‚¥”¤ž‰·ª£¡Ãºa¸«©¾½¸ÂÌt®´§½…»µÀ¸·ÅÃ·½Á¹©Á®½Áb®¶~Å¯ª£¤XÃ¯»ªƒzy„…‰ÈÇª¸a·¬’Çµ€Â¶ÁÇ¼ÁÀ©…w¸¶Èt~
 ¤·§¹·»¸µ¹³uÁÃºÄ±ª…ÀÃƒr€»¯½É·¨¤X“™Ä§´ƒ»¼£Æ¦¾ªÁƒ¾ÂÈª¹Ç¯Èª¶n¸°ºÀ¼¶¾”§¥—‚¨¢«¹¹µe¹«¬ÀÁ·ÇÍe¯¯´·’ºµ±Åº‰Ë´Ä¹¸¼®¹·Â°e»¥‘¾¨›£•¬p¹ª¿«ƒ}{ˆ„ŽÉ¸«³n±¹‘Ç¦Å¯Ç¸É½·¬ŠoÁ»·w‹
 ˜ª´µ·»´ª¡¶¶ÂµeÅ½ºº°ª‹„{w€rŠ|xii^mˆª³¯º²¬»n¶µ¹§½¯’˜¹³Æ¾ÁºÅ³·h¶©‹Æ£€Â¢ÇÈÅ¶ªœmbÃ®¶w
--- a/DPM2016/bin/Debug/DPM2018.application
+++ b/DPM2016/bin/Debug/DPM2018.application
@@ -7,14 +7,14 @@
    <framework targetVersion="4.6" profile="Full" supportedRuntime="4.0.30319" />
  </compatibleFrameworks>
  <dependency>
-    <dependentAssembly dependencyType="install" codebase="DPM2018.exe.manifest" size="27131">
+    <dependentAssembly dependencyType="install" codebase="DPM2018.exe.manifest" size="27536">
      <assemblyIdentity name="DPM2018.exe" version="1.0.0.1" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>+bIQkBXvmXpPwDPNmYVKPROccXrRsA64OYFJKbgau50=</dsig:DigestValue>
+        <dsig:DigestValue>j6iOzVhg/wmUAnUdIIcsTQxiFzWd7Y6Umtx1txLmI1c=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/DPM2016/bin/Debug/DPM2018.exe
+++ b/DPM2016/bin/Debug/DPM2018.exe
--- a/DPM2016/bin/Debug/DPM2018.exe.manifest
+++ b/DPM2016/bin/Debug/DPM2018.exe.manifest
@@ -52,11 +52,6 @@
      <assemblyIdentity name="MySql.Data.Entity" version="6.7.4.0" publicKeyToken="C5687FC88969C44D" language="neutral" processorArchitecture="msil" />
    </dependentAssembly>
  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="preRequisite" allowDelayedBinding="true">
-      <assemblyIdentity name="Syncfusion.PdfViewer.Windows" version="16.2350.0.41" publicKeyToken="3D67ED1F87D44C89" language="neutral" processorArchitecture="msil" />
-    </dependentAssembly>
-  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Aga.Controls.dll" size="86016">
      <assemblyIdentity name="Aga.Controls" version="1.0.0.0" publicKeyToken="FCC90FBF924463A3" language="neutral" processorArchitecture="msil" />
@@ -166,14 +161,14 @@
    </dependentAssembly>
  </dependency>
  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DPM2018.exe" size="5651960">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DPM2018.exe" size="5652472">
      <assemblyIdentity name="DPM2018" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>9ffgVCtaqcFBB7+VTkYr60EImPyXWmhUklRtY6m18NI=</dsig:DigestValue>
+        <dsig:DigestValue>GsZRKuwqk6Xf22e5r6oFfIc37kkzT/TEAJj+uJl3Gfw=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
@@ -381,6 +376,18 @@
      </hash>
    </dependentAssembly>
  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Syncfusion.PdfViewer.Windows.dll" size="1893888">
+      <assemblyIdentity name="Syncfusion.PdfViewer.Windows" version="16.2350.0.41" publicKeyToken="3D67ED1F87D44C89" language="neutral" processorArchitecture="msil" />
+      <hash>
+        <dsig:Transforms>
+          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
+        </dsig:Transforms>
+        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+        <dsig:DigestValue>IIBVzhy6EYdd8gXI9sVU/NqxevRGxCADg9ULapTktOs=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Syncfusion.Shared.Base.dll" size="4308992">
      <assemblyIdentity name="Syncfusion.Shared.Base" version="16.2350.0.41" publicKeyToken="3D67ED1F87D44C89" language="neutral" processorArchitecture="msil" />
--- a/DPM2016/bin/Debug/DPM2018.pdb
+++ b/DPM2016/bin/Debug/DPM2018.pdb
--- a/DPM2016/bin/Debug/Dentis/Reporting/Report/Zahlungsjournal.frx
+++ b/DPM2016/bin/Debug/Dentis/Reporting/Report/Zahlungsjournal.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="Vb" ReportInfo.Created="11/28/2015 07:43:07" ReportInfo.Modified="08/26/2018 11:13:08" ReportInfo.CreatorVersion="2018.2.11.0">
+<Report ScriptLanguage="Vb" ReportInfo.Created="11/28/2015 07:43:07" ReportInfo.Modified="03/24/2019 19:40:28" ReportInfo.CreatorVersion="2018.4.2.0">
  <ScriptText>Imports System
 Imports System.Collections
 Imports System.Collections.Generic
@@ -41,6 +41,7 @@ End Namespace
      <Column Name="Konto" DataType="System.String"/>
      <Column Name="Statusdatum" DataType="System.DateTime"/>
      <Column Name="Storno" DataType="System.String"/>
+      <Column Name="RGDatum" DataType="System.DateTime"/>
    </TableDataSource>
    <Parameter Name="Absender" DataType="System.String"/>
    <Parameter Name="Datum von" DataType="System.String"/>
@@ -52,32 +53,35 @@ End Namespace
    <ReportTitleBand Name="ReportTitle1" Width="718.2" Height="56.7">
      <TextObject Name="Text1" Left="349.65" Width="349.65" Height="18.9" Text="Zahlungsjournal [Datum von] bis [Datum bis]" HorzAlign="Right" Font="Arial, 10pt, style=Bold, Underline"/>
      <TextObject Name="Text12" Left="349.65" Top="18.9" Width="349.65" Height="18.9" Text="[Absender]" HorzAlign="Right"/>
-      <PictureObject Name="Picture1" Left="9.45" Width="160.65" Height="47.25" BeforePrintEvent="Picture1_BeforePrint" Image=""/>
+      <PictureObject Name="Picture1" Left="9.45" Width="160.65" Height="47.25" BeforePrintEvent="Picture1_BeforePrint" ImageLocation="E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Dentis\\Reporting\Logo\reportlogo.png"/>
    </ReportTitleBand>
-    <PageHeaderBand Name="PageHeader1" Top="60.03" Width="718.2" Height="28.35">
-      <LineObject Name="Line1" Left="9.45" Top="18.9" Width="689.85"/>
+    <PageHeaderBand Name="PageHeader1" Top="59.56" Width="718.2" Height="28.35">
+      <LineObject Name="Line1" Left="9.45" Top="18.9" Width="699.3"/>
      <TextObject Name="Text3" Left="9.45" Width="94.5" Height="18.9" Text="Valuta" Font="Arial, 8pt, style=Bold"/>
-      <TextObject Name="Text5" Left="103.95" Width="94.5" Height="18.9" Text="Debitor" Font="Arial, 8pt, style=Bold"/>
-      <TextObject Name="Text7" Left="406.35" Width="94.5" Height="18.9" Text="Betrag" HorzAlign="Right" Font="Arial, 8pt, style=Bold"/>
-      <TextObject Name="Text8" Left="510.3" Width="28.35" Height="18.9" Text="VZ" Font="Arial, 8pt, style=Bold"/>
-      <TextObject Name="Text13" Left="538.65" Width="94.5" Height="18.9" Text="Konto" Font="Arial, 8pt, style=Bold"/>
-      <TextObject Name="Text15" Left="642.6" Width="94.5" Height="18.9" Text="Storno" Font="Arial, 8pt, style=Bold"/>
+      <TextObject Name="Text5" Left="94.5" Width="94.5" Height="18.9" Text="Debitor" Font="Arial, 8pt, style=Bold"/>
+      <TextObject Name="Text7" Left="302.4" Width="94.5" Height="18.9" Text="Betrag" HorzAlign="Right" Font="Arial, 8pt, style=Bold"/>
+      <TextObject Name="Text8" Left="415.8" Width="28.35" Height="18.9" Text="VZ" Font="Arial, 8pt, style=Bold"/>
+      <TextObject Name="Text13" Left="444.15" Width="75.6" Height="18.9" Text="Konto" Font="Arial, 8pt, style=Bold"/>
+      <TextObject Name="Text15" Left="529.2" Width="47.25" Height="18.9" Text="Storno" Font="Arial, 8pt, style=Bold"/>
+      <TextObject Name="Text19" Left="576.45" Width="132.3" Height="18.9" Text="RG-Nummer / Datum" Font="Arial, 8pt, style=Bold"/>
    </PageHeaderBand>
-    <DataBand Name="Data1" Top="91.72" Width="718.2" Height="18.9" DataSource="Daten" Filter="[Daten.Konto]=[Konto]  OR [Konto]=&quot;&quot;">
+    <DataBand Name="Data1" Top="90.76" Width="718.2" Height="18.9" CanGrow="true" DataSource="Daten" Filter="[Daten.Konto]=[Konto]  OR [Konto]=&quot;&quot;">
      <TextObject Name="Text2" Left="9.45" Width="75.6" Height="18.9" Text="[Daten.Valuta]" Duplicates="Hide" Format="Date" Format.Format="d" Font="Arial, 8pt"/>
-      <TextObject Name="Text4" Left="103.95" Width="274.05" Height="18.9" Text="[Daten.Debitor]" Font="Arial, 8pt"/>
-      <TextObject Name="Text6" Left="406.35" Width="94.5" Height="18.9" Text="[Daten.Betrag]" Format="Number" Format.UseLocale="true" HorzAlign="Right" WordWrap="false" Font="Arial, 8pt" Trimming="EllipsisCharacter"/>
-      <CheckBoxObject Name="CheckBox1" Left="510.3" Width="18.9" Height="18.9" Checked="false" DataColumn="Daten.Vorauszahlung"/>
-      <TextObject Name="Text9" Left="538.65" Width="94.5" Height="18.9" Text="[Daten.Konto]" Font="Arial, 8pt"/>
-      <TextObject Name="Text14" Left="642.6" Width="94.5" Height="18.9" Text="[Daten.Storno]" Font="Arial, 8pt"/>
+      <TextObject Name="Text4" Left="94.5" Width="226.8" Height="18.9" CanGrow="true" Text="[Daten.Debitor]" Font="Arial, 8pt"/>
+      <TextObject Name="Text6" Left="330.75" Width="66.15" Height="18.9" Text="[Daten.Betrag]" Format="Number" Format.UseLocale="false" Format.DecimalDigits="2" Format.DecimalSeparator="." Format.GroupSeparator="'" Format.NegativePattern="1" HorzAlign="Right" WordWrap="false" Font="Arial, 8pt"/>
+      <CheckBoxObject Name="CheckBox1" Left="415.8" Width="18.9" Height="18.9" Checked="false" DataColumn="Daten.Vorauszahlung"/>
+      <TextObject Name="Text9" Left="444.15" Width="94.5" Height="18.9" Text="[Daten.Konto]" Font="Arial, 8pt"/>
+      <TextObject Name="Text14" Left="529.2" Width="37.8" Height="18.9" Text="[Daten.Storno]" Font="Arial, 8pt"/>
+      <TextObject Name="Text17" Left="576.45" Width="75.6" Height="18.9" Text="[Daten.Nrfaktura]" Font="Arial, 8pt"/>
+      <TextObject Name="Text18" Left="652.05" Width="66.15" Height="18.9" Text="[Daten.RGDatum]" Format="Date" Format.Format="d" Font="Arial, 8pt"/>
      <Sort>
        <Sort Expression="[Daten.Valuta]"/>
      </Sort>
    </DataBand>
-    <ReportSummaryBand Name="ReportSummary1" Top="113.95" Width="718.2" Height="37.8">
-      <TextObject Name="Text16" Left="359.1" Width="141.75" Height="18.9" Text="[Total]" Format="Number" Format.UseLocale="false" Format.DecimalDigits="2" Format.DecimalSeparator="." Format.GroupSeparator="'" Format.NegativePattern="1" HorzAlign="Right" Font="Arial, 10pt, style=Bold"/>
+    <ReportSummaryBand Name="ReportSummary1" Top="112.52" Width="718.2" Height="37.8">
+      <TextObject Name="Text16" Left="255.15" Top="9.45" Width="141.75" Height="18.9" Text="[Total]" Format="Number" Format.UseLocale="false" Format.DecimalDigits="2" Format.DecimalSeparator="." Format.GroupSeparator="'" Format.NegativePattern="1" HorzAlign="Right" Font="Arial, 10pt, style=Bold"/>
    </ReportSummaryBand>
-    <PageFooterBand Name="PageFooter1" Top="155.08" Width="718.2" Height="37.8">
+    <PageFooterBand Name="PageFooter1" Top="153.18" Width="718.2" Height="37.8">
      <TextObject Name="Text10" Left="9.45" Top="9.45" Width="170.1" Height="18.9" Text="[Date]"/>
      <LineObject Name="Line2" Left="9.45" Width="689.85"/>
      <TextObject Name="Text11" Left="604.8" Top="9.45" Width="94.5" Height="18.9" Text="[Page#]" HorzAlign="Right"/>
--- a/DPM2016/bin/Debug/Dentis/Reporting/SQL/Zahlungsjournal.sql
+++ b/DPM2016/bin/Debug/Dentis/Reporting/SQL/Zahlungsjournal.sql
@@ -3,7 +3,8 @@
 #Parameter3:Konto:DataTable:select konto from konto order by konto
 -SQL-
 SELECT        TOP (100) PERCENT dbo.get_name(dbo.Zahlung.Nrdebitor) AS Debitor, dbo.Zahlung.Nrfaktura, dbo.Zahlung.Valuta, dbo.Zahlung.Betrag, dbo.Zahlung.Vorauszahlung, dbo.Zahlung.Status, dbo.Zahlung.Nrkonto, dbo.KONTO.Konto, 
-                         dbo.Zahlung.Statusdatum, case when status=9 then 'J' else '' end as Storno
+                         dbo.Zahlung.Statusdatum, CASE WHEN DBO.ZAHLUNG.status = 9 THEN 'J' ELSE '' END AS Storno, dbo.faktura.Datum AS RGDatum
 FROM            dbo.Zahlung INNER JOIN
-                         dbo.KONTO ON dbo.Zahlung.Nrkonto = dbo.KONTO.Nrkonto
-where  statusdatum>='#Parameter1 00:00:00' and statusdatum <='#Parameter2 23:59:59'
+                         dbo.KONTO ON dbo.Zahlung.Nrkonto = dbo.KONTO.Nrkonto INNER JOIN
+                         dbo.faktura ON dbo.Zahlung.Nrfaktura = dbo.faktura.Nrfaktura
+where  dbo.zahlung.valuta>='#Parameter1 00:00:00' and dbo.zahlung.valuta <='#Parameter2 23:59:59' and dbo.konto.konto='#Parameter3'
--- a/DPM2016/bin/Debug/Praxis/Reporting/Report/Zahlungsjournal.frx
+++ b/DPM2016/bin/Debug/Praxis/Reporting/Report/Zahlungsjournal.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="Vb" ReportInfo.Created="11/28/2015 07:43:07" ReportInfo.Modified="08/26/2018 11:13:08" ReportInfo.CreatorVersion="2018.2.11.0">
+<Report ScriptLanguage="Vb" ReportInfo.Created="11/28/2015 07:43:07" ReportInfo.Modified="03/24/2019 19:39:34" ReportInfo.CreatorVersion="2018.4.2.0">
  <ScriptText>Imports System
 Imports System.Collections
 Imports System.Collections.Generic
@@ -41,6 +41,7 @@ End Namespace
      <Column Name="Konto" DataType="System.String"/>
      <Column Name="Statusdatum" DataType="System.DateTime"/>
      <Column Name="Storno" DataType="System.String"/>
+      <Column Name="RGDatum" DataType="System.DateTime"/>
    </TableDataSource>
    <Parameter Name="Absender" DataType="System.String"/>
    <Parameter Name="Datum von" DataType="System.String"/>
@@ -52,32 +53,35 @@ End Namespace
    <ReportTitleBand Name="ReportTitle1" Width="718.2" Height="56.7">
      <TextObject Name="Text1" Left="349.65" Width="349.65" Height="18.9" Text="Zahlungsjournal [Datum von] bis [Datum bis]" HorzAlign="Right" Font="Arial, 10pt, style=Bold, Underline"/>
      <TextObject Name="Text12" Left="349.65" Top="18.9" Width="349.65" Height="18.9" Text="[Absender]" HorzAlign="Right"/>
-      <PictureObject Name="Picture1" Left="9.45" Width="160.65" Height="47.25" BeforePrintEvent="Picture1_BeforePrint" Image=""/>
+      <PictureObject Name="Picture1" Left="9.45" Width="160.65" Height="47.25" BeforePrintEvent="Picture1_BeforePrint" ImageLocation="E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Praxis\\Reporting\Logo\reportlogo.png"/>
    </ReportTitleBand>
-    <PageHeaderBand Name="PageHeader1" Top="60.03" Width="718.2" Height="28.35">
-      <LineObject Name="Line1" Left="9.45" Top="18.9" Width="689.85"/>
+    <PageHeaderBand Name="PageHeader1" Top="59.56" Width="718.2" Height="28.35">
+      <LineObject Name="Line1" Left="9.45" Top="18.9" Width="699.3"/>
      <TextObject Name="Text3" Left="9.45" Width="94.5" Height="18.9" Text="Valuta" Font="Arial, 8pt, style=Bold"/>
-      <TextObject Name="Text5" Left="103.95" Width="94.5" Height="18.9" Text="Debitor" Font="Arial, 8pt, style=Bold"/>
-      <TextObject Name="Text7" Left="406.35" Width="94.5" Height="18.9" Text="Betrag" HorzAlign="Right" Font="Arial, 8pt, style=Bold"/>
-      <TextObject Name="Text8" Left="510.3" Width="28.35" Height="18.9" Text="VZ" Font="Arial, 8pt, style=Bold"/>
-      <TextObject Name="Text13" Left="538.65" Width="94.5" Height="18.9" Text="Konto" Font="Arial, 8pt, style=Bold"/>
-      <TextObject Name="Text15" Left="642.6" Width="94.5" Height="18.9" Text="Storno" Font="Arial, 8pt, style=Bold"/>
+      <TextObject Name="Text5" Left="94.5" Width="94.5" Height="18.9" Text="Debitor" Font="Arial, 8pt, style=Bold"/>
+      <TextObject Name="Text7" Left="302.4" Width="94.5" Height="18.9" Text="Betrag" HorzAlign="Right" Font="Arial, 8pt, style=Bold"/>
+      <TextObject Name="Text8" Left="415.8" Width="28.35" Height="18.9" Text="VZ" Font="Arial, 8pt, style=Bold"/>
+      <TextObject Name="Text13" Left="444.15" Width="75.6" Height="18.9" Text="Konto" Font="Arial, 8pt, style=Bold"/>
+      <TextObject Name="Text15" Left="529.2" Width="47.25" Height="18.9" Text="Storno" Font="Arial, 8pt, style=Bold"/>
+      <TextObject Name="Text19" Left="576.45" Width="132.3" Height="18.9" Text="RG-Nummer / Datum" Font="Arial, 8pt, style=Bold"/>
    </PageHeaderBand>
-    <DataBand Name="Data1" Top="91.72" Width="718.2" Height="18.9" DataSource="Daten" Filter="[Daten.Konto]=[Konto]  OR [Konto]=&quot;&quot;">
+    <DataBand Name="Data1" Top="90.76" Width="718.2" Height="18.9" CanGrow="true" DataSource="Daten" Filter="[Daten.Konto]=[Konto]  OR [Konto]=&quot;&quot;">
      <TextObject Name="Text2" Left="9.45" Width="75.6" Height="18.9" Text="[Daten.Valuta]" Duplicates="Hide" Format="Date" Format.Format="d" Font="Arial, 8pt"/>
-      <TextObject Name="Text4" Left="103.95" Width="274.05" Height="18.9" Text="[Daten.Debitor]" Font="Arial, 8pt"/>
-      <TextObject Name="Text6" Left="406.35" Width="94.5" Height="18.9" Text="[Daten.Betrag]" Format="Number" Format.UseLocale="true" HorzAlign="Right" WordWrap="false" Font="Arial, 8pt" Trimming="EllipsisCharacter"/>
-      <CheckBoxObject Name="CheckBox1" Left="510.3" Width="18.9" Height="18.9" Checked="false" DataColumn="Daten.Vorauszahlung"/>
-      <TextObject Name="Text9" Left="538.65" Width="94.5" Height="18.9" Text="[Daten.Konto]" Font="Arial, 8pt"/>
-      <TextObject Name="Text14" Left="642.6" Width="94.5" Height="18.9" Text="[Daten.Storno]" Font="Arial, 8pt"/>
+      <TextObject Name="Text4" Left="94.5" Width="226.8" Height="18.9" CanGrow="true" Text="[Daten.Debitor]" Font="Arial, 8pt"/>
+      <TextObject Name="Text6" Left="330.75" Width="66.15" Height="18.9" Text="[Daten.Betrag]" Format="Number" Format.UseLocale="false" Format.DecimalDigits="2" Format.DecimalSeparator="." Format.GroupSeparator="'" Format.NegativePattern="1" HorzAlign="Right" WordWrap="false" Font="Arial, 8pt"/>
+      <CheckBoxObject Name="CheckBox1" Left="415.8" Width="18.9" Height="18.9" Checked="false" DataColumn="Daten.Vorauszahlung"/>
+      <TextObject Name="Text9" Left="444.15" Width="94.5" Height="18.9" Text="[Daten.Konto]" Font="Arial, 8pt"/>
+      <TextObject Name="Text14" Left="529.2" Width="37.8" Height="18.9" Text="[Daten.Storno]" Font="Arial, 8pt"/>
+      <TextObject Name="Text17" Left="576.45" Width="75.6" Height="18.9" Text="[Daten.Nrfaktura]" Font="Arial, 8pt"/>
+      <TextObject Name="Text18" Left="652.05" Width="66.15" Height="18.9" Text="[Daten.RGDatum]" Format="Date" Format.Format="d" Font="Arial, 8pt"/>
      <Sort>
        <Sort Expression="[Daten.Valuta]"/>
      </Sort>
    </DataBand>
-    <ReportSummaryBand Name="ReportSummary1" Top="113.95" Width="718.2" Height="37.8">
-      <TextObject Name="Text16" Left="359.1" Width="141.75" Height="18.9" Text="[Total]" Format="Number" Format.UseLocale="false" Format.DecimalDigits="2" Format.DecimalSeparator="." Format.GroupSeparator="'" Format.NegativePattern="1" HorzAlign="Right" Font="Arial, 10pt, style=Bold"/>
+    <ReportSummaryBand Name="ReportSummary1" Top="112.52" Width="718.2" Height="37.8">
+      <TextObject Name="Text16" Left="255.15" Top="9.45" Width="141.75" Height="18.9" Text="[Total]" Format="Number" Format.UseLocale="false" Format.DecimalDigits="2" Format.DecimalSeparator="." Format.GroupSeparator="'" Format.NegativePattern="1" HorzAlign="Right" Font="Arial, 10pt, style=Bold"/>
    </ReportSummaryBand>
-    <PageFooterBand Name="PageFooter1" Top="155.08" Width="718.2" Height="37.8">
+    <PageFooterBand Name="PageFooter1" Top="153.18" Width="718.2" Height="37.8">
      <TextObject Name="Text10" Left="9.45" Top="9.45" Width="170.1" Height="18.9" Text="[Date]"/>
      <LineObject Name="Line2" Left="9.45" Width="689.85"/>
      <TextObject Name="Text11" Left="604.8" Top="9.45" Width="94.5" Height="18.9" Text="[Page#]" HorzAlign="Right"/>
--- a/DPM2016/bin/Debug/Praxis/Reporting/SQL/Zahlungsjournal.sql
+++ b/DPM2016/bin/Debug/Praxis/Reporting/SQL/Zahlungsjournal.sql
@@ -3,7 +3,8 @@
 #Parameter3:Konto:DataTable:select konto from konto order by konto
 -SQL-
 SELECT        TOP (100) PERCENT dbo.get_name(dbo.Zahlung.Nrdebitor) AS Debitor, dbo.Zahlung.Nrfaktura, dbo.Zahlung.Valuta, dbo.Zahlung.Betrag, dbo.Zahlung.Vorauszahlung, dbo.Zahlung.Status, dbo.Zahlung.Nrkonto, dbo.KONTO.Konto, 
-                         dbo.Zahlung.Statusdatum, case when status=9 then 'J' else '' end as Storno
+                         dbo.Zahlung.Statusdatum, CASE WHEN DBO.ZAHLUNG.status = 9 THEN 'J' ELSE '' END AS Storno, dbo.faktura.Datum AS RGDatum
 FROM            dbo.Zahlung INNER JOIN
-                         dbo.KONTO ON dbo.Zahlung.Nrkonto = dbo.KONTO.Nrkonto
-where  statusdatum>='#Parameter1 00:00:00' and statusdatum <='#Parameter2 23:59:59'
+                         dbo.KONTO ON dbo.Zahlung.Nrkonto = dbo.KONTO.Nrkonto INNER JOIN
+                         dbo.faktura ON dbo.Zahlung.Nrfaktura = dbo.faktura.Nrfaktura
+where  dbo.zahlung.valuta>='#Parameter1 00:00:00' and dbo.zahlung.valuta <='#Parameter2 23:59:59' and dbo.konto.konto='#Parameter3'
--- a/DPM2016/bin/Debug/app.publish/DPM2018.exe
+++ b/DPM2016/bin/Debug/app.publish/DPM2018.exe
--- a/DPM2016/bin/Release/Connectionstrings.cfg
+++ b/DPM2016/bin/Release/Connectionstrings.cfg
@@ -1 +1,7 @@
-˜Š“ˆ¬¶ÈµeÅÄÃÆ¨·‹²»À¶º‰p¼·£À¶¼«f›˜s¹´ª¹¯§µk²¯Çµ±µ¨‹»½É¶©±¹¾Á©·»´ƒ½¦±¾§¹r´½Ï³„lhin‹»´ª¸f²¯ŒÁ»É§ª ²¸Â¸¹²Á¾µ¸ÅÅ´º±‚¡›—o¶±Á¹³´§ji
+˜Š“ˆ¬¶ÈµeÅÄÃÆ¨·‹¸°Âu~Ž«³»µ½¶ºg›™¤™¼µ¨‚ª¶¶ª³³ÁÈ¦²sÁµ¾À¹€»ÃÂ¹¬Ä¯¹±eÁ¸¥ºÄªÈÎ‹š‹ˆysÀ«³¸¯¹½kÂ³¶É·¯µÇh¾Âº´»¯À¸·‰¼·¿°ÁÇ£¹»°Âu·«us ™³±¦¹f¹²Å´‹‡„~||Ã»ºÆt®¶’Áµ€Â¯¸»Ä´À·oÅ©É‡‡
+˜ª´µ·»¸µ¹³uÁÃºÄ±ª…ÀÃƒr€»¯½É·¨¤X“™Ä§´ƒ»¼€ƒ…}¥r‰±ÃÈ¹¬Ä¶Â¹©rÁª«Â··Ç»‚¥”¤ž‰·ª£¡Ãºa¸«©¾½¸ÂÌt®´§½…»µÀ¸·ÅÃ·½Á¹©Á®½Áb®¶~Å¯ª£¤XÃ¯»ªƒzy„…‰ÈÇª¸a·¬’Çµ€Â¶ÁÇ¼ÁÀ©…w¸¶Èt~
+¤·§¹·»¸µ¹³uÁÃºÄ±ª…ÀÃƒr€»¯½É·¨¤X“™Ä§´ƒ»¼£Æ¦¾ªÁƒ¾ÂÈª¹Ç¯Èª¶n¸°ºÀ¼¶¾”§¥—‚¨¢«¹¹µe¹«¬ÀÁ·ÇÍe¯¯´·’ºµ±Åº‰Ë´Ä¹¸¼®¹·Â°e»¥‘¾¨›£•¬p¹ª¿«ƒ}{ˆ„ŽÉ¸«³n±¹‘Ç¦Å¯Ç¸É½·¬ŠoÁ»·w‹
+˜ª´µ·»´ª¡¶¶ÂµeÅ½ºº°ª‹„{w€rŠ|xii^mˆª³¯º²¬»n¶µ¹§½¯’˜¹³Æ¾ÁºÅ³·h¶©‹Æ£€Â¢ÇÈÅ¶ªœmbÃ®¶w
+¤·§¹·»´ª¡¶¶ÂµeÅ½ºº°ª‹„{w€rŠ|xii^mˆª³¯º²¬»n¶µ¹§½¯’¤Æ¦Ê¾ÁºÅ³·h¶©‹Æ£€Â¢ÇÈÅ¶ªœmbÃ®¶w
+˜ª´µ·»´¡Í˜£¡ˆÇªÄÄªºŠ±½¶£±º°ÇÉ‰œ«¢X™ª~·µµ½†³¯Çµ§§´³…¹ÄÁw‚††³v¾¦»À¼½Å¦‚ÅºÇ¹°¨
+˜ª³°¥·Àµ³¶²µ¹³n¸·Â·±¸²Å´ÅÁ„u¯’¤±´¥s©®„´½·Ç½¦²a±©ÉµÀ´¹’Á¼º´²¤¬½²²¸¯´±µ¸¹¬¬X£¡Ê«~yv†ÄÁ¸Æe¯¥‹»½É¶©±¹¾Á©·»´ƒ½¦ÁÆ¹´Ä¥‘¨–œbœ ¥´«®´x
--- a/DPM2016/bin/Release/DPM2018.application
+++ b/DPM2016/bin/Release/DPM2018.application
@@ -7,14 +7,14 @@
    <framework targetVersion="4.6" profile="Full" supportedRuntime="4.0.30319" />
  </compatibleFrameworks>
  <dependency>
-    <dependentAssembly dependencyType="install" codebase="DPM2018.exe.manifest" size="27539">
+    <dependentAssembly dependencyType="install" codebase="DPM2018.exe.manifest" size="27536">
      <assemblyIdentity name="DPM2018.exe" version="1.0.0.1" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>XDzRIMQjIMnfi8LGcYc3Es59FQpWdnAKl1nNNB7k4yU=</dsig:DigestValue>
+        <dsig:DigestValue>r9I4JOe32LBVFgcdaPPlVcvHP7zP2iJj3sPA+I9vPcc=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/DPM2016/bin/Release/DPM2018.exe
+++ b/DPM2016/bin/Release/DPM2018.exe
--- a/DPM2016/bin/Release/DPM2018.exe.manifest
+++ b/DPM2016/bin/Release/DPM2018.exe.manifest
@@ -161,50 +161,50 @@
    </dependentAssembly>
  </dependency>
  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DPM2018.exe" size="5573112">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DPM2018.exe" size="5593592">
      <assemblyIdentity name="DPM2018" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>rPwG6TMSwXdQKqdmIt4MjEsGKyi7hL7HI3JBBJadKIA=</dsig:DigestValue>
+        <dsig:DigestValue>DRVR9BQmgKOelVyXVGVk5RXJfYpVrspq+CA4+XOfI/A=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="FastReport.dll" size="5378960">
-      <assemblyIdentity name="FastReport" version="2018.2.11.0" publicKeyToken="DB7E5CE63278458C" language="neutral" processorArchitecture="msil" />
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="FastReport.dll" size="5801360">
+      <assemblyIdentity name="FastReport" version="2018.4.2.0" publicKeyToken="DB7E5CE63278458C" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>2U6bOkyGIdEx+eav8x86aZkeOhCsyZ4Bms/AufqQn8Y=</dsig:DigestValue>
+        <dsig:DigestValue>Q4G0ogKvbQzRIJzuroDUiWIrdBwZD46FuFb1mHdASHw=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="FastReport.Bars.dll" size="5218192">
-      <assemblyIdentity name="FastReport.Bars" version="2018.2.11.0" publicKeyToken="DB7E5CE63278458C" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="FastReport.Bars" version="2018.4.2.0" publicKeyToken="DB7E5CE63278458C" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>wpAwxZO9F6GJFAWImOIhm+QET1EReXo76VvWNc7F4F8=</dsig:DigestValue>
+        <dsig:DigestValue>x6TKeRADnpG8iL/70WnGw1xisC+RBP+9WmhHQbG017E=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="FastReport.Editor.dll" size="988048">
-      <assemblyIdentity name="FastReport.Editor" version="2018.2.11.0" publicKeyToken="DB7E5CE63278458C" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="FastReport.Editor" version="2018.4.2.0" publicKeyToken="DB7E5CE63278458C" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>QZnddgw7fYoUdX8ZJTVvUGa3jUXm0KVe/iMOy4kKq3o=</dsig:DigestValue>
+        <dsig:DigestValue>ybdrHZO0BacH/7QbqvtfSecWyzFfJXyRv3MInd4Z/f0=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/DPM2016/bin/Release/DPM2018.pdb
+++ b/DPM2016/bin/Release/DPM2018.pdb
--- a/DPM2016/bin/Release/DPM2018_Secure/DPM2018.exe
+++ b/DPM2016/bin/Release/DPM2018_Secure/DPM2018.exe
--- a/DPM2016/bin/Release/DPM2018_Secure/DPM2018.pdb
+++ b/DPM2016/bin/Release/DPM2018_Secure/DPM2018.pdb
--- a/DPM2016/bin/Release/FastReport.Bars.dll
+++ b/DPM2016/bin/Release/FastReport.Bars.dll
--- a/DPM2016/bin/Release/FastReport.Editor.dll
+++ b/DPM2016/bin/Release/FastReport.Editor.dll
--- a/DPM2016/bin/Release/FastReport.dll
+++ b/DPM2016/bin/Release/FastReport.dll
--- a/DPM2016/bin/Release/SHUKeyGen.dll
+++ b/DPM2016/bin/Release/SHUKeyGen.dll
--- a/DPM2016/bin/Release/SHUKeyGen_Secure/SHUKeyGen.dll
+++ b/DPM2016/bin/Release/SHUKeyGen_Secure/SHUKeyGen.dll
--- a/DPM2016/bin/Release/SHUKeyGen_Secure/SHUKeyGen.pdb
+++ b/DPM2016/bin/Release/SHUKeyGen_Secure/SHUKeyGen.pdb
--- a/DPM2016/bin/Release/app.publish/DPM2018.exe
+++ b/DPM2016/bin/Release/app.publish/DPM2018.exe
--- a/DPM2016/obj/Debug/DPM2016.frmStammdaten.resources
+++ b/DPM2016/obj/Debug/DPM2016.frmStammdaten.resources
--- a/DPM2016/obj/Debug/DPM2016.vbproj.CoreCompileInputs.cache
+++ b/DPM2016/obj/Debug/DPM2016.vbproj.CoreCompileInputs.cache
@@ -1 +1 @@
-bdb0e9760a3439be5cb9103eeaaa7facdac0538d
+b8691d0dd18cceb13c3773bb6e186248e884077e
--- a/DPM2016/obj/Debug/DPM2016.vbproj.FileListAbsolute.txt
+++ b/DPM2016/obj/Debug/DPM2016.vbproj.FileListAbsolute.txt
@@ -107,5 +107,9 @@ E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.Compression.Base.x
 E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.Pdf.Base.xml
 E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.Shared.Base.xml
 E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.Shared.Windows.xml
-E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.vbprojResolveAssemblyReference.cache
 E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\FastReport.xml
+E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.PdfViewer.Windows.dll
+E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\PropertyGridEx.dll
+E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\PropertyGridEx.pdb
+E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\PropertyGridEx.xml
+E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.vbprojResolveAssemblyReference.cache
--- a/DPM2016/obj/Debug/DPM2016.vbproj.GenerateResource.Cache
+++ b/DPM2016/obj/Debug/DPM2016.vbproj.GenerateResource.Cache
--- a/DPM2016/obj/Debug/DPM2016.vbprojResolveAssemblyReference.cache
+++ b/DPM2016/obj/Debug/DPM2016.vbprojResolveAssemblyReference.cache
--- a/DPM2016/obj/Debug/DPM2018.application
+++ b/DPM2016/obj/Debug/DPM2018.application
@@ -7,14 +7,14 @@
    <framework targetVersion="4.6" profile="Full" supportedRuntime="4.0.30319" />
  </compatibleFrameworks>
  <dependency>
-    <dependentAssembly dependencyType="install" codebase="DPM2018.exe.manifest" size="27131">
+    <dependentAssembly dependencyType="install" codebase="DPM2018.exe.manifest" size="27536">
      <assemblyIdentity name="DPM2018.exe" version="1.0.0.1" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>+bIQkBXvmXpPwDPNmYVKPROccXrRsA64OYFJKbgau50=</dsig:DigestValue>
+        <dsig:DigestValue>j6iOzVhg/wmUAnUdIIcsTQxiFzWd7Y6Umtx1txLmI1c=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/DPM2016/obj/Debug/DPM2018.exe
+++ b/DPM2016/obj/Debug/DPM2018.exe
--- a/DPM2016/obj/Debug/DPM2018.exe.manifest
+++ b/DPM2016/obj/Debug/DPM2018.exe.manifest
@@ -52,11 +52,6 @@
      <assemblyIdentity name="MySql.Data.Entity" version="6.7.4.0" publicKeyToken="C5687FC88969C44D" language="neutral" processorArchitecture="msil" />
    </dependentAssembly>
  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="preRequisite" allowDelayedBinding="true">
-      <assemblyIdentity name="Syncfusion.PdfViewer.Windows" version="16.2350.0.41" publicKeyToken="3D67ED1F87D44C89" language="neutral" processorArchitecture="msil" />
-    </dependentAssembly>
-  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Aga.Controls.dll" size="86016">
      <assemblyIdentity name="Aga.Controls" version="1.0.0.0" publicKeyToken="FCC90FBF924463A3" language="neutral" processorArchitecture="msil" />
@@ -166,14 +161,14 @@
    </dependentAssembly>
  </dependency>
  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DPM2018.exe" size="5651960">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DPM2018.exe" size="5652472">
      <assemblyIdentity name="DPM2018" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>9ffgVCtaqcFBB7+VTkYr60EImPyXWmhUklRtY6m18NI=</dsig:DigestValue>
+        <dsig:DigestValue>GsZRKuwqk6Xf22e5r6oFfIc37kkzT/TEAJj+uJl3Gfw=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
@@ -381,6 +376,18 @@
      </hash>
    </dependentAssembly>
  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Syncfusion.PdfViewer.Windows.dll" size="1893888">
+      <assemblyIdentity name="Syncfusion.PdfViewer.Windows" version="16.2350.0.41" publicKeyToken="3D67ED1F87D44C89" language="neutral" processorArchitecture="msil" />
+      <hash>
+        <dsig:Transforms>
+          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
+        </dsig:Transforms>
+        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+        <dsig:DigestValue>IIBVzhy6EYdd8gXI9sVU/NqxevRGxCADg9ULapTktOs=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Syncfusion.Shared.Base.dll" size="4308992">
      <assemblyIdentity name="Syncfusion.Shared.Base" version="16.2350.0.41" publicKeyToken="3D67ED1F87D44C89" language="neutral" processorArchitecture="msil" />
--- a/DPM2016/obj/Debug/DPM2018.pdb
+++ b/DPM2016/obj/Debug/DPM2018.pdb
--- a/DPM2016/obj/Debug/DesignTimeResolveAssemblyReferences.cache
+++ b/DPM2016/obj/Debug/DesignTimeResolveAssemblyReferences.cache
--- a/DPM2016/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/DPM2016/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
--- a/DPM2016/obj/Debug/dpm2018.exe.licenses
+++ b/DPM2016/obj/Debug/dpm2018.exe.licenses
--- a/DPM2016/obj/Release/DPM2016.Benhandungdetail.resources
+++ b/DPM2016/obj/Release/DPM2016.Benhandungdetail.resources
--- a/DPM2016/obj/Release/DPM2016.Leistungen.resources
+++ b/DPM2016/obj/Release/DPM2016.Leistungen.resources
--- a/DPM2016/obj/Release/DPM2016.Mahnungen.resources
+++ b/DPM2016/obj/Release/DPM2016.Mahnungen.resources
--- a/DPM2016/obj/Release/DPM2016.clsStammdaten_Bez.resources
+++ b/DPM2016/obj/Release/DPM2016.clsStammdaten_Bez.resources
--- a/DPM2016/obj/Release/DPM2016.clsStammdaten_flat.resources
+++ b/DPM2016/obj/Release/DPM2016.clsStammdaten_flat.resources
--- a/DPM2016/obj/Release/DPM2016.frmFakturierung.resources
+++ b/DPM2016/obj/Release/DPM2016.frmFakturierung.resources
--- a/DPM2016/obj/Release/DPM2016.frmFirma.resources
+++ b/DPM2016/obj/Release/DPM2016.frmFirma.resources
--- a/DPM2016/obj/Release/DPM2016.frmStammdaten.resources
+++ b/DPM2016/obj/Release/DPM2016.frmStammdaten.resources
--- a/DPM2016/obj/Release/DPM2016.frmSuche.resources
+++ b/DPM2016/obj/Release/DPM2016.frmSuche.resources
--- a/DPM2016/obj/Release/DPM2016.vbproj.CoreCompileInputs.cache
+++ b/DPM2016/obj/Release/DPM2016.vbproj.CoreCompileInputs.cache
@@ -1 +1 @@
-c790a6b0a528455975721ab60e7f398255b148c4
+b8691d0dd18cceb13c3773bb6e186248e884077e
--- a/DPM2016/obj/Release/DPM2016.vbproj.FileListAbsolute.txt
+++ b/DPM2016/obj/Release/DPM2016.vbproj.FileListAbsolute.txt
@@ -98,11 +98,9 @@ E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Release\Gnostice.Free.Documents.dll
 E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Release\Gnostice.XtremeFontEngine.4.0.dll
 E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Release\Gnostice.XtremeImageEngine.dll
 E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Release\Ionic.Zlib.dll
-E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Release\Syncfusion.PdfViewer.Windows.dll
 E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Release\Ionic.Zip.Reduced.dll
 E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Release\Syncfusion.Compression.Base.xml
 E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Release\Syncfusion.Pdf.Base.xml
-E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Release\Syncfusion.PdfViewer.Windows.xml
 E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Release\Syncfusion.Shared.Base.xml
 E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Release\Syncfusion.Shared.Windows.xml
 E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Release\DPM2016.clsDokumente.resources
@@ -110,3 +108,8 @@ E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Release\DPM2016.dmstest.resources
 E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Release\DPM2016.DokumentDetail.resources
 E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Release\DPM2016.frmdokumentvorlagen.resources
 E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Release\DPM2016.frmImportVorlage.resources
+E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Release\FastReport.xml
+E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Release\PropertyGridEx.dll
+E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Release\Syncfusion.PdfViewer.Windows.dll
+E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Release\PropertyGridEx.pdb
+E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Release\PropertyGridEx.xml
--- a/DPM2016/obj/Release/DPM2016.vbproj.GenerateResource.cache
+++ b/DPM2016/obj/Release/DPM2016.vbproj.GenerateResource.cache
--- a/DPM2016/obj/Release/DPM2016.vbprojResolveAssemblyReference.cache
+++ b/DPM2016/obj/Release/DPM2016.vbprojResolveAssemblyReference.cache
--- a/DPM2016/obj/Release/DPM2018.application
+++ b/DPM2016/obj/Release/DPM2018.application
@@ -7,14 +7,14 @@
    <framework targetVersion="4.6" profile="Full" supportedRuntime="4.0.30319" />
  </compatibleFrameworks>
  <dependency>
-    <dependentAssembly dependencyType="install" codebase="DPM2018.exe.manifest" size="27539">
+    <dependentAssembly dependencyType="install" codebase="DPM2018.exe.manifest" size="27536">
      <assemblyIdentity name="DPM2018.exe" version="1.0.0.1" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>XDzRIMQjIMnfi8LGcYc3Es59FQpWdnAKl1nNNB7k4yU=</dsig:DigestValue>
+        <dsig:DigestValue>r9I4JOe32LBVFgcdaPPlVcvHP7zP2iJj3sPA+I9vPcc=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/DPM2016/obj/Release/DPM2018.exe
+++ b/DPM2016/obj/Release/DPM2018.exe
--- a/DPM2016/obj/Release/DPM2018.exe.manifest
+++ b/DPM2016/obj/Release/DPM2018.exe.manifest
@@ -161,50 +161,50 @@
    </dependentAssembly>
  </dependency>
  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DPM2018.exe" size="5573112">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DPM2018.exe" size="5593592">
      <assemblyIdentity name="DPM2018" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>rPwG6TMSwXdQKqdmIt4MjEsGKyi7hL7HI3JBBJadKIA=</dsig:DigestValue>
+        <dsig:DigestValue>DRVR9BQmgKOelVyXVGVk5RXJfYpVrspq+CA4+XOfI/A=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="FastReport.dll" size="5378960">
-      <assemblyIdentity name="FastReport" version="2018.2.11.0" publicKeyToken="DB7E5CE63278458C" language="neutral" processorArchitecture="msil" />
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="FastReport.dll" size="5801360">
+      <assemblyIdentity name="FastReport" version="2018.4.2.0" publicKeyToken="DB7E5CE63278458C" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>2U6bOkyGIdEx+eav8x86aZkeOhCsyZ4Bms/AufqQn8Y=</dsig:DigestValue>
+        <dsig:DigestValue>Q4G0ogKvbQzRIJzuroDUiWIrdBwZD46FuFb1mHdASHw=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="FastReport.Bars.dll" size="5218192">
-      <assemblyIdentity name="FastReport.Bars" version="2018.2.11.0" publicKeyToken="DB7E5CE63278458C" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="FastReport.Bars" version="2018.4.2.0" publicKeyToken="DB7E5CE63278458C" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>wpAwxZO9F6GJFAWImOIhm+QET1EReXo76VvWNc7F4F8=</dsig:DigestValue>
+        <dsig:DigestValue>x6TKeRADnpG8iL/70WnGw1xisC+RBP+9WmhHQbG017E=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="FastReport.Editor.dll" size="988048">
-      <assemblyIdentity name="FastReport.Editor" version="2018.2.11.0" publicKeyToken="DB7E5CE63278458C" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="FastReport.Editor" version="2018.4.2.0" publicKeyToken="DB7E5CE63278458C" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>QZnddgw7fYoUdX8ZJTVvUGa3jUXm0KVe/iMOy4kKq3o=</dsig:DigestValue>
+        <dsig:DigestValue>ybdrHZO0BacH/7QbqvtfSecWyzFfJXyRv3MInd4Z/f0=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/DPM2016/obj/Release/DPM2018.pdb
+++ b/DPM2016/obj/Release/DPM2018.pdb
--- a/DPM2016/obj/Release/DesignTimeResolveAssemblyReferences.cache
+++ b/DPM2016/obj/Release/DesignTimeResolveAssemblyReferences.cache
--- a/DPM2016/obj/Release/dpm2018.exe.licenses
+++ b/DPM2016/obj/Release/dpm2018.exe.licenses