neu

2021-10-27 11:19:22 +02:00
parent 13f28aa1d8
commit f4813a04a9
76 changed files with 9922 additions and 2253 deletions
--- a/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb
@@ -76,6 +76,7 @@ Public Class cMitarbeiter

    Property mit_foto_DocId As Object = Nothing
    Property mit_sprache As String = "DE"
+    Property mit_fakturierungsgruppe As String = ""


    Dim SQL As New SQL
@@ -181,6 +182,7 @@ Public Class cMitarbeiter

        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_foto_DocId", mit_foto_DocId))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_sprache", mit_sprache))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_fakturierungsgruppe", mit_fakturierungsgruppe))

        Return list
    End Function
@@ -367,6 +369,7 @@ Public Class cMitarbeiter
                            If Not dr.Item("mit_MAVerzeichnis_Spitzname") Is DBNull.Value Then Me.mit_MAVerzeichnis_Spitzname = dr.Item("mit_MAVerzeichnis_Spitzname")
                            If Not dr.Item("mit_MAVerzeichnis_Motto") Is DBNull.Value Then Me.mit_MAVerzeichnis_Motto = dr.Item("mit_MAVerzeichnis_Motto")
                            If Not dr.Item("mit_sprache") Is DBNull.Value Then Me.mit_sprache = dr.Item("mit_sprache")
+                            If Not dr.Item("mit_fakturierungsgruppe") Is DBNull.Value Then Me.mit_fakturierungsgruppe = dr.Item("mit_fakturierungsgruppe")



