fiskaluebersicht, etc.

SDL/kunden/usrcntlFiskaluebersicht.vb

@@ -2,6 +2,7 @@
 Imports System.Text.RegularExpressions
 Imports VERAG_PROG_ALLGEMEIN
 
+
 Public Class usrcntlFiskaluebersicht
 
     Public kdNr As Integer = -1
@@ -362,8 +363,33 @@ Public Class usrcntlFiskaluebersicht
             If BA IsNot Nothing Then
                 If BA.ba_datenarchivId > 0 Then files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(BA.ba_datenarchivId))
             End If
+
+
             For Each r As DataGridViewRow In dgvUnterlagen.Rows
-                files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("fka_docId").Value))
+
+                Dim Path = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("fka_docId").Value)
+
+                Dim extension As String = System.IO.Path.GetExtension(Path).ToLowerInvariant()
+
+                Select Case extension
+
+                    Case ".pdf"
+
+                        files.Add(Path)
+
+                    Case ".png", ".jpg", ".jpeg", ".bmp", ".gif", ".tif", ".tiff"
+
+                        Dim PathTemp As String = VERAG_PROG_ALLGEMEIN.cFormularManager.convertPictureToPDF(Path)
+
+                        If Not String.IsNullOrEmpty(PathTemp) Then
+                            files.Add(PathTemp)
+                        End If
+
+                End Select
+
+
+
+
             Next
             VERAG_PROG_ALLGEMEIN.cFormularManager.mergePDFs(files, outputFile)
 
@@ -1065,7 +1091,7 @@ Public Class usrcntlFiskaluebersicht
 
 
         Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "FISKALKUNDENANHAENGE", fk.FK_Datum, "", "", ArtId, kdNr)
-        If DS.uploadDataToDATENSERVERFileDialog(, ".pdf", , "PDF") Then
+        If DS.uploadDataToDATENSERVERFileDialog() <> "" Then
 
             Dim ANH = New VERAG_PROG_ALLGEMEIN.cFiskalkundenAnhaenge()
             ANH.fka_Art = ArtId