spire

2024-09-12 14:06:11 +02:00
parent 8021e5a30d
commit 10340868dc
10 changed files with 174 additions and 48 deletions
--- a/Project/licensePDFPro.elic.xml
+++ b/Project/licensePDFPro.elic.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<License Key="cEpc16XxAJrkAQDgjMzjDgDjuYoJMMP7BCUCCs6Z0SNyiAdLS2m1S5RaQhUNStB0GfzvEHaKikcHoHw2I22j0NgXiE3fhmOw0YHFw7FXbuGCUsX/DrJxVBLHGBVaWXzm/Gldmt9h3RVGQEh9V4IZN/+hOOcJXBL/TRvxGoZ3Zp4Ebhv12J/G83QlwqSjA4KqzNjlys4RVQNjIwCw1fIgSOh+GzLaGDm4Ii2+MfF0Ohr/+msHC44eKfUucyW4Vv/iW2muNqHstU5E8ezUNSXFZkS0wp4Hlbg/iorS1uuXNNdfECZL4BOV/qftRxrImsi3E3fdZ7FJw8JjvkoWWt1s4yPUtc1MS+0iXg2+64DiYwhLRTnV/8QUvOMEoQGMkDoOzMV1cabhSEJd6Z1iSFMdOZOdZR2E9nlDIJOoYPUR7HE9FclSxd6ICuBGM+Yb2YJpH9HgEkg0/3MC9kgJ9n6+XrW09oY3BvYRb9fYwdBWZ/3lqvGV9cHgQPP9EH6ApIZ8qoWH5nRQoeRwtiIrmOxRNVEN94TXuiQBuIvZMRu/uJs2ylAlIlbtMGUEK6VFys8OmY2G9fZsiKqUUQd3AyN2eOE/DJKSftJAoCqfaVqEJgbVy1zA0vjyIBsa42HCes8RJQrSdUWQyIsGWUf99mDvfSTxI+jsKGOAXgHmrK8kJ8orUL8L8P8NlyZp4RlRkCzkgP4yju0oeg32tss8iuwqXt44Gr1fk1ti5s1KXsZ1ZaGYAgucY5wEP4bmlPuQimfRIBvbNasSj/vk82RurAo77WDhmB63o9svfnVPExDpx1QxIYKezZGNA2A3J5gksZdhknWbSmcQy/HTP9bZdAfSEQCnXkdRIwnvdEts1rb5uWm4noCSVA3q7EMterUmfrKFpfzlCq96Lfor89p/nb0Cgl1xY0JDn+3k+na1rmGawro0Gz5jcPdVp+C3Z6afh03HBzbs/DSa3l+IMGLKEWP5f5wjy3ozgpP7GLuFHPtbOCy7/v7v/1mxZbUkT7CXPKVs1OEgYjH738igSjiziFJpVnDa/RmvV4WUmFLKcdNntuvpwu7hQFTDMrAU6G0K9weDH81xzJmAEZaVgW6aCu43wlPPKgvDjum5FcP/KHYG1s0CvF4ZVVON8fa0Jlmlg9zCPJ9POrmFa8Ap55BIQAgsXlyPXBXowQ3isZd3dK9R6ooq/6ODB3dnzn/QyVKljwyIxCZdJpMKza7k/hvpO3rlZne118AUE3Ry5QE7U7gDGFcn700R4vD3enxtausV+XiABDKHDBIAgLbT4ZyzXCHHxlgV2pvqL7GYwihN8FXc9UFRxqvMx8RA9gahKPIY6WOQ1q5NEyFTRPMYQRBHDTa9KSLBbfnbjmNaURfI0UeXV4/pPzEa+8in7rVJFltPk3z9XTqJK1hgd+1KfqXjmKKvh7tbM1KXx8yFI9JGTdL3vSqJGw2Qog/lLKez3ZshZVQbYJ54l4G+I6mQCOGUcKdvvOVWwggsxCAV78RuWKm7liUwnncpeSF2iq3AOMnVsTn6Bi7l4OYgZavoSEFTKuVRl+hSqC/Y9/x/ngTeAyudwAg=" Version="1.4">
+    <SerialNumber>B081D0F5-EF94-42F2-B287-4812D84164CE</SerialNumber>
+    <Type>Runtime</Type>
+    <Username>VERAG Spedition AG</Username>
+    <Email>al@verag.ag</Email>
+    <Organization>VERAG Spedition AG</Organization>
+    <LicensedDate>2024-08-31T00:00:00Z</LicensedDate>
+    <ExpiredDate>2025-08-31T00:00:00Z</ExpiredDate>
+    <Products>
+        <Product>
+            <Name>Spire.PDF Pro Edition</Name>
+            <Version>10.7</Version>
+            <Subscription>
+                <Name>Developer Subscription</Name>
+                <NumberOfPermittedDeveloper>1</NumberOfPermittedDeveloper>
+                <NumberOfPermittedSite>1</NumberOfPermittedSite>
+            </Subscription>
+        </Product>
+    </Products>
+    <Issuer>
+        <Name>e-iceblue</Name>
+        <Email>sales@e-iceblue.com</Email>
+        <Url>http://www.e-iceblue.com</Url>
+    </Issuer>
+</License>
--- a/Project/licensePDFViewer.elic.xml
+++ b/Project/licensePDFViewer.elic.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<License Key="PeQezZrFLTMrIgEAK1BoHk0gh6gdmwDKMvN6ITlC5j6D/r6sSq/TXAl5H/H/P/NvV74UnH1KUt0Cy0ef1LzPpvmqxVTsiTYA2eB3CX21oTggkxa3qP/UOJ42Kk8rwgVqchV9RJj9SlZb/zzhfN3nB4NR9rfoiwRDoE45ECcmsCO948+auxqRrc1ikuFDIM2j2YpwzoFxw3QCtLNAjhWhA8Ly7HUCNbtibu6rOnuePVThtmVNfQeTuagFSCDovxIJzlvFggZaQXI7zh3PEChu65zP7VZoJyxzfagJv5JItQCrX8BP+5YgKe6B7NBzUFGl1RqcucKn+MAQypgXrRXQY4UAWfQ4g9QTN2JTpaHZfgg22sGGV+cccDJmekfUPGfBOzlnzedJelMNWDVNBw7prh8vTdNRsOTJoFYDbh82UwRNkXethAElaJ9apMQaEg2G7cDaQzVdmY9N6oMVZ+dDZ9Vet12GAvrD5akRHviXNhXis0W/WaaifHmbgfIO7zx35qNxRQ5mwouVh/byBw7sXBjtKwpJxulpVy0FNWSeSC4sskGn9+GO+inUrurRxX8EBEDBK0ev/558sYBQ4HloBvmWDX58ni7F0xv/1BdsvW2M+viIP4DATVUVoGh+lskcoBt2Z8g/Fxib/mBpQLmvg1fasZjscdfIyZBFJ57AtcNr9cT4oC2zn+ZodXXHYACD6+AFL3d0P1v/P3Bw5giOZpdeRmnlm9mD+OEXFWOgi+lfwF2S9IYcB+LrdckNiaRhserlEE6crn6HRquPQoqzo7J+nR63anp/HfJ3+n3RWVdSg+cJ13yPyMUhgQebsvcm+/bDCWaXc9+5THRJ6aAVoBE4hZ1eHdl1ukzuXiEJJ7GG2vk2MMcy9adKZyVATxSKuBeK1FYLF/62lZC0aoh4WV70Bth9MVWbLLKmZe3KttBYOtRpXvj1zk36RBubnLuSXp3aW7lJGwrHzMvaMGlYHmq1PUwgTLmL0d2p4FP9qSXHlAtRH8/O0AMsLHrLDe/4sNHkHqy+A8YM09t1adSnxOhoDyOb41zyvjsQ635gWYvOBimN0iEyVg3dEC7g5PZkAhIahBDz1qa4+GkluYvtmrafKZc/55KbYBZ23k+In8Qfabym0v7YWSpZ+/vwE2jNRupmL/6M0YnZUQolyFzBVqCdt40NYnnMD9o9I49XjB/8dWicpD2G60vIN4XvRc9/LG0elTqFiZkD9JLMGw+1fb0EwBb5XdGy68IHPoOFpXMcVFPHeBX45r7gZnaGAB11LhJiflSKnDd8unLrHUJJJvkPHyN5HWLrSAvcmJFS4JaHM7tHQorHF3xRYWHbGLWvGRtjfO43UlGhwklrH5rs4bop5R6m0eT/5eS/rbIoofUYQMEYexzGZwXAgNA6Sal7luN7Iqx7l4ykVrIwUAeLspfvsGT/aFDKBo77VQfPubHg/N7zd+wacmagI/7HznVCGkTApEcTrkade2cpsWGQa0sIrEDqt7s/1ZrwdqIQwgJ3rMnNGZ6ljV/FOT9OdVkkCKHkJrAwDlf2ssBbOvlHqxVz5x30mMkIQPZvSVFxSL2IKfx+FJ1VoQ==" Version="1.3">
+    <Type>Runtime</Type>
+    <Username>VERAG Spedition AG</Username>
+    <Email>al@verag.ag</Email>
+    <Organization>VERAG Spedition AG</Organization>
+    <LicensedDate>2024-08-31T00:00:00Z</LicensedDate>
+    <ExpiredDate>2025-08-31T00:00:00Z</ExpiredDate>
+    <Products>
+        <Product>
+            <Name>Spire.PDFViewer for Forms</Name>
+            <Version>7.12</Version>
+            <Subscription>
+                <Name>Developer Subscription</Name>
+                <NumberOfPermittedDeveloper>1</NumberOfPermittedDeveloper>
+                <NumberOfPermittedSite>1</NumberOfPermittedSite>
+            </Subscription>
+        </Product>
+    </Products>
+    <Issuer>
+        <Name>e-iceblue</Name>
+        <Email>sales@e-iceblue.com</Email>
+        <Url>http://www.e-iceblue.com</Url>
+    </Issuer>
+</License>
--- a/SDL/SDL.vbproj
+++ b/SDL/SDL.vbproj
@@ -4822,6 +4822,8 @@
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Include="My Project\license.elic.xml" />
+    <Content Include="My Project\licensePDFPro.elic.xml" />
+    <Content Include="My Project\licensePDFViewer.elic.xml" />
    <Content Include="My Project\logo_mdm.png" />
    <Content Include="My Project\zoll.png" />
    <None Include="Resources\xml_gray.jpg" />
