201020

2020-10-20 09:03:00 +02:00
parent 75b12f314d
commit 00cd158bf0
54 changed files with 11763 additions and 323 deletions
--- a/SDL/Administration/usrCntlAdministration.vb
+++ b/SDL/Administration/usrCntlAdministration.vb
@@ -117,7 +117,7 @@

                  FROM [Rechnungsausgang] as RG1 INNER JOIN RechnungsausgangPositionen on RG1.RK_ID=RechnungsausgangPositionen.RK_ID INNER JOIN Leistungen ON Leistungen.LeistungsNr=RechnungsausgangPositionen.LeistungsNr INNER JOIN  Kostenstellen as KSt1 ON KSt1.Kostenstelle=Leistungen.Kostenstelle
                  where DATEPART(YEAR,Abfertigungsdatum )=" & jahr & " AND Firma_ID NOT IN (15)
-                 
+                 AND RG1.FilialenNr NOT IN (4804,4808) 

                group by " & If(CheckBox2.Checked, "Firma_ID, ", "") & "FilialenNr,KSt1.Kostenstelle,KSt1.Bezeichnung
                 
--- a/SDL/Classes/cFinanzOnlineWebService.vb
+++ b/SDL/Classes/cFinanzOnlineWebService.vb
@@ -15,6 +15,13 @@ Public Class cFinanzOnlineWebService
    'Shared pin As String = "webserv99"
    'Shared uid As String = "ATU53187000"

+    ' 'VERAG CS:
+    'Shared tid As String = "19379933"
+    'Shared benid As String = "WEBserv99"
+    'Shared pin As String = "WEBserv99"
+    'Shared uid As String = "XXXX"
+
+
    ''FRONT-Office:
    'Shared tid As String = "67493371k039"
    'Shared benid As String = "WEBserv99"
@@ -45,10 +52,14 @@ Public Class cFinanzOnlineWebService
                pin = "WEBserv99"
                uid = "ATU74813856"
            Case Else  'VERAG:
-                tid = "1000103u3032"
-                benid = "webserv99"
-                pin = "webserv99"
+                tid = "13390891m005"
+                benid = "WEBserv99"
+                pin = "WEBserv99"
                uid = "ATU53187000"
+                'tid = "1000103u3032"
+                'benid = "webserv99"
+                'pin = "webserv99"
+                'uid = "ATU53187000"
        End Select
    End Sub

@@ -59,8 +70,7 @@ Public Class cFinanzOnlineWebService
            Dim rc = ""
            Dim msg = ""
            SESSION_ID = CallWebService.login(tid, benid, pin, uid, rc, msg)
-            MsgBox("msg " & msg)
-            MsgBox(SESSION_ID)
+
            Return rc
        Catch ex As Exception
            MsgBox(ex.Message & ex.StackTrace)
@@ -136,14 +146,14 @@ Public Class cFinanzOnlineWebService
    End Function


-    Shared Function genUID_Formular(ByVal txtUid As String, Optional AvisoId As Integer = -1, Optional SendungsId As Integer = -1) As String 'SESSION_ID wir nur zurückgegeben
+    Shared Function genUID_Formular(ByVal txtUid As String, Optional AvisoId As Integer = -1, Optional SendungsId As Integer = -1, Optional ByRef UID_ERG As Integer = -1) As String 'SESSION_ID wir nur zurückgegeben
        Try

            Dim msgErgebnis = ""
-        Dim tmp_SESSION_ID = ""
-        Dim Firma = ""
+            Dim tmp_SESSION_ID = ""
+            Dim Firma = ""

-            Dim UID_ERG = Call_Web_Service_MethodUID_Abfrage_NEU2020(txtUid, Firma, tmp_SESSION_ID, msgErgebnis)
+            UID_ERG = Call_Web_Service_MethodUID_Abfrage_NEU2020(txtUid, Firma, tmp_SESSION_ID, msgErgebnis)

            If UID_ERG = 0 Or UID_ERG = 1 Then
                Select Case UID_ERG
@@ -154,7 +164,7 @@ Public Class cFinanzOnlineWebService
                Dim PdfTmp = SDL.FormularManagerNEU.UID_PRUEFUNG(msgErgebnis, Firma, tmp_SESSION_ID, uid, txtUid, tid, AvisoId, SendungsId)
                If PdfTmp <> "" Then

-                    Dim fileName = txtUid & ".pdf"
+                    Dim fileName = "UID_Prüfung_" & txtUid & ".pdf"
                    Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "UID_PRUEFUNG", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, txtUid, Now.ToString("ddMMyy_HHmmss.ffff"), fileName, -1, False) 'Now.ToString("ddMMyy_HHmmss.ffff")
                    If Not DS.uploadDataToDATENSERVER(PdfTmp) Then MsgBox("Fehler beim Speichern: Datenserver!") : Return False
                    If DS.da_id <= 0 Then MsgBox("Keine DocId!") : Return False
@@ -162,7 +172,7 @@ Public Class cFinanzOnlineWebService
                    Dim destPath = DS.GET_TOP1_PATH

                    If AvisoId > 0 And SendungsId > 0 Then
-                        Dim ANH As New VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge(AvisoId, fileName, DS.da_id, "PDF", "UID", SendungsId)
+                        Dim ANH As New VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge(AvisoId, fileName, DS.da_id, "UID", "PDF", SendungsId)
                        If Not ANH.SAVE Then MsgBox("Fehler beim Anhang speichern!") : Return False
                        Dim anhId = ANH.anh_id
                    End If
@@ -177,13 +187,17 @@ Public Class cFinanzOnlineWebService
        Catch ex As Exception
            MsgBox(ex.Message & ex.StackTrace)
        End Try
+
        Return ""

    End Function


    Shared Function Call_Web_Service_MethodUID_Abfrage_NEU2020(ByVal txtUid As String, Optional ByRef Firma As String = "", Optional ByRef tmp_SESSION_ID As String = "", Optional ByRef msgErgebnis As String = "", Optional SaveErgInAdressenKdNr As Integer = -1) As String 'SESSION_ID wir nur zurückgegeben
+        initValues()
+
        If Call_Web_Service_MethodUID_Login_NEU2020() <> 0 Then
+            MsgBox("FEHLER FO LOGIN")
            Return -1
        End If
        tmp_SESSION_ID = SESSION_ID
--- a/SDL/Fakturierung/cFakturierung.vb
+++ b/SDL/Fakturierung/cFakturierung.vb
@@ -906,8 +906,8 @@ Public Class cFakturierung
                ' Dim RG_Bezeichnung = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "_Rechnung_" & If(RECHNUNG.RechnungsNr, "") & ".pdf"
                Dim RG_Bezeichnung = If(RECHNUNG.[BelegartenKz] = "AR", "Rechnung_", "Gutschrift_") & If(RECHNUNG.RechnungsNr, "") & ".pdf"

-                        'Immer Exportieren, da in Therefore speichern
-                        Dim tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(RG_Bezeichnung, ".pdf", , False)
+                'Immer Exportieren, da in Therefore speichern
+                Dim tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(RG_Bezeichnung, ".pdf", , False)
                Dim p As New GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport
                rpt.Run(False)
                p.NeverEmbedFonts = ""
@@ -1099,6 +1099,8 @@ Public Class cFakturierung
                End If

                Dim RG_NR As New VERAG_PROG_ALLGEMEIN.cRechnungsnummern(RECHNUNG.Firma_ID, RECHNUNG.Buchungsjahr)
+                ' Prüfung, ob RgNr schon vergeben wurde --> dann +1, bis freie Nr. (sollte EÜGENTLICH nicht vorkommen)
+                RG_NR.CHECK_RGNR()
                ' Nächste Rechnungsnummer speichern.
                RECHNUNG.[RechnungsNr] = RG_NR.LfdRechnungsNr
                'RECHNUNG.[LfdRechnungsNr] = RG_NR.LfdRechnungsNr
@@ -1188,7 +1190,7 @@ Public Class cFakturierung
    End Function


-    Public Shared Function doSAMMELRechnungsDruck(Firma_ID As Integer, SammelrechungArt As Integer, DatumBis As Date, Rechnungsdatum As Date, PrinterName As String, Optional AnlageEinzelRg As Boolean = True, Optional Sammelrechnungsbericht As Boolean = True, Optional whereKdNr As String = "", Optional RechnungsdruckArt As Integer = -1, Optional ByRef listPDFs As List(Of String) = Nothing, Optional SB As String = "", ByRef Optional lastAktuelle_RgNr As Integer = -1, ByRef Optional DruckdatumUhrzeit As DateTime = Nothing, Optional AvisoIds As List(Of Integer) = Nothing) As Boolean 'RECHNUNG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, Optional vorschau As Boolean = False, Optional Rechnugnsdruck As Integer = -1, Optional ByRef Path As String = "") As Boolean
+    Public Shared Function doSAMMELRechnungsDruck(Firma_ID As Integer, SammelrechungArt As Integer, DatumBis As Date, Rechnungsdatum As Date, PrinterName As String, Optional AnlageEinzelRg As Boolean = True, Optional Sammelrechnungsbericht As Boolean = True, Optional whereKdNr As String = "", Optional RechnungsdruckArt As Integer = -1, Optional ByRef listPDFs As List(Of String) = Nothing, Optional SB As String = "", ByRef Optional lastAktuelle_RgNr As Integer = -1, ByRef Optional DruckdatumUhrzeit As DateTime = Nothing, Optional AvisoIds As List(Of Integer) = Nothing, Optional AnlageExcelEvolog As Boolean = False, Optional ByRef SonstAnlagen As List(Of String) = Nothing) As Boolean 'RECHNUNG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, Optional vorschau As Boolean = False, Optional Rechnugnsdruck As Integer = -1, Optional ByRef Path As String = "") As Boolean
        'If RECHNUNG Is Nothing Then MsgBox("Fehler beim Laden der Rechnungsdaten!") : Return False
        Try
            'If whereKdNr <> "" Then whereKdNr = " AND RechnungsKundenNr IN(" & whereKdNr & ") "
@@ -1215,6 +1217,7 @@ Public Class cFakturierung
            DruckdatumUhrzeit = Now.ToString("dd.MM.yyyy HH:mm:ss.fff")

            If listPDFs Is Nothing Then listPDFs = New List(Of String)
+            If SonstAnlagen Is Nothing Then SonstAnlagen = New List(Of String)
            Dim kdTmp = -1
            Dim AvisoIdTmp = -1
            Dim FilialeTmp = -1
@@ -1231,7 +1234,7 @@ Public Class cFakturierung
                            If FIRMATmp < 0 Then FIRMATmp = RG.Firma_ID  'erstes Mal
                            If kdTmp <> RG.RechnungsKundenNr Or AvisoIdTmp <> RG.AvisoID Or FIRMATmp <> RG.Firma_ID Then 'Or FilialeTmp <> RG.FilialenNr
                                Dim path = ""
-                                doSAMMELRechnungsDruck_Abschnitt(Aktuelle_RgNr, Firma_ID, Buchungsjahr, DruckdatumUhrzeit, PrinterName, AnlageEinzelRg, Sammelrechnungsbericht, RechnungsdruckArt, path,, SB) 'hier wird auch die RG Nr erhöht!
+                                doSAMMELRechnungsDruck_Abschnitt(Aktuelle_RgNr, Firma_ID, Buchungsjahr, DruckdatumUhrzeit, PrinterName, AnlageEinzelRg, Sammelrechnungsbericht, RechnungsdruckArt, path,, SB, AnlageExcelEvolog, SonstAnlagen) 'hier wird auch die RG Nr erhöht!
                                Aktuelle_RgNr = getNewRgNr(Firma_ID, Buchungsjahr)
                                If path <> "" Then listPDFs.Add(path)
                            End If
@@ -1245,7 +1248,7 @@ Public Class cFakturierung
                            If FIRMATmp < 0 Then FIRMATmp = RG.Firma_ID  'erstes Mal
                            If kdTmp <> RG.RechnungsKundenNr Or FIRMATmp <> RG.Firma_ID Then 'Or FilialeTmp <> RG.FilialenNr
                                Dim path = ""
-                                doSAMMELRechnungsDruck_Abschnitt(Aktuelle_RgNr, Firma_ID, Buchungsjahr, DruckdatumUhrzeit, PrinterName, AnlageEinzelRg, Sammelrechnungsbericht, RechnungsdruckArt, path,, SB)
+                                doSAMMELRechnungsDruck_Abschnitt(Aktuelle_RgNr, Firma_ID, Buchungsjahr, DruckdatumUhrzeit, PrinterName, AnlageEinzelRg, Sammelrechnungsbericht, RechnungsdruckArt, path,, SB, AnlageExcelEvolog, SonstAnlagen)
                                Aktuelle_RgNr = getNewRgNr(Firma_ID, Buchungsjahr)
                                If path <> "" Then listPDFs.Add(path)
                            End If
@@ -1268,7 +1271,7 @@ Public Class cFakturierung
            'Letzter Abschnitt:
            If found Then
                Dim path = ""
-                doSAMMELRechnungsDruck_Abschnitt(Aktuelle_RgNr, Firma_ID, Buchungsjahr, DruckdatumUhrzeit, PrinterName, AnlageEinzelRg, Sammelrechnungsbericht, RechnungsdruckArt, path,, SB)
+                doSAMMELRechnungsDruck_Abschnitt(Aktuelle_RgNr, Firma_ID, Buchungsjahr, DruckdatumUhrzeit, PrinterName, AnlageEinzelRg, Sammelrechnungsbericht, RechnungsdruckArt, path,, SB, AnlageExcelEvolog, SonstAnlagen)
                If path <> "" Then listPDFs.Add(path)
            End If
            lastAktuelle_RgNr = Aktuelle_RgNr
@@ -1282,9 +1285,12 @@ Public Class cFakturierung
        Dim RG_NR As New VERAG_PROG_ALLGEMEIN.cRechnungsnummern(Firma_ID, Buchungsjahr)
        getNewRgNr = RG_NR.LfdRechnungsNr
        RG_NR.INCREASE_RGNR() 'für die nächste Rechnung
+
+        ' Prüfung, ob RgNr schon vergeben wurde --> dann +1, bis freie Nr. (sollte EÜGENTLICH nicht vorkommen)
+        RG_NR.CHECK_RGNR()
    End Function

-    Public Shared Function doSAMMELRechnungsDruck_Abschnitt(ByRef RechnungsNr As Integer, Firma_ID As Integer, Buchungsjahr As Integer, DruckdatumUhrzeit As DateTime, PrinterName As String, Optional AnlageEinzelRg As Boolean = True, Optional Sammelrechnungsbericht As Boolean = True, Optional RechnungsdruckArt As Integer = -1, Optional ByRef pathPDF As String = "", Optional SRDruckWiederholen As Boolean = False, Optional SB As String = "") As Boolean
+    Public Shared Function doSAMMELRechnungsDruck_Abschnitt(ByRef RechnungsNr As Integer, Firma_ID As Integer, Buchungsjahr As Integer, DruckdatumUhrzeit As DateTime, PrinterName As String, Optional AnlageEinzelRg As Boolean = True, Optional Sammelrechnungsbericht As Boolean = True, Optional RechnungsdruckArt As Integer = -1, Optional ByRef pathPDF As String = "", Optional SRDruckWiederholen As Boolean = False, Optional SB As String = "", Optional AnlageExcelEvolog As Boolean = False, Optional ByRef SonstAnlagen As List(Of String) = Nothing) As Boolean
        'SB Nicht mehr benötigt, da RG-Nr und DruckdatumUhrzeit

        Dim dt As DataTable
@@ -1302,13 +1308,24 @@ Public Class cFakturierung
        '-------------- für PDF-Sammel-Rechnung -------------- 
        Dim pathPDF_SammelRg = ""
        Dim pathPDF_SammelBericht = ""
+        Dim xls_Evolog = ""
        Dim pathPDF_Anlage As New List(Of String)
+
        '-------------- ENDE -------------- 

        doSAMMELRechnungsDruck_Abschnitt = doSAMMELRechnungDruck_Rechnungsdruck(dt, RechnungsNr, DruckdatumUhrzeit, 3, RechnungsdruckArt, pathPDF_SammelRg, PrinterName, SRDruckWiederholen) 'Sammelrechnung drucken
        If Sammelrechnungsbericht Then If Not doSAMMELRechnungDruck_Rechnungsdruck_Sammelrechnungsbericht(RechnungsNr, DruckdatumUhrzeit, RechnungsdruckArt, pathPDF_SammelBericht, PrinterName) Then doSAMMELRechnungsDruck_Abschnitt = False  'Sammelrechnungsbericht drucken
        If AnlageEinzelRg Then If Not doSAMMELRechnungDruck_Rechnungsdruck_Anlagen(RechnungsNr, DruckdatumUhrzeit, PrinterName, pathPDF_Anlage, RechnungsdruckArt) Then doSAMMELRechnungsDruck_Abschnitt = False 'Anlagen drucken

+        'SONSTIGE ANLAGEN:
+        If AnlageExcelEvolog Then 'Sammelrechnungsbericht EVOLOG  
+            If doSAMMELRechnungDruck_Rechnungsdruck_Sammelrechnungsbericht_ExcelEvolog(RechnungsNr, DruckdatumUhrzeit, RechnungsdruckArt, xls_Evolog, PrinterName) Then
+                If xls_Evolog <> "" Then SonstAnlagen.Add(xls_Evolog)
+            Else
+                doSAMMELRechnungsDruck_Abschnitt = False
+            End If
+        End If
+

        '-------------- für PDF-Sammel-Rechnung -------------- 
        Dim list As New List(Of String) ' Sammlung PDFs 
@@ -1351,7 +1368,7 @@ Public Class cFakturierung
        If dt IsNot Nothing Then
            For Each r In dt.Rows
                Dim Path = ""
-                If Not doRechnungsDruck(r("RK_ID"),, false, RechnungsdruckArt, Path, PrinterName, True) Then
+                If Not doRechnungsDruck(r("RK_ID"),, False, RechnungsdruckArt, Path, PrinterName, True) Then
                    MsgBox("Fehler beim Sammel-Rechnungsdruck - Anlage zur Rechnung: " & RechnungsNr)
                    Return False
                End If
@@ -1364,15 +1381,96 @@ Public Class cFakturierung