--- a/VERAG_PROG_ALLGEMEIN/Classes/cNCTS_TR_Nachrichten.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cNCTS_TR_Nachrichten.vb
@@ -0,0 +1,139 @@
+
+
+Imports System.Data.SqlClient
+    Imports System.Reflection
+
+Public Class cNCTS_TR_Nachrichten
+    Property nctsNr_id As Integer
+    Property nctsNr_nctsId As Integer
+    Property nctsNr_typ As String
+    Property nctsNr_GUID As Object = Nothing
+    Property nctsNr_MRN As Object = Nothing
+    Property nctsNr_LRN As Object = Nothing
+    Property nctsNr_path As String
+    Property nctsNr_tstmp As Date = Now
+
+    Public hasEntry = False
+
+    Dim SQL As New SQL
+    Sub New()
+
+    End Sub
+    Sub New(nctsNr_id)
+        Me.nctsNr_id = nctsNr_id
+        LOAD()
+    End Sub
+    Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
+        Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nctsNr_id", nctsNr_id,, True))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nctsNr_nctsId", nctsNr_nctsId))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nctsNr_typ", nctsNr_typ))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nctsNr_GUID", nctsNr_GUID))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nctsNr_MRN", nctsNr_MRN))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nctsNr_LRN", nctsNr_LRN))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nctsNr_path", nctsNr_path))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nctsNr_tstmp", nctsNr_tstmp))
+
+        Return list
+    End Function
+
+
+
+    Public Function SAVE(Optional errHinweis = "") As Boolean
+        Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+
+        Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblNCTS_TR_Nachrichten  WHERE nctsNr_id=@nctsNr_id) " &
+                       " BEGIN " & getUpdateCmd() & " END " &
+                       " Else " &
+                       " BEGIN " & getInsertCmd() & " END " &
+                       " commit tran "
+
+        Dim ncts_IdTMP = nctsNr_id
+        ncts_IdTMP = SQL.doSQLVarListID(ncts_IdTMP, sqlstr, "FMZOLL", , list, , errHinweis)
+        If nctsNr_id <= 0 Then nctsNr_id = ncts_IdTMP
+        Return nctsNr_id > 0
+
+        '  Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list)
+    End Function
+
+    Public Sub LOAD()
+        Try
+            hasEntry = False
+            Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
+                Using cmd As New SqlCommand("SELECT * FROM tblNCTS_TR_Nachrichten WHERE nctsNr_id=@nctsNr_id  ", conn)
+                    cmd.Parameters.AddWithValue("@nctsNr_id", nctsNr_id)
+                    Dim dr = cmd.ExecuteReader()
+                    If dr.Read Then
+                        For Each li In getParameterList()
+                            Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable)
+
+                            If dr.Item(li.Text) Is DBNull.Value Then
+                                propInfo.SetValue(Me, Nothing)
+                            Else
+                                propInfo.SetValue(Me, dr.Item(li.Text))
+                            End If
+
+                        Next
+                        hasEntry = True
+                    End If
+                    dr.Close()
+                End Using
+            End Using
+        Catch ex As Exception
+            MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+    End Sub
+
+    Public Shared Function updatePath(nr_id As Integer, path As String) As String
+        Try
+            Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+            SQL.doSQL(" UPDATE [tblNCTS_TR_Nachrichten] SET nctsNr_path='" & path & "' WHERE nctsNr_id='" & nr_id & "' ", "FMZOLL")
+
+        Catch ex As Exception
+            MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+        Return ""
+    End Function
+
+
+    Public Function getUpdateCmd() As String
+        Try
+            Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+
+            Dim str As String = ""
+            For Each i In list
+                If Not i.isPrimaryParam Then
+                    str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
+                End If
+            Next
+            str = str.Substring(0, str.Length - 1) 'wg. ','
+            Return (" UPDATE [tblNCTS_TR_Nachrichten] SET " & str & " WHERE nctsNr_id=@nctsNr_id ")
+
+        Catch ex As Exception
+            MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+        Return ""
+    End Function
+
+
+    Public Function getInsertCmd() As String
+        Try
+            Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+            Dim str As String = ""
+            Dim values As String = ""
+            For Each i In list
+                If Not i.isPrimaryParam Then
+                    str &= "[" & i.Text & "],"
+                    values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
+                End If
+            Next
+            str = str.Substring(0, str.Length - 1) 'wg. ','
+            values = values.Substring(0, values.Length - 1) 'wg. ','
+            Return (" INSERT INTO tblNCTS_TR_Nachrichten  (" & str & ") VALUES(" & values & ")  ")
+        Catch ex As Exception
+            MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+        Return ""
+    End Function
+
+End Class
--- a/VERAG_PROG_ALLGEMEIN/Classes/cOffene_Posten.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cOffene_Posten.vb
@@ -0,0 +1,167 @@
+Imports System.Data.SqlClient
+Imports System.Reflection
+
+Public Class cOffene_Posten
+
+
+
+    Property OP_ID As Object = Nothing
+    Property Kontonummer As Object = Nothing
+    Property Kontoname As Object = Nothing
+    Property Belegnummer As Object = Nothing
+    Property Belegdatum As Object = Nothing
+    Property Fälligkeitsdatum As Object = Nothing
+    Property Skontodatum As Object = Nothing
+    Property Skontoprozent As Object = Nothing
+    Property Bruttobetrag As Object = Nothing
+    Property Waehrung As Object = Nothing
+    Property Steuersatz As Object = Nothing
+    Property Gesamtausstand As Object = Nothing
+    Property Steuersatz2 As Object = Nothing
+    Property Ausstand2 As Object = Nothing
+    Property Buchungstext As Object = Nothing
+    Property Bemerkung As Object = Nothing
+    Property Mahnstufe As Object = Nothing
+    Property Mahndatum As Object = Nothing
+    Property Gegenkonto As Object = Nothing
+    Property Status As Object = Nothing
+    Property KumSaldoEUR As Object = Nothing
+
+    Property Firma_ID As Object = Nothing
+
+    Dim SQL As New SQL
+
+    Sub New()
+    End Sub
+
+    Sub New(OP_ID)
+        Me.OP_ID = OP_ID
+        LOAD()
+    End Sub
+
+
+    Public Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
+        Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("OP_ID", OP_ID, , True, True))
+
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Kontonummer", Kontonummer))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Kontoname", Kontoname))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Belegnummer", Belegnummer))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Belegdatum", Belegdatum))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Fälligkeitsdatum", Fälligkeitsdatum))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Skontodatum", Skontodatum))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Skontoprozent", Skontoprozent))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Bruttobetrag", Bruttobetrag))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Waehrung", Waehrung))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Steuersatz", (Steuersatz))) '.ToString("N2")))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Gesamtausstand", Gesamtausstand))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Steuersatz2", Steuersatz2))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Ausstand2", Ausstand2))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Buchungstext", Buchungstext))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Bemerkung", Bemerkung))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Mahnstufe", Mahnstufe))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Mahndatum", Mahndatum))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Gegenkonto", Gegenkonto))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Status", Status))
+
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KumSaldoEUR", KumSaldoEUR))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_ID", Firma_ID))
+        Return list
+    End Function
+
+    Public Shared Function DELETE_ALL() As Boolean
+        Dim SQL As New SQL
+        Return SQL.doSQL("DELETE FROM [Offene Posten]", "FMZOLL")
+    End Function
+
+    Public Function SAVE() As Boolean
+        Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+
+        Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM [Offene Posten] WITH(updlock,serializable) WHERE OP_ID=@OP_ID) " &
+                       " BEGIN " & getUpdateCmd() & " END " &
+                       " Else " &
+                       " BEGIN " & getInsertCmd() & " END " &
+                       " commit tran "
+
+        OP_ID = SQL.doSQLVarListID(OP_ID, sqlstr, "FMZOLL", , list)
+        Return OP_ID > 0
+    End Function
+
+
+
+    Public Sub LOAD()
+        Try
+            Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
+                Using cmd As New SqlCommand("SELECT * FROM [Offene Posten] WHERE OP_ID=@OP_ID  ", conn)
+                    cmd.Parameters.AddWithValue("@OP_ID", OP_ID)
+                    Dim dr = cmd.ExecuteReader()
+                    If dr.Read Then
+                        For Each li In getParameterList()
+                            Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable)
+
+                            If dr.Item(li.Text) Is DBNull.Value Then
+                                propInfo.SetValue(Me, Nothing)
+                            Else
+                                propInfo.SetValue(Me, dr.Item(li.Text))
+                            End If
+
+                        Next
+
+                    End If
+                    dr.Close()
+                End Using
+            End Using
+        Catch ex As Exception
+            MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+    End Sub
+
+
+    Public Function getUpdateCmd() As String
+        Try
+            Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+
+            Dim str As String = ""
+            For Each i In list
+                If Not i.isPrimaryParam Then
+                    str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
+                End If
+            Next
+            str = str.Substring(0, str.Length - 1) 'wg. ','
+            Return (" UPDATE [Offene Posten] SET " & str & " WHERE OP_ID=@OP_ID ")
+
+        Catch ex As Exception
+            MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+        Return ""
+    End Function
+
+
+    Public Function getInsertCmd() As String
+        Try
+            Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+            Dim str As String = ""
+            Dim values As String = ""
+            For Each i In list
+                If Not i.isPrimaryParam Then
+                    str &= "[" & i.Text & "],"
+                    values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
+                End If
+            Next
+            str = str.Substring(0, str.Length - 1) 'wg. ','
+            values = values.Substring(0, values.Length - 1) 'wg. ','
+            Return (" INSERT INTO [Offene Posten]  (" & str & ") VALUES(" & values & ")  ")
+        Catch ex As Exception
+            MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+        Return ""
+    End Function
+
+
+    Public Function DELETE() As Boolean 'obj As Object, tablename As String, where As String) As Boolean
+        Dim sqlstr = " DELETE FROM [Offene Posten] WITH(updlock,serializable) WHERE OP_ID=" & Me.OP_ID
+        Return SQL.doSQL(sqlstr, "FMZOLL")
+    End Function
+
+
+End Class
--- a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb
@@ -109,11 +109,14 @@ Public Class cRechnungsausgang
    Property VorschauID As Object = Nothing
    Property Grenze As Object = Nothing
    Property RechnungSprache As Object = Nothing