--- a/SDL/buchhaltung/usrCntlBH.vb
+++ b/SDL/buchhaltung/usrCntlBH.vb
@@ -74,7 +74,7 @@ Public Class usrCntlBH
        Dim dt = SQL.loadDgvBySql(getOPSql(), "FMZOLL")
        dt.Columns.Add("VersicherungsBetrag", Type.GetType("System.Double"))
        For Each r In dt.Rows
-                r("VersicherungsBetrag") = getVersBetrag(r("Risiko"), r("Versicherungssumme"), r("GemeldeterBetrag"), )
+                r("VersicherungsBetrag") = getVersBetrag(r("Risiko"), r("Versicherungssumme"), r("GemeldeterBetrag"), r("nichtVersicherbar"))
            Next
        dt.Columns("VersicherungsBetrag").ColumnName = "V-Betrag"
        dt.Columns("Versicherungssumme").ColumnName = "V-Summe"
@@ -112,6 +112,7 @@ Public Class usrCntlBH
        sqlStr &= "SELECT * FROM ("
        sqlStr &= " SELECT        Ordnungsbegriff, AdressenNr as KdNr, Adressen.LandKz, "
        If cbxDeckungsstoppAnzeigen.Checked Then sqlStr &= " (SELECT TOP 1 ISNULL([kde_Versicherung_DeckungsstoppDatum],'')  FROM [tblKundenErweitert]  where kde_Versicherung_Deckungsstopp=1 and kde_KundenNr=AdressenNr) AS DS, "