+    Shared Function doSAMMELRechnungDruck_Rechnungsdruck_Sammelrechnungsbericht_ExcelEvolog(RechnungsNr As Integer, DruckdatumUhrzeit As Date, Optional Rechnugnsdruck As Integer = -1, Optional ByRef Path As String = "", Optional PrinterName As String = "") As Boolean 'RECHNUNG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, Optional vorschau As Boolean = False, Optional Rechnugnsdruck As Integer = -1, Optional ByRef Path As String = "") As Boolean
+        Try
+
+
+            Dim dt As DataTable = SQL.loadDgvBySql(" SELECT RechnungsNr,RechnungsKundenNr,Rechnungsausgang.Abfertigungsdatum,Rechnungsausgang.KdAuftragsNr,Rechnungsausgang.AbfertigungsNr,Rechnungsausgang.[LKW Kennzeichen] as Kennzeichen,Abfertigungsarten.Abfertigungsbezeichnung, (SELECT SUM([SteuerpflichtigerBetrag]+[SteuerfreierBetrag]) FROM RechnungsausgangPositionen where RechnungsausgangPositionen.RK_ID=Rechnungsausgang.RK_ID) as Betrag
+                              FROM Rechnungsausgang INNER JOIN Speditionsbuch on Speditionsbuch.AbfertigungsNr=Rechnungsausgang.AbfertigungsNr and Speditionsbuch.FilialenNr=Rechnungsausgang.FilialenNr and Speditionsbuch.UnterNr=Rechnungsausgang.SpeditionsbuchUnterNr
+                              INNER JOIN Abfertigungsarten ON Abfertigungsarten .Abfertigungsart=Speditionsbuch.Abfertigungsart 
+                            WHERE Rechnungsausgang.Status IN(3) And CONVERT(datetime,DruckDatumZeit ,104)='" & DruckdatumUhrzeit.ToString("dd.MM.yyyy HH:mm:ss.fff") & "'  and RechnungsNr='" & RechnungsNr & "' 
+                            ORDER BY Rechnungsausgang.FilialenNr, Rechnungsausgang.AbfertigungsNr", "FMZOLL")
+
+
+            If dt IsNot Nothing And dt.Rows.Count > 0 Then
+
+
+                Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\SR\" ' My.Computer.FileSystem.GetTempFileName
+                If Not My.Computer.FileSystem.DirectoryExists(sPath) Then
+                    My.Computer.FileSystem.CreateDirectory(sPath)
+                End If
+
+
+                Dim exclApp As Object 'as Application
+                Dim Datei As Object 'as WorkBook
+                Dim Blatt As Object 'Microsoft.Office.Interop.Excel.Worksheet 'As Object 'as Worksheet
+                exclApp = CreateObject("Excel.Application")
+                '  Dim nWeek As Integer
+                ' nWeek = DatePart(DateInterval.WeekOfYear, New Date(2004, 3, 22), _
+                '     FirstDayOfWeek.Monday, FirstWeekOfYear.FirstFourDays)
+
+
+                With exclApp
+                    .Visible = False
+
+                    Try
+                        Path = sPath & "SR_" & dt.Rows(0)("RechnungsKundenNr") & ".xlsx"
+                        While System.IO.File.Exists(Path)
+                            Path = sPath & "SR_" & dt.Rows(0)("RechnungsKundenNr") & "_" & Now.ToString("ddMMyyyyHHmmss") & ".xlsx"
+                        End While
+                        My.Computer.FileSystem.WriteAllBytes(Path, My.Resources.SR_EVOLOG, False)
+                    Catch ex As System.Exception
+                        '  MsgBox(ex.Message)
+                        MsgBox("ERROR 01: " & ex.Message & vbNewLine & ex.StackTrace)
+                        Return False
+                    End Try
+
+
+                    Datei = .Workbooks.Open(Path) 'Anpassen
+                    Blatt = Datei.Worksheets(1) 'Anpassen
+
+                    Dim cnt = 2
+                    For Each r In dt.Rows
+                        Blatt.Range("A" & cnt).Value = cnt - 1
+                        Blatt.Range("B" & cnt).Value = r("Abfertigungsdatum")
+                        Blatt.Range("C" & cnt).Value = r("KdAuftragsNr")
+                        Blatt.Range("D" & cnt).Value = r("AbfertigungsNr")
+                        Blatt.Range("E" & cnt).Value = r("Kennzeichen")
+                        Blatt.Range("F" & cnt).Value = r("Abfertigungsbezeichnung")
+                        Blatt.Range("G" & cnt).Value = r("Betrag")
+
+                        cnt += 1
+                    Next
+                    Datei.Save
+
+                    If Rechnugnsdruck = -1 Then
+                        Blatt.PrintOutEx()
+                    ElseIf Rechnugnsdruck = 3 Then
+                        'Process.Start(Path)
+                        .Visible = True
+
+                    End If
+                End With
+
+                Return True
+            End If
+
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
+        Return False
+    End Function
+
+
    Shared Function doSAMMELRechnungDruck_Rechnungsdruck_Sammelrechnungsbericht(RechnungsNr As Integer, DruckdatumUhrzeit As Date, Optional Rechnugnsdruck As Integer = -1, Optional ByRef Path As String = "", Optional PrinterName As String = "") As Boolean 'RECHNUNG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, Optional vorschau As Boolean = False, Optional Rechnugnsdruck As Integer = -1, Optional ByRef Path As String = "") As Boolean
        Try

            Dim rpt As New rptSammelRechnungAnlagenDruck

-            Dim dt As DataTable = SQL.loadDgvBySql("SELECT * FROM Rechnungsausgang WHERE Rechnungsausgang.Status IN(3) And CONVERT(datetime,DruckDatumZeit ,104)='" & DruckdatumUhrzeit.ToString("dd.MM.yyyy HH:mm:ss.fff") & "'  and RechnungsNr='" & RechnungsNr & "' ORDER BY FilialenNr, AbfertigungsNr", "FMZOLL")
+            Dim dt As DataTable = SQL.loadDgvBySql("Select * FROM Rechnungsausgang WHERE Rechnungsausgang.Status In(3) And CONVERT(datetime,DruckDatumZeit ,104)='" & DruckdatumUhrzeit.ToString("dd.MM.yyyy HH:mm:ss.fff") & "'  and RechnungsNr='" & RechnungsNr & "' ORDER BY FilialenNr, AbfertigungsNr", "FMZOLL")
            rpt.DataSource = dt

-            Dim ROW As DataRow = dt.Rows(0)
+                        Dim ROW As DataRow = dt.Rows(0)
            Dim FIRMA As New VERAG_PROG_ALLGEMEIN.cFirmen(ROW("Firma_ID"))
            Dim KD_RG As New VERAG_PROG_ALLGEMEIN.cAdressen(ROW("RechnungsKundenNr"))

--- a/SDL/Fakturierung/frmFaktEmail.Designer.vb
+++ b/SDL/Fakturierung/frmFaktEmail.Designer.vb
@@ -65,6 +65,7 @@ Partial Class frmFaktEmail
        Me.cboFaStb_Sprache = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Label6 = New System.Windows.Forms.Label()
        Me.cbxMergeRg = New System.Windows.Forms.CheckBox()
+        Me.cbxExcelEvolog = New System.Windows.Forms.CheckBox()
        CType(Me.dgvEmailBCC, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.dgvEmailCC, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.dgvEmail, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -501,12 +502,23 @@ Partial Class frmFaktEmail
        Me.cbxMergeRg.Text = "Rechnungen" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "zusammenführen"
        Me.cbxMergeRg.UseVisualStyleBackColor = True
        '
+        'cbxExcelEvolog
+        '
+        Me.cbxExcelEvolog.AutoSize = True
+        Me.cbxExcelEvolog.Location = New System.Drawing.Point(614, 763)
+        Me.cbxExcelEvolog.Name = "cbxExcelEvolog"
+        Me.cbxExcelEvolog.Size = New System.Drawing.Size(88, 17)
+        Me.cbxExcelEvolog.TabIndex = 31
+        Me.cbxExcelEvolog.Text = "Excel Evolog"
+        Me.cbxExcelEvolog.UseVisualStyleBackColor = True
+        '
        'frmFaktEmail
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.BackColor = System.Drawing.Color.WhiteSmoke
        Me.ClientSize = New System.Drawing.Size(750, 850)
+        Me.Controls.Add(Me.cbxExcelEvolog)
        Me.Controls.Add(Me.cbxMergeRg)
        Me.Controls.Add(Me.Label6)
        Me.Controls.Add(Me.cboFaStb_Sprache)
@@ -592,4 +604,5 @@ Partial Class frmFaktEmail
    Friend WithEvents cboFaStb_Sprache As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents Label6 As Label
    Friend WithEvents cbxMergeRg As CheckBox
+    Friend WithEvents cbxExcelEvolog As CheckBox
 End Class
--- a/SDL/Fakturierung/frmFaktEmail.vb
+++ b/SDL/Fakturierung/frmFaktEmail.vb
@@ -21,6 +21,7 @@ Public Class frmFaktEmail

    Dim EinzelAnlagen As Boolean
    Dim Sammelbericht As Boolean
+    Dim xlsEvolog As Boolean
    Dim RechnungsNr As Integer
    Dim DruckDatumZeit As DateTime
    Dim AvisoIds As List(Of Integer)
@@ -41,7 +42,7 @@ Public Class frmFaktEmail
    End Sub


-    Sub New(Firma_ID As Integer, SammelrechungArt As Integer, DatumBis As Date, Rechnungsdatum As Date, PrinterName As String, Optional EinzelAnlagen As Boolean = True, Optional Sammelbericht As Boolean = True, Optional KdNr As Integer = -1, Optional RechnungsdruckArt As Integer = -1, Optional ByRef listPDFs As List(Of String) = Nothing, Optional SB As String = "", ByRef Optional lastAktuelle_RgNr As Integer = -1, Optional AvisoIds As List(Of Integer) = Nothing)
+    Sub New(Firma_ID As Integer, SammelrechungArt As Integer, DatumBis As Date, Rechnungsdatum As Date, PrinterName As String, Optional EinzelAnlagen As Boolean = True, Optional Sammelbericht As Boolean = True, Optional KdNr As Integer = -1, Optional RechnungsdruckArt As Integer = -1, Optional ByRef listPDFs As List(Of String) = Nothing, Optional SB As String = "", ByRef Optional lastAktuelle_RgNr As Integer = -1, Optional AvisoIds As List(Of Integer) = Nothing, Optional xlsEvolog As Boolean = False)
        '(Firma_ID As Integer, SammelrechungArt As Integer, KdNr As Integer, DatumBis As Date, SB As String, EinzelAnlagen As Boolean, Sammelbericht As Boolean) 'Sammelrechnung

        ' Dieser Aufruf ist für den Designer erforderlich.
@@ -54,6 +55,7 @@ Public Class frmFaktEmail
        Me.SB = SB
        Me.EinzelAnlagen = EinzelAnlagen
        Me.Sammelbericht = Sammelbericht
+        Me.xlsEvolog = xlsEvolog
        Me.KdNr = KdNr
        Me.Rechnungsdatum = Rechnungsdatum
        Me.RechnungsNr = lastAktuelle_RgNr
@@ -88,6 +90,10 @@ Public Class frmFaktEmail
        Dim AD As VERAG_PROG_ALLGEMEIN.cAdressen
        Dim FISKAL As cFiskal_Daten = Nothing

+
+        cbxExcelEvolog.Checked = xlsEvolog
+
+
        If SR Then
            AD = New VERAG_PROG_ALLGEMEIN.cAdressen(KdNr)
            FISKAL = New cFiskal_Daten(KdNr)
@@ -118,6 +124,8 @@ Public Class frmFaktEmail
            End If
        End If

+        If AD.AdressenNr = 1001688 Then cbxExcelEvolog.Checked = True 'EVOLOG
+
        If AD.E_Mail IsNot Nothing AndAlso AD.E_Mail <> "" Then lkl.Text = """" & AD.E_Mail & """ anfügen" : lkl.Tag = AD.E_Mail
        lblKunde.Text = AD.AdressenNr & " - " & AD.Ordnungsbegriff

@@ -212,16 +220,17 @@ Public Class frmFaktEmail

                    VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.clearTMPPath("Zusammenfassung")
                    Dim listPDFs As New List(Of String)
+                    Dim SonstAnlagen As New List(Of String)
                    Dim lastAktuelle_RgNr As Integer = -1
                    'Rechnung erstellen:
                    '-----------------------------------------------------------------
                    Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(KdNr)
                    If RechnungsNr <= 0 Then
-                        cFakturierung.doSAMMELRechnungsDruck(Firma_ID, SammelrechungArt, DatumBis, Rechnungsdatum, "", EinzelAnlagen, Sammelbericht, KdNr, 4, listPDFs, SB, lastAktuelle_RgNr, DruckDatumZeit, AvisoIds)
+                        cFakturierung.doSAMMELRechnungsDruck(Firma_ID, SammelrechungArt, DatumBis, Rechnungsdatum, "", EinzelAnlagen, Sammelbericht, KdNr, 4, listPDFs, SB, lastAktuelle_RgNr, DruckDatumZeit, AvisoIds, cbxExcelEvolog.Checked, SonstAnlagen)
                        RechnungsNr = lastAktuelle_RgNr
                    Else
                        Dim path = ""
-                        cFakturierung.doSAMMELRechnungsDruck_Abschnitt(RechnungsNr, -1, -1, DruckDatumZeit, "", False, , 4, path, True)
+                        cFakturierung.doSAMMELRechnungsDruck_Abschnitt(RechnungsNr, -1, -1, DruckDatumZeit, "", False, , 4, path, True,, cbxExcelEvolog.Checked, SonstAnlagen)

                        lastAktuelle_RgNr = RechnungsNr
                        listPDFs.Add(path)
@@ -263,6 +272,10 @@ Public Class frmFaktEmail
                        '    Mail.Attachments.Add(l, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
                        ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
                    Next
+                    For Each l In SonstAnlagen
+                        '    Mail.Attachments.Add(l, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
+                        ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
+                    Next
                    addAttachments(Mail, lastAktuelle_RgNr, cbxMergeRg.Checked)

                    '-----------------------------------------------------------------
--- a/SDL/Fakturierung/frmFaktSammelRgDrucken.Designer.vb
+++ b/SDL/Fakturierung/frmFaktSammelRgDrucken.Designer.vb
@@ -49,6 +49,8 @@ Partial Class frmFaktSammelRgDrucken
        Me.cbxZusammenfassen = New System.Windows.Forms.CheckBox()
        Me.cboSB = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.lblSB = New System.Windows.Forms.Label()
+        Me.cbxEVOLOG = New System.Windows.Forms.CheckBox()
+        Me.Label4 = New System.Windows.Forms.Label()
        Me.pnl.SuspendLayout()
        CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
@@ -309,7 +311,7 @@ Partial Class frmFaktSammelRgDrucken
        'cbxEinzelAnlagen
        '
        Me.cbxEinzelAnlagen.AutoSize = True
-        Me.cbxEinzelAnlagen.Location = New System.Drawing.Point(150, 244)
+        Me.cbxEinzelAnlagen.Location = New System.Drawing.Point(150, 206)
        Me.cbxEinzelAnlagen.Name = "cbxEinzelAnlagen"
        Me.cbxEinzelAnlagen.Size = New System.Drawing.Size(96, 17)
        Me.cbxEinzelAnlagen.TabIndex = 14
@@ -321,7 +323,7 @@ Partial Class frmFaktSammelRgDrucken
        Me.cbxSammelbericht.AutoSize = True
        Me.cbxSammelbericht.Checked = True
        Me.cbxSammelbericht.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.cbxSammelbericht.Location = New System.Drawing.Point(150, 267)
+        Me.cbxSammelbericht.Location = New System.Drawing.Point(150, 229)
        Me.cbxSammelbericht.Name = "cbxSammelbericht"
        Me.cbxSammelbericht.Size = New System.Drawing.Size(95, 17)
        Me.cbxSammelbericht.TabIndex = 16
@@ -374,12 +376,33 @@ Partial Class frmFaktSammelRgDrucken
        Me.lblSB.Text = "Sachbearbeiter:"
        Me.lblSB.Visible = False
        '
+        'cbxEVOLOG
+        '
+        Me.cbxEVOLOG.AutoSize = True
+        Me.cbxEVOLOG.Location = New System.Drawing.Point(151, 268)
+        Me.cbxEVOLOG.Name = "cbxEVOLOG"
+        Me.cbxEVOLOG.Size = New System.Drawing.Size(99, 17)
+        Me.cbxEVOLOG.TabIndex = 19
+        Me.cbxEVOLOG.Text = "Excel EVOLOG"
+        Me.cbxEVOLOG.UseVisualStyleBackColor = True
+        '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.Location = New System.Drawing.Point(148, 252)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(41, 13)
+        Me.Label4.TabIndex = 20
+        Me.Label4.Text = "Spezial"
+        '
        'frmFaktSammelRgDrucken
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.BackColor = System.Drawing.Color.White
        Me.ClientSize = New System.Drawing.Size(811, 297)
+        Me.Controls.Add(Me.Label4)
+        Me.Controls.Add(Me.cbxEVOLOG)
        Me.Controls.Add(Me.lblSB)
        Me.Controls.Add(Me.cboSB)
        Me.Controls.Add(Me.lkl)
@@ -436,4 +459,6 @@ Partial Class frmFaktSammelRgDrucken
    Friend WithEvents cbxZusammenfassen As CheckBox
    Friend WithEvents cboSB As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents lblSB As Label
+    Friend WithEvents cbxEVOLOG As CheckBox
+    Friend WithEvents Label4 As Label
 End Class
--- a/SDL/Fakturierung/frmFaktSammelRgDrucken.vb
+++ b/SDL/Fakturierung/frmFaktSammelRgDrucken.vb
@@ -200,7 +200,7 @@ Public Class frmFaktSammelRgDrucken

        If Not IsNumeric(getSelectionKdNr_Simple) Then MsgBox("Es muss eine eindeutige KundenNr ausgewählt werden!") : Exit Sub

-        Dim f As New frmFaktEmail(cboFirma._value, Sammelrechung, CDate(txtZeitraumBis.Text), CDate(txtRechnungsdatum.Text), cboPrinter.Text, cbxEinzelAnlagen.Checked, cbxSammelbericht.Checked, getSelectionKdNr_Simple, -1, Nothing, cboSB._value,, getAvisoIds)
+        Dim f As New frmFaktEmail(cboFirma._value, Sammelrechung, CDate(txtZeitraumBis.Text), CDate(txtRechnungsdatum.Text), cboPrinter.Text, cbxEinzelAnlagen.Checked, cbxSammelbericht.Checked, getSelectionKdNr_Simple, -1, Nothing, cboSB._value,, getAvisoIds, cbxEVOLOG.Checked)
        f.ShowDialog(Me)
        initDGV()
        'Else
@@ -228,7 +228,8 @@ Public Class frmFaktSammelRgDrucken
            Me.Enabled = False
            Me.Cursor = Cursors.WaitCursor
            Dim listPDFs As New List(Of String)
-            cFakturierung.doSAMMELRechnungsDruck(cboFirma._value, Sammelrechung, CDate(txtZeitraumBis.Text), CDate(txtRechnungsdatum.Text), cboPrinter.Text, cbxEinzelAnlagen.Checked, cbxSammelbericht.Checked, getSelectionKdNr, If(ausgabeArt = 1, -1, 4), listPDFs, cboSB._value,,, getAvisoIds)
+            Dim SonstAnlagen As New List(Of String)
+            cFakturierung.doSAMMELRechnungsDruck(cboFirma._value, Sammelrechung, CDate(txtZeitraumBis.Text), CDate(txtRechnungsdatum.Text), cboPrinter.Text, cbxEinzelAnlagen.Checked, cbxSammelbericht.Checked, getSelectionKdNr, If(ausgabeArt = 1, -1, 4), listPDFs, cboSB._value,,, getAvisoIds, cbxEVOLOG.Checked, SonstAnlagen)

            '-------------- für PDF-Sammel-Rechnung -------------- 

@@ -247,6 +248,9 @@ Public Class frmFaktSammelRgDrucken
                                For Each pdf In listPDFs
                                    Mail.Attachments.Add(pdf, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
                                Next
+                                For Each pdf In SonstAnlagen
+                                    Mail.Attachments.Add(pdf, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
+                                Next
                                Mail.Display()
                            Catch ex As Exception
                                MsgBox("Fehler beim Öffnen des Mail-Programmes.") ' PDF wird geöffnet!")
@@ -287,6 +291,9 @@ Public Class frmFaktSammelRgDrucken
                        For Each pdf In listPDFs
                            Process.Start(pdf)
                        Next
+                        For Each pdf In SonstAnlagen
+                            Process.Start(pdf)
+                        Next
                End Select
            End If
            '-------------- ENDE -------------- 
--- a/SDL/Fakturierung/frmRechnungenSuche.Designer.vb
+++ b/SDL/Fakturierung/frmRechnungenSuche.Designer.vb
@@ -75,6 +75,8 @@ Partial Class frmRechnungenSuche
        Me.kdtxtAvisierer = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
        Me.txtAvisiererKdNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.pnlRechts = New System.Windows.Forms.Panel()
+        Me.Button2 = New System.Windows.Forms.Button()
+        Me.Button13 = New System.Windows.Forms.Button()
        Me.Label14 = New System.Windows.Forms.Label()
        Me.MyListBox1 = New VERAG_PROG_ALLGEMEIN.MyListBox()
        Me.Label6 = New System.Windows.Forms.Label()
@@ -108,6 +110,9 @@ Partial Class frmRechnungenSuche
        Me.cboBerichtRgAbfArt = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Label31 = New System.Windows.Forms.Label()
        Me.Button8 = New System.Windows.Forms.Button()
+        Me.MenuStrip = New System.Windows.Forms.MenuStrip()
+        Me.KundenauswertungenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.EVOLOGToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.pnl = New System.Windows.Forms.Panel()
        Me.Label32 = New System.Windows.Forms.Label()
        Me.btnExcel = New System.Windows.Forms.Button()
@@ -116,8 +121,6 @@ Partial Class frmRechnungenSuche
        Me.Label22 = New System.Windows.Forms.Label()
        Me.Label4 = New System.Windows.Forms.Label()
        Me.pnlTop = New System.Windows.Forms.Panel()
-        Me.Button2 = New System.Windows.Forms.Button()
-        Me.Button13 = New System.Windows.Forms.Button()
        CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainer.Panel1.SuspendLayout()
        Me.SplitContainer.Panel2.SuspendLayout()
@@ -133,6 +136,7 @@ Partial Class frmRechnungenSuche
        Me.cntxtCntxtSpeditionsbuch.SuspendLayout()
        Me.pnlOpt.SuspendLayout()
        Me.pnlBerichte.SuspendLayout()
+        Me.MenuStrip.SuspendLayout()
        Me.pnl.SuspendLayout()
        Me.pnlTop.SuspendLayout()
        Me.SuspendLayout()
@@ -995,6 +999,28 @@ Partial Class frmRechnungenSuche
        Me.pnlRechts.Size = New System.Drawing.Size(239, 192)
        Me.pnlRechts.TabIndex = 35
        '
+        'Button2
+        '
+        Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button2.Location = New System.Drawing.Point(6, 156)
+        Me.Button2.Margin = New System.Windows.Forms.Padding(0)
+        Me.Button2.Name = "Button2"
+        Me.Button2.Size = New System.Drawing.Size(112, 26)
+        Me.Button2.TabIndex = 43
+        Me.Button2.Text = "Alle"
+        Me.Button2.UseVisualStyleBackColor = True
+        '
+        'Button13
+        '
+        Me.Button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button13.Location = New System.Drawing.Point(121, 156)
+        Me.Button13.Margin = New System.Windows.Forms.Padding(0)
+        Me.Button13.Name = "Button13"
+        Me.Button13.Size = New System.Drawing.Size(110, 26)
+        Me.Button13.TabIndex = 42
+        Me.Button13.Text = "Keine"
+        Me.Button13.UseVisualStyleBackColor = True
+        '
        'Label14
        '
        Me.Label14.AutoSize = True
@@ -1419,6 +1445,7 @@ Partial Class frmRechnungenSuche
        Me.pnlBerichte.Controls.Add(Me.cboBerichtRgAbfArt)
        Me.pnlBerichte.Controls.Add(Me.Label31)
        Me.pnlBerichte.Controls.Add(Me.Button8)
+        Me.pnlBerichte.Controls.Add(Me.MenuStrip)
        Me.pnlBerichte.Dock = System.Windows.Forms.DockStyle.Left
        Me.pnlBerichte.Location = New System.Drawing.Point(323, 0)
        Me.pnlBerichte.Name = "pnlBerichte"
@@ -1490,6 +1517,36 @@ Partial Class frmRechnungenSuche
        Me.Button8.TextAlign = System.Drawing.ContentAlignment.MiddleRight
        Me.Button8.UseVisualStyleBackColor = True
        '
+        'MenuStrip
+        '
+        Me.MenuStrip.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.MenuStrip.Dock = System.Windows.Forms.DockStyle.None
+        Me.MenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KundenauswertungenToolStripMenuItem})
+        Me.MenuStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow
+        Me.MenuStrip.Location = New System.Drawing.Point(368, 22)
+        Me.MenuStrip.Name = "MenuStrip"
+        Me.MenuStrip.Size = New System.Drawing.Size(157, 26)
+        Me.MenuStrip.TabIndex = 42
+        Me.MenuStrip.Text = "Kundenauswertungen"
+        '
+        'KundenauswertungenToolStripMenuItem
+        '
+        Me.KundenauswertungenToolStripMenuItem.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.KundenauswertungenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.EVOLOGToolStripMenuItem})
+        Me.KundenauswertungenToolStripMenuItem.Font = New System.Drawing.Font("Segoe UI", 9.0!)
+        Me.KundenauswertungenToolStripMenuItem.ForeColor = System.Drawing.Color.White
+        Me.KundenauswertungenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.statistik2
+        Me.KundenauswertungenToolStripMenuItem.Name = "KundenauswertungenToolStripMenuItem"
+        Me.KundenauswertungenToolStripMenuItem.Size = New System.Drawing.Size(150, 20)
+        Me.KundenauswertungenToolStripMenuItem.Text = "Kundenauswertungen"
+        '
+        'EVOLOGToolStripMenuItem
+        '
+        Me.EVOLOGToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.Excel_logo
+        Me.EVOLOGToolStripMenuItem.Name = "EVOLOGToolStripMenuItem"
+        Me.EVOLOGToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.EVOLOGToolStripMenuItem.Text = "EVOLOG"
+        '
        'pnl
        '
        Me.pnl.Controls.Add(Me.Label32)
@@ -1579,28 +1636,6 @@ Partial Class frmRechnungenSuche
        Me.pnlTop.Size = New System.Drawing.Size(1211, 48)
        Me.pnlTop.TabIndex = 0
        '
-        'Button2
-        '
-        Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button2.Location = New System.Drawing.Point(6, 156)
-        Me.Button2.Margin = New System.Windows.Forms.Padding(0)
-        Me.Button2.Name = "Button2"
-        Me.Button2.Size = New System.Drawing.Size(112, 26)
-        Me.Button2.TabIndex = 43
-        Me.Button2.Text = "Alle"
-        Me.Button2.UseVisualStyleBackColor = True
-        '
-        'Button13
-        '
-        Me.Button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button13.Location = New System.Drawing.Point(121, 156)
-        Me.Button13.Margin = New System.Windows.Forms.Padding(0)
-        Me.Button13.Name = "Button13"
-        Me.Button13.Size = New System.Drawing.Size(110, 26)
-        Me.Button13.TabIndex = 42
-        Me.Button13.Text = "Keine"
-        Me.Button13.UseVisualStyleBackColor = True
-        '
        'frmRechnungenSuche
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
@@ -1610,6 +1645,7 @@ Partial Class frmRechnungenSuche
        Me.Controls.Add(Me.SplitContainer)
        Me.Controls.Add(Me.pnlTop)
        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.MainMenuStrip = Me.MenuStrip
        Me.Name = "frmRechnungenSuche"
        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
        Me.Text = "Rechnungsdaten"
@@ -1633,6 +1669,8 @@ Partial Class frmRechnungenSuche
        Me.pnlOpt.PerformLayout()
        Me.pnlBerichte.ResumeLayout(False)
        Me.pnlBerichte.PerformLayout()
+        Me.MenuStrip.ResumeLayout(False)
+        Me.MenuStrip.PerformLayout()
        Me.pnl.ResumeLayout(False)
        Me.pnl.PerformLayout()
        Me.pnlTop.ResumeLayout(False)
@@ -1734,4 +1772,7 @@ Partial Class frmRechnungenSuche
    Friend WithEvents txtMaxSrch As VERAG_PROG_ALLGEMEIN.MyTextBox
    Friend WithEvents Button2 As Button
    Friend WithEvents Button13 As Button
+    Friend WithEvents MenuStrip As MenuStrip
+    Friend WithEvents KundenauswertungenToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents EVOLOGToolStripMenuItem As ToolStripMenuItem
 End Class
--- a/SDL/Fakturierung/frmRechnungenSuche.resx
+++ b/SDL/Fakturierung/frmRechnungenSuche.resx
@@ -123,6 +123,9 @@
  <metadata name="cntxtCntxtSpeditionsbuch.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
+  <metadata name="MenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>208, 17</value>
+  </metadata>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
--- a/SDL/Fakturierung/frmRechnungenSuche.vb
+++ b/SDL/Fakturierung/frmRechnungenSuche.vb
@@ -635,4 +635,13 @@ Public Class frmRechnungenSuche
            MyListBox1.SetSelected(i, False)
        Next
    End Sub
+
+
+    Private Sub EVOLOGToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EVOLOGToolStripMenuItem.Click
+        If DataGridView.SelectedRows.Count = 0 Then Exit Sub
+        Dim RG_TMP As New VERAG_PROG_ALLGEMEIN.cRechnungsausgang(DataGridView.SelectedRows(0).Cells("RK_ID").Value)
+        If RG_TMP.Sammelrechnung <> 0 Then
+            cFakturierung.doSAMMELRechnungDruck_Rechnungsdruck_Sammelrechnungsbericht_ExcelEvolog(RG_TMP.RechnungsNr, RG_TMP.DruckDatumZeit, 3, "", "")
+        End If
+    End Sub
 End Class
--- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb
+++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb
@@ -530,7 +530,7 @@ Public Class usrCntlFaktAbrechnung



-                                                              If kdFirmaRechnungAn.KdData_KUNDE_ERW IsNot Nothing AndAlso kdFirmaRechnungAn.KdData_KUNDE_ERW.kde_InfoAuftragsNr AndAlso kdFirmaRechnungAn.KdData_KUNDE_ERW.kde_InfoAuftragsNr <> "" Then
+                                                              If kdFirmaRechnungAn.KdData_KUNDE_ERW IsNot Nothing AndAlso kdFirmaRechnungAn.KdData_KUNDE_ERW.kde_InfoAuftragsNr IsNot Nothing AndAlso kdFirmaRechnungAn.KdData_KUNDE_ERW.kde_InfoAuftragsNr <> "" Then
                                                                  ToolTip.SetToolTip(picKdAuftrInfo, kdFirmaRechnungAn.KdData_KUNDE_ERW.kde_InfoAuftragsNr)
                                                                  picKdAuftrInfo.Cursor = Cursors.Hand
                                                                  picKdAuftrInfo.Tag = kdFirmaRechnungAn.KdData_KUNDE_ERW.kde_InfoAuftragsNr
--- a/SDL/Formulare/KDFormulare/frmFormulare.vb
+++ b/SDL/Formulare/KDFormulare/frmFormulare.vb
@@ -2472,7 +2472,7 @@ Public Class FormularManagerNEU
            listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(sessionID, 73, 191, 70, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))

            ' Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "UID_Prüfung", listTowrite)
-            Dim PdfTmp = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "UID_Prufung", listTowrite)
+            Dim PdfTmp = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2_FO, "", "UID_Prufung", listTowrite)

            Return PdfTmp

@@ -3911,6 +3911,13 @@ Public Class FormularManagerNEU
        End Select
    End Function