+    Property FakturierungsGruppe As String = ""


    ' FROM [VERAG as object=nothing.[dbo as object=nothing.[Rechnungsausgang as object=nothing

    Public POSITIONEN As New List(Of cRechnungsausgangPositionen)
+    Public ANHAENGE As New List(Of cRechnungsausgangANHAENGE)
+
    Shared SQL As New SQL

    Sub New()
@@ -332,6 +335,7 @@ Public Class cRechnungsausgang
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("VorschauID", VorschauID))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Grenze", Grenze))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("RechnungSprache", RechnungSprache))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FakturierungsGruppe", FakturierungsGruppe))

        Return list
    End Function
@@ -414,6 +418,7 @@ Public Class cRechnungsausgang
        If RK_ID > 0 Then
            doVorzeichenPOS()
            If saveAll Then SAVE_POSITIONEN(RK_ID) ' positionen speicehrn
+            If saveAll Then SAVE_ANHAENGE(RK_ID) ' positionen speicehrn
            doVorzeichenPOS()
        End If
        doVorzeichen()
@@ -450,7 +455,7 @@ Public Class cRechnungsausgang

        If FIRMA.Firma_ID = 26 Then
            If RechnungsLandKz <> "GB" And RechnungsLandKz <> "UK" Then
-                errMsg = "ERROR: Es darf nur nach GB abgerechnet werden!" : Return False
+                errMsg = "WARN: Abrechnung außerhalb GB." ' Return False
            End If
            If Währungscode <> "GBP" Then
                errMsg = "ERROR: Es darf nur mit Währung 'GBP' abgerechnet werden!" : Return False