+        sqlStr &= " (SELECT TOP 1 ISNULL(kde_txtVersicherungNichtVersicherbar,'')  FROM [tblKundenErweitert]  where  kde_KundenNr=AdressenNr) AS nichtVersicherbar, "
        If True Then sqlStr &= " isnull((SELECT TOP 1 [kde_Versicherung_GemeldeterBetrag] FROM [tblKundenErweitert]  where kde_KundenNr=AdressenNr),0) AS GemeldeterBetrag, "
        sqlStr &= "     (SELECT SUM(Gesamtausstand) FROM dbo.[Offene Posten] WHERE (Kontonummer = AdressenNr " & Firmen_ID & ")) AS LfdSaldo, "
        sqlStr &= "     (SELECT        MIN(Belegdatum) AS Expr1"
@@ -152,7 +153,7 @@ Public Class usrCntlBH
        End If


-        If cbxNichtVersicherbarAusblenden.Checked Then sqlStr &= " AND isnull((SELECT  kde_txtVersicherungNichtVersicherbar FROM tblKundenErweitert WHERE kde_KundenNr=Adressen.AdressenNr),0)=0 "
+

        If cbxKundeBeiRechtsanwaltausblenden.Checked Then sqlStr &= " and Rechtsanwalt= 0 "
        'If cbxKundeBeiRechtsanwaltausblenden.Checked Then sqlStr &= " and Rechtsanwalt= 0 "
@@ -178,6 +179,8 @@ Public Class usrCntlBH
        sqlStr &= ") as T "
        sqlStr &= " WHERE 1=1 "

+        If cbxNichtVersicherbarAusblenden.Checked Then sqlStr &= " AND isnull(nichtVersicherbar,0) = 0 "
+
        If txtOPRisikoBetragVon._value <> "" Or txtOPRisikoBetragBis._value <> "" Then
            If txtOPRisikoBetragVon._value <> "" Then sqlStr &= " AND Risiko >= '" & txtOPRisikoBetragVon._value & "'"
            If txtOPRisikoBetragBis._value <> "" Then sqlStr &= " AND Risiko <= '" & txtOPRisikoBetragBis._value & "'"
@@ -423,7 +426,7 @@ Public Class usrCntlBH



-                                              rpt.lblVersBetrag.Text = getVersBetrag(risiko, rpt.Fields.Item("Versicherungssumme").Value, rpt.Fields.Item("GemeldeterBetrag").Value).ToString("C")
+                                              rpt.lblVersBetrag.Text = getVersBetrag(risiko, rpt.Fields.Item("Versicherungssumme").Value, rpt.Fields.Item("GemeldeterBetrag").Value, IIf(rpt.Fields.Item("nichtVersicherbar").Value IsNot DBNull.Value, rpt.Fields.Item("nichtVersicherbar").Value, False)).ToString("C")



@@ -452,39 +455,39 @@ Public Class usrCntlBH
        Me.Cursor = Cursors.Default
    End Sub

-    Function getVersBetrag(risiko, Versicherungssumme, GemeldeterBetrag, Optional versicherungGekündigt = False) As Double
+    Function getVersBetrag(risiko, Versicherungssumme, GemeldeterBetrag, versicherungGekündigt) As Double
        If risiko Is DBNull.Value Then Return 0

-        If versicherungGekündigt Then Return 0
+        If Not versicherungGekündigt Is DBNull.Value AndAlso versicherungGekündigt Then Return 0

        Dim versBetrag As Double = 0
-            If risiko <= 0 Then
-                versBetrag = 0
-            ElseIf cbxBagatellgrenze.Checked And risiko <= txtBagatellgrenzeBei._value Then
-                versBetrag = 0 ' kleiner Bagatellgrenze
-            ElseIf risiko <= GrenzeVersicherung Then
-                If Versicherungssumme IsNot DBNull.Value Then
-                    If risiko > CDbl(Versicherungssumme) Then
-                        versBetrag = Versicherungssumme
-                    Else
-                        versBetrag = risiko
-                    End If
+        If risiko <= 0 Then
+            versBetrag = 0
+        ElseIf cbxBagatellgrenze.Checked And risiko <= txtBagatellgrenzeBei._value Then
+            versBetrag = 0 ' kleiner Bagatellgrenze
+        ElseIf risiko <= GrenzeVersicherung Then
+            If Versicherungssumme IsNot DBNull.Value Then
+                If risiko > CDbl(Versicherungssumme) Then
+                    versBetrag = Versicherungssumme
                Else
                    versBetrag = risiko
                End If
            Else