+    Public Shared Function getUO2_FO() As String
+        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+            Case "IMEX", "ATILLA", "UNISPED", "FRONTOFFICE" : Return VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+            Case Else : Return ""
+        End Select
+    End Function
+
    Public Shared Function getUO2(FilialenNr As String) As String
        If FilialenNr = "" Then Return getUO2()
        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(FilialenNr)
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -638,6 +638,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Byte[].
+        '''</summary>
+        Friend ReadOnly Property FA_Graz_EV_Veranlagung_Muster() As Byte()
+            Get
+                Dim obj As Object = ResourceManager.GetObject("FA_Graz_EV_Veranlagung_Muster", resourceCulture)
+                Return CType(obj,Byte())
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
@@ -844,6 +854,15 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die  ähnelt.
+        '''</summary>
+        Friend ReadOnly Property kkk9jjjjjjjj() As String
+            Get
+                Return ResourceManager.GetString("kkk9jjjjjjjj", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
@@ -1783,6 +1802,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Byte[].
+        '''</summary>
+        Friend ReadOnly Property SR_EVOLOG() As Byte()
+            Get
+                Dim obj As Object = ResourceManager.GetObject("SR_EVOLOG", resourceCulture)
+                Return CType(obj,Byte())
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
@@ -2122,7 +2151,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die 1.1.7.6 ähnelt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die 1.1.7.7 ähnelt.
        '''</summary>
        Friend ReadOnly Property Version() As String
            Get
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -629,7 +629,7 @@
    <value>..\Resources\email.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="Version" xml:space="preserve">
-    <value>1.1.7.6</value>
+    <value>1.1.7.7</value>
  </data>
  <data name="axxes1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\axxes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -775,4 +775,13 @@
  <data name="plose_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\plose_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="SR_EVOLOG" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SR_EVOLOG.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="kkk9jjjjjjjj" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FA_Graz_EV_Veranlagung_Muster" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\FA_Graz_EV-Veranlagung_Muster.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>
--- a/SDL/Resources/FA_Graz_EV-Veranlagung_Muster.xlsx
+++ b/SDL/Resources/FA_Graz_EV-Veranlagung_Muster.xlsx
--- a/SDL/Resources/SR_EVOLOG.xlsx
+++ b/SDL/Resources/SR_EVOLOG.xlsx
--- a/SDL/SDL.vbproj
+++ b/SDL/SDL.vbproj
@@ -486,6 +486,12 @@
    <Compile Include="Reports\Zoll\subrptKontrolleLKW_NCTSTR.vb">
      <SubType>Component</SubType>
    </Compile>
+    <Compile Include="Speditionsbuch\Nacherfassung\frmNacherfassungEndEmpfaenger.Designer.vb">
+      <DependentUpon>frmNacherfassungEndEmpfaenger.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Speditionsbuch\Nacherfassung\frmNacherfassungEndEmpfaenger.vb">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\AES\usrCntlATLAS_AES.Designer.vb">
      <DependentUpon>usrCntlATLAS_AES.vb</DependentUpon>
    </Compile>
@@ -2400,6 +2406,12 @@
    <Compile Include="zoll\usrCntlAuswertungenAufschub_Abgabenliste.vb">
      <SubType>UserControl</SubType>
    </Compile>
+    <Compile Include="zoll\usrCntlAuswertungenEV_Veranlagungen.Designer.vb">
+      <DependentUpon>usrCntlAuswertungenEV_Veranlagungen.vb</DependentUpon>
+    </Compile>
+    <Compile Include="zoll\usrCntlAuswertungenEV_Veranlagungen.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="zoll\usrCntlAuswertungenFiskal_IntrastatMeldung.Designer.vb">
      <DependentUpon>usrCntlAuswertungenFiskal_IntrastatMeldung.vb</DependentUpon>
    </Compile>
@@ -2520,6 +2532,9 @@
    <EmbeddedResource Include="Reports\Zoll\subrptKontrolleLKW_NCTSTR.resx">
      <DependentUpon>subrptKontrolleLKW_NCTSTR.vb</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="Speditionsbuch\Nacherfassung\frmNacherfassungEndEmpfaenger.resx">
+      <DependentUpon>frmNacherfassungEndEmpfaenger.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\AES\usrCntlATLAS_AES.resx">
      <DependentUpon>usrCntlATLAS_AES.vb</DependentUpon>
    </EmbeddedResource>
@@ -3466,6 +3481,9 @@
    <EmbeddedResource Include="zoll\usrCntlAuswertungenAufschub_Abgabenliste.resx">
      <DependentUpon>usrCntlAuswertungenAufschub_Abgabenliste.vb</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="zoll\usrCntlAuswertungenEV_Veranlagungen.resx">
+      <DependentUpon>usrCntlAuswertungenEV_Veranlagungen.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="zoll\usrCntlAuswertungenFiskal_IntrastatMeldung.resx">
      <DependentUpon>usrCntlAuswertungenFiskal_IntrastatMeldung.vb</DependentUpon>
    </EmbeddedResource>
@@ -3493,6 +3511,10 @@
  </ItemGroup>
  <ItemGroup>
    <None Include="ClassDiagram1.cd" />
+    <None Include="Resources\FA_Graz_EV-Veranlagung_Muster.xlsx">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\SR_EVOLOG.xlsx" />
    <None Include="ZOLLSYSTEM\DAKOSY\KundenExport\VERAG_KundenStamm_Export.xsd">
      <SubType>Designer</SubType>
    </None>
--- a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungEndEmpfaenger.Designer.vb
+++ b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungEndEmpfaenger.Designer.vb
@@ -0,0 +1,436 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class frmNacherfassungEndEmpfaenger
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()>
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()>
+    Private Sub InitializeComponent()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmNacherfassungEndEmpfaenger))
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Me.dgvEndEmpfaenger = New System.Windows.Forms.DataGridView()
+        Me.Label35 = New System.Windows.Forms.Label()
+        Me.btnOK = New System.Windows.Forms.Button()
+        Me.Button1 = New System.Windows.Forms.Button()
+        Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.kdEndEmpfaenger = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
+        Me.cboUSt_UstIdNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txtRechnugnsbetrag = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.lklBearbeitungAbbrechenUl = New System.Windows.Forms.LinkLabel()
+        Me.Button3 = New System.Windows.Forms.Button()
+        Me.Button2 = New System.Windows.Forms.Button()
+        Me.lblErrKD = New System.Windows.Forms.Label()
+        Me.Label21 = New System.Windows.Forms.Label()
+        Me.lblErrUID = New System.Windows.Forms.Label()
+        Me.cboUSt_UstIdNrLand = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Button4 = New System.Windows.Forms.Button()
+        Me.txtKdNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txtRechnugnsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.clmnKdNr = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.clmnEndEmpfaenger = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.clmnUIDLand = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.clmnUID = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.clmnRechnungsbetrag = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.clmnRechnungsNr = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.Button5 = New System.Windows.Forms.Button()
+        CType(Me.dgvEndEmpfaenger, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SuspendLayout()
+        '
+        'dgvEndEmpfaenger
+        '
+        Me.dgvEndEmpfaenger.AllowUserToAddRows = False
+        Me.dgvEndEmpfaenger.AllowUserToDeleteRows = False
+        Me.dgvEndEmpfaenger.AllowUserToResizeColumns = False
+        Me.dgvEndEmpfaenger.AllowUserToResizeRows = False
+        Me.dgvEndEmpfaenger.BackgroundColor = System.Drawing.Color.White
+        Me.dgvEndEmpfaenger.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.dgvEndEmpfaenger.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnKdNr, Me.clmnEndEmpfaenger, Me.clmnUIDLand, Me.clmnUID, Me.clmnRechnungsbetrag, Me.clmnRechnungsNr})
+        Me.dgvEndEmpfaenger.GridColor = System.Drawing.Color.DarkGray
+        Me.dgvEndEmpfaenger.Location = New System.Drawing.Point(15, 25)
+        Me.dgvEndEmpfaenger.Name = "dgvEndEmpfaenger"
+        Me.dgvEndEmpfaenger.RowHeadersVisible = False
+        Me.dgvEndEmpfaenger.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
+        Me.dgvEndEmpfaenger.Size = New System.Drawing.Size(576, 197)
+        Me.dgvEndEmpfaenger.TabIndex = 1
+        '
+        'Label35
+        '
+        Me.Label35.AutoSize = True
+        Me.Label35.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label35.Location = New System.Drawing.Point(12, 9)
+        Me.Label35.Name = "Label35"
+        Me.Label35.Size = New System.Drawing.Size(88, 13)
+        Me.Label35.TabIndex = 0
+        Me.Label35.Text = "Endempfänger"
+        Me.Label35.Visible = False
+        '
+        'btnOK
+        '
+        Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK
+        Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnOK.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
+        Me.btnOK.Location = New System.Drawing.Point(411, 276)
+        Me.btnOK.Name = "btnOK"
+        Me.btnOK.Size = New System.Drawing.Size(176, 41)
+        Me.btnOK.TabIndex = 17
+        Me.btnOK.Text = "OK"
+        Me.btnOK.UseVisualStyleBackColor = True
+        '
+        'Button1
+        '
+        Me.Button1.DialogResult = System.Windows.Forms.DialogResult.Cancel
+        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
+        Me.Button1.Location = New System.Drawing.Point(283, 276)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(122, 41)
+        Me.Button1.TabIndex = 16
+        Me.Button1.Text = "Abbrechen"
+        Me.Button1.UseVisualStyleBackColor = True
+        '
+        'DataGridViewTextBoxColumn1
+        '
+        Me.DataGridViewTextBoxColumn1.FillWeight = 80.0!
+        Me.DataGridViewTextBoxColumn1.HeaderText = "LeistungsNr"
+        Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1"
+        Me.DataGridViewTextBoxColumn1.Width = 70
+        '
+        'DataGridViewTextBoxColumn2
+        '
+        Me.DataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
+        Me.DataGridViewTextBoxColumn2.HeaderText = "Leistungsbez"
+        Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2"
+        '
+        'DataGridViewTextBoxColumn3
+        '
+        Me.DataGridViewTextBoxColumn3.HeaderText = "Preis"
+        Me.DataGridViewTextBoxColumn3.Name = "DataGridViewTextBoxColumn3"
+        '
+        'kdEndEmpfaenger
+        '
+        Me.kdEndEmpfaenger._AlleFirmenCLUSTER = True
+        Me.kdEndEmpfaenger._AllowSetValue = True
+        Me.kdEndEmpfaenger._autoSizeGross = False
+        Me.kdEndEmpfaenger._display_Name1 = False
+        Me.kdEndEmpfaenger._displayAVISO_Email = False
+        Me.kdEndEmpfaenger._displayFullName = False
+        Me.kdEndEmpfaenger._displayWoelflKd = False
+        Me.kdEndEmpfaenger._hideIfListEmpty = True
+        Me.kdEndEmpfaenger._loadKdData = True
+        Me.kdEndEmpfaenger._UseFIRMA = ""
+        Me.kdEndEmpfaenger._ValueKdAndName = False
+        Me.kdEndEmpfaenger.dgvpos = "LEFT"
+        Me.kdEndEmpfaenger.KdName = Nothing
+        Me.kdEndEmpfaenger.KdNr = "-1"
+        Me.kdEndEmpfaenger.kdNrField = Nothing
+        Me.kdEndEmpfaenger.KdNrNullInt = Nothing
+        Me.kdEndEmpfaenger.Location = New System.Drawing.Point(88, 228)
+        Me.kdEndEmpfaenger.Name = "kdEndEmpfaenger"
+        Me.kdEndEmpfaenger.nurAktive = True
+        Me.kdEndEmpfaenger.searchActive = True
+        Me.kdEndEmpfaenger.Size = New System.Drawing.Size(268, 20)
+        Me.kdEndEmpfaenger.TabIndex = 5
+        Me.kdEndEmpfaenger.TIMER_SEARCH = True
+        Me.kdEndEmpfaenger.usrcntl = Nothing
+        '
+        'cboUSt_UstIdNr
+        '
+        Me.cboUSt_UstIdNr._DateTimeOnly = False
+        Me.cboUSt_UstIdNr._numbersOnly = False
+        Me.cboUSt_UstIdNr._numbersOnlyKommastellen = ""
+        Me.cboUSt_UstIdNr._Prozent = False
+        Me.cboUSt_UstIdNr._ShortDateNew = False
+        Me.cboUSt_UstIdNr._ShortDateOnly = False
+        Me.cboUSt_UstIdNr._TimeOnly = False
+        Me.cboUSt_UstIdNr._value = Nothing
+        Me.cboUSt_UstIdNr._Waehrung = False
+        Me.cboUSt_UstIdNr._WaehrungZeichen = True
+        Me.cboUSt_UstIdNr.Location = New System.Drawing.Point(394, 228)
+        Me.cboUSt_UstIdNr.MaxLineLength = -1
+        Me.cboUSt_UstIdNr.MaxLines_Warning = ""
+        Me.cboUSt_UstIdNr.MaxLines_Warning_Label = Nothing
+        Me.cboUSt_UstIdNr.Name = "cboUSt_UstIdNr"
+        Me.cboUSt_UstIdNr.Size = New System.Drawing.Size(108, 20)
+        Me.cboUSt_UstIdNr.TabIndex = 7
+        '
+        'txtRechnugnsbetrag
+        '
+        Me.txtRechnugnsbetrag._DateTimeOnly = False
+        Me.txtRechnugnsbetrag._numbersOnly = False
+        Me.txtRechnugnsbetrag._numbersOnlyKommastellen = ""
+        Me.txtRechnugnsbetrag._Prozent = False
+        Me.txtRechnugnsbetrag._ShortDateNew = False
+        Me.txtRechnugnsbetrag._ShortDateOnly = False
+        Me.txtRechnugnsbetrag._TimeOnly = False
+        Me.txtRechnugnsbetrag._value = Nothing
+        Me.txtRechnugnsbetrag._Waehrung = True
+        Me.txtRechnugnsbetrag._WaehrungZeichen = True
+        Me.txtRechnugnsbetrag.Location = New System.Drawing.Point(501, 228)
+        Me.txtRechnugnsbetrag.MaxLineLength = -1
+        Me.txtRechnugnsbetrag.MaxLines_Warning = ""
+        Me.txtRechnugnsbetrag.MaxLines_Warning_Label = Nothing
+        Me.txtRechnugnsbetrag.Name = "txtRechnugnsbetrag"
+        Me.txtRechnugnsbetrag.Size = New System.Drawing.Size(90, 20)
+        Me.txtRechnugnsbetrag.TabIndex = 8
+        '
+        'lklBearbeitungAbbrechenUl
+        '
+        Me.lklBearbeitungAbbrechenUl.AutoSize = True
+        Me.lklBearbeitungAbbrechenUl.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.lklBearbeitungAbbrechenUl.Location = New System.Drawing.Point(473, 251)
+        Me.lklBearbeitungAbbrechenUl.Name = "lklBearbeitungAbbrechenUl"
+        Me.lklBearbeitungAbbrechenUl.Size = New System.Drawing.Size(118, 13)
+        Me.lklBearbeitungAbbrechenUl.TabIndex = 12
+        Me.lklBearbeitungAbbrechenUl.TabStop = True
+        Me.lklBearbeitungAbbrechenUl.Text = "Bearbeitung abbrechen"
+        Me.lklBearbeitungAbbrechenUl.Visible = False
+        '
+        'Button3
+        '
+        Me.Button3.BackgroundImage = CType(resources.GetObject("Button3.BackgroundImage"), System.Drawing.Image)
+        Me.Button3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button3.Location = New System.Drawing.Point(593, 25)
+        Me.Button3.Name = "Button3"
+        Me.Button3.Size = New System.Drawing.Size(30, 20)
+        Me.Button3.TabIndex = 2
+        Me.Button3.TabStop = False
+        Me.Button3.UseVisualStyleBackColor = True
+        '
+        'Button2
+        '
+        Me.Button2.BackgroundImage = Global.SDL.My.Resources.Resources.plus
+        Me.Button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button2.Location = New System.Drawing.Point(593, 228)
+        Me.Button2.Name = "Button2"
+        Me.Button2.Size = New System.Drawing.Size(30, 20)
+        Me.Button2.TabIndex = 9
+        Me.Button2.TabStop = False
+        Me.Button2.UseVisualStyleBackColor = True
+        '
+        'lblErrKD
+        '
+        Me.lblErrKD.ForeColor = System.Drawing.Color.Red
+        Me.lblErrKD.Location = New System.Drawing.Point(12, 251)
+        Me.lblErrKD.Name = "lblErrKD"
+        Me.lblErrKD.Size = New System.Drawing.Size(235, 13)
+        Me.lblErrKD.TabIndex = 10
+        Me.lblErrKD.Text = "Bitte angeben!"
+        Me.lblErrKD.Visible = False
+        '
+        'Label21
+        '
+        Me.Label21.AutoSize = True
+        Me.Label21.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!)
+        Me.Label21.Location = New System.Drawing.Point(591, 213)
+        Me.Label21.Name = "Label21"
+        Me.Label21.Size = New System.Drawing.Size(33, 12)
+        Me.Label21.TabIndex = 3
+        Me.Label21.Text = "(Enter)"
+        '
+        'lblErrUID
+        '
+        Me.lblErrUID.ForeColor = System.Drawing.Color.Red
+        Me.lblErrUID.Location = New System.Drawing.Point(352, 251)
+        Me.lblErrUID.Name = "lblErrUID"
+        Me.lblErrUID.Size = New System.Drawing.Size(82, 13)
+        Me.lblErrUID.TabIndex = 11
+        Me.lblErrUID.Text = "Bitte angeben!"
+        Me.lblErrUID.Visible = False
+        '
+        'cboUSt_UstIdNrLand
+        '
+        Me.cboUSt_UstIdNrLand._allowedValuesFreiText = Nothing
+        Me.cboUSt_UstIdNrLand._allowFreiText = False
+        Me.cboUSt_UstIdNrLand._value = ""
+        Me.cboUSt_UstIdNrLand.FormattingEnabled = True
+        Me.cboUSt_UstIdNrLand.Location = New System.Drawing.Point(355, 228)
+        Me.cboUSt_UstIdNrLand.Name = "cboUSt_UstIdNrLand"
+        Me.cboUSt_UstIdNrLand.Size = New System.Drawing.Size(40, 21)
+        Me.cboUSt_UstIdNrLand.TabIndex = 6
+        '
+        'Button4
+        '
+        Me.Button4.DialogResult = System.Windows.Forms.DialogResult.Cancel
+        Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button4.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
+        Me.Button4.Location = New System.Drawing.Point(27, 276)
+        Me.Button4.Name = "Button4"
+        Me.Button4.Size = New System.Drawing.Size(122, 41)
+        Me.Button4.TabIndex = 13
+        Me.Button4.Text = "UID Prüfen" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(Stufe 1)"
+        Me.Button4.UseVisualStyleBackColor = True
+        Me.Button4.Visible = False
+        '
+        'txtKdNr
+        '
+        Me.txtKdNr._DateTimeOnly = False
+        Me.txtKdNr._numbersOnly = False
+        Me.txtKdNr._numbersOnlyKommastellen = ""
+        Me.txtKdNr._Prozent = False
+        Me.txtKdNr._ShortDateNew = False
+        Me.txtKdNr._ShortDateOnly = False
+        Me.txtKdNr._TimeOnly = False
+        Me.txtKdNr._value = Nothing
+        Me.txtKdNr._Waehrung = False
+        Me.txtKdNr._WaehrungZeichen = True
+        Me.txtKdNr.Location = New System.Drawing.Point(15, 228)
+        Me.txtKdNr.MaxLineLength = -1
+        Me.txtKdNr.MaxLines_Warning = ""
+        Me.txtKdNr.MaxLines_Warning_Label = Nothing
+        Me.txtKdNr.Name = "txtKdNr"
+        Me.txtKdNr.ReadOnly = True
+        Me.txtKdNr.Size = New System.Drawing.Size(76, 20)
+        Me.txtKdNr.TabIndex = 4
+        '
+        'txtRechnugnsNr
+        '
+        Me.txtRechnugnsNr._DateTimeOnly = False
+        Me.txtRechnugnsNr._numbersOnly = False
+        Me.txtRechnugnsNr._numbersOnlyKommastellen = ""
+        Me.txtRechnugnsNr._Prozent = False
+        Me.txtRechnugnsNr._ShortDateNew = False
+        Me.txtRechnugnsNr._ShortDateOnly = False
+        Me.txtRechnugnsNr._TimeOnly = False
+        Me.txtRechnugnsNr._value = Nothing
+        Me.txtRechnugnsNr._Waehrung = True
+        Me.txtRechnugnsNr._WaehrungZeichen = True
+        Me.txtRechnugnsNr.Location = New System.Drawing.Point(15, 297)
+        Me.txtRechnugnsNr.MaxLineLength = -1
+        Me.txtRechnugnsNr.MaxLines_Warning = ""
+        Me.txtRechnugnsNr.MaxLines_Warning_Label = Nothing
+        Me.txtRechnugnsNr.Name = "txtRechnugnsNr"
+        Me.txtRechnugnsNr.Size = New System.Drawing.Size(61, 20)
+        Me.txtRechnugnsNr.TabIndex = 14
+        Me.txtRechnugnsNr.Visible = False
+        '
+        'clmnKdNr
+        '
+        Me.clmnKdNr.FillWeight = 80.0!
+        Me.clmnKdNr.HeaderText = "KdNr"
+        Me.clmnKdNr.Name = "clmnKdNr"
+        Me.clmnKdNr.Width = 70
+        '
+        'clmnEndEmpfaenger
+        '
+        Me.clmnEndEmpfaenger.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
+        Me.clmnEndEmpfaenger.HeaderText = "EndEmpfänger"
+        Me.clmnEndEmpfaenger.Name = "clmnEndEmpfaenger"
+        '
+        'clmnUIDLand
+        '
+        Me.clmnUIDLand.HeaderText = ""
+        Me.clmnUIDLand.Name = "clmnUIDLand"
+        Me.clmnUIDLand.Width = 40
+        '
+        'clmnUID
+        '
+        Me.clmnUID.HeaderText = "UID-Nr"
+        Me.clmnUID.Name = "clmnUID"
+        '
+        'clmnRechnungsbetrag
+        '
+        DataGridViewCellStyle2.Format = "C2"
+        Me.clmnRechnungsbetrag.DefaultCellStyle = DataGridViewCellStyle2
+        Me.clmnRechnungsbetrag.HeaderText = "Rechnungsbetrag"
+        Me.clmnRechnungsbetrag.Name = "clmnRechnungsbetrag"
+        '
+        'clmnRechnungsNr
+        '
+        Me.clmnRechnungsNr.HeaderText = "RechnungsNr"
+        Me.clmnRechnungsNr.Name = "clmnRechnungsNr"
+        Me.clmnRechnungsNr.Visible = False
+        Me.clmnRechnungsNr.Width = 180
+        '
+        'Button5
+        '
+        Me.Button5.DialogResult = System.Windows.Forms.DialogResult.Cancel
+        Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button5.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
+        Me.Button5.Location = New System.Drawing.Point(125, 276)
+        Me.Button5.Name = "Button5"
+        Me.Button5.Size = New System.Drawing.Size(122, 41)
+        Me.Button5.TabIndex = 15
+        Me.Button5.Text = "UID Prüfen" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(Stufe 2)"
+        Me.Button5.UseVisualStyleBackColor = True
+        '
+        'frmNacherfassungEndEmpfaenger
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.BackColor = System.Drawing.Color.White
+        Me.ClientSize = New System.Drawing.Size(636, 329)
+        Me.Controls.Add(Me.Button5)
+        Me.Controls.Add(Me.txtRechnugnsNr)
+        Me.Controls.Add(Me.kdEndEmpfaenger)
+        Me.Controls.Add(Me.txtKdNr)
+        Me.Controls.Add(Me.Button4)
+        Me.Controls.Add(Me.cboUSt_UstIdNrLand)
+        Me.Controls.Add(Me.lblErrUID)
+        Me.Controls.Add(Me.lklBearbeitungAbbrechenUl)
+        Me.Controls.Add(Me.Button3)
+        Me.Controls.Add(Me.Button2)
+        Me.Controls.Add(Me.lblErrKD)
+        Me.Controls.Add(Me.Label21)
+        Me.Controls.Add(Me.txtRechnugnsbetrag)
+        Me.Controls.Add(Me.cboUSt_UstIdNr)
+        Me.Controls.Add(Me.Button1)
+        Me.Controls.Add(Me.btnOK)
+        Me.Controls.Add(Me.dgvEndEmpfaenger)
+        Me.Controls.Add(Me.Label35)
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.Name = "frmNacherfassungEndEmpfaenger"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+        Me.Text = "Endempfänger"
+        CType(Me.dgvEndEmpfaenger, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+    Friend WithEvents dgvEndEmpfaenger As System.Windows.Forms.DataGridView
+    Friend WithEvents Label35 As System.Windows.Forms.Label
+    Friend WithEvents btnOK As System.Windows.Forms.Button
+    Friend WithEvents Button1 As System.Windows.Forms.Button
+    Friend WithEvents DataGridViewTextBoxColumn3 As System.Windows.Forms.DataGridViewTextBoxColumn
+    Friend WithEvents DataGridViewTextBoxColumn1 As System.Windows.Forms.DataGridViewTextBoxColumn
+    Friend WithEvents DataGridViewTextBoxColumn2 As System.Windows.Forms.DataGridViewTextBoxColumn
+    Friend WithEvents kdEndEmpfaenger As VERAG_PROG_ALLGEMEIN.KdSearchBox
+    Friend WithEvents cboUSt_UstIdNr As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents txtRechnugnsbetrag As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents lklBearbeitungAbbrechenUl As LinkLabel
+    Friend WithEvents Button3 As Button
+    Friend WithEvents Button2 As Button
+    Friend WithEvents lblErrKD As Label
+    Friend WithEvents Label21 As Label
+    Friend WithEvents lblErrUID As Label
+    Friend WithEvents cboUSt_UstIdNrLand As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Button4 As Button
+    Friend WithEvents txtKdNr As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents txtRechnugnsNr As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents clmnKdNr As DataGridViewTextBoxColumn
+    Friend WithEvents clmnEndEmpfaenger As DataGridViewTextBoxColumn
+    Friend WithEvents clmnUIDLand As DataGridViewTextBoxColumn
+    Friend WithEvents clmnUID As DataGridViewTextBoxColumn
+    Friend WithEvents clmnRechnungsbetrag As DataGridViewTextBoxColumn
+    Friend WithEvents clmnRechnungsNr As DataGridViewTextBoxColumn
+    Friend WithEvents Button5 As Button
+End Class
--- a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungEndEmpfaenger.resx
+++ b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungEndEmpfaenger.resx
--- a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungEndEmpfaenger.vb
+++ b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungEndEmpfaenger.vb
@@ -0,0 +1,178 @@
+Public Class frmNacherfassungEndEmpfaenger
+    Public ENDEMPFAENGER As List(Of VERAG_PROG_ALLGEMEIN.cEndEmpfaener)
+    Public FilialenNr As Integer = -1
+    Public AbfertigungsNr As Integer = -1
+    Public UnterNr As Integer = -1
+
+
+
+    Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click
+        Try
+            ENDEMPFAENGER.Clear()
+            For Each r As DataGridViewRow In dgvEndEmpfaenger.Rows
+                'If Not IsNumeric(r.Cells("LeistungsNr").Value) Then MsgBox("Leistungsnummer muss eine Zahl sein!") : Me.DialogResult = Windows.Forms.DialogResult.None : Exit Sub
+                'If Not IsNumeric(r.Cells("Preis").Value) Then MsgBox("Preis muss eine Zahl sein!") : Me.DialogResult = Windows.Forms.DialogResult.None : Exit Sub
+                ENDEMPFAENGER.Add(New VERAG_PROG_ALLGEMEIN.cEndEmpfaener(FilialenNr, AbfertigungsNr, UnterNr, CInt(r.Cells("clmnKdNr").Value), CStr(r.Cells("clmnEndEmpfaenger").Value), r.Cells("clmnUIDLand").Value, r.Cells("clmnUID").Value, r.Cells("clmnRechnungsbetrag").Value, r.Cells("clmnRechnungsNr").Value))
+            Next
+            Me.Close()
+
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+            Me.DialogResult = Windows.Forms.DialogResult.None
+        End Try
+    End Sub
+
+    Private Sub frmNacherfassungVorkosten_Load(sender As Object, e As EventArgs) Handles Me.Load
+        For Each v In ENDEMPFAENGER
+            dgvEndEmpfaenger.Rows.Add(v.EndEmpfaengerKdNr, v.EndEmpfaenger, If(v.UstIdKz, ""), If(v.UstIdNr, ""), v.Rechnungsbetrag, v.RechnungsNr)
+        Next
+
+
+        cboUSt_UstIdNrLand.fillWithSQL(" SELECT [Länderverzeichnis für die Außenhandelsstatistik].LandKz,[Länderverzeichnis für die Außenhandelsstatistik].LandBez  " &
+                                      " FROM [Länderverzeichnis für die Außenhandelsstatistik] LEFT JOIN [Währungstabelle] ON [Länderverzeichnis für die Außenhandelsstatistik].LandNr = [Währungstabelle].[Währungsschlüssel] " &
+                                      " WHERE [Währungstabelle].[MitgliedslandEU] = 1 " &
+                                      " ORDER BY [Länderverzeichnis für die Außenhandelsstatistik].LandKz ", , "FMZOLL", True)
+        kdEndEmpfaenger.initKdBox(Me, txtKdNr)
+        kdEndEmpfaenger.Focus()
+    End Sub
+
+    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
+        lblErrKD.Visible = False
+        lblErrUID.Visible = False
+        'lblErrRG.Visible = False
+
+        kdEndEmpfaenger.Focus() 'Rg_value
+        If kdEndEmpfaenger.KdNr_value <= 0 Then lblErrKD.Visible = True : Exit Sub
+        If cboUSt_UstIdNr.Text = "" Then lblErrUID.Visible = True : Exit Sub
+        If cboUSt_UstIdNrLand._value = "" Then lblErrUID.Visible = True : Exit Sub
+
+        Dim rg = Nothing
+        If IsNumeric(txtRechnugnsbetrag._value) AndAlso txtRechnugnsbetrag._value > 0 Then
+            rg = CDbl(txtRechnugnsbetrag._value)
+        End If
+
+        If UL_EDIT < 0 Then
+            dgvEndEmpfaenger.Rows.Add(kdEndEmpfaenger.KdNr_value, kdEndEmpfaenger.Text, cboUSt_UstIdNrLand._value, cboUSt_UstIdNr.Text, rg, txtRechnugnsNr.Text)
+        Else
+            dgvEndEmpfaenger.Rows.RemoveAt(UL_EDIT)
+            dgvEndEmpfaenger.Rows.Insert(UL_EDIT, kdEndEmpfaenger.KdNr_value, kdEndEmpfaenger.Text, cboUSt_UstIdNrLand._value, cboUSt_UstIdNr.Text, rg, txtRechnugnsNr.Text)
+            UL_EDIT = -1
+            Button2.BackgroundImage = My.Resources.plus
+            lklBearbeitungAbbrechenUl.Visible = False
+        End If
+
+        kdEndEmpfaenger.KdNr = ""
+        cboUSt_UstIdNr.Text = ""
+        cboUSt_UstIdNrLand.changeItem("")
+        txtRechnugnsbetrag.Text = ""
+        txtRechnugnsNr.Text = ""
+
+        kdEndEmpfaenger.Focus()
+    End Sub
+
+    Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
+        If dgvEndEmpfaenger.SelectedRows.Count > 0 Then
+            dgvEndEmpfaenger.Rows.Remove(dgvEndEmpfaenger.SelectedRows(0))
+        End If
+    End Sub
+
+
+    Private Sub txtRechnugnsbetrag_KeyDown(sender As Object, e As KeyEventArgs) Handles txtRechnugnsbetrag.KeyDown, txtRechnugnsNr.KeyDown, cboUSt_UstIdNr.KeyDown
+        If e.KeyCode = Keys.Return Then
+            Button2.PerformClick()
+        End If
+    End Sub
+
+    Dim UL_EDIT = -1
+    Private Sub dgvUnterlage_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvEndEmpfaenger.CellDoubleClick
+        If e.RowIndex < 0 Then Exit Sub
+        editableRowUL(e.RowIndex)
+    End Sub
+
+    Sub editableRowUL(index As Integer)
+        kdEndEmpfaenger.KdNr = dgvEndEmpfaenger.Rows(index).Cells("clmnKdNr").Value
+        cboUSt_UstIdNr.Text = dgvEndEmpfaenger.Rows(index).Cells("clmnUID").Value
+        txtRechnugnsbetrag.Text = dgvEndEmpfaenger.Rows(index).Cells("clmnRechnungsbetrag").Value
+        txtRechnugnsNr.Text = dgvEndEmpfaenger.Rows(index).Cells("clmnRechnungsNr").Value
+        cboUSt_UstIdNrLand.changeItem(dgvEndEmpfaenger.Rows(index).Cells("clmnUIDLand").Value)
+
+        UL_EDIT = index
+        Button2.BackgroundImage = My.Resources.stift
+        lklBearbeitungAbbrechenUl.Visible = True
+    End Sub
+
+    Private Sub lklBearbeitungAbbrechenUl_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles lklBearbeitungAbbrechenUl.LinkClicked
+        UL_EDIT = -1
+        kdEndEmpfaenger.KdNr = ""
+        cboUSt_UstIdNr.Text = ""
+        cboUSt_UstIdNrLand.changeItem("")
+        txtRechnugnsbetrag.Text = ""
+        txtRechnugnsNr.Text = ""
+        Button1.BackgroundImage = My.Resources.plus
+        lklBearbeitungAbbrechenUl.Visible = False
+        kdEndEmpfaenger.Focus()
+    End Sub
+
+    Private Sub frmNacherfassungEndEmpfaenger_Shown(sender As Object, e As EventArgs) Handles Me.Shown
+        kdEndEmpfaenger.Focus()
+    End Sub
+
+    Private Sub kdEndEmpfaenger_TextChanged(sender As Object, e As EventArgs) Handles kdEndEmpfaenger.PropertyChanged
+        If kdEndEmpfaenger.KdData_ADRESSEN IsNot Nothing Then
+            cboUSt_UstIdNrLand.changeItem(If(kdEndEmpfaenger.KdData_ADRESSEN.UstIdKz, ""))
+            cboUSt_UstIdNr.Text = If(kdEndEmpfaenger.KdData_ADRESSEN.UstIdNr, "")
+        End If
+    End Sub
+
+    Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
+        dgvEndEmpfaenger.ClearSelection()
+
+        For Each r As DataGridViewRow In dgvEndEmpfaenger.Rows
+            'If r.Cells("clmnUIDLand").Value <> "" AndAlso r.Cells("clmnUIDNr").Value <> "" Then
+            If r.Cells("clmnKdNr").Value IsNot Nothing AndAlso r.Cells("clmnKdNr").Value.ToString <> "" Then
+                r.Cells("clmnUIDLand").Style.BackColor = Color.LightGray
+                r.Cells("clmnUIDLand").Style.ForeColor = Color.Black
+
+
+                Dim UID = VERAG_PROG_ALLGEMEIN.cUIDPruefung.doUIDPruefung(r.Cells("clmnKdNr").Value, True)
+                If UID IsNot Nothing Then
+                    If UID.uid_valid Then
+                        r.Cells("clmnUIDLand").Style.BackColor = Color.Green
+                        r.Cells("clmnUIDLand").Style.ForeColor = Color.White
+                    Else
+                        r.Cells("clmnUIDLand").Style.BackColor = Color.DarkRed
+                        r.Cells("clmnUIDLand").Style.ForeColor = Color.White
+                    End If
+                End If
+                r.Cells("clmnUID").Style.BackColor = r.Cells("clmnUIDLand").Style.BackColor
+                r.Cells("clmnUID").Style.ForeColor = r.Cells("clmnUIDLand").Style.ForeColor
+            End If
+        Next
+        Me.DialogResult = DialogResult.None
+    End Sub
+
+    Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click
+        dgvEndEmpfaenger.ClearSelection()
+
+        For Each r As DataGridViewRow In dgvEndEmpfaenger.Rows
+            'If r.Cells("clmnUIDLand").Value <> "" AndAlso r.Cells("clmnUIDNr").Value <> "" Then
+            If r.Cells("clmnUIDLand").Value IsNot Nothing AndAlso r.Cells("clmnUIDLand").Value.ToString <> "" AndAlso r.Cells("clmnUID").Value IsNot Nothing AndAlso r.Cells("clmnUID").Value.ToString <> "" Then
+                r.Cells("clmnUIDLand").Style.BackColor = Color.LightGray
+                r.Cells("clmnUIDLand").Style.ForeColor = Color.Black
+
+                Dim UID_ERG = SDL.cFinanzOnlineWebService.Call_Web_Service_MethodUID_Abfrage_NEU2020(If(r.Cells("clmnUIDLand").Value, "") & If(r.Cells("clmnUID").Value, ""), "", "", "")
+                Select Case UID_ERG
+                    Case 0
+                        r.Cells("clmnUIDLand").Style.BackColor = Color.Green
+                        r.Cells("clmnUIDLand").Style.ForeColor = Color.White
+                    Case 1
+                        r.Cells("clmnUIDLand").Style.BackColor = Color.DarkRed
+                        r.Cells("clmnUIDLand").Style.ForeColor = Color.White
+                End Select
+            End If
+            r.Cells("clmnUID").Style.BackColor = r.Cells("clmnUIDLand").Style.BackColor
+            r.Cells("clmnUID").Style.ForeColor = r.Cells("clmnUIDLand").Style.ForeColor
+        Next
+        Me.DialogResult = DialogResult.None
+    End Sub
+End Class
--- a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.Designer.vb
+++ b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.Designer.vb
@@ -147,6 +147,8 @@ Partial Class frmNacherfassungNEU
        Me.txtKdAuftragsnummer = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.lblErrWaehrung = New System.Windows.Forms.Label()
        Me.Panel2 = New System.Windows.Forms.Panel()
+        Me.Label64 = New System.Windows.Forms.Label()
+        Me.cboAbklärungFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.lblSachbearbeiterIch = New VERAG_PROG_ALLGEMEIN.MyLinkLabelVALUE()
        Me.Button1 = New System.Windows.Forms.Button()
        Me.btnOK = New System.Windows.Forms.Button()
@@ -226,8 +228,7 @@ Partial Class frmNacherfassungNEU
        Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.DataGridViewTextBoxColumn5 = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.cboAbklärungFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.Label64 = New System.Windows.Forms.Label()
+        Me.Button4 = New System.Windows.Forms.Button()
        Me.pnl.SuspendLayout()
        Me.Panel3.SuspendLayout()
        Me.GroupBox4.SuspendLayout()
@@ -593,7 +594,7 @@ Partial Class frmNacherfassungNEU
        Me.lblErrSachbearbeiter.Location = New System.Drawing.Point(235, 46)
        Me.lblErrSachbearbeiter.Name = "lblErrSachbearbeiter"
        Me.lblErrSachbearbeiter.Size = New System.Drawing.Size(76, 13)
-        Me.lblErrSachbearbeiter.TabIndex = 3
+        Me.lblErrSachbearbeiter.TabIndex = 5
        Me.lblErrSachbearbeiter.Text = "Bitte angeben!"
        Me.lblErrSachbearbeiter.Visible = False
        '
@@ -604,7 +605,7 @@ Partial Class frmNacherfassungNEU
        Me.Label52.Location = New System.Drawing.Point(4, 4)
        Me.Label52.Name = "Label52"
        Me.Label52.Size = New System.Drawing.Size(140, 13)
-        Me.Label52.TabIndex = 0
+        Me.Label52.TabIndex = 1
        Me.Label52.Text = "Sachbearbeiter (quick-stop):"
        '
        'Label12
@@ -614,7 +615,7 @@ Partial Class frmNacherfassungNEU
        Me.Label12.Location = New System.Drawing.Point(3, 46)
        Me.Label12.Name = "Label12"
        Me.Label12.Size = New System.Drawing.Size(140, 13)
-        Me.Label12.TabIndex = 2
+        Me.Label12.TabIndex = 4
        Me.Label12.Text = "Sachbearbeiter (Verzollung):"
        '
        'ContextMenuStrip1
@@ -779,7 +780,7 @@ Partial Class frmNacherfassungNEU
        Me.Label17.Location = New System.Drawing.Point(769, 495)
        Me.Label17.Name = "Label17"
        Me.Label17.Size = New System.Drawing.Size(85, 13)
-        Me.Label17.TabIndex = 66
+        Me.Label17.TabIndex = 67
        Me.Label17.Text = "EU-Fiskal Empf.:"
        Me.Label17.Visible = False
        '
@@ -808,7 +809,7 @@ Partial Class frmNacherfassungNEU
        Me.cbxBar.Location = New System.Drawing.Point(404, 309)
        Me.cbxBar.Name = "cbxBar"
        Me.cbxBar.Size = New System.Drawing.Size(82, 17)
-        Me.cbxBar.TabIndex = 43
+        Me.cbxBar.TabIndex = 44
        Me.cbxBar.Text = "Bar, Betrag:"
        Me.cbxBar.UseVisualStyleBackColor = False
        '
@@ -819,7 +820,7 @@ Partial Class frmNacherfassungNEU
        Me.cbxFakturiert.Location = New System.Drawing.Point(404, 333)
        Me.cbxFakturiert.Name = "cbxFakturiert"
        Me.cbxFakturiert.Size = New System.Drawing.Size(70, 17)
-        Me.cbxFakturiert.TabIndex = 47
+        Me.cbxFakturiert.TabIndex = 48
        Me.cbxFakturiert.Text = "Fakturiert"
        Me.cbxFakturiert.UseVisualStyleBackColor = False
        '
@@ -829,7 +830,7 @@ Partial Class frmNacherfassungNEU
        Me.Label20.Location = New System.Drawing.Point(14, 434)
        Me.Label20.Name = "Label20"
        Me.Label20.Size = New System.Drawing.Size(132, 13)
-        Me.Label20.TabIndex = 50
+        Me.Label20.TabIndex = 51
        Me.Label20.Text = "Beleg-Nummer ZA/T1/T2:"
        '
        'Label21
@@ -838,7 +839,7 @@ Partial Class frmNacherfassungNEU
        Me.Label21.Location = New System.Drawing.Point(402, 613)
        Me.Label21.Name = "Label21"
        Me.Label21.Size = New System.Drawing.Size(79, 13)
-        Me.Label21.TabIndex = 85
+        Me.Label21.TabIndex = 86
        Me.Label21.Text = "Erfassungs-Nr.:"
        '
        'Label22
@@ -847,7 +848,7 @@ Partial Class frmNacherfassungNEU
        Me.Label22.Location = New System.Drawing.Point(400, 577)
        Me.Label22.Name = "Label22"
        Me.Label22.Size = New System.Drawing.Size(49, 13)
-        Me.Label22.TabIndex = 81
+        Me.Label22.TabIndex = 82
        Me.Label22.Text = "Vermerk:"
        '
        'Label23
@@ -856,7 +857,7 @@ Partial Class frmNacherfassungNEU
        Me.Label23.Location = New System.Drawing.Point(14, 512)
        Me.Label23.Name = "Label23"
        Me.Label23.Size = New System.Drawing.Size(64, 13)
-        Me.Label23.TabIndex = 67
+        Me.Label23.TabIndex = 68
        Me.Label23.Text = "Bemerkung:"
        '
        'GroupBox4
@@ -895,7 +896,7 @@ Partial Class frmNacherfassungNEU
        Me.GroupBox4.Location = New System.Drawing.Point(630, 43)
        Me.GroupBox4.Name = "GroupBox4"
        Me.GroupBox4.Size = New System.Drawing.Size(253, 296)
-        Me.GroupBox4.TabIndex = 44
+        Me.GroupBox4.TabIndex = 45
        Me.GroupBox4.TabStop = False
        '
        'pnlHandling
@@ -1355,7 +1356,7 @@ Partial Class frmNacherfassungNEU
        Me.Label29.Location = New System.Drawing.Point(400, 512)
        Me.Label29.Name = "Label29"
        Me.Label29.Size = New System.Drawing.Size(67, 13)
-        Me.Label29.TabIndex = 68
+        Me.Label29.TabIndex = 69
        Me.Label29.Text = "Packstücke:"
        '
        'Label30
@@ -1364,7 +1365,7 @@ Partial Class frmNacherfassungNEU
        Me.Label30.Location = New System.Drawing.Point(583, 473)
        Me.Label30.Name = "Label30"
        Me.Label30.Size = New System.Drawing.Size(96, 13)
-        Me.Label30.TabIndex = 60
+        Me.Label30.TabIndex = 61
        Me.Label30.Text = "Umrechnungskurs:"
        '
        'Label31
@@ -1373,7 +1374,7 @@ Partial Class frmNacherfassungNEU
        Me.Label31.Location = New System.Drawing.Point(401, 473)
        Me.Label31.Name = "Label31"
        Me.Label31.Size = New System.Drawing.Size(87, 13)
-        Me.Label31.TabIndex = 59
+        Me.Label31.TabIndex = 60
        Me.Label31.Text = "Rechnungbetrag"
        '
        'Label32
@@ -1382,7 +1383,7 @@ Partial Class frmNacherfassungNEU
        Me.Label32.Location = New System.Drawing.Point(523, 472)
        Me.Label32.Name = "Label32"
        Me.Label32.Size = New System.Drawing.Size(54, 13)
-        Me.Label32.TabIndex = 56
+        Me.Label32.TabIndex = 57
        Me.Label32.Text = "Währung:"
        '
        'Label33
@@ -1391,7 +1392,7 @@ Partial Class frmNacherfassungNEU
        Me.Label33.Location = New System.Drawing.Point(401, 434)
        Me.Label33.Name = "Label33"
        Me.Label33.Size = New System.Drawing.Size(60, 13)
-        Me.Label33.TabIndex = 52
+        Me.Label33.TabIndex = 53
        Me.Label33.Text = "Rohmasse:"
        '
        'Label34
@@ -1400,7 +1401,7 @@ Partial Class frmNacherfassungNEU
        Me.Label34.Location = New System.Drawing.Point(14, 613)
        Me.Label34.Name = "Label34"
        Me.Label34.Size = New System.Drawing.Size(98, 13)
-        Me.Label34.TabIndex = 84
+        Me.Label34.TabIndex = 85
        Me.Label34.Text = "Zahlungsaufschub:"
        '
        'btnFertig
@@ -1409,7 +1410,7 @@ Partial Class frmNacherfassungNEU
        Me.btnFertig.Location = New System.Drawing.Point(721, 475)
        Me.btnFertig.Name = "btnFertig"
        Me.btnFertig.Size = New System.Drawing.Size(123, 35)
-        Me.btnFertig.TabIndex = 65
+        Me.btnFertig.TabIndex = 66
        Me.btnFertig.Text = "Speichern" & Global.Microsoft.VisualBasic.ChrW(10) & "Nächster Eintrag >>"
        Me.btnFertig.UseVisualStyleBackColor = True
        Me.btnFertig.Visible = False
@@ -1417,6 +1418,7 @@ Partial Class frmNacherfassungNEU
        'Panel1
        '
        Me.Panel1.AutoScroll = True
+        Me.Panel1.Controls.Add(Me.Button4)
        Me.Panel1.Controls.Add(Me.txtKdAuftragsnummerEmpfaenger)
        Me.Panel1.Controls.Add(Me.txtKdAuftragsnummerFrachtfuehrer)
        Me.Panel1.Controls.Add(Me.txtKdAuftragsnummerAvisierer)
@@ -1599,7 +1601,7 @@ Partial Class frmNacherfassungNEU
        Me.txtInkasso.MaxLines_Warning_Label = Nothing
        Me.txtInkasso.Name = "txtInkasso"
        Me.txtInkasso.Size = New System.Drawing.Size(121, 20)
-        Me.txtInkasso.TabIndex = 80
+        Me.txtInkasso.TabIndex = 81
        Me.txtInkasso.Visible = False
        '
        'Label15
@@ -1608,7 +1610,7 @@ Partial Class frmNacherfassungNEU
        Me.Label15.Location = New System.Drawing.Point(57, 580)
        Me.Label15.Name = "Label15"
        Me.Label15.Size = New System.Drawing.Size(47, 13)
-        Me.Label15.TabIndex = 82
+        Me.Label15.TabIndex = 83
        Me.Label15.Text = "Inkasso:"
        Me.Label15.Visible = False
        '
@@ -1619,7 +1621,7 @@ Partial Class frmNacherfassungNEU
        Me.Panel5.Location = New System.Drawing.Point(17, 675)
        Me.Panel5.Name = "Panel5"
        Me.Panel5.Size = New System.Drawing.Size(365, 118)
-        Me.Panel5.TabIndex = 90
+        Me.Panel5.TabIndex = 91
        '
        'dgvBelege
        '
@@ -1669,7 +1671,7 @@ Partial Class frmNacherfassungNEU
        Me.tbcntrRg.Name = "tbcntrRg"
        Me.tbcntrRg.SelectedIndex = 0
        Me.tbcntrRg.Size = New System.Drawing.Size(361, 24)
-        Me.tbcntrRg.TabIndex = 89
+        Me.tbcntrRg.TabIndex = 90
        '
        'TabPage1
        '
@@ -1720,7 +1722,7 @@ Partial Class frmNacherfassungNEU
        Me.Button3.Name = "Button3"
        Me.Button3.Padding = New System.Windows.Forms.Padding(0, 0, 5, 0)
        Me.Button3.Size = New System.Drawing.Size(146, 59)
-        Me.Button3.TabIndex = 88
+        Me.Button3.TabIndex = 89
        Me.Button3.Text = "zum Therefore-Akt"
        Me.Button3.TextAlign = System.Drawing.ContentAlignment.MiddleRight
        Me.Button3.UseVisualStyleBackColor = True
@@ -1731,7 +1733,7 @@ Partial Class frmNacherfassungNEU
        Me.txtT1Verzollungsadresse.Location = New System.Drawing.Point(115, 298)
        Me.txtT1Verzollungsadresse.Name = "txtT1Verzollungsadresse"
        Me.txtT1Verzollungsadresse.Size = New System.Drawing.Size(266, 68)
-        Me.txtT1Verzollungsadresse.TabIndex = 45
+        Me.txtT1Verzollungsadresse.TabIndex = 46
        Me.txtT1Verzollungsadresse.Text = ""
        '
        'pnlFiskal
@@ -1748,7 +1750,7 @@ Partial Class frmNacherfassungNEU
        Me.pnlFiskal.Location = New System.Drawing.Point(680, 374)
        Me.pnlFiskal.Name = "pnlFiskal"
        Me.pnlFiskal.Size = New System.Drawing.Size(195, 96)
-        Me.pnlFiskal.TabIndex = 55
+        Me.pnlFiskal.TabIndex = 56
        Me.pnlFiskal.Visible = False
        '
        'Label62
@@ -1899,7 +1901,7 @@ Partial Class frmNacherfassungNEU
        Me.lblErrWaehrung.Location = New System.Drawing.Point(523, 514)
        Me.lblErrWaehrung.Name = "lblErrWaehrung"
        Me.lblErrWaehrung.Size = New System.Drawing.Size(99, 13)
-        Me.lblErrWaehrung.TabIndex = 69
+        Me.lblErrWaehrung.TabIndex = 70
        Me.lblErrWaehrung.Text = "Währung angeben!"
        Me.lblErrWaehrung.Visible = False
        '
@@ -1923,7 +1925,30 @@ Partial Class frmNacherfassungNEU
        Me.Panel2.Location = New System.Drawing.Point(403, 655)
        Me.Panel2.Name = "Panel2"
        Me.Panel2.Size = New System.Drawing.Size(480, 144)
-        Me.Panel2.TabIndex = 91
+        Me.Panel2.TabIndex = 92
+        '
+        'Label64
+        '
+        Me.Label64.AutoSize = True
+        Me.Label64.ForeColor = System.Drawing.Color.Black
+        Me.Label64.Location = New System.Drawing.Point(245, 3)
+        Me.Label64.Name = "Label64"
+        Me.Label64.Size = New System.Drawing.Size(36, 13)
+        Me.Label64.TabIndex = 0
+        Me.Label64.Text = "Filiale:"
+        '
+        'cboAbklärungFiliale
+        '
+        Me.cboAbklärungFiliale._allowedValuesFreiText = Nothing
+        Me.cboAbklärungFiliale._allowFreiText = False
+        Me.cboAbklärungFiliale._value = ""
+        Me.cboAbklärungFiliale.DropDownWidth = 280
+        Me.cboAbklärungFiliale.Font = New System.Drawing.Font("Microsoft Tai Le", 10.0!)
+        Me.cboAbklärungFiliale.FormattingEnabled = True
+        Me.cboAbklärungFiliale.Location = New System.Drawing.Point(248, 19)
+        Me.cboAbklärungFiliale.Name = "cboAbklärungFiliale"
+        Me.cboAbklärungFiliale.Size = New System.Drawing.Size(63, 24)
+        Me.cboAbklärungFiliale.TabIndex = 3
        '
        'lblSachbearbeiterIch
        '
@@ -1932,7 +1957,7 @@ Partial Class frmNacherfassungNEU
        Me.lblSachbearbeiterIch.Location = New System.Drawing.Point(7, 88)
        Me.lblSachbearbeiterIch.Name = "lblSachbearbeiterIch"
        Me.lblSachbearbeiterIch.Size = New System.Drawing.Size(304, 13)
-        Me.lblSachbearbeiterIch.TabIndex = 6
+        Me.lblSachbearbeiterIch.TabIndex = 8
        Me.lblSachbearbeiterIch.TabStop = True
        Me.lblSachbearbeiterIch.Text = "XXX Eintragen"
        Me.lblSachbearbeiterIch.TextAlign = System.Drawing.ContentAlignment.TopRight
@@ -1946,7 +1971,7 @@ Partial Class frmNacherfassungNEU
        Me.Button1.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
        Me.Button1.Name = "Button1"
        Me.Button1.Size = New System.Drawing.Size(123, 27)
-        Me.Button1.TabIndex = 7
+        Me.Button1.TabIndex = 9
        Me.Button1.Text = "Vorkosten"
        Me.Button1.UseVisualStyleBackColor = True
        '
@@ -1960,7 +1985,7 @@ Partial Class frmNacherfassungNEU
        Me.btnOK.Name = "btnOK"
        Me.btnOK.Padding = New System.Windows.Forms.Padding(20, 0, 0, 0)
        Me.btnOK.Size = New System.Drawing.Size(146, 81)
-        Me.btnOK.TabIndex = 5
+        Me.btnOK.TabIndex = 7
        Me.btnOK.Text = "OK"
        Me.btnOK.UseVisualStyleBackColor = True
        '
@@ -1969,7 +1994,7 @@ Partial Class frmNacherfassungNEU
        Me.lblLastMa.Location = New System.Drawing.Point(131, 118)
        Me.lblLastMa.Name = "lblLastMa"
        Me.lblLastMa.Size = New System.Drawing.Size(180, 13)
-        Me.lblLastMa.TabIndex = 8
+        Me.lblLastMa.TabIndex = 10
        Me.lblLastMa.Text = "-"
        Me.lblLastMa.TextAlign = System.Drawing.ContentAlignment.TopRight
        '
@@ -1981,7 +2006,7 @@ Partial Class frmNacherfassungNEU
        Me.btnCancel.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
        Me.btnCancel.Name = "btnCancel"
        Me.btnCancel.Size = New System.Drawing.Size(146, 27)
-        Me.btnCancel.TabIndex = 9
+        Me.btnCancel.TabIndex = 11
        Me.btnCancel.Text = "Abbrechen"
        Me.btnCancel.UseVisualStyleBackColor = True
        '
@@ -1998,7 +2023,7 @@ Partial Class frmNacherfassungNEU
        Me.cboSachbearbeiter.Location = New System.Drawing.Point(6, 61)
        Me.cboSachbearbeiter.Name = "cboSachbearbeiter"
        Me.cboSachbearbeiter.Size = New System.Drawing.Size(305, 24)
-        Me.cboSachbearbeiter.TabIndex = 4
+        Me.cboSachbearbeiter.TabIndex = 6
        '
        'cboQuickStopMa
        '
@@ -2013,7 +2038,7 @@ Partial Class frmNacherfassungNEU
        Me.cboQuickStopMa.Location = New System.Drawing.Point(7, 19)
        Me.cboQuickStopMa.Name = "cboQuickStopMa"
        Me.cboQuickStopMa.Size = New System.Drawing.Size(242, 24)
-        Me.cboQuickStopMa.TabIndex = 1
+        Me.cboQuickStopMa.TabIndex = 2
        '
        'lblErrPruefAnzahl
        '
@@ -2022,7 +2047,7 @@ Partial Class frmNacherfassungNEU
        Me.lblErrPruefAnzahl.Location = New System.Drawing.Point(636, 342)
        Me.lblErrPruefAnzahl.Name = "lblErrPruefAnzahl"
        Me.lblErrPruefAnzahl.Size = New System.Drawing.Size(181, 13)
-        Me.lblErrPruefAnzahl.TabIndex = 48
+        Me.lblErrPruefAnzahl.TabIndex = 49
        Me.lblErrPruefAnzahl.Text = "Anzahl der Abfertigungen nicht ident!"
        Me.lblErrPruefAnzahl.Visible = False
        '
@@ -2145,7 +2170,7 @@ Partial Class frmNacherfassungNEU
        Me.txtEUFiskalEmpf.nurAktive = True
        Me.txtEUFiskalEmpf.searchActive = True
        Me.txtEUFiskalEmpf.Size = New System.Drawing.Size(21, 20)
-        Me.txtEUFiskalEmpf.TabIndex = 70
+        Me.txtEUFiskalEmpf.TabIndex = 71
        Me.txtEUFiskalEmpf.TIMER_SEARCH = True
        Me.txtEUFiskalEmpf.usrcntl = Nothing
        Me.txtEUFiskalEmpf.Visible = False
@@ -2309,7 +2334,7 @@ Partial Class frmNacherfassungNEU
        Me.txtZucker_Aufschub.MaxLines_Warning_Label = Nothing
        Me.txtZucker_Aufschub.Name = "txtZucker_Aufschub"
        Me.txtZucker_Aufschub.Size = New System.Drawing.Size(52, 20)
-        Me.txtZucker_Aufschub.TabIndex = 77
+        Me.txtZucker_Aufschub.TabIndex = 78
        Me.txtZucker_Aufschub.Visible = False
        '
        'txtZucker_Datum
@@ -2331,7 +2356,7 @@ Partial Class frmNacherfassungNEU
        Me.txtZucker_Datum.MaxLines_Warning_Label = Nothing
        Me.txtZucker_Datum.Name = "txtZucker_Datum"
        Me.txtZucker_Datum.Size = New System.Drawing.Size(64, 20)
-        Me.txtZucker_Datum.TabIndex = 76
+        Me.txtZucker_Datum.TabIndex = 77
        Me.txtZucker_Datum.Visible = False
        '
        'Label27
@@ -2340,7 +2365,7 @@ Partial Class frmNacherfassungNEU
        Me.Label27.Location = New System.Drawing.Point(338, 533)
        Me.Label27.Name = "Label27"
        Me.Label27.Size = New System.Drawing.Size(55, 13)
-        Me.Label27.TabIndex = 74
+        Me.Label27.TabIndex = 75
        Me.Label27.Text = "Aufschub:"
        Me.Label27.Visible = False
        '
@@ -2350,7 +2375,7 @@ Partial Class frmNacherfassungNEU
        Me.Label49.Location = New System.Drawing.Point(268, 533)
        Me.Label49.Name = "Label49"
        Me.Label49.Size = New System.Drawing.Size(41, 13)
-        Me.Label49.TabIndex = 73
+        Me.Label49.TabIndex = 74
        Me.Label49.Text = "Datum:"
        Me.Label49.Visible = False
        '
@@ -2374,7 +2399,7 @@ Partial Class frmNacherfassungNEU
        Me.txtZuckerMRN.MaxLines_Warning_Label = Nothing
        Me.txtZuckerMRN.Name = "txtZuckerMRN"
        Me.txtZuckerMRN.Size = New System.Drawing.Size(233, 20)
-        Me.txtZuckerMRN.TabIndex = 75
+        Me.txtZuckerMRN.TabIndex = 76
        Me.txtZuckerMRN.Visible = False
        '
        'MyLinkLabelVALUE3
@@ -2385,7 +2410,7 @@ Partial Class frmNacherfassungNEU
        Me.MyLinkLabelVALUE3.Location = New System.Drawing.Point(200, 572)
        Me.MyLinkLabelVALUE3.Name = "MyLinkLabelVALUE3"
        Me.MyLinkLabelVALUE3.Size = New System.Drawing.Size(65, 13)
-        Me.MyLinkLabelVALUE3.TabIndex = 79
+        Me.MyLinkLabelVALUE3.TabIndex = 80
        Me.MyLinkLabelVALUE3.TabStop = True
        Me.MyLinkLabelVALUE3.Text = "Eingabehilfe"
        Me.MyLinkLabelVALUE3.valuename = Nothing
@@ -2399,7 +2424,7 @@ Partial Class frmNacherfassungNEU
        Me.MyLinkLabelVALUE2.Location = New System.Drawing.Point(315, 473)
        Me.MyLinkLabelVALUE2.Name = "MyLinkLabelVALUE2"
        Me.MyLinkLabelVALUE2.Size = New System.Drawing.Size(65, 13)
-        Me.MyLinkLabelVALUE2.TabIndex = 58
+        Me.MyLinkLabelVALUE2.TabIndex = 59
        Me.MyLinkLabelVALUE2.TabStop = True
        Me.MyLinkLabelVALUE2.Text = "Eingabehilfe"
        Me.MyLinkLabelVALUE2.valuename = Nothing
@@ -2410,7 +2435,7 @@ Partial Class frmNacherfassungNEU
        Me.Label43.Location = New System.Drawing.Point(29, 533)
        Me.Label43.Name = "Label43"
        Me.Label43.Size = New System.Drawing.Size(72, 13)
-        Me.Label43.TabIndex = 72
+        Me.Label43.TabIndex = 73
        Me.Label43.Text = "Zucker-MRN:"
        Me.Label43.Visible = False
        '
@@ -2434,7 +2459,7 @@ Partial Class frmNacherfassungNEU
        Me.txtCRN.MaxLines_Warning_Label = Nothing
        Me.txtCRN.Name = "txtCRN"
        Me.txtCRN.Size = New System.Drawing.Size(365, 20)
-        Me.txtCRN.TabIndex = 61
+        Me.txtCRN.TabIndex = 62
        '
        'Label48
        '
@@ -2442,7 +2467,7 @@ Partial Class frmNacherfassungNEU
        Me.Label48.Location = New System.Drawing.Point(16, 473)
        Me.Label48.Name = "Label48"
        Me.Label48.Size = New System.Drawing.Size(120, 13)
-        Me.Label48.TabIndex = 57
+        Me.Label48.TabIndex = 58
        Me.Label48.Text = "CRN (Qualitätsnummer):"
        '
        'MyLinkLabelVALUE1
@@ -2453,7 +2478,7 @@ Partial Class frmNacherfassungNEU
        Me.MyLinkLabelVALUE1.Location = New System.Drawing.Point(161, 434)
        Me.MyLinkLabelVALUE1.Name = "MyLinkLabelVALUE1"
        Me.MyLinkLabelVALUE1.Size = New System.Drawing.Size(220, 13)
-        Me.MyLinkLabelVALUE1.TabIndex = 51
+        Me.MyLinkLabelVALUE1.TabIndex = 52
        Me.MyLinkLabelVALUE1.TabStop = True
        Me.MyLinkLabelVALUE1.Text = "Eingabehilfe Belegnummer (MRN/CRN/ATC)"
        Me.MyLinkLabelVALUE1.valuename = Nothing
@@ -2468,7 +2493,7 @@ Partial Class frmNacherfassungNEU
        Me.cbxWaehrung.Location = New System.Drawing.Point(526, 489)
        Me.cbxWaehrung.Name = "cbxWaehrung"
        Me.cbxWaehrung.Size = New System.Drawing.Size(54, 21)
-        Me.cbxWaehrung.TabIndex = 63
+        Me.cbxWaehrung.TabIndex = 64
        '
        'cboAuftraggeberOffert
        '
@@ -2541,7 +2566,7 @@ Partial Class frmNacherfassungNEU
        Me.txtRohmasse.MaxLines_Warning_Label = Nothing
        Me.txtRohmasse.Name = "txtRohmasse"
        Me.txtRohmasse.Size = New System.Drawing.Size(176, 20)
-        Me.txtRohmasse.TabIndex = 54
+        Me.txtRohmasse.TabIndex = 55
        '
        'txtZahlungsaufschub
        '
@@ -2562,7 +2587,7 @@ Partial Class frmNacherfassungNEU
        Me.txtZahlungsaufschub.MaxLines_Warning_Label = Nothing
        Me.txtZahlungsaufschub.Name = "txtZahlungsaufschub"
        Me.txtZahlungsaufschub.Size = New System.Drawing.Size(364, 20)
-        Me.txtZahlungsaufschub.TabIndex = 86
+        Me.txtZahlungsaufschub.TabIndex = 87
        '
        'txtAbsenderKdNr
        '
@@ -2626,7 +2651,7 @@ Partial Class frmNacherfassungNEU
        Me.txtBarzahlungsbetrag.MaxLines_Warning_Label = Nothing
        Me.txtBarzahlungsbetrag.Name = "txtBarzahlungsbetrag"
        Me.txtBarzahlungsbetrag.Size = New System.Drawing.Size(135, 20)
-        Me.txtBarzahlungsbetrag.TabIndex = 46
+        Me.txtBarzahlungsbetrag.TabIndex = 47
        '
        'txtFraechterKdNr
        '
@@ -2696,7 +2721,7 @@ Partial Class frmNacherfassungNEU
        Me.txtPackstuecke.Name = "txtPackstuecke"
        Me.txtPackstuecke.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
        Me.txtPackstuecke.Size = New System.Drawing.Size(473, 46)
-        Me.txtPackstuecke.TabIndex = 78
+        Me.txtPackstuecke.TabIndex = 79
        '
        'txtUmrechnungskurs
        '
@@ -2717,7 +2742,7 @@ Partial Class frmNacherfassungNEU
        Me.txtUmrechnungskurs.MaxLines_Warning_Label = Nothing
        Me.txtUmrechnungskurs.Name = "txtUmrechnungskurs"
        Me.txtUmrechnungskurs.Size = New System.Drawing.Size(92, 20)
-        Me.txtUmrechnungskurs.TabIndex = 64
+        Me.txtUmrechnungskurs.TabIndex = 65
        '
        'txtRechnungsbetrag
        '
@@ -2738,7 +2763,7 @@ Partial Class frmNacherfassungNEU
        Me.txtRechnungsbetrag.MaxLines_Warning_Label = Nothing
        Me.txtRechnungsbetrag.Name = "txtRechnungsbetrag"
        Me.txtRechnungsbetrag.Size = New System.Drawing.Size(116, 20)
-        Me.txtRechnungsbetrag.TabIndex = 62
+        Me.txtRechnungsbetrag.TabIndex = 63
        '
        'txtBemerkung
        '
@@ -2760,7 +2785,7 @@ Partial Class frmNacherfassungNEU
        Me.txtBemerkung.Multiline = True
        Me.txtBemerkung.Name = "txtBemerkung"
        Me.txtBemerkung.Size = New System.Drawing.Size(365, 82)
-        Me.txtBemerkung.TabIndex = 71
+        Me.txtBemerkung.TabIndex = 72
        '
        'txtEmpfaengerKdNr
        '
@@ -2805,7 +2830,7 @@ Partial Class frmNacherfassungNEU
        Me.txtVermerk.MaxLines_Warning_Label = Nothing
        Me.txtVermerk.Name = "txtVermerk"
        Me.txtVermerk.Size = New System.Drawing.Size(313, 20)
-        Me.txtVermerk.TabIndex = 83
+        Me.txtVermerk.TabIndex = 84
        '
        'txtErfassungsnummer
        '
@@ -2827,7 +2852,7 @@ Partial Class frmNacherfassungNEU
        Me.txtErfassungsnummer.MaxLines_Warning_Label = Nothing
        Me.txtErfassungsnummer.Name = "txtErfassungsnummer"
        Me.txtErfassungsnummer.Size = New System.Drawing.Size(313, 20)
-        Me.txtErfassungsnummer.TabIndex = 87
+        Me.txtErfassungsnummer.TabIndex = 88
        '
        'txtEndEmpfKdNr
        '
@@ -2872,7 +2897,7 @@ Partial Class frmNacherfassungNEU
        Me.txtBelegNummerZAT1T2.MaxLines_Warning_Label = Nothing
        Me.txtBelegNummerZAT1T2.Name = "txtBelegNummerZAT1T2"
        Me.txtBelegNummerZAT1T2.Size = New System.Drawing.Size(365, 20)
-        Me.txtBelegNummerZAT1T2.TabIndex = 53
+        Me.txtBelegNummerZAT1T2.TabIndex = 54
        '
        'pnlZOll
        '
@@ -3027,7 +3052,7 @@ Partial Class frmNacherfassungNEU
        Me.Label58.Location = New System.Drawing.Point(14, 301)
        Me.Label58.Name = "Label58"
        Me.Label58.Size = New System.Drawing.Size(102, 26)
-        Me.Label58.TabIndex = 42
+        Me.Label58.TabIndex = 43
        Me.Label58.Text = "NCTS-" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Gestellungsadresse:"
        '
        'Panel4
@@ -3049,7 +3074,7 @@ Partial Class frmNacherfassungNEU
        Me.Panel4.Location = New System.Drawing.Point(12, 374)
        Me.Panel4.Name = "Panel4"
        Me.Panel4.Size = New System.Drawing.Size(665, 52)
-        Me.Panel4.TabIndex = 49
+        Me.Panel4.TabIndex = 50
        '
        'Label63
        '
@@ -3057,7 +3082,7 @@ Partial Class frmNacherfassungNEU
        Me.Label63.Location = New System.Drawing.Point(604, 5)
        Me.Label63.Name = "Label63"
        Me.Label63.Size = New System.Drawing.Size(44, 13)
-        Me.Label63.TabIndex = 10
+        Me.Label63.TabIndex = 6
        Me.Label63.Text = "Grenze:"
        '
        'cboGrenze
@@ -3091,7 +3116,7 @@ Partial Class frmNacherfassungNEU
        Me.txtHandlingZuKassieren.MaxLines_Warning_Label = Nothing
        Me.txtHandlingZuKassieren.Name = "txtHandlingZuKassieren"
        Me.txtHandlingZuKassieren.Size = New System.Drawing.Size(123, 20)
-        Me.txtHandlingZuKassieren.TabIndex = 9
+        Me.txtHandlingZuKassieren.TabIndex = 10
        '
        'Label60
        '
@@ -3113,7 +3138,7 @@ Partial Class frmNacherfassungNEU
        Me.cboFilialeHandling.Location = New System.Drawing.Point(393, 21)
        Me.cboFilialeHandling.Name = "cboFilialeHandling"
        Me.cboFilialeHandling.Size = New System.Drawing.Size(80, 22)
-        Me.cboFilialeHandling.TabIndex = 8
+        Me.cboFilialeHandling.TabIndex = 9
        '
        'Label59
        '
@@ -3144,7 +3169,7 @@ Partial Class frmNacherfassungNEU
        Me.datAvisUhrzeit.Name = "datAvisUhrzeit"
        Me.datAvisUhrzeit.ShowCheckBox = True
        Me.datAvisUhrzeit.Size = New System.Drawing.Size(140, 20)
-        Me.datAvisUhrzeit.TabIndex = 7
+        Me.datAvisUhrzeit.TabIndex = 8
        Me.datAvisUhrzeit.Value = New Date(2016, 7, 6, 0, 0, 0, 0)
        '
        'MyTextBoxLKWKz
@@ -3167,7 +3192,7 @@ Partial Class frmNacherfassungNEU
        Me.MyTextBoxLKWKz.MaxLines_Warning_Label = Nothing
        Me.MyTextBoxLKWKz.Name = "MyTextBoxLKWKz"
        Me.MyTextBoxLKWKz.Size = New System.Drawing.Size(217, 20)
-        Me.MyTextBoxLKWKz.TabIndex = 6
+        Me.MyTextBoxLKWKz.TabIndex = 7
        '
        'txtLKWId
        '
@@ -3210,28 +3235,17 @@ Partial Class frmNacherfassungNEU
        Me.DataGridViewTextBoxColumn5.HeaderText = "Anzahl"
        Me.DataGridViewTextBoxColumn5.Name = "DataGridViewTextBoxColumn5"
        '
-        'cboAbklärungFiliale
+        'Button4
        '
-        Me.cboAbklärungFiliale._allowedValuesFreiText = Nothing
-        Me.cboAbklärungFiliale._allowFreiText = False
-        Me.cboAbklärungFiliale._value = ""
-        Me.cboAbklärungFiliale.DropDownWidth = 280
-        Me.cboAbklärungFiliale.Font = New System.Drawing.Font("Microsoft Tai Le", 10.0!)
-        Me.cboAbklärungFiliale.FormattingEnabled = True
-        Me.cboAbklärungFiliale.Location = New System.Drawing.Point(248, 19)
-        Me.cboAbklärungFiliale.Name = "cboAbklärungFiliale"
-        Me.cboAbklärungFiliale.Size = New System.Drawing.Size(63, 24)
-        Me.cboAbklärungFiliale.TabIndex = 12
-        '
-        'Label64
-        '
-        Me.Label64.AutoSize = True
-        Me.Label64.ForeColor = System.Drawing.Color.Black
-        Me.Label64.Location = New System.Drawing.Point(245, 3)
-        Me.Label64.Name = "Label64"
-        Me.Label64.Size = New System.Drawing.Size(36, 13)
-        Me.Label64.TabIndex = 13
-        Me.Label64.Text = "Filiale:"
+        Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button4.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+        Me.Button4.Location = New System.Drawing.Point(440, 265)
+        Me.Button4.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
+        Me.Button4.Name = "Button4"
+        Me.Button4.Size = New System.Drawing.Size(145, 27)
+        Me.Button4.TabIndex = 42
+        Me.Button4.Text = "Endempfänger Liste"
+        Me.Button4.UseVisualStyleBackColor = True
        '
        'frmNacherfassungNEU
        '
@@ -3468,4 +3482,5 @@ Partial Class frmNacherfassungNEU
    Public WithEvents cboGrenze As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents Label64 As Label
    Public WithEvents cboAbklärungFiliale As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Button4 As Button
 End Class
--- a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb
+++ b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb
@@ -97,7 +97,6 @@ Public Class frmNacherfassungNEU
            End If


-
            cboSachbearbeiter.Items.Clear()
            cboSachbearbeiter.fillWithSQL("SELECT  ID,/*cast(ID as nvarchar(3)) +' ' + Name as*/ Name FROM Personal WHERE [Status]<>'L' " & sbWhere & " and [SBSichtbar]=1  ORDER BY Name ", False, "FMZOLL", True)

@@ -210,7 +209,6 @@ Public Class frmNacherfassungNEU
        cboEmpfaengerOffert._value = SPEDITIONSBUCH.EmpfängerOffertenNr


-
        txtAuftraggeber.Text = SPEDITIONSBUCH.Vermittler
        If SPEDITIONSBUCH.VermittlerKundenNr > 0 Then txtAuftraggeber.KdNr = SPEDITIONSBUCH.VermittlerKundenNr
        '  MsgBox("ABF: " & cboAuftraggeberOffert.Items.Count)
@@ -1518,4 +1516,22 @@ Public Class frmNacherfassungNEU
        txtCMRNr.Enabled = cbxCMR.Checked
        txtCMRDatum.Enabled = cbxCMR.Checked
    End Sub
+
+    Private Sub Button4_Click_2(sender As Object, e As EventArgs) Handles Button4.Click
+        '   SPEDITIONSBUCH.LOAD_VORKOSTEN()
+        Dim f As New frmNacherfassungEndEmpfaenger
+        f.FilialenNr = SPEDITIONSBUCH.FilialenNr
+        f.AbfertigungsNr = SPEDITIONSBUCH.AbfertigungsNr
+        f.UnterNr = SPEDITIONSBUCH.UnterNr
+
+        f.ENDEMPFAENGER = SPEDITIONSBUCH.ENDEMPFAENGER
+        If f.ShowDialog(Me) = Windows.Forms.DialogResult.OK Then
+            SPEDITIONSBUCH.ENDEMPFAENGER = f.ENDEMPFAENGER
+            If SPEDITIONSBUCH.ENDEMPFAENGER.Count > 0 Then
+                txtEndEmpf.KdNr = SPEDITIONSBUCH.ENDEMPFAENGER(0).EndEmpfaengerKdNr
+            End If
+
+        End If
+
+    End Sub
 End Class
--- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb
+++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb
@@ -55,6 +55,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.dgvLKW = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.pnlOpt = New System.Windows.Forms.Panel()
        Me.pnlBerichte = New System.Windows.Forms.Panel()
+        Me.cboHandlingssatz = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Button20 = New System.Windows.Forms.Button()
        Me.Label46 = New System.Windows.Forms.Label()
        Me.Button19 = New System.Windows.Forms.Button()
@@ -172,7 +173,8 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.Label45 = New System.Windows.Forms.Label()
        Me.cboFilialeHandling = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.SplitContainer = New System.Windows.Forms.SplitContainer()
-        Me.cboHandlingssatz = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Label47 = New System.Windows.Forms.Label()
+        Me.cboSB_TR = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cntxtCntxtSpeditionsbuch.SuspendLayout()
        Me.pnlRechts.SuspendLayout()
        CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -273,6 +275,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.kdtxtAuftraggeber._displayWoelflKd = False
        Me.kdtxtAuftraggeber._hideIfListEmpty = True
        Me.kdtxtAuftraggeber._loadKdData = False
+        Me.kdtxtAuftraggeber._UseFIRMA = ""
        Me.kdtxtAuftraggeber._ValueKdAndName = True
        Me.kdtxtAuftraggeber.dgvpos = "LEFT"
        Me.kdtxtAuftraggeber.KdName = ""
@@ -285,6 +288,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.kdtxtAuftraggeber.searchActive = True
        Me.kdtxtAuftraggeber.Size = New System.Drawing.Size(261, 20)
        Me.kdtxtAuftraggeber.TabIndex = 17
+        Me.kdtxtAuftraggeber.TIMER_SEARCH = True
        Me.kdtxtAuftraggeber.usrcntl = Nothing
        '
        'txtAuftraggeberKdnr
@@ -462,6 +466,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.kdtxtAvisierer._displayWoelflKd = False
        Me.kdtxtAvisierer._hideIfListEmpty = True
        Me.kdtxtAvisierer._loadKdData = False
+        Me.kdtxtAvisierer._UseFIRMA = ""
        Me.kdtxtAvisierer._ValueKdAndName = True
        Me.kdtxtAvisierer.dgvpos = "LEFT"
        Me.kdtxtAvisierer.KdName = ""
@@ -474,6 +479,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.kdtxtAvisierer.searchActive = True
        Me.kdtxtAvisierer.Size = New System.Drawing.Size(261, 20)
        Me.kdtxtAvisierer.TabIndex = 37
+        Me.kdtxtAvisierer.TIMER_SEARCH = True
        Me.kdtxtAvisierer.usrcntl = Nothing
        '
        'txtAvisiererKdNr
@@ -687,6 +693,18 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.pnlBerichte.TabIndex = 6
        Me.pnlBerichte.Visible = False
        '
+        'cboHandlingssatz
+        '
+        Me.cboHandlingssatz._allowedValuesFreiText = Nothing
+        Me.cboHandlingssatz._allowFreiText = False
+        Me.cboHandlingssatz._value = ""
+        Me.cboHandlingssatz.DropDownWidth = 300
+        Me.cboHandlingssatz.FormattingEnabled = True
+        Me.cboHandlingssatz.Location = New System.Drawing.Point(399, 137)
+        Me.cboHandlingssatz.Name = "cboHandlingssatz"
+        Me.cboHandlingssatz.Size = New System.Drawing.Size(159, 21)
+        Me.cboHandlingssatz.TabIndex = 60
+        '
        'Button20
        '
        Me.Button20.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -1351,6 +1369,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.kdtxtFrachtfuehrer._displayWoelflKd = False
        Me.kdtxtFrachtfuehrer._hideIfListEmpty = True
        Me.kdtxtFrachtfuehrer._loadKdData = False
+        Me.kdtxtFrachtfuehrer._UseFIRMA = ""
        Me.kdtxtFrachtfuehrer._ValueKdAndName = True
        Me.kdtxtFrachtfuehrer.dgvpos = "LEFT"
        Me.kdtxtFrachtfuehrer.KdName = ""
@@ -1363,6 +1382,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.kdtxtFrachtfuehrer.searchActive = True
        Me.kdtxtFrachtfuehrer.Size = New System.Drawing.Size(261, 20)
        Me.kdtxtFrachtfuehrer.TabIndex = 22
+        Me.kdtxtFrachtfuehrer.TIMER_SEARCH = True
        Me.kdtxtFrachtfuehrer.usrcntl = Nothing
        '
        'cboSB_Qs
@@ -1376,7 +1396,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.cboSB_Qs.FormattingEnabled = True
        Me.cboSB_Qs.Location = New System.Drawing.Point(738, 58)
        Me.cboSB_Qs.Name = "cboSB_Qs"
-        Me.cboSB_Qs.Size = New System.Drawing.Size(241, 24)
+        Me.cboSB_Qs.Size = New System.Drawing.Size(117, 24)
        Me.cboSB_Qs.TabIndex = 27
        '
        'txtAbfertDat
@@ -1437,7 +1457,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.cboSachbearbeiter.FormattingEnabled = True
        Me.cboSachbearbeiter.Location = New System.Drawing.Point(738, 31)
        Me.cboSachbearbeiter.Name = "cboSachbearbeiter"
-        Me.cboSachbearbeiter.Size = New System.Drawing.Size(241, 24)
+        Me.cboSachbearbeiter.Size = New System.Drawing.Size(268, 24)
        Me.cboSachbearbeiter.TabIndex = 26
        '
        'cboFiliale
@@ -1601,6 +1621,8 @@ Partial Class usrCntlSpeditionsBuchSuche
        '
        'SplitContainer1.Panel1
        '
+        Me.SplitContainer1.Panel1.Controls.Add(Me.cboSB_TR)
+        Me.SplitContainer1.Panel1.Controls.Add(Me.Label47)
        Me.SplitContainer1.Panel1.Controls.Add(Me.cboSB_Qs)
        Me.SplitContainer1.Panel1.Controls.Add(Me.txtAbfertDat)
        Me.SplitContainer1.Panel1.Controls.Add(Me.txtAbfertDatBis)
@@ -2044,6 +2066,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.kdtxtEmpfaenger._displayWoelflKd = False
        Me.kdtxtEmpfaenger._hideIfListEmpty = True
        Me.kdtxtEmpfaenger._loadKdData = False
+        Me.kdtxtEmpfaenger._UseFIRMA = ""
        Me.kdtxtEmpfaenger._ValueKdAndName = True
        Me.kdtxtEmpfaenger.dgvpos = "LEFT"
        Me.kdtxtEmpfaenger.KdName = ""
@@ -2056,6 +2079,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.kdtxtEmpfaenger.searchActive = True
        Me.kdtxtEmpfaenger.Size = New System.Drawing.Size(261, 20)
        Me.kdtxtEmpfaenger.TabIndex = 10
+        Me.kdtxtEmpfaenger.TIMER_SEARCH = True
        Me.kdtxtEmpfaenger.usrcntl = Nothing
        '
        'cbxFakturiert
@@ -2116,6 +2140,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.kdtxtEndempfaenger._displayWoelflKd = False
        Me.kdtxtEndempfaenger._hideIfListEmpty = True
        Me.kdtxtEndempfaenger._loadKdData = False
+        Me.kdtxtEndempfaenger._UseFIRMA = ""
        Me.kdtxtEndempfaenger._ValueKdAndName = True
        Me.kdtxtEndempfaenger.dgvpos = "LEFT"
        Me.kdtxtEndempfaenger.KdName = ""
@@ -2128,6 +2153,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.kdtxtEndempfaenger.searchActive = True
        Me.kdtxtEndempfaenger.Size = New System.Drawing.Size(261, 20)
        Me.kdtxtEndempfaenger.TabIndex = 28
+        Me.kdtxtEndempfaenger.TIMER_SEARCH = True
        Me.kdtxtEndempfaenger.usrcntl = Nothing
        '
        'cbxBar
@@ -2179,6 +2205,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.kdtxtAbsender._displayWoelflKd = False
        Me.kdtxtAbsender._hideIfListEmpty = True
        Me.kdtxtAbsender._loadKdData = False
+        Me.kdtxtAbsender._UseFIRMA = ""
        Me.kdtxtAbsender._ValueKdAndName = True
        Me.kdtxtAbsender.dgvpos = "LEFT"
        Me.kdtxtAbsender.KdName = ""
@@ -2191,6 +2218,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.kdtxtAbsender.searchActive = True
        Me.kdtxtAbsender.Size = New System.Drawing.Size(261, 20)
        Me.kdtxtAbsender.TabIndex = 6
+        Me.kdtxtAbsender.TIMER_SEARCH = True
        Me.kdtxtAbsender.usrcntl = Nothing
        '
        'txtFrachtfuehrerKdnr
@@ -2382,17 +2410,28 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.SplitContainer.SplitterWidth = 2
        Me.SplitContainer.TabIndex = 3
        '
-        'cboHandlingssatz
+        'Label47
        '
-        Me.cboHandlingssatz._allowedValuesFreiText = Nothing
-        Me.cboHandlingssatz._allowFreiText = False
-        Me.cboHandlingssatz._value = ""
-        Me.cboHandlingssatz.DropDownWidth = 300
-        Me.cboHandlingssatz.FormattingEnabled = True
-        Me.cboHandlingssatz.Location = New System.Drawing.Point(399, 137)
-        Me.cboHandlingssatz.Name = "cboHandlingssatz"
-        Me.cboHandlingssatz.Size = New System.Drawing.Size(159, 21)
-        Me.cboHandlingssatz.TabIndex = 60
+        Me.Label47.AutoSize = True
+        Me.Label47.Location = New System.Drawing.Point(858, 62)
+        Me.Label47.Name = "Label47"
+        Me.Label47.Size = New System.Drawing.Size(25, 13)
+        Me.Label47.TabIndex = 32
+        Me.Label47.Text = "TR:"
+        '
+        'cboSB_TR
+        '
+        Me.cboSB_TR._allowedValuesFreiText = Nothing
+        Me.cboSB_TR._allowFreiText = False
+        Me.cboSB_TR._value = ""
+        Me.cboSB_TR.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
+        Me.cboSB_TR.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
+        Me.cboSB_TR.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboSB_TR.FormattingEnabled = True
+        Me.cboSB_TR.Location = New System.Drawing.Point(889, 57)
+        Me.cboSB_TR.Name = "cboSB_TR"
+        Me.cboSB_TR.Size = New System.Drawing.Size(117, 24)
+        Me.cboSB_TR.TabIndex = 33
        '
        'usrCntlSpeditionsBuchSuche
        '
@@ -2586,4 +2625,6 @@ Partial Class usrCntlSpeditionsBuchSuche
    Friend WithEvents MyComboBox1 As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents lstFilialeHandling As VERAG_PROG_ALLGEMEIN.MyListBox
    Friend WithEvents cboHandlingssatz As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents cboSB_TR As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Label47 As Label
 End Class
--- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
+++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
@@ -277,6 +277,7 @@ Public Class usrCntlSpeditionsBuchSuche

        If cboSachbearbeiter._value <> "" Then sqlstr &= " AND [Personalnummer] = @Personalnummer "
        If cboSB_Qs._value <> "" Then sqlstr &= " AND [PersonalnummerQS] = @PersonalnummerQS "
+        If cboSB_TR._value <> "" Then sqlstr &= " AND [PersonalnummerAbklTR] = @PersonalnummerAbklTR "
        Return sqlstr
    End Function

@@ -322,6 +323,7 @@ Public Class usrCntlSpeditionsBuchSuche
        ' list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FilialeHandling", cboFilialeHandling._value))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Personalnummer", cboSachbearbeiter._value))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("PersonalnummerQS", cboSB_Qs._value))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("PersonalnummerAbklTR", cboSB_TR._value))
        Return list

    End Function
@@ -427,6 +429,7 @@ Public Class usrCntlSpeditionsBuchSuche
        lstGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("WAI", "WAI"))
        lstGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NKD", "NKD"))
        lstGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SUA", "SUA"))
