20181112

2018-11-12 23:34:18 +01:00
parent ff62eecace
commit f2d011ff07
29 changed files with 59 additions and 49 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/Behandlung/Behandlung.vb
+++ b/DPM2016/Behandlung/Behandlung.vb
@@ -436,8 +436,20 @@ Public Class Behandlung
        r.Item("mutiert_am") = Now
        r.Item("mutierer") = Globals.ActUser
        r.Item("aktiv") = True
-        r.Item("nrgesetz") = 0
-        r.Item("nrbehandlungsart") = 0
+        Dim dbgesetz As New clsDB
+        dbgesetz.Get_Tabledata("Gesetz", "", "Select * from gesetz where standard=1")
+        If dbgesetz.dsDaten.Tables(0).Rows.Count = 0 Then
+            r.Item("nrgesetz") = 0
+        Else
+            r.Item("nrgesetz") = dbgesetz.dsDaten.Tables(0).Rows(0).Item("nrgesetz")
+        End If
+
+        dbgesetz.Get_Tabledata("Gesetz", "", "Select * from behandlungsart where standard=1")
+        If dbgesetz.dsDaten.Tables(0).Rows.Count = 0 Then
+            r.Item("nrbehandlungsart") = 0
+        Else
+            r.Item("nrbehandlungsart") = dbgesetz.dsDaten.Tables(0).Rows(0).Item("nrbehandlungsart")
+        End If


        db.dsDaten.Tables(0).Rows.Add(r)
--- a/DPM2016/Behandlung/Benhandungdetail.vb
+++ b/DPM2016/Behandlung/Benhandungdetail.vb
@@ -1104,12 +1104,20 @@
            Case "Dentotar"
                If kv Then
                    result = db.Get_Datavalue("Select nrestyp from estyp where default_bei_kv_dentotar=1")
-                    Me.cbboxNrGesetz.SelectedValue = 2
                Else
                    result = db.Get_Datavalue("Select nrestyp from estyp where default_bei_rg_dentotar=1")
-                    Me.cbboxNrGesetz.SelectedValue = 2
                    Me.chkMitdatum.Checked = True
                End If
+                Dim dbgesetz As New clsDB
+                Try
+                    dbgesetz.Get_Tabledata("Gesetz", "", "Select * from gesetz where standard=1")
+                    If dbgesetz.dsDaten.Tables(0).Rows.Count > 0 Then
+                        Me.cbboxNrGesetz.SelectedValue = dbgesetz.dsDaten.Tables(0).Rows(0).Item(0)
+                    End If
+                Catch
+                    Me.cbboxNrGesetz.SelectedValue = 1
+                End Try
+
            Case Else
                If kv Then
                    result = db.Get_Datavalue("Select nrestyp from estyp where default_bei_kv=1")