-                If Versicherungssumme IsNot DBNull.Value Then
-                    If risiko > CDbl(Versicherungssumme) Then
-                        versBetrag = Versicherungssumme
-                    Else
-                        versBetrag = risiko
-                    End If
-                Else
-                    versBetrag = GrenzeVersicherung
-                End If
+                versBetrag = risiko
            End If
+        Else
+            If Versicherungssumme IsNot DBNull.Value Then
+                If risiko > CDbl(Versicherungssumme) Then
+                    versBetrag = Versicherungssumme
+                Else
+                    versBetrag = risiko
+                End If
+            Else
+                versBetrag = GrenzeVersicherung
+            End If
+        End If

-            Return If(GemeldeterBetrag > 0, GemeldeterBetrag, versBetrag)
+        Return If(GemeldeterBetrag > 0, GemeldeterBetrag, versBetrag)
    End Function

    Private Sub cbxOPUmsatz_CheckedChanged(sender As Object, e As EventArgs) Handles cbxOPUmsatz.CheckedChanged
--- a/SDL/kunden/frmKundenblatt.Designer.vb
+++ b/SDL/kunden/frmKundenblatt.Designer.vb
@@ -99,6 +99,7 @@ Partial Class frmKundenblatt
        Me.PictureBox6 = New System.Windows.Forms.PictureBox()
        Me.Button5 = New System.Windows.Forms.Button()
        Me.Panel5 = New System.Windows.Forms.Panel()
+        Me.Button7 = New System.Windows.Forms.Button()
        Me.Label35 = New System.Windows.Forms.Label()
        Me.flpSDLDok = New System.Windows.Forms.FlowLayoutPanel()
        Me.scanErstbestellung = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
@@ -199,7 +200,6 @@ Partial Class frmKundenblatt
        Me.tbiKartenverwaltung = New System.Windows.Forms.ToolStripMenuItem()
        Me.tbiLKW = New System.Windows.Forms.ToolStripMenuItem()
        Me.tbiVERAGCard = New System.Windows.Forms.ToolStripMenuItem()
-        Me.Button7 = New System.Windows.Forms.Button()
        Me.pnlInfo.SuspendLayout()
        Me.tbFirmendaten.SuspendLayout()
        Me.Panel4.SuspendLayout()
@@ -1072,6 +1072,16 @@ Partial Class frmKundenblatt
        Me.Panel5.Size = New System.Drawing.Size(1610, 143)
        Me.Panel5.TabIndex = 177
        '
+        'Button7
+        '
+        Me.Button7.Location = New System.Drawing.Point(1169, 20)
+        Me.Button7.Name = "Button7"
+        Me.Button7.Size = New System.Drawing.Size(101, 20)
+        Me.Button7.TabIndex = 177
+        Me.Button7.Text = "GO BOX"
+        Me.Button7.UseVisualStyleBackColor = True
+        Me.Button7.Visible = False
+        '
        'Label35
        '
        Me.Label35.AutoSize = True
@@ -2231,7 +2241,7 @@ Partial Class frmKundenblatt
        '
        Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24)
        Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM"
-        Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4
+        Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8
        Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4)
        Me.cntxtCntxtMDM.Text = "cntxtMDM"
        '
@@ -2365,16 +2375,6 @@ Partial Class frmKundenblatt
        Me.tbiVERAGCard.Size = New System.Drawing.Size(186, 22)
        Me.tbiVERAGCard.Text = "VERAG Card"
        '
-        'Button7
-        '
-        Me.Button7.Location = New System.Drawing.Point(1169, 20)
-        Me.Button7.Name = "Button7"
-        Me.Button7.Size = New System.Drawing.Size(101, 20)
-        Me.Button7.TabIndex = 177
-        Me.Button7.Text = "GO BOX"
-        Me.Button7.UseVisualStyleBackColor = True
-        Me.Button7.Visible = False
-        '
        'frmKundenblatt
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
--- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb
+++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb
@@ -1246,7 +1246,7 @@ Public Class cFormularManager

    Public Shared Sub mergePDFs(files As List(Of String), ByRef outputFile As String)

-        VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense()
+        If Not VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense() Then MsgBox("Fehler beim Laden der SPIRE-Lizenz")
        files.RemoveAll(Function(v) v.Equals("")) 'Alle leeren Stings löschen
        If files.Count > 0 Then
            Dim doc As Spire.Pdf.PdfDocumentBase = Spire.Pdf.PdfDocument.MergeFiles(files.ToArray)
@@ -1390,9 +1390,10 @@ Public Class cFormularManager
            '    Exit Sub
            'End If

-            VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense()
+            If Not VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense() Then MsgBox("Fehler beim Laden der SPIRE-Lizenz")

            For Each pdfPath In PDFFile
+
                Dim doc As New Spire.Pdf.PdfDocument(pdfPath)

                doc.PageSettings.Size = Spire.Pdf.PdfPageSize.A4
@@ -1460,7 +1461,7 @@ Public Class cFormularManager
    Public Shared Sub PrintViaSpirePDF_FromURL(URLs As String(), Optional printerName As String = "")
        Try