+        lstGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMB", "AMB"))
        lstGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("???", "???"))


@@ -437,6 +440,7 @@ Public Class usrCntlSpeditionsBuchSuche
        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG"))
        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX"))
        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISPED"))
+        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "AMBAR"))
        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FRONTOFFICE", "FRONTOFFICE"))


@@ -446,6 +450,7 @@ Public Class usrCntlSpeditionsBuchSuche
        cboFilialeHandling.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG"))
        cboFilialeHandling.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX"))
        cboFilialeHandling.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISPED"))
+        cboFilialeHandling.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "AMBAR"))
        cboFilialeHandling.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FRONTOFFICE", "FRONTOFFICE"))


@@ -460,7 +465,10 @@ Public Class usrCntlSpeditionsBuchSuche
        End Select

        cboSB_Qs.fillWithSQL("SELECT [mit_id],[mit_vname] + ' '+ [mit_nname] as NAME " &
-                                  " FROM [ADMIN].[dbo].[tblMitarbeiter] WHERE mit_niederlassung IN ('SUB','Suben')  AND mit_abteilung='QS' AND [mit_gekuendigt]=0  " & where & "  order by name", False, "ADMIN", True)
+                                  " FROM [tblMitarbeiter] WHERE mit_niederlassung IN ('SUB','Suben')  AND mit_abteilung='QS' AND [mit_gekuendigt]=0  " & where & "  order by name", False, "ADMIN", True)
+
+        cboSB_TR.fillWithSQL("SELECT [mit_id],[mit_vname] + ' '+ [mit_nname] as NAME " &
+                                  " FROM [tblMitarbeiter] WHERE mit_firma IN ('VERIMEX') AND [mit_gekuendigt]=0 order by name", False, "ADMIN", True)
        Button4.PerformClick()

        cboRolle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Auftraggeber", "VermittlerKundenNr"))
--- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS.vb
+++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS.vb
@@ -170,6 +170,7 @@ Public Class usrCntlATLAS_NCTS
            Case "ATILLA" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "SUW"
            Case "UNISPED" : txtDyMandant.Text = "UNAT" : txtDyNiederlassung.Text = "ATSPED"
            Case "IMEX" : txtDyMandant.Text = "IMEX" : txtDyNiederlassung.Text = "IME"
+            Case "AMBAR" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "AMBWO"
        End Select


--- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/cDakosyInterface_Send.vb
+++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/cDakosyInterface_Send.vb
@@ -145,6 +145,8 @@ Class DAKOSY_Interface_SEND
            Select Case FIRMA_DY
                Case "ATILLA"
                    Return "SUW"
+                Case "AMBAR"
+                    Return "AMBWO"
                Case "VERAG"
                    Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_niederlassung
                        Case "SUB" : Return "SUB"
--- a/SDL/ZOLLSYSTEM/DAKOSY/Stammreferenz/frmDakosyStammreferenz.vb
+++ b/SDL/ZOLLSYSTEM/DAKOSY/Stammreferenz/frmDakosyStammreferenz.vb
@@ -43,6 +43,7 @@
            Case "ATILLA" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "SUW"
            Case "IMEX" : txtDyMandant.Text = "IMEX" : txtDyNiederlassung.Text = If(nl <> "", nl, "IME")
            Case "UNISPED" : txtDyMandant.Text = "UNAT" : txtDyNiederlassung.Text = "ATSP"
+            Case "AMBAR" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "AMBWO"
        End Select

        cboVerfahren.Items.Clear()
--- a/SDL/ZOLLSYSTEM/DAKOSY/Stammreferenz/frmDakosyStammreferenzVerwalten.vb
+++ b/SDL/ZOLLSYSTEM/DAKOSY/Stammreferenz/frmDakosyStammreferenzVerwalten.vb
@@ -240,6 +240,7 @@

            Case "ATIL"
                cboNL.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SUW", "SUW"))
+                cboNL.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBWO", "AMBWO"))
                cboNL.changeItem("SUW")
            Case "UNAT"
                cboNL.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATSP", "ATSP"))
--- a/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb
+++ b/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb
@@ -71,8 +71,10 @@
    Private Sub frmZollanmeldung_Load(sender As Object, e As EventArgs) Handles Me.Load
        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO") And FilialenNr = 5501 Then
            FIRMA_DY = "IMEX"
+        ElseIf FilialenNr = 5701 Then
+            FIRMA_DY = "AMBWO"
        Else
-            If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then
+                If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then

                If DY Is Nothing Then
                    '       '  FIRMA_DY = DY.
--- a/SDL/kunden/frmNeuerKunde.vb
+++ b/SDL/kunden/frmNeuerKunde.vb
@@ -126,6 +126,10 @@
            KUNDE.EORITIN = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtEORI.Text)
            KUNDE.EORITIN_NL = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtEORINL.Text)

+
+            Dim KUNDE_ERW As New VERAG_PROG_ALLGEMEIN.cKundenErweitert(kdnr)
+            KUNDE_ERW.kde_BesonderheitenNeu = 1
+
            Dim err = ""
            If Not ADRESSE.VALID(err) Then
                lblError.Text = err
@@ -142,6 +146,7 @@
                    lblError.Text = "FEHLER beim Eintragen in die Tabelle 'Kunden'!"
                    kdnr = -1 : Exit Sub
                End If
+                KUNDE_ERW.SAVE()
            Else
                lblError.Text = "FEHLER beim Eintragen in die Tabelle 'Adressen'!"
                kdnr = -1 : Exit Sub
--- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb
+++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb
@@ -22,16 +22,16 @@ Partial Class usrcntlKundeBearbeitenFull
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Me.tbcntrDetails = New System.Windows.Forms.TabControl()
        Me.tbAbfertigung = New System.Windows.Forms.TabPage()
        Me.cboFremdspedition = New VERAG_PROG_ALLGEMEIN.MyComboBox()
@@ -82,6 +82,8 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.tbFiskal = New System.Windows.Forms.TabPage()
        Me.UsrCntlKundeFiskaldaten1 = New SDL.usrCntlKundeFiskaldaten()
        Me.tbVerrechnung = New System.Windows.Forms.TabPage()
+        Me.Label93 = New System.Windows.Forms.Label()
+        Me.txtDebKdNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.cbxAutoFakturierung = New System.Windows.Forms.CheckBox()
        Me.txtAbf_Zahlungsziel3 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.txtAbf_Zahlungsziel2 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -300,8 +302,7 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cbxFiBu = New System.Windows.Forms.CheckBox()
        Me.cbxFiBuLG = New System.Windows.Forms.CheckBox()
-        Me.Label93 = New System.Windows.Forms.Label()
-        Me.txtDebKdNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.cbxVeranlagungskunde = New System.Windows.Forms.CheckBox()
        Me.tbcntrDetails.SuspendLayout()
        Me.tbAbfertigung.SuspendLayout()
        Me.tbcntrAbf.SuspendLayout()
@@ -962,6 +963,7 @@ Partial Class usrcntlKundeBearbeitenFull
        '
        'tbVerrechnung
        '
+        Me.tbVerrechnung.Controls.Add(Me.cbxVeranlagungskunde)
        Me.tbVerrechnung.Controls.Add(Me.Label93)
        Me.tbVerrechnung.Controls.Add(Me.txtDebKdNr)
        Me.tbVerrechnung.Controls.Add(Me.cbxAutoFakturierung)
@@ -1006,6 +1008,38 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.tbVerrechnung.Text = "Verrechnung"
        Me.tbVerrechnung.UseVisualStyleBackColor = True
        '
+        'Label93
+        '
+        Me.Label93.AutoSize = True
+        Me.Label93.Location = New System.Drawing.Point(12, 23)
+        Me.Label93.Name = "Label93"
+        Me.Label93.Size = New System.Drawing.Size(110, 13)
+        Me.Label93.TabIndex = 32
+        Me.Label93.Text = "Debitoren-KundenNr.:"
+        '
+        'txtDebKdNr
+        '
+        Me.txtDebKdNr._DateTimeOnly = False
+        Me.txtDebKdNr._numbersOnly = True
+        Me.txtDebKdNr._numbersOnlyKommastellen = ""
+        Me.txtDebKdNr._Prozent = False
+        Me.txtDebKdNr._ShortDateNew = False
+        Me.txtDebKdNr._ShortDateOnly = False
+        Me.txtDebKdNr._TimeOnly = False
+        Me.txtDebKdNr._value = ""
+        Me.txtDebKdNr._Waehrung = False
+        Me.txtDebKdNr._WaehrungZeichen = False
+        Me.txtDebKdNr.ForeColor = System.Drawing.Color.Red
+        Me.txtDebKdNr.Location = New System.Drawing.Point(125, 20)
+        Me.txtDebKdNr.MaxLength = 10
+        Me.txtDebKdNr.MaxLineLength = -1
+        Me.txtDebKdNr.MaxLines_Warning = ""
+        Me.txtDebKdNr.MaxLines_Warning_Label = Nothing
+        Me.txtDebKdNr.Name = "txtDebKdNr"
+        Me.txtDebKdNr.Size = New System.Drawing.Size(86, 20)
+        Me.txtDebKdNr.TabIndex = 33
+        Me.txtDebKdNr.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+        '
        'cbxAutoFakturierung
        '
        Me.cbxAutoFakturierung.AutoSize = True
@@ -2316,8 +2350,8 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.dgvUmsatzbericht.AllowUserToDeleteRows = False
        Me.dgvUmsatzbericht.AllowUserToOrderColumns = True
        Me.dgvUmsatzbericht.AllowUserToResizeRows = False
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        DataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11
        Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White
        Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvUmsatzbericht.Location = New System.Drawing.Point(6, 25)
@@ -2414,8 +2448,8 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.dgvOffenePosten.AllowUserToDeleteRows = False
        Me.dgvOffenePosten.AllowUserToOrderColumns = True
        Me.dgvOffenePosten.AllowUserToResizeRows = False
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle12
        Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White
        Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvOffenePosten.Location = New System.Drawing.Point(6, 38)
@@ -2571,41 +2605,41 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.dgvKreditkarten.AllowUserToDeleteRows = False
        Me.dgvKreditkarten.AllowUserToOrderColumns = True
        Me.dgvKreditkarten.AllowUserToResizeRows = False
-        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
+        DataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle13
        Me.dgvKreditkarten.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
+        DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle14
        Me.dgvKreditkarten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle5
+        DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle15
        Me.dgvKreditkarten.Location = New System.Drawing.Point(9, 20)
        Me.dgvKreditkarten.MultiSelect = False
        Me.dgvKreditkarten.Name = "dgvKreditkarten"
        Me.dgvKreditkarten.ReadOnly = True
-        DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle6
+        DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle16
        Me.dgvKreditkarten.RowHeadersVisible = False
-        DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle7
+        DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle17
        Me.dgvKreditkarten.RowTemplate.DefaultCellStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.dgvKreditkarten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
        Me.dgvKreditkarten.Size = New System.Drawing.Size(642, 312)
@@ -2743,8 +2777,8 @@ Partial Class usrcntlKundeBearbeitenFull
        '
        'dgvUstv_LaenderUndSteuernummern
        '
-        DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8
+        DataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle18
        Me.dgvUstv_LaenderUndSteuernummern.BackgroundColor = System.Drawing.Color.White
        Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvUstv_LaenderUndSteuernummern.Location = New System.Drawing.Point(9, 94)
@@ -2957,8 +2991,8 @@ Partial Class usrcntlKundeBearbeitenFull
        'dgvSonst_IDSKunden
        '
        Me.dgvSonst_IDSKunden.AllowUserToResizeRows = False
-        DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
+        DataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle19
        Me.dgvSonst_IDSKunden.BackgroundColor = System.Drawing.Color.White
        Me.dgvSonst_IDSKunden.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvSonst_IDSKunden.Location = New System.Drawing.Point(9, 251)
@@ -3161,8 +3195,8 @@ Partial Class usrcntlKundeBearbeitenFull
        'DataGridView1
        '
        Me.DataGridView1.AllowUserToResizeRows = False
-        DataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10
+        DataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle20
        Me.DataGridView1.BackgroundColor = System.Drawing.Color.White
        Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.DataGridView1.Enabled = False
@@ -3990,37 +4024,16 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.cbxFiBuLG.UseVisualStyleBackColor = True
        Me.cbxFiBuLG.Visible = False
        '
-        'Label93
+        'cbxVeranlagungskunde
        '
-        Me.Label93.AutoSize = True
-        Me.Label93.Location = New System.Drawing.Point(12, 23)
-        Me.Label93.Name = "Label93"
-        Me.Label93.Size = New System.Drawing.Size(110, 13)
-        Me.Label93.TabIndex = 32
-        Me.Label93.Text = "Debitoren-KundenNr.:"
-        '
-        'txtDebKdNr
-        '
-        Me.txtDebKdNr._DateTimeOnly = False
-        Me.txtDebKdNr._numbersOnly = True
-        Me.txtDebKdNr._numbersOnlyKommastellen = ""
-        Me.txtDebKdNr._Prozent = False
-        Me.txtDebKdNr._ShortDateNew = False
-        Me.txtDebKdNr._ShortDateOnly = False
-        Me.txtDebKdNr._TimeOnly = False
-        Me.txtDebKdNr._value = ""
-        Me.txtDebKdNr._Waehrung = False
-        Me.txtDebKdNr._WaehrungZeichen = False
-        Me.txtDebKdNr.ForeColor = System.Drawing.Color.Red
-        Me.txtDebKdNr.Location = New System.Drawing.Point(125, 20)
-        Me.txtDebKdNr.MaxLength = 10
-        Me.txtDebKdNr.MaxLineLength = -1
-        Me.txtDebKdNr.MaxLines_Warning = ""
-        Me.txtDebKdNr.MaxLines_Warning_Label = Nothing
-        Me.txtDebKdNr.Name = "txtDebKdNr"
-        Me.txtDebKdNr.Size = New System.Drawing.Size(86, 20)
-        Me.txtDebKdNr.TabIndex = 33
-        Me.txtDebKdNr.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+        Me.cbxVeranlagungskunde.AutoSize = True
+        Me.cbxVeranlagungskunde.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cbxVeranlagungskunde.Location = New System.Drawing.Point(417, 198)
+        Me.cbxVeranlagungskunde.Name = "cbxVeranlagungskunde"
+        Me.cbxVeranlagungskunde.Size = New System.Drawing.Size(121, 17)
+        Me.cbxVeranlagungskunde.TabIndex = 34
+        Me.cbxVeranlagungskunde.Text = "Veranlagungskunde"
+        Me.cbxVeranlagungskunde.UseVisualStyleBackColor = True
        '
        'usrcntlKundeBearbeitenFull
        '
@@ -4375,4 +4388,5 @@ Partial Class usrcntlKundeBearbeitenFull
    Friend WithEvents cbxVerzolltBei As CheckBox
    Friend WithEvents Label93 As Label
    Friend WithEvents txtDebKdNr As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents cbxVeranlagungskunde As CheckBox
 End Class
--- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb
+++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb
@@ -54,7 +54,7 @@ Public Class usrcntlKundeBearbeitenFull
        End Select

        If ADRESSE.AdressenNr <= 0 Then
-
+            KUNDE_ERW.kde_BesonderheitenNeu = 1
            cboKundenkreis.Items.Clear()
            If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Then
                cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  500000-599999: EV - Kunden", "500000-599999"))
@@ -273,6 +273,7 @@ Public Class usrcntlKundeBearbeitenFull

        cbxDepot.Checked = KUNDE_ERW.Depot_Kunde
        cbxAutoFakturierung.Checked = KUNDE_ERW.AutoFakturierung
+        cbxVeranlagungskunde.Checked = KUNDE_ERW.Veranlagungskunde


        txtVERAG_Schnittstellen_ID.Text = If(KUNDE_ERW.kde_VERAG_INTERFACE_ID, "")
@@ -533,6 +534,7 @@ Public Class usrcntlKundeBearbeitenFull

        KUNDE_ERW.Depot_Kunde = cbxDepot.Checked
        KUNDE_ERW.AutoFakturierung = cbxAutoFakturierung.Checked
+        KUNDE_ERW.Veranlagungskunde = cbxVeranlagungskunde.Checked
        KUNDE_ERW.kde_VERAG_INTERFACE_ID = isLeerNothing(txtVERAG_Schnittstellen_ID.Text)
        KUNDE_ERW.kde_BesonderheitenNeu = cbxBesonderheitenNEU.Checked

@@ -684,6 +686,7 @@ Public Class usrcntlKundeBearbeitenFull
                cboFiliale.changeItem("5601")
            Case "AMBAR"
                cboFiliale.changeItem("5701")
+                MsgBox("AMBAR")
            Case "ATILLA"
                cboFiliale.changeItem("4801")
            Case Else
@@ -1114,6 +1117,7 @@ Public Class usrcntlKundeBearbeitenFull
            Select Case cboKundenkreis._value
                Case "1000000-1099990" : cbxFiBu.Checked = True : cboFirma.changeItem("20") : cboFiliale.changeItem("5501")
                Case "2000000-2099990" : cbxFiBu.Checked = True : cboFirma.changeItem("21") : cboFiliale.changeItem("5601")