@@ -479,6 +484,16 @@ Public Class cRechnungsausgang
        End If
        Return True
    End Function
+    Public Function SAVE_ANHAENGE(RK_ID) As Boolean
+        If DELETE_ANHAENGE() Then ' zuerst Einträge löschen...
+            'ORDER_ANHAENGE() ' ... dann ordnen ...
+            For Each p In ANHAENGE
+                If Not p.INSERT(RK_ID) Then Return False ' ... dann insert
+            Next
+        Else : Return False
+        End If
+        Return True
+    End Function


    Public Sub LOAD()
@@ -572,6 +587,11 @@ Public Class cRechnungsausgang
        Return SQL.doSQL(sqlstr, "FMZOLL")
    End Function

+    Public Function DELETE_ANHAENGE() As Boolean 'obj As Object, tablename As String, where As String) As Boolean
+        Dim sqlstr = " DELETE FROM [RechnungsausgangAnhaenge]  WHERE RK_ID=" & Me.RK_ID
+        Return SQL.doSQL(sqlstr, "FMZOLL")
+    End Function
+
    Public Sub LOAD_POSITIONEN()
        Try
            POSITIONEN.Clear()
@@ -601,6 +621,63 @@ Public Class cRechnungsausgang
        End Try
    End Sub

+    Public Sub LOAD_ANHAENGE()
+        Try
+            ANHAENGE.Clear()
+            Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
+                Using cmd As New SqlCommand("Select * FROM RechnungsausgangAnhaenge WHERE RK_ID=@RK_ID  ", conn)
+                    cmd.Parameters.AddWithValue("@RK_ID", Me.RK_ID)
+
+                    Dim dr = cmd.ExecuteReader()
+                    While dr.Read
+                        Dim l As New cRechnungsausgangAnhaenge
+                        For Each i In l.getParameterList()
+                            Dim propInfo As PropertyInfo = l.GetType.GetProperty(i.Scalarvariable)
+                            If dr.Item(i.Text) Is DBNull.Value Then
+                                propInfo.SetValue(l, Nothing)
+                            Else
+                                propInfo.SetValue(l, dr.Item(i.Text))
+                            End If
+                        Next
+                        ANHAENGE.Add(l)
+                    End While
+                    dr.Close()
+                End Using
+            End Using
+            doVorzeichenPOS()
+        Catch ex As Exception
+            MsgBox("Fehler In der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+    End Sub
+
+    Shared Function LOAD_ANHAENGE_LIST(RK_ID) As List(Of cRechnungsausgangAnhaenge)
+        Dim ANHAENGE As New List(Of cRechnungsausgangAnhaenge)
+        Try
+            Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
+                Using cmd As New SqlCommand("Select * FROM RechnungsausgangAnhaenge WHERE RK_ID=@RK_ID  ", conn)
+                    cmd.Parameters.AddWithValue("@RK_ID", RK_ID)
+
+                    Dim dr = cmd.ExecuteReader()
+                    While dr.Read
+                        Dim l As New cRechnungsausgangAnhaenge
+                        For Each i In l.getParameterList()
+                            Dim propInfo As PropertyInfo = l.GetType.GetProperty(i.Scalarvariable)
+                            If dr.Item(i.Text) Is DBNull.Value Then
+                                propInfo.SetValue(l, Nothing)
+                            Else
+                                propInfo.SetValue(l, dr.Item(i.Text))
+                            End If
+                        Next
+                        ANHAENGE.Add(l)
+                    End While
+                    dr.Close()
+                End Using
+            End Using
+        Catch ex As Exception
+            MsgBox("Fehler In der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+        Return ANHAENGE
+    End Function
    Public Sub ORDER_POSITIONEN()
        Try
            '  Dim POSITIONEN_Tmp As New List(Of cRechnungsausgangPositionen)
@@ -669,7 +746,7 @@ Public Class cRechnungsausgangPositionen


        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("SteuerpflichtigerBetrag", SteuerpflichtigerBetrag))
-            list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("SteuerfreierBetrag", SteuerfreierBetrag))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("SteuerfreierBetrag", SteuerfreierBetrag))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("AufschubkontoNr", AufschubkontoNr))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Aufschubfälligkeit", Aufschubfälligkeit))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Prüfsumme berechnen", Prüfsumme_berechnen, "Prüfsumme_berechnen")) '!!!!
@@ -682,7 +759,7 @@ Public Class cRechnungsausgangPositionen
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("BGebProzent", BGebProzent))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("BGebBgl", BGebBgl))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("BGebMinBetrag", BGebMinBetrag))
-            list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("RePosZeitstempel", RePosZeitstempel))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("RePosZeitstempel", RePosZeitstempel))

        'list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("upsize_ts", XXXXXXXXXXXXX))
        Return list