-            VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense()
+            If Not VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense() Then MsgBox("Fehler beim Laden der SPIRE-Lizenz")
            If printerName = "" Then
                Dim oPS As New System.Drawing.Printing.PrinterSettings
                printerName = oPS.PrinterName
@@ -1513,7 +1514,7 @@ Public Class cFormularManager
        Try
            If targetPath = "" Then targetPath = getTMPPath_PDF()

-            VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense()
+            If Not VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense() Then MsgBox("Fehler beim Laden der SPIRE-Lizenz")
            Dim doc As New Spire.Pdf.PdfDocument '= New Spire.Pdf.PdfDocument(URL)


@@ -1554,7 +1555,7 @@ Public Class cFormularManager
            End If


-            VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense()
+            If Not VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense() Then MsgBox("Fehler beim Laden der SPIRE-Lizenz")

            Using webClient As New Net.WebClient()
                Dim data() As Byte = webClient.DownloadData(URL)
@@ -2247,7 +2248,7 @@ Public Class DATENVERVER_OPTIONS
        Try
            If targetPath = "" Then targetPath = TMP_PATH

-            VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense()
+            If Not VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense() Then MsgBox("Fehler beim Laden der SPIRE-Lizenz")
            Dim doc As New Spire.Pdf.PdfDocument '= New Spire.Pdf.PdfDocument(URL)
            doc.LoadFromHTML(File, False, False, False)
            'doc.LoadFromFile(File)