+                Case "3000000-3099990" : cbxFiBu.Checked = True : cboFirma.changeItem("24") : cboFiliale.changeItem("5701")
                Case "728000-799999" : cbxFiBu.Checked = True : cboFirma.changeItem("1") : cboFiliale.changeItem("4803")
                Case "30000-49999" : cbxFiBu.Checked = True : cboFirma.changeItem("11") : cboFiliale.changeItem("4803")
                Case "500000-599999" : cbxFiBu.Checked = True : cboFirma.changeItem("1") : cboFiliale.changeItem("4803")
@@ -1175,6 +1179,12 @@ Public Class usrcntlKundeBearbeitenFull
                        cboFirma._value = 20
                        selCheck = True
                    End If
+                Case "AMBAR"
+                    If cboFiliale._value = "5701" Then
+                        selCheck = False
+                        cboFirma._value = 24
+                        selCheck = True
+                    End If
                Case "FRONTOFFICE"
                    If cboFiliale._value = "5801" Then
                        selCheck = False
--- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungPLOSE.vb
+++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungPLOSE.vb
@@ -54,12 +54,13 @@ Public Class usrCntlSDLLeistungPLOSE
        scanPIN.INIT(kdNr, KfzKennzeichen, "SDL_" & SDLNr, "HIST_" & History)

        initDataBinding()
-        boud = True
-
        If txtPLOSEKdNr.Text = "" Then
            getPartnerKdNrFromFMZOLL() ' Lädt die Partner-KdNr
            txtPLOSEKdNr.Text = PartnerKdNrFromFMZOLL.PLOSE_KundenNr
        End If
+
+        boud = True
+
        ' If txtMSEKdNr.Text = "" Then
        '  getPartnerKdNrFromFMZOLL() ' Lädt die Partner-KdNr
        ' txtMSEKdNr.Text = PartnerKdNrFromFMZOLL.MSEKundenNr
--- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_CZ.vb
+++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_CZ.vb
@@ -53,6 +53,7 @@ Public Class usrCntlSDLLeistungenPLOSE_CZ

        initDataBinding()
        boud = True
+
        If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_Leistungen_bearbeiten", Me.FindForm) Then
            cProgramFunctions.setControlReadOnly(Me)
        End If
--- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_IT.vb
+++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_IT.vb
@@ -47,13 +47,13 @@ Public Class usrCntlSDLLeistungenPLOSE_IT
        scanSonstiges.INIT(kdNr, KfzKennzeichen, "SDL_" & SDLNr, "HIST_" & History)

        initDataBinding()
-        boud = True


        If txtPLOSEKdNr.Text = "" Then
            getPartnerKdNrFromFMZOLL() ' Lädt die Partner-KdNr
            txtPLOSEKdNr.Text = PartnerKdNrFromFMZOLL.PLOSE_KundenNr
        End If
+        boud = True

        If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_Leistungen_bearbeiten", Me.FindForm) Then
            cProgramFunctions.setControlReadOnly(Me)
--- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenUTA.vb
+++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenUTA.vb
@@ -47,12 +47,12 @@ Public Class usrCntlSDLLeistungenUTA
       scanSonstiges.INIT(kdNr, KfzKennzeichen, "SDL_" & SDLNr, "HIST_" & History)

        initDataBinding()
-        boud = True
-      
+
        If txtClientNr.Text = "" Then
            getPartnerKdNrFromFMZOLL() ' Lädt die Partner-KdNr
            txtClientNr.Text = PartnerKdNrFromFMZOLL.UTAKundenNr
        End If
+        boud = True

        If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_Leistungen_bearbeiten", Me.FindForm) Then
            cProgramFunctions.setControlReadOnly(Me)
--- a/SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.Designer.vb
+++ b/SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.Designer.vb
@@ -0,0 +1,228 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class usrCntlAuswertungenEV_Veranlagungen
+    Inherits System.Windows.Forms.UserControl
+
+    'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()>
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()>
+    Private Sub InitializeComponent()
+        Me.Label8 = New System.Windows.Forms.Label()
+        Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+        Me.txtJahr = New System.Windows.Forms.NumericUpDown()
+        Me.cboMonat = New System.Windows.Forms.ComboBox()
+        Me.Label77 = New System.Windows.Forms.Label()
+        Me.datAuswertBis = New System.Windows.Forms.DateTimePicker()
+        Me.Label78 = New System.Windows.Forms.Label()
+        Me.Label79 = New System.Windows.Forms.Label()
+        Me.Label80 = New System.Windows.Forms.Label()
+        Me.datAuswertVon = New System.Windows.Forms.DateTimePicker()
+        Me.Button3 = New System.Windows.Forms.Button()
+        Me.lblErr = New System.Windows.Forms.Label()
+        Me.Label14 = New System.Windows.Forms.Label()
+        Me.lblCnt = New System.Windows.Forms.Label()
+        Me.lblCnt2 = New System.Windows.Forms.Label()
+        Me.GroupBox2.SuspendLayout()
+        CType(Me.txtJahr, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SuspendLayout()
+        '
+        'Label8
+        '
+        Me.Label8.AutoSize = True
+        Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark
+        Me.Label8.Location = New System.Drawing.Point(3, 0)
+        Me.Label8.Name = "Label8"
+        Me.Label8.Size = New System.Drawing.Size(125, 17)
+        Me.Label8.TabIndex = 16
+        Me.Label8.Text = "EV Veranlagung"
+        '
+        'GroupBox2
+        '
+        Me.GroupBox2.Controls.Add(Me.lblCnt2)
+        Me.GroupBox2.Controls.Add(Me.txtJahr)
+        Me.GroupBox2.Controls.Add(Me.cboMonat)
+        Me.GroupBox2.Controls.Add(Me.Label77)
+        Me.GroupBox2.Controls.Add(Me.datAuswertBis)
+        Me.GroupBox2.Controls.Add(Me.Label78)
+        Me.GroupBox2.Controls.Add(Me.Label79)
+        Me.GroupBox2.Controls.Add(Me.Label80)
+        Me.GroupBox2.Controls.Add(Me.datAuswertVon)
+        Me.GroupBox2.Controls.Add(Me.Button3)
+        Me.GroupBox2.Controls.Add(Me.lblErr)
+        Me.GroupBox2.Controls.Add(Me.Label14)
+        Me.GroupBox2.Controls.Add(Me.lblCnt)
+        Me.GroupBox2.Location = New System.Drawing.Point(2, 11)
+        Me.GroupBox2.Name = "GroupBox2"
+        Me.GroupBox2.Size = New System.Drawing.Size(697, 86)
+        Me.GroupBox2.TabIndex = 15
+        Me.GroupBox2.TabStop = False
+        '
+        'txtJahr
+        '
+        Me.txtJahr.Location = New System.Drawing.Point(315, 37)
+        Me.txtJahr.Maximum = New Decimal(New Integer() {2050, 0, 0, 0})
+        Me.txtJahr.Minimum = New Decimal(New Integer() {1999, 0, 0, 0})
+        Me.txtJahr.Name = "txtJahr"
+        Me.txtJahr.Size = New System.Drawing.Size(48, 20)
+        Me.txtJahr.TabIndex = 40
+        Me.txtJahr.Value = New Decimal(New Integer() {2016, 0, 0, 0})
+        '
+        'cboMonat
+        '
+        Me.cboMonat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboMonat.FormattingEnabled = True
+        Me.cboMonat.Items.AddRange(New Object() {"", "Jänner", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"})
+        Me.cboMonat.Location = New System.Drawing.Point(186, 36)
+        Me.cboMonat.Name = "cboMonat"
+        Me.cboMonat.Size = New System.Drawing.Size(87, 21)
+        Me.cboMonat.TabIndex = 41
+        '
+        'Label77
+        '
+        Me.Label77.AutoSize = True
+        Me.Label77.Location = New System.Drawing.Point(569, 40)
+        Me.Label77.Name = "Label77"
+        Me.Label77.Size = New System.Drawing.Size(23, 13)
+        Me.Label77.TabIndex = 39
+        Me.Label77.Text = "bis:"
+        '
+        'datAuswertBis
+        '
+        Me.datAuswertBis.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
+        Me.datAuswertBis.Location = New System.Drawing.Point(598, 37)
+        Me.datAuswertBis.Name = "datAuswertBis"
+        Me.datAuswertBis.Size = New System.Drawing.Size(93, 20)
+        Me.datAuswertBis.TabIndex = 38
+        '
+        'Label78
+        '
+        Me.Label78.AutoSize = True
+        Me.Label78.Location = New System.Drawing.Point(279, 40)
+        Me.Label78.Name = "Label78"
+        Me.Label78.Size = New System.Drawing.Size(30, 13)
+        Me.Label78.TabIndex = 35
+        Me.Label78.Text = "Jahr:"
+        '
+        'Label79
+        '
+        Me.Label79.AutoSize = True
+        Me.Label79.Location = New System.Drawing.Point(145, 40)
+        Me.Label79.Name = "Label79"
+        Me.Label79.Size = New System.Drawing.Size(40, 13)
+        Me.Label79.TabIndex = 36
+        Me.Label79.Text = "Monat:"
+        '
+        'Label80
+        '
+        Me.Label80.AutoSize = True
+        Me.Label80.Location = New System.Drawing.Point(436, 40)
+        Me.Label80.Name = "Label80"
+        Me.Label80.Size = New System.Drawing.Size(28, 13)
+        Me.Label80.TabIndex = 37
+        Me.Label80.Text = "von:"
+        '
+        'datAuswertVon
+        '
+        Me.datAuswertVon.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
+        Me.datAuswertVon.Location = New System.Drawing.Point(470, 37)
+        Me.datAuswertVon.Name = "datAuswertVon"
+        Me.datAuswertVon.Size = New System.Drawing.Size(93, 20)
+        Me.datAuswertVon.TabIndex = 34
+        '
+        'Button3
+        '
+        Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button3.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.Button3.Location = New System.Drawing.Point(9, 16)
+        Me.Button3.Name = "Button3"
+        Me.Button3.Size = New System.Drawing.Size(121, 37)
+        Me.Button3.TabIndex = 33
+        Me.Button3.Text = "Excel-Auswertungen erstellen"
+        Me.Button3.UseVisualStyleBackColor = True
+        '
+        'lblErr
+        '
+        Me.lblErr.AutoSize = True
+        Me.lblErr.ForeColor = System.Drawing.Color.Red
+        Me.lblErr.Location = New System.Drawing.Point(6, 56)
+        Me.lblErr.Name = "lblErr"
+        Me.lblErr.Size = New System.Drawing.Size(69, 13)
+        Me.lblErr.TabIndex = 13
+        Me.lblErr.Text = "Keine Daten!"
+        Me.lblErr.Visible = False
+        '
+        'Label14
+        '
+        Me.Label14.AutoSize = True
+        Me.Label14.Location = New System.Drawing.Point(145, 16)
+        Me.Label14.Name = "Label14"
+        Me.Label14.Size = New System.Drawing.Size(222, 13)
+        Me.Label14.TabIndex = 5
+        Me.Label14.Text = "Erstellt Excel Dateien für dei EV Veranlagung."
+        '
+        'lblCnt
+        '
+        Me.lblCnt.Location = New System.Drawing.Point(52, 56)
+        Me.lblCnt.Name = "lblCnt"
+        Me.lblCnt.Size = New System.Drawing.Size(78, 13)
+        Me.lblCnt.TabIndex = 42
+        Me.lblCnt.Text = "99/99"
+        Me.lblCnt.TextAlign = System.Drawing.ContentAlignment.TopRight
+        '
+        'lblCnt2
+        '
+        Me.lblCnt2.Location = New System.Drawing.Point(52, 69)
+        Me.lblCnt2.Name = "lblCnt2"
+        Me.lblCnt2.Size = New System.Drawing.Size(78, 13)
+        Me.lblCnt2.TabIndex = 43
+        Me.lblCnt2.Text = "99/99"
+        Me.lblCnt2.TextAlign = System.Drawing.ContentAlignment.TopRight
+        '
+        'usrCntlAuswertungenEV_Veranlagungen
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.BackColor = System.Drawing.Color.White
+        Me.Controls.Add(Me.Label8)
+        Me.Controls.Add(Me.GroupBox2)
+        Me.Name = "usrCntlAuswertungenEV_Veranlagungen"
+        Me.Size = New System.Drawing.Size(708, 105)
+        Me.GroupBox2.ResumeLayout(False)
+        Me.GroupBox2.PerformLayout()
+        CType(Me.txtJahr, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+    Friend WithEvents Label8 As System.Windows.Forms.Label
+    Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox
+    Friend WithEvents lblErr As System.Windows.Forms.Label
+    Friend WithEvents Label14 As System.Windows.Forms.Label
+    Friend WithEvents Button3 As System.Windows.Forms.Button
+    Friend WithEvents txtJahr As NumericUpDown
+    Friend WithEvents cboMonat As ComboBox
+    Friend WithEvents Label77 As Label
+    Friend WithEvents datAuswertBis As DateTimePicker
+    Friend WithEvents Label78 As Label
+    Friend WithEvents Label79 As Label
+    Friend WithEvents Label80 As Label
+    Friend WithEvents datAuswertVon As DateTimePicker
+    Friend WithEvents lblCnt As Label
+    Friend WithEvents lblCnt2 As Label
+End Class
--- a/SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.resx
+++ b/SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
--- a/SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.vb
+++ b/SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.vb
@@ -0,0 +1,205 @@
+Imports System.IO
+
+Public Class usrCntlAuswertungenEV_Veranlagungen
+
+
+
+    Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+
+    Private Property rst As Object
+
+    Private Sub usrCntlBrgBuchungenFremd_Load(sender As Object, e As EventArgs) Handles Me.Load
+        'datVon.Value = CDate("01." & Now.AddMonths(-1).Month & "." & Now.AddMonths(-1).Year)
+        'datBis.Value = datVon.Value.AddMonths(1).AddDays(-1)
+
+        txtJahr.Value = Now.Year
+        cboMonat.SelectedIndex = Now.AddMonths(-1).Month
+
+        'datVon_NCTSTR.Value = Now
+        'datBis_NCTSTR.Value = Now.AddDays(3)
+        lblErr.Visible = False
+        lblCnt.Text = ""
+        lblCnt2.Text = ""
+    End Sub
+
+
+
+
+
+    Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
+        Try
+            Me.Cursor = Cursors.WaitCursor
+            lblCnt.Text = ""
+            lblCnt2.Text = ""
+            Dim dt As DataTable = SQL.loadDgvBySql("SELECT [kde_KundenNr]  FROM [tblKundenErweitert] INNER JOIN ADRESSEN on adressennr = kde_KundenNr WHERE [Veranlagungskunde]=1 and Auswahl='A' ", "FMZOLL")
+            If dt Is Nothing Then lblErr.Visible = True : Exit Sub
+            Dim folderpath = ""
+            Dim FolderBrowserDialog1 As New FolderBrowserDialog
+            If FolderBrowserDialog1.ShowDialog() = DialogResult.OK Then
+                folderpath = FolderBrowserDialog1.SelectedPath
+            End If
+
+            Dim cnt = 1
+            For Each r In dt.Rows
+                lblCnt.Text = cnt & "/ " & dt.Rows.Count
+                Me.Refresh()
+                genExcelKd(r("kde_KundenNr"), folderpath)
+                cnt += 1
+            Next
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
+        Me.Cursor = Cursors.Default
+    End Sub
+
+    Sub genExcelKd(KdNr, sPath)
+
+        Dim dt As DataTable = SQL.loadDgvBySql("SELECT [FilialenNr],[AbfertigungsNr],[UnterNr],Empfänger FROM [Speditionsbuch]  where EmpfängerKundenNr='" & KdNr & "'  and cast(Abfertigungsdatum as date) between '" & datAuswertVon.Value & "' and '" & datAuswertBis.Value & "' and Abfertigungsart=38 ORDER BY Abfertigungsdatum ", "FMZOLL")
+        If dt Is Nothing Then lblErr.Visible = True : Exit Sub
+        If dt.Rows.Count = 0 Then lblErr.Visible = True : Exit Sub
+        lblCnt2.Text = ""
+
+        'EXCEL
+        Try
+
+            'Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\SR\" ' My.Computer.FileSystem.GetTempFileName
+            'If Not My.Computer.FileSystem.DirectoryExists(sPath) Then
+            '    My.Computer.FileSystem.CreateDirectory(sPath)
+            'End If
+
+            Dim Path = ""
+            Dim exclApp As Object 'as Application
+            Dim Datei As Object 'as WorkBook
+            Dim Blatt As Object 'Microsoft.Office.Interop.Excel.Worksheet 'As Object 'as Worksheet
+            exclApp = CreateObject("Excel.Application")
+
+
+            Try
+                Path = sPath & "FA_Graz_" & AdjustPath(dt.Rows(0)("Empfänger")) & ".xlsx"
+                While System.IO.File.Exists(Path)
+                    Path = sPath & "FA_Graz_" & AdjustPath(dt.Rows(0)("Empfänger")) & "_" & Now.ToString("ddMMyyyyHHmmss") & ".xlsx"
+                End While
+                My.Computer.FileSystem.WriteAllBytes(Path, My.Resources.FA_Graz_EV_Veranlagung_Muster, False)
+
+
+            Catch ex As System.Exception
+                '  MsgBox(ex.Message)
+                MsgBox("ERROR 01: " & ex.Message & vbNewLine & ex.StackTrace)
+                Exit Sub
+            End Try
+
+            With exclApp
+                .Visible = False
+                Datei = .Workbooks.Open(Path)
+                Blatt = Datei.Worksheets(1)
+
+                Blatt.Range("A2").Value = dt.Rows(0)("Empfänger") & "  /   Finanzamt Graz   " & datAuswertVon.Value.ToShortDateString & "-" & datAuswertBis.Value.ToShortDateString
+
+                Dim cnt = 8
+                Dim cnt_zeile = 1
+                For Each r In dt.Rows
+                    lblCnt2.Text = cnt_zeile & "/" & dt.Rows.Count
+                    Dim SPEDBUCH As New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch(r("FilialenNr"), r("AbfertigungsNr"), r("UnterNr"))
+                    If SPEDBUCH.hasEntry Then
+                        'LRN
+                        Dim BezugsNr = If(SPEDBUCH.AtlasBezNrEZA, "")
+                        If BezugsNr = "" Then BezugsNr = SPEDBUCH.FilialenNr & "/" & SPEDBUCH.AbfertigungsNr
+
+                        'Handelsrechnungen
+                        Dim handelsrechnungen = "" : Dim semi = ""
+                        For Each rg In SQL.DLookupArray("DRef", "[zsAnmGdsItemDocCerts] As DOC inner join zsAnmRefs As ANM On ANM.LizenzNr=DOC.LizenzNr And  ANM.OperatorID=DOC.OperatorID And  ANM.AnmID=DOC.AnmID", "(LRN = '" & BezugsNr & "') and DocCd IN ('N380','N325')", "EZOLL")
+                            handelsrechnungen &= semi & rg : semi = ","
+                        Next
+
+                        'EUST
+                        Dim EUST_Basis As Double = 0
+                        Dim EUST_5EV As Double = 0
+                        Dim dtEUST = SQL.loadDgvBySql("select sum(base) Base,sum(Amnt)Amnt FROM ztIMsgGdsItemDutyCalc as GDS inner join zzAktivitaet as AKT on GDS.OperatorID=AKT.OperatorID AND GDS.LizenzNr=AKT.LizenzNr AND GDS.IMsgID=AKT.IMsgID
+                                        inner join zsAnmRefs as ANM on ANM.LizenzNr=AKT.LizenzNr AND  ANM.OperatorID=AKT.OperatorID AND  ANM.AnmID=AKT.AnmID  
+                                        where  Ty IN ('5EV') and  LRN LIKE '" & BezugsNr & "' AND ErledigungsTypID LIKE 'F%'", "EZOLL")
+                        If dtEUST IsNot Nothing AndAlso dtEUST.Rows.Count >= 0 Then
+                            EUST_Basis = dtEUST(0)("Base")
+                            EUST_5EV = dtEUST(0)("Amnt")
+                        End If
+
+
+                        If SPEDBUCH.ENDEMPFAENGER.Count > 0 Then
+                            Dim cnt2 = 0
+                            For Each EEMPF In SPEDBUCH.ENDEMPFAENGER
+
+                                Blatt.Range("A" & cnt).EntireRow.Copy()
+                                Blatt.Range("A" & cnt).EntireRow.Insert(Microsoft.Office.Interop.Excel.XlDirection.xlDown)
+
+                                Blatt.Range("A" & cnt).Value = SPEDBUCH.FilialenNr & "/" & SPEDBUCH.AbfertigungsNr
+                                Blatt.Range("B" & cnt).Value = SPEDBUCH.Abfertigungsdatum
+                                Blatt.Range("C" & cnt).Value = handelsrechnungen
+
+                                If cnt2 = 0 Then 'Nur oberste Zeile je Abfertigung
+                                    Blatt.Range("D" & cnt).Value = EUST_Basis
+                                    Blatt.Range("E" & cnt).Value = EUST_5EV
+                                    'Blatt.Range("D" & cnt).Value = EUST_Basis.ToString("0.00")
+                                    'Blatt.Range("E" & cnt).Value = EUST_5EV.ToString("0.00")
+                                    'Blatt.Range("D" & cnt).Style.NumberFormat = "###,###,##0.00 €"
+                                    'Blatt.Range("E" & cnt).Style.NumberFormat = "###,###,##0.00 €"
+                                Else
+                                    Blatt.Range("D" & cnt).Value = "-"
+                                    Blatt.Range("E" & cnt).Value = "-"
+                                End If
+
+                                Blatt.Range("F" & cnt).Value = EEMPF.EndEmpfaenger
+                                Blatt.Range("G" & cnt).Value = If(EEMPF.UstIdKz, "") & If(EEMPF.UstIdNr, "")
+                                If EEMPF.Rechnungsbetrag IsNot Nothing AndAlso IsNumeric(EEMPF.Rechnungsbetrag) Then
+                                    Blatt.Range("H" & cnt).Value = CDbl(EEMPF.Rechnungsbetrag)
+                                    'Blatt.Range("H" & cnt).Value = CDbl(EEMPF.Rechnungsbetrag).ToString("0.00")
+                                    'Blatt.Range("H" & cnt).Style.NumberFormat = "###,###,##0.00 €"
+                                End If
+
+                                cnt += 1
+                                cnt2 += 1
+                                '+Zeile
+                            Next
+                        Else
+                            Blatt.Range("A" & cnt).EntireRow.Copy()
+                            Blatt.Range("A" & cnt).EntireRow.Insert(Microsoft.Office.Interop.Excel.XlDirection.xlDown)
+
+                            Blatt.Range("A" & cnt).Value = SPEDBUCH.FilialenNr & "/" & SPEDBUCH.AbfertigungsNr
+                            Blatt.Range("B" & cnt).Value = SPEDBUCH.Abfertigungsdatum
+
+                            Blatt.Range("C" & cnt).Value = handelsrechnungen
+                            Blatt.Range("D" & cnt).Value = EUST_Basis
+                            Blatt.Range("E" & cnt).Value = EUST_5EV
+                            'Blatt.Range("D" & cnt).Value = EUST_Basis.ToString("0.00")
+                            'Blatt.Range("E" & cnt).Value = EUST_5EV.ToString("0.00")
+                            'Blatt.Range("D" & cnt).Style.NumberFormat = "###,###,##0.00 €"
+                            'Blatt.Range("E" & cnt).Style.NumberFormat = "###,###,##0.00 €"
+
+                            cnt += 1
+                            '+Zeile
+                        End If
+
+
+
+                    End If
+                    cnt_zeile += 1
+                Next
+
+                Datei.Save
+                .Visible = True 'TEST
+            End With
+
+
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
+
+    End Sub
+    Private Function AdjustPath(Input As String) As String
+        Return System.Text.RegularExpressions.Regex.Replace(Input, "[\\/:*?""<>|]", String.Empty)
+    End Function
+    Private Sub Nctstr_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboMonat.SelectedIndexChanged, txtJahr.ValueChanged
+        If cboMonat.SelectedIndex <= 0 Then Exit Sub
+        Dim d As Date = CDate("01." & (cboMonat.SelectedIndex) & "." & txtJahr.Text)
+        datAuswertVon.Value = d
+        datAuswertBis.Value = d.AddMonths(1).AddDays(-1)
+    End Sub
+End Class
--- a/SDL/zoll/usrCntlBrgBuchungenFremd.vb
+++ b/SDL/zoll/usrCntlBrgBuchungenFremd.vb
@@ -56,7 +56,7 @@ Public Class usrCntlBrgBuchungenFremd
            sqlatr &= " WHERE nctsSA_GRN IN (" & cboBRG._value & ") and ncts_Status between 50 and 60  " ' CONVERT(date, ncts_Trans_DatumZeit ,104 )  BETWEEN '" & datVon.Value.ToShortDateString & "' AND '" & datBis.Value.ToShortDateString & "'"
            sqlatr &= where
            sqlatr &= "  AND    (SELECT COUNT(*) FROM [tblDakosy_Statusmeldungen] WHERE [dySt_dyId]=ncts_dyaAnmID AND  [dySt_status] = 50  AND	CONVERT(date, [dySt_ergZeitpunkt] ,104 ) BETWEEN '" & datVon.Value.ToShortDateString & "' AND '" & datBis.Value.ToShortDateString & "')>0 "
-            Dim dt As DataTable = SQL.loadDgvBySql(sqlatr, "FMZOLL")
+            Dim dt As DataTable = SQL.loadDgvBySql(sqlatr, "FMZOLL", 120)


            'Bei IMEX kein E-ZOLL
@@ -69,7 +69,7 @@ Public Class usrCntlBrgBuchungenFremd
                    sqlatr &= "  FROM vwVERAG_Zolaris_EZoll_NCTS_Datenübernahme_Eroeffnung "
                    sqlatr &= " WHERE GRN IN (" & cboBRG._value & ") and cast( AnmeldungsDatum as date)  BETWEEN '" & datVon.Value.ToShortDateString & "' AND '" & datBis.Value.ToShortDateString & "' "

-                    Dim dt2 As DataTable = SQL.loadDgvBySql(sqlatr, "EZOLL")
+                    Dim dt2 As DataTable = SQL.loadDgvBySql(sqlatr, "EZOLL", 120)

                    If dt Is Nothing Then
                        dt = dt2
--- a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb
+++ b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb
@@ -192,8 +192,13 @@ Partial Class usrCntlZOLLAuswertungen
        Me.datVonImex = New System.Windows.Forms.DateTimePicker()
        Me.Label43 = New System.Windows.Forms.Label()
        Me.TabPage2 = New System.Windows.Forms.TabPage()
+        Me.UsrCntlAuswertungenUIDPruefung1 = New SDL.usrCntlAuswertungenUIDPruefung()
+        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1 = New SDL.usrCntlAuswertungenKunden_Auftragsrueckgang()
        Me.TabPage3 = New System.Windows.Forms.TabPage()
+        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1 = New SDL.usrCntlAuswertungenFiskal_IntrastatMeldung()
+        Me.UsrCntlAuswertungenFiskalvertretung_42001 = New SDL.usrCntlAuswertungenFiskalvertretung_4200()
        Me.TabPage4 = New System.Windows.Forms.TabPage()
+        Me.UsrCntlAuswertungenAufschub_Abgabenliste1 = New SDL.usrCntlAuswertungenAufschub_Abgabenliste()
        Me.TabPage5 = New System.Windows.Forms.TabPage()
        Me.Label60 = New System.Windows.Forms.Label()
        Me.PictureBox8 = New System.Windows.Forms.PictureBox()
@@ -215,11 +220,7 @@ Partial Class usrCntlZOLLAuswertungen
        Me.Label67 = New System.Windows.Forms.Label()
        Me.Button14 = New System.Windows.Forms.Button()
        Me.pnl = New System.Windows.Forms.Panel()
-        Me.UsrCntlAuswertungenUIDPruefung1 = New SDL.usrCntlAuswertungenUIDPruefung()
-        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1 = New SDL.usrCntlAuswertungenKunden_Auftragsrueckgang()
-        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1 = New SDL.usrCntlAuswertungenFiskal_IntrastatMeldung()
-        Me.UsrCntlAuswertungenFiskalvertretung_42001 = New SDL.usrCntlAuswertungenFiskalvertretung_4200()
-        Me.UsrCntlAuswertungenAufschub_Abgabenliste1 = New SDL.usrCntlAuswertungenAufschub_Abgabenliste()
+        Me.UsrCntlAuswertungenEV_Veranlagungen1 = New SDL.usrCntlAuswertungenEV_Veranlagungen()
        Me.GroupBox1.SuspendLayout()
        Me.GroupBox2.SuspendLayout()
        CType(Me.picDurmaz, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -1217,7 +1218,7 @@ Partial Class usrCntlZOLLAuswertungen
        Me.tbcntr.Location = New System.Drawing.Point(0, 57)
        Me.tbcntr.Name = "tbcntr"
        Me.tbcntr.SelectedIndex = 0
-        Me.tbcntr.Size = New System.Drawing.Size(660, 1529)
+        Me.tbcntr.Size = New System.Drawing.Size(626, 1529)
        Me.tbcntr.TabIndex = 22
        '
        'TabPage1
@@ -1255,7 +1256,7 @@ Partial Class usrCntlZOLLAuswertungen
        Me.TabPage1.Location = New System.Drawing.Point(4, 22)
        Me.TabPage1.Name = "TabPage1"
        Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage1.Size = New System.Drawing.Size(652, 1503)
+        Me.TabPage1.Size = New System.Drawing.Size(618, 1503)
        Me.TabPage1.TabIndex = 0
        Me.TabPage1.Text = "Bürgschaften"
        Me.TabPage1.UseVisualStyleBackColor = True
@@ -2065,33 +2066,76 @@ Partial Class usrCntlZOLLAuswertungen
        Me.TabPage2.Location = New System.Drawing.Point(4, 22)
        Me.TabPage2.Name = "TabPage2"
        Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage2.Size = New System.Drawing.Size(669, 1503)
+        Me.TabPage2.Size = New System.Drawing.Size(635, 1503)
        Me.TabPage2.TabIndex = 1
        Me.TabPage2.Text = "Kunden"
        Me.TabPage2.UseVisualStyleBackColor = True
        '
+        'UsrCntlAuswertungenUIDPruefung1
+        '
+        Me.UsrCntlAuswertungenUIDPruefung1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlAuswertungenUIDPruefung1.Location = New System.Drawing.Point(6, 259)
+        Me.UsrCntlAuswertungenUIDPruefung1.Name = "UsrCntlAuswertungenUIDPruefung1"
+        Me.UsrCntlAuswertungenUIDPruefung1.Size = New System.Drawing.Size(708, 176)
+        Me.UsrCntlAuswertungenUIDPruefung1.TabIndex = 1
+        '
+        'UsrCntlAuswertungenKunden_Auftragsrueckgang1
+        '
+        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Location = New System.Drawing.Point(6, 18)
+        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Name = "UsrCntlAuswertungenKunden_Auftragsrueckgang1"
+        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Size = New System.Drawing.Size(0, 235)
+        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.TabIndex = 0
+        '
        'TabPage3
        '
+        Me.TabPage3.Controls.Add(Me.UsrCntlAuswertungenEV_Veranlagungen1)
        Me.TabPage3.Controls.Add(Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1)
        Me.TabPage3.Controls.Add(Me.UsrCntlAuswertungenFiskalvertretung_42001)
        Me.TabPage3.Location = New System.Drawing.Point(4, 22)
        Me.TabPage3.Name = "TabPage3"
        Me.TabPage3.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage3.Size = New System.Drawing.Size(669, 1503)
+        Me.TabPage3.Size = New System.Drawing.Size(618, 1503)
        Me.TabPage3.TabIndex = 2
-        Me.TabPage3.Text = "Fiskalvertretung"
+        Me.TabPage3.Text = "Fiskalvertretung / EV-Veranlagung"
        Me.TabPage3.UseVisualStyleBackColor = True
        '
+        'UsrCntlAuswertungenFiskal_IntrastatMeldung1
+        '
+        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Location = New System.Drawing.Point(3, 327)
+        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Name = "UsrCntlAuswertungenFiskal_IntrastatMeldung1"
+        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Size = New System.Drawing.Size(708, 235)
+        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.TabIndex = 1
+        '
+        'UsrCntlAuswertungenFiskalvertretung_42001
+        '
+        Me.UsrCntlAuswertungenFiskalvertretung_42001.BackColor = System.Drawing.Color.White
+        Me.UsrCntlAuswertungenFiskalvertretung_42001.Location = New System.Drawing.Point(3, 22)
+        Me.UsrCntlAuswertungenFiskalvertretung_42001.Name = "UsrCntlAuswertungenFiskalvertretung_42001"
+        Me.UsrCntlAuswertungenFiskalvertretung_42001.Size = New System.Drawing.Size(708, 234)
+        Me.UsrCntlAuswertungenFiskalvertretung_42001.TabIndex = 0
+        '
        'TabPage4
        '
        Me.TabPage4.Controls.Add(Me.UsrCntlAuswertungenAufschub_Abgabenliste1)
        Me.TabPage4.Location = New System.Drawing.Point(4, 22)
        Me.TabPage4.Name = "TabPage4"
-        Me.TabPage4.Size = New System.Drawing.Size(669, 1503)
+        Me.TabPage4.Size = New System.Drawing.Size(635, 1503)
        Me.TabPage4.TabIndex = 3
        Me.TabPage4.Text = "Aufschubdaten"
        Me.TabPage4.UseVisualStyleBackColor = True
        '
+        'UsrCntlAuswertungenAufschub_Abgabenliste1
+        '
+        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Location = New System.Drawing.Point(3, 22)
+        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Name = "UsrCntlAuswertungenAufschub_Abgabenliste1"
+        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Size = New System.Drawing.Size(708, 180)
+        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.TabIndex = 0
+        '
        'TabPage5
        '
        Me.TabPage5.Controls.Add(Me.Label60)
@@ -2100,7 +2144,7 @@ Partial Class usrCntlZOLLAuswertungen
        Me.TabPage5.Location = New System.Drawing.Point(4, 22)
        Me.TabPage5.Name = "TabPage5"
        Me.TabPage5.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage5.Size = New System.Drawing.Size(669, 1503)
+        Me.TabPage5.Size = New System.Drawing.Size(635, 1503)
        Me.TabPage5.TabIndex = 4
        Me.TabPage5.Text = "UNISPED"
        Me.TabPage5.UseVisualStyleBackColor = True
@@ -2308,50 +2352,16 @@ Partial Class usrCntlZOLLAuswertungen
        Me.pnl.Dock = System.Windows.Forms.DockStyle.Top
        Me.pnl.Location = New System.Drawing.Point(0, 0)
        Me.pnl.Name = "pnl"
-        Me.pnl.Size = New System.Drawing.Size(660, 57)
+        Me.pnl.Size = New System.Drawing.Size(626, 57)
        Me.pnl.TabIndex = 23
        '
-        'UsrCntlAuswertungenUIDPruefung1
+        'UsrCntlAuswertungenEV_Veranlagungen1
        '
-        Me.UsrCntlAuswertungenUIDPruefung1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlAuswertungenUIDPruefung1.Location = New System.Drawing.Point(6, 259)
-        Me.UsrCntlAuswertungenUIDPruefung1.Name = "UsrCntlAuswertungenUIDPruefung1"
-        Me.UsrCntlAuswertungenUIDPruefung1.Size = New System.Drawing.Size(708, 176)
-        Me.UsrCntlAuswertungenUIDPruefung1.TabIndex = 1
-        '
-        'UsrCntlAuswertungenKunden_Auftragsrueckgang1
-        '
-        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Location = New System.Drawing.Point(6, 18)
-        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Name = "UsrCntlAuswertungenKunden_Auftragsrueckgang1"
-        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Size = New System.Drawing.Size(0, 235)
-        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.TabIndex = 0
-        '
-        'UsrCntlAuswertungenFiskal_IntrastatMeldung1
-        '
-        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Location = New System.Drawing.Point(3, 327)
-        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Name = "UsrCntlAuswertungenFiskal_IntrastatMeldung1"
-        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Size = New System.Drawing.Size(708, 235)
-        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.TabIndex = 1
-        '
-        'UsrCntlAuswertungenFiskalvertretung_42001
-        '
-        Me.UsrCntlAuswertungenFiskalvertretung_42001.BackColor = System.Drawing.Color.White
-        Me.UsrCntlAuswertungenFiskalvertretung_42001.Location = New System.Drawing.Point(3, 22)
-        Me.UsrCntlAuswertungenFiskalvertretung_42001.Name = "UsrCntlAuswertungenFiskalvertretung_42001"
-        Me.UsrCntlAuswertungenFiskalvertretung_42001.Size = New System.Drawing.Size(708, 234)
-        Me.UsrCntlAuswertungenFiskalvertretung_42001.TabIndex = 0
-        '
-        'UsrCntlAuswertungenAufschub_Abgabenliste1
-        '
-        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Location = New System.Drawing.Point(3, 22)
-        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Name = "UsrCntlAuswertungenAufschub_Abgabenliste1"
-        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Size = New System.Drawing.Size(708, 180)
-        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.TabIndex = 0
+        Me.UsrCntlAuswertungenEV_Veranlagungen1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlAuswertungenEV_Veranlagungen1.Location = New System.Drawing.Point(3, 568)
+        Me.UsrCntlAuswertungenEV_Veranlagungen1.Name = "UsrCntlAuswertungenEV_Veranlagungen1"
+        Me.UsrCntlAuswertungenEV_Veranlagungen1.Size = New System.Drawing.Size(708, 105)
+        Me.UsrCntlAuswertungenEV_Veranlagungen1.TabIndex = 2
        '
        'usrCntlZOLLAuswertungen
        '
@@ -2362,7 +2372,7 @@ Partial Class usrCntlZOLLAuswertungen
        Me.Controls.Add(Me.tbcntr)
        Me.Controls.Add(Me.pnl)
        Me.Name = "usrCntlZOLLAuswertungen"
-        Me.Size = New System.Drawing.Size(660, 926)
+        Me.Size = New System.Drawing.Size(626, 926)
        Me.GroupBox1.ResumeLayout(False)
        Me.GroupBox1.PerformLayout()
        Me.GroupBox2.ResumeLayout(False)
@@ -2613,4 +2623,5 @@ Partial Class usrCntlZOLLAuswertungen
    Friend WithEvents datAuswertVon_NCTSTR As DateTimePicker
    Friend WithEvents Label81 As Label
    Friend WithEvents Button19 As Button
+    Friend WithEvents UsrCntlAuswertungenEV_Veranlagungen1 As usrCntlAuswertungenEV_Veranlagungen
 End Class
--- a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte
+++ b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte
@@ -318,7 +318,7 @@ Public Class KdSearchBox
                SQLstr &= " AND (  "
                SQLstr &= "   Ordnungsbegriff LIKE '" & srch & "%'   " : If IsNumeric(srch) Then SQLstr &= "  OR AdressenNr LIKE '" & srch & "%'   "
                SQLstr &= "   ) "
-                If srch2 <> "" Then SQLstr &= " AND ( Adressen.PLZ LIKE '" & srch2 & "%' OR Adressen.Ort LIKE '" & srch2 & "%' OR Adressen.LandKz LIKE '" & srch2 & "%' OR Adressen.Straße LIKE '" & srch2 & "%' ) "
+                If srch2 <> "" Then SQLstr &= " AND (Filialen.Firma LIKE '" & srch2 & "%' OR ( Adressen.PLZ LIKE '" & srch2 & "%' OR Adressen.Ort LIKE '" & srch2 & "%' OR Adressen.LandKz LIKE '" & srch2 & "%' OR Adressen.Straße LIKE '" & srch2 & "%' )) "
                SQLstr &= "  AND [Auswahl]='A' "

                'If VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER <> "" Then
@@ -393,7 +393,7 @@ Public Class KdSearchBox
                SQLstr &= " AND (  "
                SQLstr &= "   Ordnungsbegriff LIKE '" & srch & "%'   " : If IsNumeric(srch) Then SQLstr &= "  OR AdressenNr LIKE '" & srch & "%'   "
                SQLstr &= "   ) "
-                If srch2 <> "" Then SQLstr &= " AND ( Adressen.PLZ LIKE '" & srch2 & "%' OR Adressen.Ort LIKE '" & srch2 & "%' OR Adressen.LandKz LIKE '" & srch2 & "%' OR Adressen.Straße LIKE '" & srch2 & "%' ) "
+                If srch2 <> "" Then SQLstr &= " AND (Filialen.Firma LIKE '" & srch2 & "%' OR ( Adressen.PLZ LIKE '" & srch2 & "%' OR Adressen.Ort LIKE '" & srch2 & "%' OR Adressen.LandKz LIKE '" & srch2 & "%' OR Adressen.Straße LIKE '" & srch2 & "%' )) "
                SQLstr &= "  AND [Auswahl]='I' "
                'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then 'Keine
                '    SQLstr &= "  AND isnull(Kunden.[FilialenNr],0) NOT IN ('5701') "
--- a/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb
@@ -508,6 +508,17 @@ Public Class SQL
    End Function


+    Function DLookupArray(srchField, table, where, Optional conn_art = "SDL") As List(Of String)
+        Dim list As New List(Of String)
+        Dim dt = loadDgvBySql("SELECT  " & srchField & "  FROM " & table & " WHERE " & where & "", conn_art)
+        If dt IsNot Nothing Then
+            For Each r As DataRow In dt.Rows
+                list.Add(r(srchField))
+            Next
+        End If
+        Return list
+    End Function
+

    Public Function getValueTxtBySql(ByVal sql As String, Optional conn_art As String = "SDL", Optional List As List(Of MyListItem2) = Nothing, Optional conn As SqlConnection = Nothing, Optional defaultReturn As Object = "") As String

--- a/VERAG_PROG_ALLGEMEIN/Classes/cKundenBesonderheiten.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cKundenBesonderheiten.vb
@@ -84,6 +84,12 @@ Public Class cKundenBesonderheiten
        End Try
    End Sub

+    Public Shared Function DELETE_ALL_KD(kdb_KundenNr As Integer) As Boolean
+        Dim SQL As New SQL
+        Dim sqlstr = " DELETE FROM tblKundenBesonderheiten  WHERE kdb_KundenNr=" & kdb_KundenNr
+        Return SQL.doSQL(sqlstr, "FMZOLL")
+    End Function
+


    Public Function getUpdateCmd() As String
--- a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb
@@ -48,6 +48,7 @@ Public Class cKundenErweitert
    Property kde_Inkasso_UebergebenAm As Object = Nothing
    Property kde_Inkasso_GemeldeterBetrag As Object = Nothing
    Property AutoFakturierung As Boolean = False
+    Property Veranlagungskunde As Boolean = False
    Property Anmerkungen_Warnhinweis As Object = Nothing
    Property kde_VERAG_INTERFACE_ID As Object = Nothing
    Property kde_BesonderheitenNeu As Boolean = False
@@ -104,6 +105,7 @@ Public Class cKundenErweitert
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Inkasso_UebergebenAm", kde_Inkasso_UebergebenAm))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Inkasso_GemeldeterBetrag", kde_Inkasso_GemeldeterBetrag))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("AutoFakturierung", AutoFakturierung))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Veranlagungskunde", Veranlagungskunde))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Anmerkungen_Warnhinweis", Anmerkungen_Warnhinweis))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_VERAG_INTERFACE_ID", kde_VERAG_INTERFACE_ID))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_BesonderheitenNeu", kde_BesonderheitenNeu))
--- a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb
@@ -349,6 +349,7 @@ Public Class cRechnungsausgang
    Public Function CHECK_Validation(ByRef errMsg As String) As Boolean
        If Firma_ID <= 0 Then errMsg = "ERROR: Firma auswählen!" : Return False
        If Rechnung_an = 0 OrElse CStr(Rechnung_an) = "" Then errMsg = "ERROR: Rechnungsempfänger auswählen!" : Return False