@@ -725,4 +802,63 @@ Public Class cRechnungsausgangPositionen



+End Class
+
+
+Public Class cRechnungsausgangAnhaenge
+
+    Property RK_ID As Integer
+    Property dsId As Integer
+    Property anhId As Integer
+    Property Bezeichnung As String = ""
+
+
+    Dim SQL As New SQL
+
+    Sub New()
+    End Sub
+
+
+
+    Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
+        Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("RK_ID", RK_ID))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("dsId", dsId))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("anhId", anhId))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Bezeichnung", Bezeichnung))
+
+        Return list
+    End Function
+
+    Public Function INSERT(RK_ID) As Boolean
+        Me.RK_ID = RK_ID
+        Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+        Return SQL.doSQLVarList(getInsertCmd, "FMZOLL", , list)
+    End Function
+
+
+
+    Public Function getInsertCmd() As String
+        Try
+            'Me.Eingegeben_am = Now
+            Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+            Dim str As String = ""
+            Dim values As String = ""
+            For Each i In list
+                If Not i.isPrimaryParam Then
+                    str &= "[" & i.Text & "],"
+                    values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
+                End If
+            Next
+            str = str.Substring(0, str.Length - 1) 'wg. ','
+            values = values.Substring(0, values.Length - 1) 'wg. ','
+            Return (" INSERT INTO RechnungsausgangAnhaenge  (" & str & ") VALUES(" & values & ")  ")
+        Catch ex As Exception
+            MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+        Return ""
+    End Function
+
+
+
 End Class