--- a/Project/licensePDFPro.elic.xml
+++ b/Project/licensePDFPro.elic.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<License Key="cEpc16XxAJrkAQDgjMzjDgDjuYoJMMP7BCUCCs6Z0SNyiAdLS2m1S5RaQhUNStB0GfzvEHaKikcHoHw2I22j0NgXiE3fhmOw0YHFw7FXbuGCUsX/DrJxVBLHGBVaWXzm/Gldmt9h3RVGQEh9V4IZN/+hOOcJXBL/TRvxGoZ3Zp4Ebhv12J/G83QlwqSjA4KqzNjlys4RVQNjIwCw1fIgSOh+GzLaGDm4Ii2+MfF0Ohr/+msHC44eKfUucyW4Vv/iW2muNqHstU5E8ezUNSXFZkS0wp4Hlbg/iorS1uuXNNdfECZL4BOV/qftRxrImsi3E3fdZ7FJw8JjvkoWWt1s4yPUtc1MS+0iXg2+64DiYwhLRTnV/8QUvOMEoQGMkDoOzMV1cabhSEJd6Z1iSFMdOZOdZR2E9nlDIJOoYPUR7HE9FclSxd6ICuBGM+Yb2YJpH9HgEkg0/3MC9kgJ9n6+XrW09oY3BvYRb9fYwdBWZ/3lqvGV9cHgQPP9EH6ApIZ8qoWH5nRQoeRwtiIrmOxRNVEN94TXuiQBuIvZMRu/uJs2ylAlIlbtMGUEK6VFys8OmY2G9fZsiKqUUQd3AyN2eOE/DJKSftJAoCqfaVqEJgbVy1zA0vjyIBsa42HCes8RJQrSdUWQyIsGWUf99mDvfSTxI+jsKGOAXgHmrK8kJ8orUL8L8P8NlyZp4RlRkCzkgP4yju0oeg32tss8iuwqXt44Gr1fk1ti5s1KXsZ1ZaGYAgucY5wEP4bmlPuQimfRIBvbNasSj/vk82RurAo77WDhmB63o9svfnVPExDpx1QxIYKezZGNA2A3J5gksZdhknWbSmcQy/HTP9bZdAfSEQCnXkdRIwnvdEts1rb5uWm4noCSVA3q7EMterUmfrKFpfzlCq96Lfor89p/nb0Cgl1xY0JDn+3k+na1rmGawro0Gz5jcPdVp+C3Z6afh03HBzbs/DSa3l+IMGLKEWP5f5wjy3ozgpP7GLuFHPtbOCy7/v7v/1mxZbUkT7CXPKVs1OEgYjH738igSjiziFJpVnDa/RmvV4WUmFLKcdNntuvpwu7hQFTDMrAU6G0K9weDH81xzJmAEZaVgW6aCu43wlPPKgvDjum5FcP/KHYG1s0CvF4ZVVON8fa0Jlmlg9zCPJ9POrmFa8Ap55BIQAgsXlyPXBXowQ3isZd3dK9R6ooq/6ODB3dnzn/QyVKljwyIxCZdJpMKza7k/hvpO3rlZne118AUE3Ry5QE7U7gDGFcn700R4vD3enxtausV+XiABDKHDBIAgLbT4ZyzXCHHxlgV2pvqL7GYwihN8FXc9UFRxqvMx8RA9gahKPIY6WOQ1q5NEyFTRPMYQRBHDTa9KSLBbfnbjmNaURfI0UeXV4/pPzEa+8in7rVJFltPk3z9XTqJK1hgd+1KfqXjmKKvh7tbM1KXx8yFI9JGTdL3vSqJGw2Qog/lLKez3ZshZVQbYJ54l4G+I6mQCOGUcKdvvOVWwggsxCAV78RuWKm7liUwnncpeSF2iq3AOMnVsTn6Bi7l4OYgZavoSEFTKuVRl+hSqC/Y9/x/ngTeAyudwAg=" Version="1.4">
+    <SerialNumber>B081D0F5-EF94-42F2-B287-4812D84164CE</SerialNumber>
+    <Type>Runtime</Type>
+    <Username>VERAG Spedition AG</Username>
+    <Email>al@verag.ag</Email>
+    <Organization>VERAG Spedition AG</Organization>
+    <LicensedDate>2024-08-31T00:00:00Z</LicensedDate>
+    <ExpiredDate>2025-08-31T00:00:00Z</ExpiredDate>
+    <Products>
+        <Product>
+            <Name>Spire.PDF Pro Edition</Name>
+            <Version>10.7</Version>
+            <Subscription>
+                <Name>Developer Subscription</Name>
+                <NumberOfPermittedDeveloper>1</NumberOfPermittedDeveloper>
+                <NumberOfPermittedSite>1</NumberOfPermittedSite>
+            </Subscription>
+        </Product>
+    </Products>
+    <Issuer>
+        <Name>e-iceblue</Name>
+        <Email>sales@e-iceblue.com</Email>
+        <Url>http://www.e-iceblue.com</Url>
+    </Issuer>
+</License>
--- a/Project/licensePDFViewer.elic.xml
+++ b/Project/licensePDFViewer.elic.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<License Key="PeQezZrFLTMrIgEAK1BoHk0gh6gdmwDKMvN6ITlC5j6D/r6sSq/TXAl5H/H/P/NvV74UnH1KUt0Cy0ef1LzPpvmqxVTsiTYA2eB3CX21oTggkxa3qP/UOJ42Kk8rwgVqchV9RJj9SlZb/zzhfN3nB4NR9rfoiwRDoE45ECcmsCO948+auxqRrc1ikuFDIM2j2YpwzoFxw3QCtLNAjhWhA8Ly7HUCNbtibu6rOnuePVThtmVNfQeTuagFSCDovxIJzlvFggZaQXI7zh3PEChu65zP7VZoJyxzfagJv5JItQCrX8BP+5YgKe6B7NBzUFGl1RqcucKn+MAQypgXrRXQY4UAWfQ4g9QTN2JTpaHZfgg22sGGV+cccDJmekfUPGfBOzlnzedJelMNWDVNBw7prh8vTdNRsOTJoFYDbh82UwRNkXethAElaJ9apMQaEg2G7cDaQzVdmY9N6oMVZ+dDZ9Vet12GAvrD5akRHviXNhXis0W/WaaifHmbgfIO7zx35qNxRQ5mwouVh/byBw7sXBjtKwpJxulpVy0FNWSeSC4sskGn9+GO+inUrurRxX8EBEDBK0ev/558sYBQ4HloBvmWDX58ni7F0xv/1BdsvW2M+viIP4DATVUVoGh+lskcoBt2Z8g/Fxib/mBpQLmvg1fasZjscdfIyZBFJ57AtcNr9cT4oC2zn+ZodXXHYACD6+AFL3d0P1v/P3Bw5giOZpdeRmnlm9mD+OEXFWOgi+lfwF2S9IYcB+LrdckNiaRhserlEE6crn6HRquPQoqzo7J+nR63anp/HfJ3+n3RWVdSg+cJ13yPyMUhgQebsvcm+/bDCWaXc9+5THRJ6aAVoBE4hZ1eHdl1ukzuXiEJJ7GG2vk2MMcy9adKZyVATxSKuBeK1FYLF/62lZC0aoh4WV70Bth9MVWbLLKmZe3KttBYOtRpXvj1zk36RBubnLuSXp3aW7lJGwrHzMvaMGlYHmq1PUwgTLmL0d2p4FP9qSXHlAtRH8/O0AMsLHrLDe/4sNHkHqy+A8YM09t1adSnxOhoDyOb41zyvjsQ635gWYvOBimN0iEyVg3dEC7g5PZkAhIahBDz1qa4+GkluYvtmrafKZc/55KbYBZ23k+In8Qfabym0v7YWSpZ+/vwE2jNRupmL/6M0YnZUQolyFzBVqCdt40NYnnMD9o9I49XjB/8dWicpD2G60vIN4XvRc9/LG0elTqFiZkD9JLMGw+1fb0EwBb5XdGy68IHPoOFpXMcVFPHeBX45r7gZnaGAB11LhJiflSKnDd8unLrHUJJJvkPHyN5HWLrSAvcmJFS4JaHM7tHQorHF3xRYWHbGLWvGRtjfO43UlGhwklrH5rs4bop5R6m0eT/5eS/rbIoofUYQMEYexzGZwXAgNA6Sal7luN7Iqx7l4ykVrIwUAeLspfvsGT/aFDKBo77VQfPubHg/N7zd+wacmagI/7HznVCGkTApEcTrkade2cpsWGQa0sIrEDqt7s/1ZrwdqIQwgJ3rMnNGZ6ljV/FOT9OdVkkCKHkJrAwDlf2ssBbOvlHqxVz5x30mMkIQPZvSVFxSL2IKfx+FJ1VoQ==" Version="1.3">
+    <Type>Runtime</Type>
+    <Username>VERAG Spedition AG</Username>
+    <Email>al@verag.ag</Email>
+    <Organization>VERAG Spedition AG</Organization>
+    <LicensedDate>2024-08-31T00:00:00Z</LicensedDate>
+    <ExpiredDate>2025-08-31T00:00:00Z</ExpiredDate>
+    <Products>
+        <Product>
+            <Name>Spire.PDFViewer for Forms</Name>
+            <Version>7.12</Version>
+            <Subscription>
+                <Name>Developer Subscription</Name>
+                <NumberOfPermittedDeveloper>1</NumberOfPermittedDeveloper>
+                <NumberOfPermittedSite>1</NumberOfPermittedSite>
+            </Subscription>
+        </Product>
+    </Products>
+    <Issuer>
+        <Name>e-iceblue</Name>
+        <Email>sales@e-iceblue.com</Email>
+        <Url>http://www.e-iceblue.com</Url>
+    </Issuer>
+</License>
--- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
+++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
@@ -134,11 +134,11 @@
    </Reference>
    <Reference Include="Spire.Pdf, Version=10.7.21.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>bin\Debug\Spire.Pdf.dll</HintPath>