+        If SpeditionsbuchUnterNr Is Nothing Then errMsg = "ERROR: Speditionsbuch-UnterNr auswählen!" : Return False
        '   If Steuerschlüssel Then errMsg = "ERROR: Steuerschlüssel muss angegeben werden!" : Return False

        Return True
--- a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsnummern.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsnummern.vb
@@ -70,6 +70,17 @@ Public Class cRechnungsnummern
    End Function


+    Public Function CHECK_RGNR() As Integer ' Prüfung, ob RgNr schon vergeben wurde --> dann +1, bis freie Nr.
+        Dim increased = False
+        While SQL.DLookup("count(*)", "Rechnungsausgang", " RechnungsNr='" & LfdRechnungsNr & "' and Firma_ID='" & SpeditionsbuchNr & "' ", "FMZOLL", 0) > 0
+            LfdRechnungsNr += 1
+            increased = True
+        End While
+        If increased Then SAVE()
+        Return LfdRechnungsNr
+    End Function
+
+
    Public Function SAVE() As Boolean 'obj As Object, tablename As String, where As String) As Boolean
        Dim list As List(Of VERAG_PROG_ALLGEMEIN.MyListItem2) = getParameterList()

--- a/VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb
@@ -86,6 +86,9 @@ Public Class cSendungen
    Property VORSYSTEM_Id As Object = Nothing
    Property tblSnd_FilialeAbklaerung As Object = Nothing

+    Property tblSnd_AbklaerungTR As Object = Nothing
+    Property tblSnd_AbklaerungTR_MA As Object = Nothing
+

    Public saveSachbearbeiter As Boolean = False

@@ -272,6 +275,8 @@ Public Class cSendungen
                    Me.tblSnd_FilialeAbklaerung = SQL.checkNullReturnValue(dr.Item("tblSnd_FilialeAbklaerung"), Nothing)
                    Me.VORSYSTEM = SQL.checkNullReturnValue(dr.Item("VORSYSTEM"), Nothing)
                    Me.VORSYSTEM_Id = SQL.checkNullReturnValue(dr.Item("VORSYSTEM_Id"), Nothing)
+                    Me.tblSnd_AbklaerungTR = SQL.checkNullReturnValue(dr.Item("tblSnd_AbklaerungTR"), Nothing)
+                    Me.tblSnd_AbklaerungTR_MA = SQL.checkNullReturnValue(dr.Item("tblSnd_AbklaerungTR_MA"), Nothing)

                End If

@@ -442,6 +447,10 @@ Public Class cSendungen
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_FilialeAbklaerung", tblSnd_FilialeAbklaerung))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("VORSYSTEM", VORSYSTEM))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("VORSYSTEM_Id", VORSYSTEM_Id))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_AbklaerungTR", tblSnd_AbklaerungTR))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_AbklaerungTR_MA", tblSnd_AbklaerungTR_MA))
+
+


        Return list
--- a/VERAG_PROG_ALLGEMEIN/Classes/cSpeditionsbuch.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cSpeditionsbuch.vb
@@ -178,10 +178,12 @@ Public Class cSpeditionsbuch
    Property HandlingZuKassieren As Double = 0

    Property FilialenNrAbklaerung As Object = Nothing
+    Property PersonalnummerAbklTR As Object = Nothing


    Property UNTERPOS As New List(Of cSpeditionsbuchUnterPos)
    Property VORKOSTEN As New List(Of cVorkosten)
+    Property ENDEMPFAENGER As New List(Of cEndEmpfaener)

    Dim SQL As New SQL

@@ -233,7 +235,7 @@ Public Class cSpeditionsbuch
                       " commit tran "

        If SQL.doSQLVarList(sqlstr, "FMZOLL", , list) Then
-            If SAVE_VORKOSTEN() Then
+            If SAVE_VORKOSTEN() And SAVE_ENDEMPFAENGER() Then
                Return True
            End If
        End If
@@ -338,10 +340,12 @@ Public Class cSpeditionsbuch
                        Me.FilialenNrHandling = SQL.checkNullReturnValue(dr.Item("FilialenNrHandling"), Nothing)
                        Me.FilialenNrAbklaerung = SQL.checkNullReturnValue(dr.Item("FilialenNrAbklaerung"), Nothing)
                        Me.HandlingZuKassieren = SQL.checkNulDbl(dr.Item("HandlingZuKassieren"))
+                        Me.PersonalnummerAbklTR = SQL.checkNullReturnValue(dr.Item("PersonalnummerAbklTR"), Nothing)

                        Me.SB_CMRNr = SQL.checkNullReturnValue(dr.Item("SB_CMRNr"), Nothing)

                        LOAD_VORKOSTEN()
+                        LOAD_ENDEMPFAENGER()

                        Me.SB_Zeitstempel = SQL.checkNullDateNothing(dr.Item("SB_Zeitstempel"))

@@ -446,6 +450,7 @@ Public Class cSpeditionsbuch
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FilialenNrHandling", FilialenNrHandling))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FilialenNrAbklaerung", FilialenNrAbklaerung))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("HandlingZuKassieren", HandlingZuKassieren))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("PersonalnummerAbklTR", PersonalnummerAbklTR))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("SB_CMRNr", SB_CMRNr))


@@ -555,6 +560,44 @@ Public Class cSpeditionsbuch
            MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
        End Try
    End Sub
+
+    Public Sub LOAD_ENDEMPFAENGER()
+        Try
+            Dim conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
+
+            'Using cmd2 As New SqlCommand("SELECT * FROM tblSpeditionsbuchUnterPos INNER JOIN [Abfertigungsarten] ON sbup_Abfertigungsart=Abfertigungsart WHERE sbup_Filiale=@sbup_Filiale AND sbup_AbfertigungsNr=@sbup_AbfertigungsNr AND sbup_UnterNr=@sbup_UnterNr ", conn)
+            Using cmd2 As New SqlCommand("SELECT * FROM tblSpeditionsbuchEndEmpfaenger WHERE FilialenNr=@FilialenNr AND AbfertigungsNr=@AbfertigungsNr AND UnterNr=@UnterNr ", conn)
+                cmd2.Parameters.AddWithValue("@FilialenNr", Me.FilialenNr)
+                cmd2.Parameters.AddWithValue("@AbfertigungsNr", Me.AbfertigungsNr)
+                cmd2.Parameters.AddWithValue("@UnterNr", Me.UnterNr)
+                Dim dr2 = cmd2.ExecuteReader()
+                Me.ENDEMPFAENGER.Clear()
+                While dr2.Read
+                    Dim a As New cEndEmpfaener()
+
+                    a.FilialenNr = SQL.checkNullReturnValue(dr2.Item("FilialenNr"), -1)
+                    a.AbfertigungsNr = SQL.checkNullReturnValue(dr2.Item("AbfertigungsNr"), -1)
+                    a.UnterNr = SQL.checkNullReturnValue(dr2.Item("UnterNr"), -1)
+                    a.EndEmpfaengerKdNr = SQL.checkNullReturnValue(dr2.Item("EndEmpfaengerKdNr"), -1)
+                    a.EndEmpfaenger = SQL.checkNullReturnValue(dr2.Item("EndEmpfaenger"), "")
+                    a.UstIdKz = SQL.checkNullReturnValue(dr2.Item("UstIdKz"), Nothing)
+                    a.UstIdNr = SQL.checkNullReturnValue(dr2.Item("UstIdNr"), Nothing)
+                    a.Rechnungsbetrag = SQL.checkNullReturnValue(dr2.Item("Rechnungsbetrag"), Nothing)
+                    a.RechnungsNr = SQL.checkNullReturnValue(dr2.Item("RechnungsNr"), Nothing)
+                    '   a.Abfertigungsbezeichnung = SQL.checkNullReturnValue(dr2.Item("Abfertigungsbezeichnung"), "-")
+
+                    Me.ENDEMPFAENGER.Add(a)
+                End While
+                dr2.Close()
+            End Using
+
+            conn.Close()
+            'End Using
+            'Return Nothing
+        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 SAVE_UNTERPOS() As Boolean 'obj As Object, tablename As String, where As String) As Boolean
        '   Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
        SAVE_UNTERPOS = False
@@ -579,6 +622,19 @@ Public Class cSpeditionsbuch
            Next
        End If

+        '   Return b
+    End Function
+    Public Function SAVE_ENDEMPFAENGER() As Boolean 'obj As Object, tablename As String, where As String) As Boolean
+        '   Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+        SAVE_ENDEMPFAENGER = False
+        Dim sqlstr = " DELETE FROM tblSpeditionsbuchEndEmpfaenger WHERE FilialenNr=" & Me.FilialenNr & " AND AbfertigungsNr=" & Me.AbfertigungsNr & " AND UnterNr=" & Me.UnterNr & " "
+        If SQL.doSQL(sqlstr, "FMZOLL") Then
+            SAVE_ENDEMPFAENGER = True
+            For Each a In ENDEMPFAENGER
+                If Not a.INSERT() Then SAVE_ENDEMPFAENGER = False
+            Next
+        End If
+
        '   Return b
    End Function
 End Class
@@ -698,4 +754,72 @@ Public Class cVorkosten
        Return False
    End Function

+End Class
+
+
+Public Class cEndEmpfaener
+
+    Property FilialenNr As Integer
+    Property AbfertigungsNr As Integer
+    Property UnterNr As Integer
+    Property EndEmpfaengerKdNr As Integer
+    Property EndEmpfaenger As Object = Nothing
+    Property UstIdKz As Object = Nothing
+    Property UstIdNr As Object = Nothing
+    Property Rechnungsbetrag As Object = Nothing
+    Property RechnungsNr As Object = Nothing
+
+    '  Property Abfertigungsbezeichnung As String = "-"
+    Dim SQL As New SQL
+
+    Sub New()
+    End Sub
+
+    Sub New(FilialenNr, AbfertigungsNr, UnterNr, EndEmpfaengerKdNr, EndEmpfaenger, UstIdKz, UstIdNr, Rechnungsbetrag, RechnungsNr)
+        Me.FilialenNr = FilialenNr
+        Me.AbfertigungsNr = AbfertigungsNr
+        Me.UnterNr = UnterNr
+        Me.EndEmpfaengerKdNr = EndEmpfaengerKdNr
+        Me.EndEmpfaenger = EndEmpfaenger
+        Me.UstIdKz = UstIdKz
+        Me.UstIdNr = UstIdNr
+        Me.Rechnungsbetrag = Rechnungsbetrag
+        Me.RechnungsNr = RechnungsNr
+    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("FilialenNr", FilialenNr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("AbfertigungsNr", AbfertigungsNr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UnterNr", UnterNr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("EndEmpfaengerKdNr", EndEmpfaengerKdNr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("EndEmpfaenger", EndEmpfaenger))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UstIdKz", UstIdKz))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UstIdNr", UstIdNr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Rechnungsbetrag", Rechnungsbetrag))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("RechnungsNr", RechnungsNr))
+        Return list
+    End Function
+
+    Public Function INSERT() As Boolean
+        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.Text.Replace("-", "").Replace(" ", "") & ","
+                End If
+            Next
+            str = str.Substring(0, str.Length - 1) 'wg. ','
+            values = values.Substring(0, values.Length - 1) 'wg. ','
+
+            Return SQL.doSQLVarList(" INSERT INTO [tblSpeditionsbuchEndEmpfaenger]  (" & str & ") VALUES(" & values & ")  ", "FMZOLL", , list)
+        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 False
+    End Function
+
 End Class
--- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb
+++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb
@@ -1220,6 +1220,7 @@ Public Class cFormularManager
    Public Shared Function getPDFViaSpirePDF_FromURL(URL As String, Optional targetPath As String = "") As String
        Try
            If targetPath = "" Then targetPath = getTMPPath_PDF()
+
            Dim doc As New Spire.Pdf.PdfDocument '= New Spire.Pdf.PdfDocument(URL)
            doc.LoadFromHTML(URL, True, True, True)
            If doc IsNot Nothing Then