--- a/DPM2016/Behandlung/Leistungen.Designer.vb
+++ b/DPM2016/Behandlung/Leistungen.Designer.vb
@@ -158,7 +158,6 @@ 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
@@ -289,7 +288,6 @@ 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
@@ -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{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style6{}Style1{}Caption{AlignHorz:Center;}Style2{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"&gt;&lt;CaptionStyle parent="Style2" me="Style10" /&gt;&lt;EditorStyle parent="Editor" me="Style5" /&gt;&lt;EvenRowStyle parent="EvenRow" me="Style8" /&gt;&lt;FilterBarStyle parent="FilterBar" me="Style13" /&gt;&lt;FilterWatermarkStyle parent="FilterWatermark" me="Style14" /&gt;&lt;FooterStyle parent="Footer" me="Style3" /&gt;&lt;GroupStyle parent="Group" me="Style12" /&gt;&lt;HeadingStyle parent="Heading" me="Style2" /&gt;&lt;HighLightRowStyle parent="HighlightRow" me="Style7" /&gt;&lt;InactiveStyle parent="Inactive" me="Style4" /&gt;&lt;OddRowStyle parent="OddRow" me="Style9" /&gt;&lt;RecordSelectorStyle parent="RecordSelector" me="Style11" /&gt;&lt;SelectedStyle parent="Selected" me="Style6" /&gt;&lt;Style parent="Normal" me="Style1" /&gt;&lt;ClientRect&gt;0, 0, 1071, 137&lt;/ClientRect&gt;&lt;BorderSide&gt;0&lt;/BorderSide&gt;&lt;/C1.Win.C1TrueDBGrid.MergeView&gt;&lt;/Splits&gt;&lt;NamedStyles&gt;&lt;Style parent="" me="Normal" /&gt;&lt;Style parent="Normal" me="Heading" /&gt;&lt;Style parent="Heading" me="Footer" /&gt;&lt;Style parent="Heading" me="Caption" /&gt;&lt;Style parent="Heading" me="Inactive" /&gt;&lt;Style parent="Normal" me="Selected" /&gt;&lt;Style parent="Normal" me="Editor" /&gt;&lt;Style parent="Normal" me="HighlightRow" /&gt;&lt;Style parent="Normal" me="EvenRow" /&gt;&lt;Style parent="Normal" me="OddRow" /&gt;&lt;Style parent="Heading" me="RecordSelector" /&gt;&lt;Style parent="Normal" me="FilterBar" /&gt;&lt;Style parent="FilterBar" me="FilterWatermark" /&gt;&lt;Style parent="Caption" me="Group" /&gt;&lt;/NamedStyles&gt;&lt;vertSplits&gt;1&lt;/vertSplits&gt;&lt;horzSplits&gt;1&lt;/horzSplits&gt;&lt;Layout&gt;None&lt;/Layout&gt;&lt;DefaultRecSelWidth&gt;17&lt;/DefaultRecSelWidth&gt;&lt;ClientArea&gt;0, 0, 1071, 137&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
+    <value>&lt;?xml version="1.0"?&gt;&lt;Blob&gt;&lt;Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"&gt;&lt;Data&gt;HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}Heading{Wrap:True;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{BackColor:Info;}&lt;/Data&gt;&lt;/Styles&gt;&lt;Splits&gt;&lt;C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"&gt;&lt;CaptionStyle parent="Style2" me="Style10" /&gt;&lt;EditorStyle parent="Editor" me="Style5" /&gt;&lt;EvenRowStyle parent="EvenRow" me="Style8" /&gt;&lt;FilterBarStyle parent="FilterBar" me="Style13" /&gt;&lt;FilterWatermarkStyle parent="FilterWatermark" me="Style14" /&gt;&lt;FooterStyle parent="Footer" me="Style3" /&gt;&lt;GroupStyle parent="Group" me="Style12" /&gt;&lt;HeadingStyle parent="Heading" me="Style2" /&gt;&lt;HighLightRowStyle parent="HighlightRow" me="Style7" /&gt;&lt;InactiveStyle parent="Inactive" me="Style4" /&gt;&lt;OddRowStyle parent="OddRow" me="Style9" /&gt;&lt;RecordSelectorStyle parent="RecordSelector" me="Style11" /&gt;&lt;SelectedStyle parent="Selected" me="Style6" /&gt;&lt;Style parent="Normal" me="Style1" /&gt;&lt;ClientRect&gt;0, 0, 1071, 137&lt;/ClientRect&gt;&lt;BorderSide&gt;0&lt;/BorderSide&gt;&lt;/C1.Win.C1TrueDBGrid.MergeView&gt;&lt;/Splits&gt;&lt;NamedStyles&gt;&lt;Style parent="" me="Normal" /&gt;&lt;Style parent="Normal" me="Heading" /&gt;&lt;Style parent="Heading" me="Footer" /&gt;&lt;Style parent="Heading" me="Caption" /&gt;&lt;Style parent="Heading" me="Inactive" /&gt;&lt;Style parent="Normal" me="Selected" /&gt;&lt;Style parent="Normal" me="Editor" /&gt;&lt;Style parent="Normal" me="HighlightRow" /&gt;&lt;Style parent="Normal" me="EvenRow" /&gt;&lt;Style parent="Normal" me="OddRow" /&gt;&lt;Style parent="Heading" me="RecordSelector" /&gt;&lt;Style parent="Normal" me="FilterBar" /&gt;&lt;Style parent="FilterBar" me="FilterWatermark" /&gt;&lt;Style parent="Caption" me="Group" /&gt;&lt;/NamedStyles&gt;&lt;vertSplits&gt;1&lt;/vertSplits&gt;&lt;horzSplits&gt;1&lt;/horzSplits&gt;&lt;Layout&gt;None&lt;/Layout&gt;&lt;DefaultRecSelWidth&gt;17&lt;/DefaultRecSelWidth&gt;&lt;ClientArea&gt;0, 0, 1071, 137&lt;/ClientArea&gt;&lt;PrintPageHeaderStyle parent="" me="Style15" /&gt;&lt;PrintPageFooterStyle parent="" me="Style16" /&gt;&lt;/Blob&gt;</value>
  </data>
 </root>
--- a/DPM2016/Behandlung/Leistungen.vb
+++ b/DPM2016/Behandlung/Leistungen.vb
@@ -701,7 +701,7 @@ Public Class Leistungen
    End Sub

    Sub Leistung_Einfuegen(Optional ssonummer As String = "", Optional anzahl As Integer = 1)
-        If ssonummer = "" Then Exit Sub
+        ' If ssonummer = "" Then Exit Sub
        If interror > 0 Then
            interror = 0
            Exit Sub
--- a/DPM2016/Behandlung/clsFakturaFunktionen.vb
+++ b/DPM2016/Behandlung/clsFakturaFunktionen.vb
@@ -124,7 +124,7 @@
                    reportnr = ReportNrOriginal
                    'fakturanr = fakturanr - 1
                End If
-                fakturanr = fakturanr + 1
+                'fakturanr = fakturanr + 1
            Next i
            If Folgeauswertung > 0 And anzahlraten < 2 Then
                reportnr = Folgeauswertung
--- 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", "order by nummervon")
+            Me.Get_Tabledata("Tarife", "where aktiv=1 order by nummervon")
            IntTables.Inttables.Tables.Add(dsDaten.Tables(0).Copy)
        End If

--- a/DPM2016/Klassen/clsStammdaten_flat.vb
+++ b/DPM2016/Klassen/clsStammdaten_flat.vb
@@ -66,6 +66,7 @@ Public Class clsStammdaten_flat
            spalten.Spaltentitel_aktualisieren(Me.c1daten, Me.Tablename, db.dsDaten.Tables(0))

            Me.c1d.ContextMenuStrip = Nothing
+            Me.c1d.AllowAddNew = True
            Select Case Tablename
                Case "Auswertung"
                    Dim printer As New clsPrinter
@@ -79,8 +80,10 @@ Public Class clsStammdaten_flat
                    Me.c1d.ContextMenuStrip = Me.ContextMenuStrip1
                Case "Tarif"
                    Me.c1d.ContextMenuStrip = Me.ctxMenuTarif
+                    Me.c1d.AllowAddNew = False
                Case "Dentotar"
-                    Me.c1d.ContextMenuStrip = Me.ctxmenudentotar
+                    Me.c1d.ContextMenuStrip = Me.ctxmenuDentotar
+                    Me.c1d.AllowAddNew = False

            End Select
        Catch ex As Exception
--- a/DPM2016/Sysadmin/frmStammdaten.vb
+++ b/DPM2016/Sysadmin/frmStammdaten.vb
@@ -1,4 +1,5 @@
-Imports FlexCel.Core
+Imports System.ComponentModel
+Imports FlexCel.Core
 Imports FlexCel.XlsAdapter
 Public Class frmStammdaten

@@ -9,7 +10,7 @@ Public Class frmStammdaten
    End Sub

    Private Sub TreeView1_AfterSelect(sender As Object, e As TreeViewEventArgs) Handles TreeView1.AfterSelect
-        refresh_Details
+        Refresh_Details()
    End Sub
    Sub Refresh_Details()
        Try
@@ -188,4 +189,8 @@ Public Class frmStammdaten
    Private Sub ClsStammdaten_flat1_Load(sender As Object, e As EventArgs) Handles ClsStammdaten_flat1.Load

    End Sub
+
+    Private Sub frmStammdaten_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing
+        IntTables.Inttables.Tables.Clear()
+    End Sub
 End Class
--- a/DPM2016/Utils/Globals.vb
+++ b/DPM2016/Utils/Globals.vb
@@ -6,7 +6,7 @@ Module Globals
    Public Productname As String = "Dental Practice Manager"
    Public Lizenzgeber As String = "Stefan Hutter Unternehmensberatung, 8808 Pfäffikon"
    Public Version As String = "1.0.2.1808"
-    Public Versionastaum As String = "04.09.2018"
+    Public Versionastaum As String = "12.11.2018"

    Public RGCollection As New Collection
    Public Spaltendaten As New DataTable
--- 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="27536">
+    <dependentAssembly dependencyType="install" codebase="DPM2018.exe.manifest" size="27131">
      <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>U8nrCqNUKJYdJS2uuAZSmjnTJBUo6VyxTU3WKWWI4Fk=</dsig:DigestValue>
+        <dsig:DigestValue>+bIQkBXvmXpPwDPNmYVKPROccXrRsA64OYFJKbgau50=</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,6 +52,11 @@
      <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" />
@@ -161,14 +166,14 @@
    </dependentAssembly>
  </dependency>
  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DPM2018.exe" size="5651448">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DPM2018.exe" size="5651960">
      <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>EkaMgN8Fjw9gwdIwAcPhSorQN0vlxpkq5FeIvIGJKow=</dsig:DigestValue>
+        <dsig:DigestValue>9ffgVCtaqcFBB7+VTkYr60EImPyXWmhUklRtY6m18NI=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
@@ -376,18 +381,6 @@
      </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/app.publish/DPM2018.exe
+++ b/DPM2016/bin/Debug/app.publish/DPM2018.exe
--- a/DPM2016/obj/Debug/DPM2016.Leistungen.resources
+++ b/DPM2016/obj/Debug/DPM2016.Leistungen.resources
--- a/DPM2016/obj/Debug/DPM2016.clsStammdaten_flat.resources
+++ b/DPM2016/obj/Debug/DPM2016.clsStammdaten_flat.resources
--- a/DPM2016/obj/Debug/DPM2016.vbproj.CoreCompileInputs.cache
+++ b/DPM2016/obj/Debug/DPM2016.vbproj.CoreCompileInputs.cache
@@ -1 +1 @@
-d19d5a4d18fe18e707c9aecd58fa33fa610ecd90
+bdb0e9760a3439be5cb9103eeaaa7facdac0538d
--- a/DPM2016/obj/Debug/DPM2016.vbproj.FileListAbsolute.txt
+++ b/DPM2016/obj/Debug/DPM2016.vbproj.FileListAbsolute.txt
@@ -103,8 +103,6 @@ E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.dmstest.resources
 E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmdokumentvorlagen.resources
 E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmImportVorlage.resources
 E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.Pdf.Base.dll
-E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.PdfViewer.Windows.dll
-E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.PdfViewer.Windows.xml
 E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.Compression.Base.xml
 E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.Pdf.Base.xml
 E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.Shared.Base.xml
--- 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="27536">
+    <dependentAssembly dependencyType="install" codebase="DPM2018.exe.manifest" size="27131">
      <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>U8nrCqNUKJYdJS2uuAZSmjnTJBUo6VyxTU3WKWWI4Fk=</dsig:DigestValue>
+        <dsig:DigestValue>+bIQkBXvmXpPwDPNmYVKPROccXrRsA64OYFJKbgau50=</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,6 +52,11 @@
      <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" />
@@ -161,14 +166,14 @@
    </dependentAssembly>
  </dependency>
  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DPM2018.exe" size="5651448">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DPM2018.exe" size="5651960">
      <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>EkaMgN8Fjw9gwdIwAcPhSorQN0vlxpkq5FeIvIGJKow=</dsig:DigestValue>
+        <dsig:DigestValue>9ffgVCtaqcFBB7+VTkYr60EImPyXWmhUklRtY6m18NI=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
@@ -376,18 +381,6 @@
      </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/dpm2018.exe.licenses
+++ b/DPM2016/obj/Debug/dpm2018.exe.licenses