+      <HintPath>F:\PROGRAMMIERUNG\dll\Spire.PDF\Spire.Pdf.dll</HintPath>
    </Reference>
    <Reference Include="Spire.PdfViewer.Forms, Version=7.12.23.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>bin\Debug\Spire.PdfViewer.Forms.dll</HintPath>
+      <HintPath>F:\PROGRAMMIERUNG\dll\Spire.PDF\Spire.PdfViewer.Forms.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -1414,6 +1414,10 @@
  <ItemGroup>
    <None Include="Resources\fragezeichen.png" />
  </ItemGroup>
+  <ItemGroup>
+    <Content Include="My Project\licensePDFPro.elic.xml" />
+    <Content Include="My Project\licensePDFViewer.elic.xml" />
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
  <ProjectExtensions />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
--- a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb
+++ b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb
@@ -132,7 +132,7 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(

    End Function

-    Public Shared Sub spireLoadLicense()
+    Public Shared Function spireLoadLicense() As Boolean
        Try


@@ -144,15 +144,29 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(
            '  Exit Sub

            'wegen Problemen die extra Aktivierung pro Lizenzkey wieder eingebaut.
+            Spire.PdfViewer.License.LicenseProvider.ClearLicense()
            Spire.PdfViewer.License.LicenseProvider.SetLicenseKey("PeQezZrFLTMrIgEAK1BoHk0gh6gdmwDKMvN6ITlC5j6D/r6sSq/TXAl5H/H/P/NvV74UnH1KUt0Cy0ef1LzPpvmqxVTsiTYA2eB3CX21oTggkxa3qP/UOJ42Kk8rwgVqchV9RJj9SlZb/zzhfN3nB4NR9rfoiwRDoE45ECcmsCO948+auxqRrc1ikuFDIM2j2YpwzoFxw3QCtLNAjhWhA8Ly7HUCNbtibu6rOnuePVThtmVNfQeTuagFSCDovxIJzlvFggZaQXI7zh3PEChu65zP7VZoJyxzfagJv5JItQCrX8BP+5YgKe6B7NBzUFGl1RqcucKn+MAQypgXrRXQY4UAWfQ4g9QTN2JTpaHZfgg22sGGV+cccDJmekfUPGfBOzlnzedJelMNWDVNBw7prh8vTdNRsOTJoFYDbh82UwRNkXethAElaJ9apMQaEg2G7cDaQzVdmY9N6oMVZ+dDZ9Vet12GAvrD5akRHviXNhXis0W/WaaifHmbgfIO7zx35qNxRQ5mwouVh/byBw7sXBjtKwpJxulpVy0FNWSeSC4sskGn9+GO+inUrurRxX8EBEDBK0ev/558sYBQ4HloBvmWDX58ni7F0xv/1BdsvW2M+viIP4DATVUVoGh+lskcoBt2Z8g/Fxib/mBpQLmvg1fasZjscdfIyZBFJ57AtcNr9cT4oC2zn+ZodXXHYACD6+AFL3d0P1v/P3Bw5giOZpdeRmnlm9mD+OEXFWOgi+lfwF2S9IYcB+LrdckNiaRhserlEE6crn6HRquPQoqzo7J+nR63anp/HfJ3+n3RWVdSg+cJ13yPyMUhgQebsvcm+/bDCWaXc9+5THRJ6aAVoBE4hZ1eHdl1ukzuXiEJJ7GG2vk2MMcy9adKZyVATxSKuBeK1FYLF/62lZC0aoh4WV70Bth9MVWbLLKmZe3KttBYOtRpXvj1zk36RBubnLuSXp3aW7lJGwrHzMvaMGlYHmq1PUwgTLmL0d2p4FP9qSXHlAtRH8/O0AMsLHrLDe/4sNHkHqy+A8YM09t1adSnxOhoDyOb41zyvjsQ635gWYvOBimN0iEyVg3dEC7g5PZkAhIahBDz1qa4+GkluYvtmrafKZc/55KbYBZ23k+In8Qfabym0v7YWSpZ+/vwE2jNRupmL/6M0YnZUQolyFzBVqCdt40NYnnMD9o9I49XjB/8dWicpD2G60vIN4XvRc9/LG0elTqFiZkD9JLMGw+1fb0EwBb5XdGy68IHPoOFpXMcVFPHeBX45r7gZnaGAB11LhJiflSKnDd8unLrHUJJJvkPHyN5HWLrSAvcmJFS4JaHM7tHQorHF3xRYWHbGLWvGRtjfO43UlGhwklrH5rs4bop5R6m0eT/5eS/rbIoofUYQMEYexzGZwXAgNA6Sal7luN7Iqx7l4ykVrIwUAeLspfvsGT/aFDKBo77VQfPubHg/N7zd+wacmagI/7HznVCGkTApEcTrkade2cpsWGQa0sIrEDqt7s/1ZrwdqIQwgJ3rMnNGZ6ljV/FOT9OdVkkCKHkJrAwDlf2ssBbOvlHqxVz5x30mMkIQPZvSVFxSL2IKfx+FJ1VoQ==")
            Spire.PdfViewer.License.LicenseProvider.LoadLicense()
+
+            Spire.Pdf.License.LicenseProvider.ClearLicense()
            Spire.Pdf.License.LicenseProvider.SetLicenseKey("cEpc16XxAJrkAQDgjMzjDgDjuYoJMMP7BCUCCs6Z0SNyiAdLS2m1S5RaQhUNStB0GfzvEHaKikcHoHw2I22j0NgXiE3fhmOw0YHFw7FXbuGCUsX/DrJxVBLHGBVaWXzm/Gldmt9h3RVGQEh9V4IZN/+hOOcJXBL/TRvxGoZ3Zp4Ebhv12J/G83QlwqSjA4KqzNjlys4RVQNjIwCw1fIgSOh+GzLaGDm4Ii2+MfF0Ohr/+msHC44eKfUucyW4Vv/iW2muNqHstU5E8ezUNSXFZkS0wp4Hlbg/iorS1uuXNNdfECZL4BOV/qftRxrImsi3E3fdZ7FJw8JjvkoWWt1s4yPUtc1MS+0iXg2+64DiYwhLRTnV/8QUvOMEoQGMkDoOzMV1cabhSEJd6Z1iSFMdOZOdZR2E9nlDIJOoYPUR7HE9FclSxd6ICuBGM+Yb2YJpH9HgEkg0/3MC9kgJ9n6+XrW09oY3BvYRb9fYwdBWZ/3lqvGV9cHgQPP9EH6ApIZ8qoWH5nRQoeRwtiIrmOxRNVEN94TXuiQBuIvZMRu/uJs2ylAlIlbtMGUEK6VFys8OmY2G9fZsiKqUUQd3AyN2eOE/DJKSftJAoCqfaVqEJgbVy1zA0vjyIBsa42HCes8RJQrSdUWQyIsGWUf99mDvfSTxI+jsKGOAXgHmrK8kJ8orUL8L8P8NlyZp4RlRkCzkgP4yju0oeg32tss8iuwqXt44Gr1fk1ti5s1KXsZ1ZaGYAgucY5wEP4bmlPuQimfRIBvbNasSj/vk82RurAo77WDhmB63o9svfnVPExDpx1QxIYKezZGNA2A3J5gksZdhknWbSmcQy/HTP9bZdAfSEQCnXkdRIwnvdEts1rb5uWm4noCSVA3q7EMterUmfrKFpfzlCq96Lfor89p/nb0Cgl1xY0JDn+3k+na1rmGawro0Gz5jcPdVp+C3Z6afh03HBzbs/DSa3l+IMGLKEWP5f5wjy3ozgpP7GLuFHPtbOCy7/v7v/1mxZbUkT7CXPKVs1OEgYjH738igSjiziFJpVnDa/RmvV4WUmFLKcdNntuvpwu7hQFTDMrAU6G0K9weDH81xzJmAEZaVgW6aCu43wlPPKgvDjum5FcP/KHYG1s0CvF4ZVVON8fa0Jlmlg9zCPJ9POrmFa8Ap55BIQAgsXlyPXBXowQ3isZd3dK9R6ooq/6ODB3dnzn/QyVKljwyIxCZdJpMKza7k/hvpO3rlZne118AUE3Ry5QE7U7gDGFcn700R4vD3enxtausV+XiABDKHDBIAgLbT4ZyzXCHHxlgV2pvqL7GYwihN8FXc9UFRxqvMx8RA9gahKPIY6WOQ1q5NEyFTRPMYQRBHDTa9KSLBbfnbjmNaURfI0UeXV4/pPzEa+8in7rVJFltPk3z9XTqJK1hgd+1KfqXjmKKvh7tbM1KXx8yFI9JGTdL3vSqJGw2Qog/lLKez3ZshZVQbYJ54l4G+I6mQCOGUcKdvvOVWwggsxCAV78RuWKm7liUwnncpeSF2iq3AOMnVsTn6Bi7l4OYgZavoSEFTKuVRl+hSqC/Y9/x/ngTeAyudwAg=")
            Spire.Pdf.License.LicenseProvider.LoadLicense()

+            'Spire.PdfViewer.License.LicenseProvider.SetLicenseFileName("licensePDFViewer.elic.xml")
+            'Spire.PdfViewer.License.LicenseProvider.LoadLicense()
+            'Spire.Pdf.License.LicenseProvider.SetLicenseFileName("licensePDFPro.elic.xml")
+            'Spire.Pdf.License.LicenseProvider.LoadLicense()
+
+            'Spire.Pdf.License.LicenseProvider.SetLicenseFileName("license.elic.xml")
+            'Spire.Pdf.License.LicenseProvider.LoadLicense()
+
+            Return True
+
        Catch ex As Exception
            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+            Return False
        End Try
-    End Sub
+    End Function

    Public Shared Function genCSVFromDT(dt As DataTable, Optional openCSV As Boolean = False, Optional showColumnName As Boolean = True, Optional optFileName As String = "") As String
        Try