--- a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsnummern.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsnummern.vb
@@ -50,6 +50,9 @@ Public Class cRechnungsnummern
            Case 23 ' UNISPED Zollservice
                VonRechnungsNr = Now.ToString("yy") & "5000000"
                BisRechnungsNr = Now.ToString("yy") & "5999999"
+            Case 26 ' VERAG-UNISPED
+                VonRechnungsNr = Now.ToString("yy") & "0000001"
+                BisRechnungsNr = Now.ToString("yy") & "9999999"
        End Select
        LfdRechnungsNr = VonRechnungsNr
        '-------------------------------------
--- a/VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb
@@ -102,6 +102,10 @@ Public Class cSendungen
    Property tblSnd_Frachtkosten As Object = Nothing


+    Property tblSnd_AbfertigungTR As Object = Nothing
+    Property tblSnd_AbfertigungTR_MA As Object = Nothing
+
+
    Public saveSachbearbeiter As Boolean = False

    Property ABRECHNUNG As New List(Of cSendungAbrechnung)
@@ -371,6 +375,8 @@ Public Class cSendungen
                    Me.tblSnd_Vorpapier3 = SQL.checkNullReturnValue(dr.Item("tblSnd_Vorpapier3"), Nothing)
                    Me.tblSnd_Vorpapier3_Pos = SQL.checkNullReturnValue(dr.Item("tblSnd_Vorpapier3_Pos"), Nothing)
                    Me.tblSnd_Frachtkosten = SQL.checkNullReturnValue(dr.Item("tblSnd_Frachtkosten"), Nothing)
+                    Me.tblSnd_AbfertigungTR = SQL.checkNullReturnValue(dr.Item("tblSnd_AbfertigungTR"), Nothing)
+                    Me.tblSnd_AbfertigungTR_MA = SQL.checkNullReturnValue(dr.Item("tblSnd_AbfertigungTR_MA"), Nothing)

                End If

@@ -586,8 +592,8 @@ Public Class cSendungen
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Vorpapier3", tblSnd_Vorpapier3))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Vorpapier3_Pos", tblSnd_Vorpapier3_Pos))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Frachtkosten", tblSnd_Frachtkosten))
-
-
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_AbfertigungTR", tblSnd_AbfertigungTR))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_AbfertigungTR_MA", tblSnd_AbfertigungTR_MA))


        Return list
--- a/VERAG_PROG_ALLGEMEIN/Classes/cTrdInvoice.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cTrdInvoice.vb
@@ -332,7 +332,7 @@ Class TrdInvoice_FUNCTIONS
            Dim WährungsdifferenzSteuerpflichtigerBetrag As Double
            Dim WährungsdifferenzSteuerfreierBetrag As Integer

-            Dim dt As DataTable = SQL.loadDgvBySql(getSQLString_SELECTForTrdInvoice(Firma), "FMZOLL")
+            Dim dt As DataTable = SQL.loadDgvBySql(getSQLString_SELECTForTrdInvoice(Firma), "FMZOLL", 2400)
            If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
                For Each ROW In dt.Rows
                    Dim TRD_INVOICE As New VERAG_PROG_ALLGEMEIN.cTrdInvoice(ROW("RK_RechnungsDatum"), ROW("RK_RechnungsNr"))
--- a/VERAG_PROG_ALLGEMEIN/Classes/old_cRKSV_DE.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/old_cRKSV_DE.vb