--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/GASTON_SCHUL/agsCustomsExchange.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/GASTON_SCHUL/agsCustomsExchange.Designer.vb
--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/GASTON_SCHUL/agsCustomsExchange.xsd
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/GASTON_SCHUL/agsCustomsExchange.xsd
@@ -0,0 +1,939 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.gaston-schul.com/platform/facade/customs/ags/exchange"
+            xmlns:b2b="http://www.gaston-schul.com/platform/facade/customs/ags/exchange"
+            elementFormDefault="qualified" attributeFormDefault="unqualified" xml:lang="EN" version="0.1.2">
+
+    <!-- Venetian Blind Design -->
+
+    <xsd:element name="exchangeRequest" type="b2b:exchangeRequestType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Customs approved data for creating an export declaration.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <!-- complex types -->
+
+    <xsd:complexType name="exchangeRequestType">
+        <xsd:sequence>
+            <xsd:element name="uuid" type="b2b:uuid"/>
+            <xsd:element name="version" type="b2b:version"/>
+            <xsd:element name="requestDateTime" type="b2b:dateTime"/>
+            <xsd:element name="creationDateTime" type="b2b:dateTime"/>
+            <xsd:element name="dispatchCountry" type="b2b:countryCode"/>
+            <xsd:element name="destinationCountry" type="b2b:countryCode"/>
+            <xsd:element name="localReferenceNumber" type="b2b:string_35" minOccurs="0"/>
+            <xsd:element name="movementReferenceNumber" type="b2b:string_35" minOccurs="0"/>
+            <xsd:element name="declaration" type="b2b:declarationType"/>
+            <xsd:element name="goodsShipment" type="b2b:goodsShipmentType"/>
+            <xsd:element name="attachments" type="b2b:attachmentType" minOccurs="0" maxOccurs="99"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="declarationType">
+        <xsd:sequence>
+            <xsd:element name="declarationOffice" type="b2b:declarationOffice" minOccurs="0"/>
+            <xsd:element name="declarationCode" type="b2b:declarationCode" minOccurs="0"/>
+            <xsd:element name="declarationTypeCode" type="b2b:declarationTypeCode" minOccurs="0"/>
+            <xsd:element name="procedure" type="b2b:procedure" minOccurs="0"/>
+            <xsd:element name="commercialReferenceNumber" type="b2b:string_35"/>
+            <xsd:element name="invoiceAmount" type="b2b:priceType_18_2" minOccurs="0"/>
+            <xsd:element name="deductibleAmount" type="b2b:priceType_16_2" minOccurs="0"/>
+            <xsd:element name="transportCostsAmount" type="b2b:priceType_16_2" minOccurs="0"/>
+            <xsd:element name="insuranceCostsAmount" type="b2b:priceType_16_2" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="goodsShipmentType">
+        <xsd:sequence>
+            <xsd:element name="countryOfExportation" type="b2b:countryCode"/>
+            <xsd:element name="natureOfTransaction" type="b2b:natureOfTransaction"/>
+            <xsd:element name="deliveryDestination" type="b2b:countryCode"/>
+            <xsd:element name="consignee" type="b2b:consigneeType"/>
+            <xsd:element name="consignor" type="b2b:consignorType"/>
+            <xsd:element name="consignment" type="b2b:consignmentType"/>
+            <xsd:element name="exitOffice" type="b2b:exitOffice" minOccurs="0"/>
+            <xsd:element name="internationalCommercialTerms" type="b2b:inCoTermType"/>
+            <xsd:element name="portOfLoading" type="b2b:portType" minOccurs="0"/>
+            <xsd:element name="portOfDischarge" type="b2b:portType" minOccurs="0"/>
+            <xsd:element name="shippingLine" type="b2b:string_1_70" minOccurs="0"/>
+            <xsd:element name="goodsItem" type="b2b:goodsItemType" maxOccurs="999"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="consigneeType">
+        <xsd:sequence>
+            <xsd:element name="name" type="b2b:string_70" minOccurs="0"/>
+            <xsd:element name="address" type="b2b:addressType" minOccurs="0"/>
+            <xsd:element name="eoriNumber" type="b2b:token_3_17" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        European Union registration and identification number for businesses
+                        which undertake the import or export of goods into or out of the EU.
+                        It comprises of the ISO 3166 Alpha-2 country code followed by
+                        a code or number that is unique in the member state.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="consignorType">
+        <xsd:sequence>
+            <xsd:element name="name" type="b2b:string_70" minOccurs="0"/>
+            <xsd:element name="address" type="b2b:addressType" minOccurs="0"/>
+            <xsd:element name="eoriNumber" type="b2b:token_3_17" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        European Union registration and identification number for businesses
+                        which undertake the import or export of goods into or out of the EU.
+                        It comprises of the ISO 3166 Alpha-2 country code followed by
+                        a code or number that is unique in the member state.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="consignmentType">
+        <xsd:sequence>
+            <xsd:element name="borderTransportMeansType" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="modeCrossing" type="b2b:modeTransport" minOccurs="0"/>
+                        <xsd:element name="nationalityCrossing" type="b2b:countryCode" minOccurs="0"/>
+                        <xsd:element name="identificationCrossingBorder" type="b2b:string_35"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="departureTransportMeansType" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="modeTransport" type="b2b:modeTransport"/>
+                        <xsd:element name="identificationDeparture" type="b2b:string_1_35"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="arrivalTransportMeansType" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="modeTransport" type="b2b:modeTransport" minOccurs="0"/>
+                        <xsd:element name="identificationArrival" type="b2b:string_1_35" minOccurs="0"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="freightType" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="paymentMethod" type="b2b:modePaymentTransport" minOccurs="0"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="goodsLocationName" type="b2b:string_1_256" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="portType">
+        <xsd:sequence>
+            <xsd:element name="portCode" type="b2b:token_1_10"/>
+            <xsd:element name="portCountry" type="b2b:countryCode"/>
+            <xsd:element name="portLocationName" type="b2b:string_1_35" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="inCoTermType">
+        <xsd:sequence>
+            <xsd:element name="inCoTerm" type="b2b:inCoTerm"/>
+            <xsd:element name="inCoTermCountryRelationship" type="b2b:inCoTermCountryRelationship"/>
+            <xsd:element name="inCoTermPlaceCode" type="b2b:string_35" minOccurs="0"/>
+            <xsd:element name="inCoTermPlaceName" type="b2b:string_35"/>
+            <xsd:element name="inCoTermPlaceDescription" type="b2b:string_35" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="principalType">
+        <xsd:sequence>
+            <xsd:element name="nameType" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:simpleContent>
+                        <xsd:extension base="b2b:string_35">
+                            <xsd:attribute name="language" type="b2b:countryCode"/>
+                        </xsd:extension>
+                    </xsd:simpleContent>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="address" type="b2b:addressType" minOccurs="0"/>
+            <xsd:element name="taxIdentificationNumber" type="b2b:string_1_17" minOccurs="0"/>
+            <xsd:element name="contactPersonType" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="contactPersonName" type="b2b:string_35" minOccurs="0"/>
+                        <xsd:element name="contactPersonCommunicationNumber" type="b2b:string_15" minOccurs="0"/>
+                        <xsd:element name="contactPersonEmail" type="b2b:string_70" minOccurs="0"/>
+                        <xsd:element name="contactPersonFaxNumber" type="b2b:string_15" minOccurs="0"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="goodsItemType">
+        <xsd:sequence>
+            <xsd:element name="sequenceNumeric" type="b2b:sequenceNumeric"/>
+            <xsd:element name="customsValueAmount" type="b2b:priceType_16_2" minOccurs="0"/>
+            <xsd:element name="statisticalValueAmount" type="b2b:priceType_16_2" minOccurs="0"/>
+            <xsd:element name="additionalDocumentType" minOccurs="0" maxOccurs="99">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="documentCode" type="b2b:documentCode"/>
+                        <xsd:element name="documentReference" type="b2b:string_1_35" minOccurs="0"/>
+                        <xsd:element name="amount" type="b2b:priceType_16_2" minOccurs="0"/>
+                        <xsd:element name="quantity" type="b2b:quantityType" minOccurs="0"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="additionalInformationType" minOccurs="0" maxOccurs="99">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="statementCode" type="b2b:statementCode"/>
+                        <xsd:element name="statementDescription" type="b2b:string_1_512" minOccurs="0"/>
+                        <xsd:element name="statementTypeCode" type="b2b:token_1_3"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="commodityType">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="sequenceNumeric" type="b2b:sequenceNumeric"/>
+                        <xsd:element name="description" type="b2b:string_1_512"/>
+                        <xsd:element name="valueAmount" type="b2b:priceType_16_2" minOccurs="0"/>
+                       <xsd:element name="classificationType" minOccurs="0" maxOccurs="99">
+                            <xsd:complexType>
+                                <xsd:sequence>
+                                    <xsd:element name="commodityCode" type="b2b:string_8_22" minOccurs="0"/>
+                                    <xsd:element name="unitedNationsDangerousGoodCode" type="b2b:unitedNationsDangerousGoodCode" minOccurs="0"/>
+                                </xsd:sequence>
+                            </xsd:complexType>
+                        </xsd:element>
+                        <xsd:element name="transportEquipmentType" minOccurs="0" maxOccurs="99">
+                            <xsd:complexType>
+                                <xsd:sequence>
+                                    <xsd:element name="sequenceNumeric" type="b2b:sequenceNumeric" minOccurs="0"/>
+                                    <xsd:element name="equipmentIdentificationNumberId" type="b2b:equipmentIdentificationNumberId" minOccurs="0"/>
+                                </xsd:sequence>
+                            </xsd:complexType>
+                        </xsd:element>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="goodsMeasureType">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="grossMassMeasure" type="b2b:weightType_16_6" minOccurs="0"/>
+                        <xsd:element name="netNetWeightMeasure" type="b2b:weightType_16_6"/>
+                        <xsd:element name="tariffQuantity" type="b2b:decimal_16_6" minOccurs="0"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="governmentProcedureType" maxOccurs="2">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="currentCode" type="b2b:governmentProcedure" minOccurs="0"/>
+                        <xsd:element name="previousCode" type="b2b:governmentProcedure" minOccurs="0"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="manufacturerType" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="name" type="b2b:string_1_70" minOccurs="0"/>
+                        <xsd:element name="id" type="b2b:string_1_17" minOccurs="0"/>
+                        <xsd:element name="address" type="b2b:addressType" minOccurs="0"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="originType" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="countryCode" type="b2b:countryCode"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="packagingType" maxOccurs="99">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="sequenceNumeric" type="b2b:sequenceNumeric"/>
+                        <xsd:element name="MarksNumbersID" type="b2b:string_1_512" minOccurs="0"/>
+                        <xsd:element name="packagingQuantity" type="b2b:packagingSequenceNumeric" minOccurs="0"/>
+                        <xsd:element name="typeCode" type="b2b:packagingTypeCode"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="previousDocumentType" minOccurs="0" maxOccurs="9">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="DocTypeCode" type="b2b:prevDocTypeCode"/>
+                        <xsd:element name="DocSortCode" type="b2b:prevDocSortCode"/>
+                        <xsd:element name="DocNr" type="b2b:string_1_31"/>
+                        <xsd:element name="lineNumeric" type="b2b:previousDocumentNumeric" minOccurs="0"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="refundRecipientPartyType" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="name" type="b2b:string_1_70" minOccurs="0"/>
+                        <xsd:element name="id" type="b2b:string_1_17" minOccurs="0"/>
+                        <xsd:element name="address" type="b2b:addressType" minOccurs="0"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="valuationAdjustmentType" minOccurs="0" maxOccurs="99">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="additionCode" type="b2b:valuationAdjustmentAdditionCode" minOccurs="0"/>
+                        <xsd:element name="valuationAdjustmentAmount" type="b2b:priceType_16_2" minOccurs="0"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="attachmentType">
+        <xsd:sequence>
+            <xsd:element name="attachmentName">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Must have an extension so the user can open it with the corresponding program
+                    </xsd:documentation>
+                </xsd:annotation>
+                <xsd:simpleType>
+                    <xsd:restriction base="xsd:string">
+                        <xsd:maxLength value="160"/>
+                    </xsd:restriction>
+                </xsd:simpleType>
+            </xsd:element>
+            <xsd:element name="attachmentType" type="b2b:attachmentTypeCode">
+                <xsd:annotation>
+                    <xsd:documentation>Example 380 for invoice,...</xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="attachmentReference" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Contains the invoice number, MRN or other reference markers
+                    </xsd:documentation>
+                </xsd:annotation>
+                <xsd:simpleType>
+                    <xsd:restriction base="xsd:string">
+                        <xsd:maxLength value="35"/>
+                    </xsd:restriction>
+                </xsd:simpleType>
+            </xsd:element>
+            <xsd:element name="binaryAttachmentData" type="xsd:base64Binary"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="addressType">
+        <xsd:sequence>
+            <xsd:element name="postalCode" type="b2b:string_15"/>
+            <xsd:element name="streetAndNumber" type="b2b:string_2_35"/>
+            <xsd:element name="city" type="b2b:string_2_35"/>
+            <xsd:element name="country" type="b2b:countryCode"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="priceType_16_2">
+        <xsd:simpleContent>
+            <xsd:extension base="b2b:decimal_16_2">
+                <xsd:attribute name="currency" type="b2b:currency" use="required"/>
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="priceType_18_2">
+        <xsd:simpleContent>
+            <xsd:extension base="b2b:decimal_18_2">
+                <xsd:attribute name="currency" type="b2b:currency" use="required"/>
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="weightType_16_6">
+        <xsd:simpleContent>
+            <xsd:extension base="b2b:decimal_16_6">
+                <xsd:attribute name="massUnit" fixed="kg" use="required"/>
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="quantityType">
+        <xsd:simpleContent>
+            <xsd:extension base="b2b:quantityTypeNumeric">
+                <xsd:attribute name="unitCode" type="xsd:string" use="required"/>
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <!-- simple types -->
+
+    <xsd:simpleType name="uuid">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="EN">
+                A universally unique type 4 identifier (UUID) is a 128-bit number used to identify a single exchange document.
+                The term globally unique identifier (GUID) is also used, typically in software created by Microsoft.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:string">
+            <xsd:length value="36" fixed="true"/>
+            <xsd:pattern value="[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-4[0-9a-fA-F]{3}-[8-9a-bA-B][0-9a-fA-F]{3}-[0-9a-fA-F]{12}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="version">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="EN">
+                Version of the schema used.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:string">
+            <xsd:length value="5" fixed="true"/>
+            <xsd:pattern value="\d.\d.\d"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="dateTime">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="EN">
+                ISO 8601 Date and time with timezone added relative to UTC. For example, 2019-01-01T12:00:00+01:00 for UK time
+                Content is yyyy-mm-ddThh:mm:ssphh:mm where p is + or -. Note that the time zone is required.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:dateTime">
+            <xsd:pattern value="\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d[+\-]\d\d:\d\d"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="declarationCode">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="NL">
+                https://www.belastingdienst.nl/codeboek_sagitta/huidig/html/tabel-codeboek%2C%20onderdeel%20aangiftebehandeling-a03.html
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="CO"/>
+            <xsd:enumeration value="EU"/>
+            <xsd:enumeration value="EX"/>
+            <xsd:enumeration value="IM"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="declarationTypeCode">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="NL">
+                https://www.belastingdienst.nl/codeboek_sagitta/huidig/html/tabel-codeboek%2C%20onderdeel%20aangiftebehandeling-a04.html
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="A"/>
+            <xsd:enumeration value="B"/>
+            <xsd:enumeration value="D"/>
+            <xsd:enumeration value="E"/>
+            <xsd:enumeration value="X"/>
+            <xsd:enumeration value="Y"/>
+            <xsd:enumeration value="Z"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="procedure">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="NL">
+                https://www.belastingdienst.nl/wps/wcm/connect/bldcontenten/belastingdienst/customs/customs-processes/special-procedures/special-procedures-for-goods/special-procedures-for-goods
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="A"/>
+            <xsd:enumeration value="B"/>
+            <xsd:enumeration value="C"/>
+            <xsd:enumeration value="D"/>
+            <xsd:enumeration value="E"/>
+            <xsd:enumeration value="H"/>
+            <xsd:enumeration value="I"/>
+            <xsd:enumeration value="J"/>
+            <xsd:enumeration value="K"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="modeTransport">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="NL">
+                https://www.belastingdienst.nl/codeboek_sagitta/huidig/html/tabel-codeboek%20sagitta%2C%20onderdeel%20algemeen-a27.html
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="AIR"/>
+            <xsd:enumeration value="HUMAN"/>
+            <xsd:enumeration value="POSTAL"/>
+            <xsd:enumeration value="RAIL"/>
+            <xsd:enumeration value="ROAD"/>
+            <xsd:enumeration value="SEA"/>
+            <xsd:enumeration value="INLAND_WATERWAYS"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="modePaymentTransport">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="NL">
+                https://www.belastingdienst.nl/codeboek_sagitta/huidig/html/tabel-codeboek%2C%20onderdeel%20aangiftebehandeling-116.html
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="CASH"/>
+            <xsd:enumeration value="CREDIT_CARD"/>
+            <xsd:enumeration value="CHECK"/>
+            <xsd:enumeration value="OTHER"/>
+            <xsd:enumeration value="ELECTRONIC"/>
+            <xsd:enumeration value="ACCOUNT_HOLDER"/>
+            <xsd:enumeration value="NOT_PAYED_BEFOREHAND"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="inCoTerm">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="NL">
+                https://www.belastingdienst.nl/codeboek_sagitta/huidig/html/tabel-codeboek%2C%20onderdeel%20aangiftebehandeling-a14.html
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="CFR"/>
+            <xsd:enumeration value="CIF"/>
+            <xsd:enumeration value="CIP"/>
+            <xsd:enumeration value="CPT"/>
+            <xsd:enumeration value="DAF"/>
+            <xsd:enumeration value="DAP"/>
+            <xsd:enumeration value="DAT"/>
+            <xsd:enumeration value="DDP"/>
+            <xsd:enumeration value="DDU"/>
+            <xsd:enumeration value="DEQ"/>
+            <xsd:enumeration value="DES"/>
+            <xsd:enumeration value="EXW"/>
+            <xsd:enumeration value="FAS"/>
+            <xsd:enumeration value="FCA"/>
+            <xsd:enumeration value="FOB"/>
+            <xsd:enumeration value="XXX"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="natureOfTransaction">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="NL">
+                https://www.belastingdienst.nl/codeboek_sagitta/huidig/html/tabel-codeboek%2C%20onderdeel%20aangiftebehandeling-a22.html
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:unsignedShort">
+            <xsd:enumeration value="1"/>
+            <xsd:enumeration value="2"/>
+            <xsd:enumeration value="3"/>
+            <xsd:enumeration value="4"/>
+            <xsd:enumeration value="5"/>
+            <xsd:enumeration value="6"/>
+            <xsd:enumeration value="7"/>
+            <xsd:enumeration value="8"/>
+            <xsd:enumeration value="9"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="inCoTermCountryRelationship">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="NL">
+                https://www.belastingdienst.nl/codeboek_sagitta/huidig/html/tabel-codeboek%2C%20onderdeel%20aangiftebehandeling-a89.html
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:unsignedShort">
+            <xsd:enumeration value="1"/>
+            <xsd:enumeration value="2"/>
+            <xsd:enumeration value="3"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="governmentProcedure">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="NL">
+                https://www.belastingdienst.nl/codeboek_sagitta/huidig/html/tabel-codeboek%2C%20onderdeel%20aangiftebehandeling-a35.html
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:token">
+            <xsd:maxLength value="2"/>
+            <xsd:pattern value=".{1,2}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="valuationAdjustmentAdditionCode">
+        <xsd:annotation>
+            <xsd:documentation>
+                https://www.belastingdienst.nl/codeboek_sagitta/huidig/html/tabel-codeboek%2C%20onderdeel%20aangiftebehandeling-a11.html
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:token">
+            <xsd:maxLength value="3"/>
+            <xsd:pattern value=".{1,3}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="attachmentTypeCode">
+        <xsd:annotation>
+            <xsd:documentation>
+                https://www.belastingdienst.nl/codeboek_sagitta/huidig/html/tabel-codeboek%2C%20onderdeel%20aangiftebehandeling-a28.html
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:token">
+            <xsd:maxLength value="3"/>
+            <xsd:pattern value=".{1,3}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="unitedNationsDangerousGoodCode">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="EN">
+                UN IDs are four-digit numbers that identify dangerous goods, hazardous substances and articles
+                in the framework of international transport.
+                They are assigned by the United Nations Committee of Experts on the Transport of Dangerous Goods.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:string">
+            <xsd:pattern value="\d{4}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="documentCode">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="NL" >
+                https://www.belastingdienst.nl/codeboek_sagitta/huidig/html/tabel-codeboek%2C%20onderdeel%20aangiftebehandeling-t03.html
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:token">
+            <xsd:maxLength value="4"/>
+            <xsd:pattern value=".{1,4}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="statementCode">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="NL">
+                https://www.belastingdienst.nl/codeboek_sagitta/huidig/html/tabel-codeboek%2C%20onderdeel%20aangiftebehandeling-a12.html
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:token">
+            <xsd:maxLength value="17"/>
+            <xsd:pattern value=".{1,17}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="packagingTypeCode">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="NL">
+                https://www.belastingdienst.nl/codeboek_sagitta/huidig/html/tabel-codeboek%2C%20onderdeel%20aangiftebehandeling-a25.html
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:token">
+            <xsd:maxLength value="2"/>
+            <xsd:pattern value=".{1,2}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="exitOffice">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="NL">
+                https://www.belastingdienst.nl/codeboek_sagitta/huidig/html/tabel-codeboek%2C%20onderdeel%20aangiftebehandeling-s20.html
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:token">
+            <xsd:maxLength value="17"/>
+            <xsd:pattern value=".{1,17}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="declarationOffice">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="NL">
+                https://www.belastingdienst.nl/codeboek_sagitta/huidig/html/tabel-codeboek%20sagitta%2C%20onderdeel%20algemeen-s03.html
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:token">
+            <xsd:maxLength value="4"/>
+            <xsd:pattern value=".{1,4}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="prevDocTypeCode">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="NL">
+                X - Summiere Aangifte
+                Y - Oorspronkelijke Aangifte
+                Z - Voorafgaand Document
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="X"/>
+            <xsd:enumeration value="Y"/>
+            <xsd:enumeration value="Z"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="prevDocSortCode">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="NL">
+                https://www.belastingdienst.nl/codeboek_sagitta/huidig/html/tabel-codeboek%20sagitta%2C%20onderdeel%20transit-014.html
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:token">
+            <xsd:maxLength value="3"/>
+            <xsd:pattern value=".{1,3}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="previousDocumentNumeric">
+        <xsd:restriction base="xsd:decimal">
+            <xsd:pattern value="[0-9]{1,4}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="sequenceNumeric">
+        <xsd:restriction base="xsd:decimal">
+            <xsd:pattern value="[0-9]{1,5}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="packagingSequenceNumeric">
+        <xsd:restriction base="xsd:decimal">
+            <xsd:pattern value="[0-9]{1,8}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="quantityTypeNumeric">
+        <xsd:restriction base="xsd:decimal">
+            <xsd:pattern value="[0-9]{1,16}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="equipmentIdentificationNumberId">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="EN">
+                Placeholder for container nr, train, barge, plane etc.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:string">
+            <xsd:maxLength value="17"/>
+            <xsd:pattern value=".{1,17}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="currency">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="EN">
+                ISO 4217 currency code,
+                like GBP for pound sterling or EUR for Euro
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:string">
+            <xsd:length value="3" fixed="true"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="countryCode">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="EN">
+                ISO 3166 Alpha-2 country code,
+                like GB for the United Kingdom of Great Britain and Northern Ireland,
+                and NL for the Kingdom of the Netherlands
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:string">
+            <xsd:length value="2" fixed="true"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="decimal_16_2">
+        <xsd:restriction base="xsd:decimal">
+            <xsd:totalDigits value="16"/>
+            <xsd:fractionDigits value="2"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="decimal_16_6">
+        <xsd:restriction base="xsd:decimal">
+            <xsd:totalDigits value="16"/>
+            <xsd:fractionDigits value="6"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="decimal_18_2">
+        <xsd:restriction base="xsd:decimal">
+            <xsd:totalDigits value="18"/>
+            <xsd:fractionDigits value="2"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="string_15">
+        <xsd:restriction base="xsd:string">
+            <xsd:maxLength value="15"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="string_35">
+        <xsd:restriction base="xsd:string">
+            <xsd:maxLength value="35"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="string_70">
+        <xsd:restriction base="xsd:string">
+            <xsd:maxLength value="70"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="string_1_17">
+        <xsd:restriction base="xsd:string">
+            <xsd:maxLength value="17"/>
+            <xsd:pattern value=".{1,17}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="string_8_22">
+        <xsd:restriction base="xsd:string">
+            <xsd:maxLength value="22"/>
+            <xsd:pattern value=".{8,22}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="string_1_25">
+        <xsd:restriction base="xsd:string">
+            <xsd:maxLength value="25"/>
+            <xsd:pattern value=".{1,25}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="string_1_31">
+        <xsd:restriction base="xsd:string">
+            <xsd:maxLength value="31"/>
+            <xsd:pattern value=".{1,31}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="string_1_35">
+        <xsd:restriction base="xsd:string">
+            <xsd:maxLength value="35"/>
+            <xsd:pattern value=".{1,35}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="string_2_35">
+        <xsd:restriction base="xsd:string">
+            <xsd:maxLength value="35"/>
+            <xsd:pattern value=".{2,35}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="string_1_70">
+        <xsd:restriction base="xsd:string">
+            <xsd:maxLength value="70"/>
+            <xsd:pattern value=".{1,70}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="string_1_256">
+        <xsd:restriction base="xsd:string">
+            <xsd:maxLength value="256"/>
+            <xsd:pattern value=".{1,256}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="string_1_512">
+        <xsd:restriction base="xsd:string">
+            <xsd:maxLength value="512"/>
+            <xsd:pattern value=".{1,512}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="token_1_3">
+        <xsd:restriction base="xsd:token">
+            <xsd:maxLength value="3"/>
+            <xsd:pattern value=".{1,3}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="token_1_10">
+        <xsd:restriction base="xsd:token">
+            <xsd:maxLength value="10"/>
+            <xsd:pattern value=".{1,10}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="token_3_17">
+        <xsd:restriction base="xsd:token">
+            <xsd:maxLength value="17"/>
+            <xsd:pattern value=".{3,17}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:annotation>
+        <xsd:appinfo>
+            <copyright-notice>Copyright 2020 gaston-schul.com and/or its affiliates. All rights reserved.</copyright-notice>
+            <author>Marcel Mullenders</author>
+        </xsd:appinfo>
+        <xsd:documentation>
+            End-User License Agreement (EULA) of ags customs exchange
+
+            This End-User License Agreement ("EULA") is a legal agreement between you and Gaston Schul
+            This EULA agreement governs your acquisition and use of our ags customs exchange software ("Software")
+            directly from Gaston Schul or indirectly through a Gaston Schul authorized reseller or distributor (a "Reseller").
+            Please read this EULA agreement carefully before completing the installation process and using the ags customs exchange software.
+            It provides a license to use the ags customs exchange software and contains warranty information and liability disclaimers.
+
+            If you are entering into this EULA agreement on behalf of a company or other legal entity,
+            you represent that you have the authority to bind such entity and its affiliates to these terms and conditions.
+            If you do not have such authority or if you do not agree with the terms and conditions of this EULA agreement,
+            do not install or use the Software, and you must not accept this EULA agreement.
+
+            This EULA agreement shall apply only to the Software supplied by Gaston Schul herewith regardless of whether other
+            software is referred to or described herein. The terms also apply to any Gaston Schul updates, supplements, Internet-based services,
+            and support services for the Software, unless other terms accompany those items on delivery. If so, those terms apply.
+
+            License Grant
+
+            Gaston Schul hereby grants you a personal, non-transferable, non-exclusive licence to use the v software on your devices
+            in accordance with the terms of this EULA agreement. You are permitted to load the ags customs exchange software (for example a PC, laptop, mobile or tablet)
+            under your control. You are responsible for ensuring your device meets the minimum requirements of the ags customs exchange software.
+
+            You are not permitted to:
+
+            Edit, alter, modify, adapt or otherwise change the whole or any part of the Software
+            Attempt to do any such things as to distribute or resell the Software
+            Allow any third party to use the Software on behalf of or for the benefit of any third party
+            Use the Software in any way which breaches any applicable local, national or international law
+            Use the Software for any purpose that Gaston Schul considers is a breach of this EULA agreement
+
+            Intellectual Property and Ownership
+
+            Gaston Schul shall at all times retain ownership of the Software as originally downloaded by you and all subsequent downloads of the Software by you.
+            The Software (and the copyright, and other intellectual property rights of whatever nature in the Software, including any modifications made thereto)
+            are and shall remain the property of Gaston Schul.
+            Gaston Schul reserves the right to grant licences to use the Software to third parties.
+
+            Termination
+
+            This EULA agreement is effective from the date you first use the Software and shall continue until terminated.
+            You may terminate it at any time.
+            It will also terminate immediately if you fail to comply with any term of this EULA agreement.
+            Upon such termination, the licenses granted by this EULA agreement will immediately terminate and you agree to stop all access and use of the Software.
+            The provisions that by their nature continue and survive will survive any termination of this EULA agreement.
+
+            Governing Law
+
+            This EULA agreement, and any dispute arising out of or in connection with this EULA agreement,
+            shall be governed by and construed in accordance with the laws of the Netherlands.
+        </xsd:documentation>
+    </xsd:annotation>
+
+</xsd:schema>
--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/VERAG/IN_EZA/cVERAG_in_eza.vb
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/VERAG/IN_EZA/cVERAG_in_eza.vb
@@ -90,12 +90,13 @@ Public Class cVERAG_in_eza_FULL
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("InvoiceAmount", EZA.InvoiceAmount))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("InvoiceCurrency", EZA.InvoiceCurrency))

-
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ContainerNr1", EZA.ContainerNr1))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ContainerNr2", EZA.ContainerNr2))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ContainerNr3", EZA.ContainerNr3))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ContainerNr4", EZA.ContainerNr4))

+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FreightCostsEU", EZA.FreightCostsEU))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FreightCostsNonEU", EZA.FreightCostsNonEU))

        Return list
    End Function
@@ -115,7 +116,19 @@ Public Class cVERAG_in_eza_FULL
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("GoodsTariffExt7", POS.GoodsTariffExt7))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("GoodsTariffExt8", POS.GoodsTariffExt8))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("GoodsTariffExt9", POS.GoodsTariffExt9))
-        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("GoodsTariffExt10", POS.GoodsTariffExt10))
+
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("GoodsTariffYCode1", POS.GoodsTariffYCode1))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("GoodsTariffYCode2", POS.GoodsTariffYCode2))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("GoodsTariffYCode3", POS.GoodsTariffYCode3))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("GoodsTariffYCode4", POS.GoodsTariffYCode4))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("GoodsTariffYCode5", POS.GoodsTariffYCode5))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("GoodsTariffYCode6", POS.GoodsTariffYCode6))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("GoodsTariffYCode7", POS.GoodsTariffYCode7))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("GoodsTariffYCode8", POS.GoodsTariffYCode8))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("GoodsTariffYCode9", POS.GoodsTariffYCode9))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("GoodsTariffYCode10", POS.GoodsTariffYCode10))
+
+
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("GoodsDescription", POS.GoodsDescription))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("OriginCountryCode", POS.OriginCountryCode))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("GrossWeight", POS.GrossWeight))
@@ -167,7 +180,10 @@ Public Class cVERAG_in_eza_FULL
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("City", ADR.City))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("CountryCode", ADR.CountryCode))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("PostalCode", ADR.PostalCode))
-        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStID", ADR.UStID))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("TaxNo", ADR.TaxNo))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ContactPerson", ADR.ContactPerson))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Telefon", ADR.Telefon))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Email", ADR.Email))

        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("shTrAd_ShTrId", Me.shTr_id,,,, True))

@@ -718,6 +734,9 @@ Public Class cVERAG_in_eza
    Public Property ContainerNr3 As String = ""
    Public Property ContainerNr4 As String = ""

+    Public Property FreightCostsEU As String = ""
+    Public Property FreightCostsNonEU As String = ""
+

    Public Property POSITIONS As New List(Of cVERAG_in_eza_position)
    Public Property DOCUMENTS As New List(Of cVERAG_in_shipment_Document)
@@ -744,7 +763,11 @@ Public Class cVERAG_in_eza_Adressen
    Public Property City As String = ""  '                       VARCHAR (35)  NULL,
    Public Property CountryCode As String = ""  '                       VARCHAR (3)   NULL,
    Public Property PostalCode As String = ""  '                            VARCHAR (9)   NULL,
-    Public Property UStID As String = ""  '                  VARCHAR (14)  NULL,
+    Public Property UStID As String = ""  'NICHT MEHR --> TaxNo
+    Public Property TaxNo As String = ""  '                  VARCHAR (14)  NULL,
+    Public Property ContactPerson As String = ""  '                  VARCHAR (14)  NULL,
+    Public Property Telefon As String = ""  '                  VARCHAR (14)  NULL,
+    Public Property Email As String = ""  '                  VARCHAR (14)  NULL, 

 End Class

@@ -754,14 +777,26 @@ Public Class cVERAG_in_eza_position
    Public Property GoodsTariff As Object = Nothing
    Public Property GoodsTariffExt1 As Object = Nothing
    Public Property GoodsTariffExt2 As Object = Nothing
-    Public Property GoodsTariffExt3 As Object = Nothing
-    Public Property GoodsTariffExt4 As Object = Nothing
-    Public Property GoodsTariffExt5 As Object = Nothing
-    Public Property GoodsTariffExt6 As Object = Nothing
-    Public Property GoodsTariffExt7 As Object = Nothing
-    Public Property GoodsTariffExt8 As Object = Nothing
-    Public Property GoodsTariffExt9 As Object = Nothing
-    Public Property GoodsTariffExt10 As String = ""
+    Public Property GoodsTariffExt3 As Object = Nothing 'NICHT MEHR!!!
+    Public Property GoodsTariffExt4 As Object = Nothing 'NICHT MEHR!!!
+    Public Property GoodsTariffExt5 As Object = Nothing 'NICHT MEHR!!!
+    Public Property GoodsTariffExt6 As Object = Nothing 'NICHT MEHR!!!
+    Public Property GoodsTariffExt7 As Object = Nothing 'NICHT MEHR!!!
+    Public Property GoodsTariffExt8 As Object = Nothing 'NICHT MEHR!!!
+    Public Property GoodsTariffExt9 As Object = Nothing 'NICHT MEHR!!!
+    Public Property GoodsTariffExt10 As String = "" 'NICHT MEHR!!!
+    Public Property GoodsTariffYCode1 As String = ""
+    Public Property GoodsTariffYCode2 As String = ""
+    Public Property GoodsTariffYCode3 As String = ""
+    Public Property GoodsTariffYCode4 As String = ""
+    Public Property GoodsTariffYCode5 As String = ""
+    Public Property GoodsTariffYCode6 As String = ""
+    Public Property GoodsTariffYCode7 As String = ""
+    Public Property GoodsTariffYCode8 As String = ""
+    Public Property GoodsTariffYCode9 As String = ""
+    Public Property GoodsTariffYCode10 As String = ""
+
+
    Public Property GoodsDescription As String = ""
    Public Property OriginCountryCode As String = ""
    Public Property GrossWeight As Object = Nothing
--- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
+++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
@@ -95,15 +95,15 @@
    </Reference>
    <Reference Include="Spire.License, Version=1.3.8.46, Culture=neutral, PublicKeyToken=b1144360237c8b3f, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\dll\PDF Spire\6.8.5\Spire.License.dll</HintPath>
+      <HintPath>..\..\..\dll\PDF Spire\6.10\Spire.License.dll</HintPath>
    </Reference>
-    <Reference Include="Spire.Pdf, Version=6.8.2.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
+    <Reference Include="Spire.Pdf, Version=6.8.5.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\dll\PDF Spire\6.8.5\Spire.Pdf.dll</HintPath>
+      <HintPath>..\..\..\dll\PDF Spire\6.10\Spire.Pdf.dll</HintPath>
    </Reference>
    <Reference Include="Spire.PdfViewer.Forms, Version=5.8.2.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\dll\PDF Spire\6.8.5\Spire.PdfViewer.Forms.dll</HintPath>
+      <HintPath>..\..\..\dll\PDF Spire\6.10\Spire.PdfViewer.Forms.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -467,6 +467,7 @@
    <Compile Include="Schnittstellen\cJsonPost.vb" />
    <Compile Include="Schnittstellen\cSyska_Interface.vb" />
    <Compile Include="Schnittstellen\cTherefore.vb" />
+    <Compile Include="Schnittstellen\GASTON_SCHUL\agsCustomsExchange.Designer.vb" />
    <Compile Include="Schnittstellen\VERAG\ATEZ\BeyannameBilgi.Designer.vb" />
    <Compile Include="Schnittstellen\VERAG\IN_AVISO\cVERAG_in_TRAviso.vb" />
    <Compile Include="Schnittstellen\VERAG\IN_SHIPPMENT\cVERAG_in_shippmentWHAT.vb" />
@@ -573,6 +574,9 @@
    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
+    <None Include="Schnittstellen\GASTON_SCHUL\agsCustomsExchange.xsd">
+      <SubType>Designer</SubType>
+    </None>
    <None Include="Schnittstellen\VERAG\ATEZ\BeyannameBilgi.json" />
    <None Include="Schnittstellen\VERAG\ATEZ\TR_EX\declarationJsonSchema.json" />
    <None Include="Schnittstellen\VERAG\ATEZ\TR_EX\declarationJsonSchema.xsd">