Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

VERAG_PROG_ALLGEMEIN/Classes/cOriginalATR.vb

@@ -11,6 +11,8 @@ Public Class cOrigianlATR
     Property atr_mitId As Integer
     Property atr_absender As Object = Nothing
     Property atr_empfaenger As Object = Nothing
+    Property atr_empfaengerkdnr As Integer = -1
+    Property atr_absenderkdnr As Integer = -1
     Property atr_austellungsdatum As Object = Nothing
     Property atr_AvisoId As Object = Nothing
     Property atr_SendungsId As Object = Nothing
@@ -19,12 +21,20 @@ Public Class cOrigianlATR
     Property atr_DHL_ReferenzNr As Object = Nothing
     Property atr_location As Object = Nothing
     Property atr_info As Object = Nothing
+    Property atr_erhalenDatum As Object = Nothing
+    Property atr_erhalten_Art As Object = Nothing
+    Property atr_FilialenNr As Integer = -1
+    Property atr_AbfertigungsNr As Integer = -1
+    Property atr_anhID As Integer = -1
 
 
     Public hasEntry = False
 
     Dim SQL As New SQL
 
+    Sub New()
+
+    End Sub
     Sub New(atr_id)
         Me.atr_id = atr_id
         LOAD()
@@ -33,7 +43,6 @@ Public Class cOrigianlATR
         Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_id", atr_id,, True))
 
-
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_documentNr", atr_documentNr))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_erfassungsdatum", atr_erfassungsdatum))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_Sachbearbeiter", atr_Sachbearbeiter))
@@ -48,6 +57,15 @@ Public Class cOrigianlATR
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_DHL_ReferenzNr", atr_DHL_ReferenzNr))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_location", atr_location))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_info", atr_info))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_erhalenDatum", atr_erhalenDatum))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_erhalten_Art", atr_erhalten_Art))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_FilialenNr", atr_FilialenNr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_AbfertigungsNr", atr_AbfertigungsNr))
+
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_absenderkdnr", atr_absenderkdnr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_empfaengerkdnr", atr_empfaengerkdnr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_anhID", atr_anhID))
+
 
         Return list
     End Function
@@ -68,6 +86,12 @@ Public Class cOrigianlATR
 
         Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list)
     End Function
+    Public Function DELETE() As Boolean
+
+        Dim sqlstr = " DELETE tblOriginalATR  WHERE atr_id='" & atr_id & "'"
+
+        Return SQL.doSQL(sqlstr, "FMZOLL")
+    End Function
 
     Public Sub LOAD()
         Try

VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb

@@ -1455,13 +1455,20 @@ Public Class cSyska_Interface
                 For Each r In dt.Rows
 
                     If KdNr = -1 OrElse r("KundenNrZentrale") = KdNr Then 'TEST!! 
-                        Dim strRisiko = 0
-                        If r("Risiko") Is DBNull.Value Then strRisiko = Format(CDbl(r("Risiko")), fmt).Replace(",", ".")
+                        Dim strRisiko As String = "0"
+                        If r("Risiko") IsNot DBNull.Value Then strRisiko = CDbl(r("Risiko")).ToString.Replace(",", ".")
+
+                        'If r("Risiko") IsNot DBNull.Value Then
+
+                        '    MsgBox(Format(CDbl(r("Risiko")), fmt).Replace(",", "."))
+                        'MsgBox(Format(CDbl(r("Risiko")), fmt))
+                        '    MsgBox((CDbl(r("Risiko"))))
+                        'End If
 
                         SQL.doSQL("UPDATE [FIBU2].[dbo].[fibu_konto]
                                                   SET [dec_wert3] = '" & strRisiko & "'
                                                   WHERE ([i_firm_refid]=1 Or [i_firm_refid]=19)
-                                                  AND [c_kontoart]='DE'
+                                                  AND [c_kontoart]='DE' 
                                                         And [i_konto]=" & r("KundenNrZentrale") & " ", "FIBU")
                     End If
                 Next
@@ -1490,7 +1497,7 @@ Public Class cSyska_Interface
 	                GROUP BY Adressen.Ordnungsbegriff, Adressen.LandKz, Adressen.AdressenNr, Kunden.KundenNrZentrale, Kunden.Abfertigungsverbot, Kunden.LfdSaldo, Kunden.UStV_SummeUmsatzsteuerbetragEUR, 
 	                Kunden.UStV_SummeErstattungsbetragEUR, Kunden.UStV_Summe3470BetragEUR, Kunden.UStV_SummeVZBetragEUR, Kunden.UStV_SummeVorschaubetragEUR, Kunden.BankgarantieBetrag, Kunden.BankgarantieGültigBis
                 ) as T1
-                GROUP BY KundenNrZentrale, Risiko,LfdSaldo, BankgarantieBetrag, BankgarantieGültigBis"
+                GROUP BY KundenNrZentrale, Risiko,LfdSaldo, BankgarantieBetrag, BankgarantieGültigBis "
     End Function
 
 End Class

VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb

@@ -492,6 +492,23 @@ Public Class cProgramFunctions
 
     End Sub
 
+    Public Shared Function getFilePathTypeValid(filePath) As String
+        Dim fi As New FileInfo(filePath)
+        Dim filename = fi.Name
+
+        Dim Typ = ""
+        Select Case fi.Extension.ToString.Replace(".", "").ToUpper
+            Case "PDF" : Typ = "PDF"
+            Case "XLS", "XLM", "XLSM", "XLSX", "CSV" : Typ = "EXCEL"
+            Case "DOC", "DOCX" : Typ = "WORD"
+            Case "TXT" : Typ = "TEXT"
+            Case "JPEG", "JPG", "GIF", "TFF" : Typ = "BILD"
+            Case "EXE" : MsgBox("Aviso-Anhänge: Ungültiges Datei-Format!") : Return False
+            Case Else : Typ = "SONSTIGES"
+        End Select
+        Return Typ
+    End Function
+
     Shared Function EmAilAttach(e As DragEventArgs) As String
         Try