diff --git a/SDL/Classes/cRKSV.vb b/SDL/Classes/cRKSV.vb
index 0cd9e0e6..9a764b11 100644
--- a/SDL/Classes/cRKSV.vb
+++ b/SDL/Classes/cRKSV.vb
@@ -338,7 +338,7 @@ Public Class cRKSV
     Shared Function getGJ(BelegDat As Date, Optional FIRMA As String = "") As Integer
         If FIRMA = "" Then FIRMA = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
         Select Case FIRMA
-            Case "IMEX", "FRONTOFFICE"
+            Case "IMEX", "FRONTOFFICE", "UNISPED", "AMBAR"
                 Return BelegDat.Year
             Case Else
                 Return IIf(BelegDat.Month = 1, BelegDat.Year - 1, BelegDat.Year)
diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb
index ed71ef2d..146c1426 100644
--- a/SDL/Fakturierung/cFakturierung.vb
+++ b/SDL/Fakturierung/cFakturierung.vb
@@ -6,6 +6,14 @@ Public Class cFakturierung
 
     Shared SQL As New VERAG_PROG_ALLGEMEIN.SQL
 
+    Public Shared Function fktSVSRVS(firmaId As Integer, varWert As Object, Optional varWährungscode As Object = "EUR") As Object
+        Select Case firmaId
+            Case 21, 22, 23
+                fktSVSRVS_UNISPED(varWert, varWährungscode)
+            Case Else
+                fktSVSRVS(varWert, varWährungscode)
+        End Select
+    End Function
     Public Shared Function fktSVSRVS(varWert As Object, Optional varWährungscode As Object = "EUR") As Object
 
         Dim varVersicherungssumme As Object
@@ -180,6 +188,65 @@ Public Class cFakturierung
 
     End Function
 
+    Public Shared Function fktSVSRVS_UNISPED(varWert As Object, Optional varWährungscode As Object = "EUR") As Object
+
+        Dim varVersicherungssumme As Object
+        Dim varRechnungswährung As Object
+
+        ' Versicherungssumme prüfen
+
+        varVersicherungssumme = varWert
+        If varVersicherungssumme Is Nothing OrElse varVersicherungssumme = 0 Then
+            MsgBox("Die SVS/RVS-Prämie kann nicht ermittelt werden. Der Warenwert zur Bestimmung der Versicherungssumme ist nicht bekannt.", , "fktSVSRVS")
+            fktSVSRVS_UNISPED = Nothing
+            Exit Function
+        ElseIf varVersicherungssumme < 0 Then
+            varVersicherungssumme = 0 - varVersicherungssumme
+        End If
+
+        ' Die SVS/RVS-Tabelle ist in der Währung ATS geführt.
+        ' Wenn der Wert zur Bestimmung der Versicherungssumme auf einer anderen Währung basiert,
+        ' wird der Wert in ATS umgerechnet.
+        ' Die Versicherungsprämie ist in der Währung ATS angegeben. Lautet die Rechnung auf eine
+        ' andere Währung, wird die Versicherungsprämie auf diese Währung umgerechnet.
+
+        varRechnungswährung = varWährungscode
+        Select Case VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(varVersicherungssumme, varRechnungswährung, "EUR")
+            Case Is <= 2500
+                fktSVSRVS_UNISPED = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(2.91, "EUR", varRechnungswährung)
+            Case Is <= 3750
+                fktSVSRVS_UNISPED = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(4.42, "EUR", varRechnungswährung)
+            Case Is <= 5000
+                fktSVSRVS_UNISPED = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(5.82, "EUR", varRechnungswährung)
+            Case Is <= 6250
+                fktSVSRVS_UNISPED = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(7.1, "EUR", varRechnungswährung)
+            Case Is <= 7500
+                fktSVSRVS_UNISPED = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(8.67, "EUR", varRechnungswährung)
+            Case Is <= 10000
+                fktSVSRVS_UNISPED = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(11.34, "EUR", varRechnungswährung)
+            Case Is <= 15000
+                fktSVSRVS_UNISPED = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(16.24, "EUR", varRechnungswährung)
+            Case Is <= 20000
+                fktSVSRVS_UNISPED = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(21.13, "EUR", varRechnungswährung)
+            Case Is <= 25000
+                fktSVSRVS_UNISPED = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(25.3, "EUR", varRechnungswährung)
+            Case Is <= 50000
+                fktSVSRVS_UNISPED = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(44.73, "EUR", varRechnungswährung)
+            Case Is <= 100000
+                fktSVSRVS_UNISPED = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(73.8, "EUR", varRechnungswährung)
+            Case Is <= 150000
+                fktSVSRVS_UNISPED = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(104.87, "EUR", varRechnungswährung)
+            Case Is <= 200000
+                fktSVSRVS_UNISPED = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(134, "EUR", varRechnungswährung)
+            Case Is <= 300000
+                fktSVSRVS_UNISPED = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(160.85, "EUR", varRechnungswährung)
+            Case Is <= 1500000
+                fktSVSRVS_UNISPED = Int((varVersicherungssumme * 0.00055) * 100 + 0.5) / 100
+            Case Else
+                fktSVSRVS_UNISPED = Int((1500000 * 0.00055) * 100 + 0.5) / 100
+        End Select
+
+    End Function
 
     Shared Sub setGesamtBetraege(ByRef RECHNUNG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, Optional Steuersatz_Proz As Object = Nothing)
         Dim steuerPflichtigerBetrag As Double = 0
@@ -235,12 +302,16 @@ Public Class cFakturierung
 
         ' Dim Nettozahlungsziel
 
-
+        Dim ZZTage = 10
         If RECHNUNG.RechnungsKundenNr > 0 Then
 
             Dim RECHNUNG_AD As New VERAG_PROG_ALLGEMEIN.cAdressen(RECHNUNG.RechnungsKundenNr)
             Dim RECHNUNG_KD As New VERAG_PROG_ALLGEMEIN.cKunde(RECHNUNG.RechnungsKundenNr)
 
+            If RECHNUNG_KD.Zahlungsziel IsNot Nothing AndAlso IsNumeric(RECHNUNG_KD.Zahlungsziel) Then
+                ZZTage = RECHNUNG_KD.Zahlungsziel
+            End If
+
             Select Case RECHNUNG.[BelegartenNr]
                 Case 70 'RECHNUNG
 
@@ -249,10 +320,10 @@ Public Class cFakturierung
                             strText = strText & "Der Rechnungsbetrag wurde durch erteilten Abbuchungsauftrag eingezogen." & vbCrLf
                         Else
                             If checkIfKreditaufwendungen(RECHNUNG) Then
-                                strZahlbar = "Zahlbar innerhalb 10 Tagen abzüglich Pos. 750; ab 10 Tagen netto fällig."
+                                strZahlbar = "Zahlbar innerhalb " & ZZTage & " Tagen abzüglich Pos. 750; ab 10 Tagen netto fällig."
                             Else
                                 'Zahlungsziel allgemein.
-                                strZahlbar = "Zahlbar innerhalb 10 Tagen ab Rechnungsdatum."
+                                strZahlbar = "Zahlbar innerhalb " & ZZTage & " Tagen ab Rechnungsdatum."
                             End If
 
                             'Zahlungsziel bei Maut/Diesel.
@@ -296,38 +367,54 @@ Public Class cFakturierung
                     End If
             End Select
 
-
-            ' Informations- und Werbetexte drucken
-            Dim sqlStr = "SELECT * FROM Rechnungstexte WHERE 1=1"
-            If RECHNUNG.Firma_ID > 0 Then sqlStr &= " AND (Firma_ID='" & RECHNUNG.Firma_ID & "' or Firma_ID is null) "
-            If If(RECHNUNG_AD.LandKz, "") <> "" Then sqlStr &= " AND (LandKz='" & RECHNUNG_AD.LandKz & "' or LandKz is null) "
-            If If(RECHNUNG.OffertenNr, 0) > 0 Then sqlStr &= " AND (OffertenNr='" & RECHNUNG.OffertenNr & "' or OffertenNr is null) "
-
-            'Wennn Rechnung als Email geschickt werden sollte Rechnungsdruck=2
-            If If(RECHNUNG_AD.Rechnungsdruck, -1) = 2 And If(RECHNUNG_AD.E_Mail, "") <> "" Then sqlStr &= " AND EMailRechnung=1 "
-
-            Select Case RECHNUNG.[BelegartenNr]
-                Case 70
-                    sqlStr &= " AND (DrucksteuerungsKz='R' OR DrucksteuerungsKz='') "
-                Case 71
-                    sqlStr &= " AND (DrucksteuerungsKz='G' OR DrucksteuerungsKz='') "
-            End Select
-            Dim dt_RechnungsTexte As DataTable = SQL.loadDgvBySql(sqlStr & " order by Firma_ID desc,LandKz desc,Offertennr desc", "FMZOLL")
-
-            If dt_RechnungsTexte.Rows.Count > 0 Then
-                strText &= dt_RechnungsTexte.Rows(0)("Text") & vbCrLf
-                '  MsgBox(dt_RechnungsTexte.Rows(0)("Text") & vbCrLf)
+            If getRTXT_SQL(strText, RECHNUNG, RECHNUNG_AD, RECHNUNG.Firma_ID, RECHNUNG.RechnungsLandKz, RECHNUNG.OffertenNr, True) Then
+            ElseIf getRTXT_SQL(strText, RECHNUNG, RECHNUNG_AD, RECHNUNG.Firma_ID, RECHNUNG.RechnungsLandKz, , True) Then
+            ElseIf getRTXT_SQL(strText, RECHNUNG, RECHNUNG_AD, RECHNUNG.Firma_ID, ,, True) Then
+            ElseIf getRTXT_SQL(strText, RECHNUNG, RECHNUNG_AD, ,,, True) Then
+            ElseIf getRTXT_SQL(strText, RECHNUNG, RECHNUNG_AD, ,,, False) Then
             End If
 
 
+            '' Informations- und Werbetexte drucken
+            'Dim sqlStr = "SELECT * FROM Rechnungstexte WHERE 1=1"
+            'If RECHNUNG.Firma_ID > 0 Then sqlStr &= " AND (Firma_ID='" & RECHNUNG.Firma_ID & "' or Firma_ID is null) "
+            'If If(RECHNUNG_AD.LandKz, "") <> "" Then sqlStr &= " AND (LandKz='" & RECHNUNG_AD.LandKz & "' or LandKz is null) "
+            'If If(RECHNUNG.OffertenNr, 0) > 0 Then sqlStr &= " AND (OffertenNr='" & RECHNUNG.OffertenNr & "' or OffertenNr is null) "
 
-            strText = strZahlbar & vbNewLine & strText
-            ' Text in Rechnungskopfsatz übernehmen.
-            If strText = "" Then
+            ''Wennn Rechnung als Email geschickt werden sollte Rechnungsdruck=2
+            'If If(RECHNUNG_AD.Rechnungsdruck, -1) = 2 And If(RECHNUNG_AD.E_Mail, "") <> "" Then sqlStr &= " AND EMailRechnung=1 "
+
+            'Select Case RECHNUNG.[BelegartenNr]
+            '    Case 70
+            '        sqlStr &= " AND (DrucksteuerungsKz='R' OR DrucksteuerungsKz='') "
+            '    Case 71
+            '        sqlStr &= " AND (DrucksteuerungsKz='G' OR DrucksteuerungsKz='') "
+            'End Select
+
+            'Dim dt_RechnungsTexte As DataTable = SQL.loadDgvBySql(sqlStr & " order by Firma_ID desc,LandKz desc,Offertennr desc", "FMZOLL")
+            'If dt_RechnungsTexte.Rows.Count > 0 Then
+            '    strText &= dt_RechnungsTexte.Rows(0)("Text") & vbCrLf
+            '    '  MsgBox(dt_RechnungsTexte.Rows(0)("Text") & vbCrLf)
+            'End If
+
+            Select Case RECHNUNG.Firma_ID
+                Case 21, 22, 23
+                    Dim VORL = RECHNUNG.POSITIONEN.FindAll(Function(x) (x.LeistungsNr = 700 Or x.LeistungsNr = 710))
+                    If VORL IsNot Nothing AndAlso VORL.Count > 0 Then
+                        strText = strText.Replace("<Vorlageprovision>", "Bei Zahlungseingang bis zum <Rechnungsdatum+10T> können Sie die verrechnete Vorlageprovision in Abzug bringen. " & vbCrLf)
+                    End If
+            End Select
+
+                strText = strZahlbar & vbNewLine & strText
+                ' Text in Rechnungskopfsatz übernehmen.
+                strText = strText.Replace("<Vorlageprovision>", "")
+
+                If strText = "" Then
                 RECHNUNG.Text = Nothing
             Else
                 strText.Replace("<EMailAdresse>", If(RECHNUNG_AD.E_Mail, " - "))
 
+
                 ' varPos = InStr(1, strText, "<EMailAdresse>")
                 '  If varPos > 0 And Not rstAdr.EOF And Not IsNull(rstAdr![E-Mail]) Then
                 'If Len(strText) > (varPos - 1 + Len("<EMailAdresse>")) Then
@@ -338,9 +425,18 @@ Public Class cFakturierung
                 '  End If
                 ' Me![Text] = strText
                 RECHNUNG.Text = strText
+                End If
+
             End If
 
-        End If
+        'Select Case RECHNUNG.Firma_ID
+        '    Case "21", "22", "23"
+        '        strText = strText.Replace("", "")
+        'End Select
+
+
+        'MsgBox("Firma:" & RECHNUNG.Firma_ID & " - Land:" & "" & RECHNUNG.RechnungsLandKz & " - OffertenNr:" & RECHNUNG.OffertenNr & " - TXT: " & strText)
+
 
 
         Return strText
@@ -348,6 +444,47 @@ Public Class cFakturierung
 
     End Function
 
+
+
+    Shared Function getRTXT_SQL(ByRef strText, RECHNUNG, RECHNUNG_AD, Optional FIRMA_ID = Nothing, Optional LandKz = Nothing, Optional OffertenNr = Nothing, Optional EMailRechnung = Nothing) As Boolean
+        ' Informations- und Werbetexte drucken
+        Dim sqlStr = "SELECT * FROM Rechnungstexte WHERE 1=1"
+        If FIRMA_ID IsNot Nothing Then
+            sqlStr &= " AND Firma_ID='" & RECHNUNG.Firma_ID & "' "
+        Else
+            sqlStr &= " AND Firma_ID is null"
+        End If
+        If LandKz IsNot Nothing Then
+            sqlStr &= " AND LandKz='" & LandKz & "' "
+        Else
+            sqlStr &= " AND LandKz is null"
+        End If
+        If OffertenNr IsNot Nothing Then
+            sqlStr &= " AND OffertenNr='" & OffertenNr & "' "
+        Else
+            sqlStr &= " AND OffertenNr is null"
+        End If
+        If EMailRechnung IsNot Nothing Then
+            'Wennn Rechnung als Email geschickt werden sollte Rechnungsdruck=2
+            If If(RECHNUNG_AD.Rechnungsdruck, -1) = 2 And If(RECHNUNG_AD.E_Mail, "") <> "" Then sqlStr &= " AND EMailRechnung=1 "
+        End If
+
+        Select Case RECHNUNG.[BelegartenNr]
+            Case 70
+                sqlStr &= " AND (DrucksteuerungsKz='R' OR DrucksteuerungsKz='') "
+            Case 71
+                sqlStr &= " AND (DrucksteuerungsKz='G' OR DrucksteuerungsKz='') "
+        End Select
+        '  MsgBox(sqlStr & " order by Firma_ID desc,LandKz desc,Offertennr desc")
+
+        Dim dt_RechnungsTexte As DataTable = SQL.loadDgvBySql(sqlStr & " order by Firma_ID desc,LandKz desc,Offertennr desc", "FMZOLL")
+        If dt_RechnungsTexte.Rows.Count > 0 Then
+            strText &= dt_RechnungsTexte.Rows(0)("Text") & vbCrLf
+            Return True
+        End If
+        Return False
+    End Function
+
     Shared Function checkIfcheckIfZollbelege(RECHNUNG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang) As Boolean
         For Each POS In RECHNUNG.POSITIONEN
             If (POS.LeistungsNr = 10 Or POS.LeistungsNr = 60 Or POS.LeistungsNr = 70) Then
@@ -746,6 +883,9 @@ Public Class cFakturierung
             rpt.txtKdAuftragsNr_Ueberschrift.Visible = (rpt.txtKdAuftragsNr.Text <> String.Empty)
 
             rpt.txtVermerk.Text = (If(RECHNUNG.Text, "").ToString.Trim & vbNewLine & vbNewLine & If(RECHNUNG.Notiz, "").ToString.Trim).ToString.Trim
+            If RECHNUNG.RechnungsDatum IsNot Nothing Then
+                rpt.txtVermerk.Text = rpt.txtVermerk.Text.Replace("<Rechnungsdatum+10T>", CDate(RECHNUNG.RechnungsDatum).AddDays(10).ToShortDateString)
+            End If
 
             '  REVERSE CHARGE (Übergang der Steuerschuld in EU-Ländern).
             '             Dies hat zur Folge, dass steuerfreie Rechnungsbeträge für Leistungen,
@@ -949,6 +1089,31 @@ Public Class cFakturierung
                 End Try
                 '-------------------------------------------------------------------------------
 
+                'ABRECHNUNGS API:
+                '-------------------------------------------------------------------------------
+                If Not Kopie Then
+                    Try
+                        Dim KUNDE_ERW As New VERAG_PROG_ALLGEMEIN.cKundenErweitert(RECHNUNG.RechnungsKundenNr)
+                        If KUNDE_ERW IsNot Nothing Then
+                            'TRADESHIFT:
+                            Try
+                                If KUNDE_ERW.kde_API_Tradeshift Then
+                                    Select Case RECHNUNG.Firma_ID
+                                        Case 21, 22, 23
+                                            System.IO.File.Copy(tmpPath, "\\srv01.unisu.at\Unisped\___AR_PDF\" & RG_Bezeichnung, True)
+                                    End Select
+                                End If
+                            Catch ex As Exception
+                                MsgBox("Tradeshift Export fehlgeschlagen! " & ex.Message & ex.StackTrace)
+                            End Try
+                        End If
+                    Catch ex As Exception
+                        MsgBox("API Fehler!" & ex.Message & ex.StackTrace)
+                    End Try
+                End If
+                '-------------------------------------------------------------------------------
+
+
                 Select Case If(Rechnugnsdruck > 0, Rechnugnsdruck, If(AD.Rechnungsdruck, 0))'If(AD.Rechnungsdruck, 0)
                     Case 0, 1 'DRUCKEN
 
@@ -1116,6 +1281,31 @@ Public Class cFakturierung
         End Select
         getSignature &= "<br>"
 
+        'BREXIT
+        If True Then
+            Select Case firma
+                Case 21 'UNISPED
+                    getSignature &= "<br>"
+                    getSignature &= "<div style=""font-size:14px"">"
+                    getSignature &= "Sind Sie bereits auf den BREXIT vorbereitet?<br/>"
+                    getSignature &= "Weiter Infos finden Sie unter: <a href=""http://www.brexit.at"">http://www.brexit.at<br/>"
+                    getSignature &= "<img width=""250"" height=""80"" src=""" & imgsrc & "bexit.png""/></a><br/>"
+                    getSignature &= "<b>BREXIT Hotline:</b>  +43 7711 2677 - 27|  <b>@</b>  <a href=""mailto:brexit@unisped.at"">brexit@unisped.at</a> <br/>"
+                    getSignature &= "</div>"
+                    getSignature &= "<br>"
+                    getSignature &= "<br>"
+                Case Else
+                    getSignature &= "<br>"
+                    getSignature &= "<div style=""font-size:14px"">"
+                    getSignature &= "Sind Sie bereits auf den BREXIT vorbereitet?<br/>"
+                    getSignature &= "Weiter Infos finden Sie unter: <a href=""http://www.brexit.at"">http://www.brexit.at<br/>"
+                    getSignature &= "<img width=""250"" height=""80"" src=""" & imgsrc & "brexit.png""/></a><br/>"
+                    getSignature &= "<b>BREXIT Hotline:</b>  +43 7711 2777 - 885  |  <b>@</b>  <a href=""mailto:brexit@verag.ag"">brexit@verag.ag</a> <br/>"
+                    getSignature &= "</div>"
+                    getSignature &= "<br>"
+                    getSignature &= "<br>"
+            End Select
+        End If
         Select Case landKz
             Case "D", "A", "DE", "AT", "CH"
                 getSignature &= "<span style=""font-size:9px"">Wir arbeiten ausschließlich auf Grund der Allgemeinen Österreichischen Spediteurbedingungen in der jeweils geltenden Fassung. Zahlungen werden zunächst auf Frachten,<br>
@@ -1450,6 +1640,32 @@ Public Class cFakturierung
             End Try
             '-------------------------------------------------------------------------------
 
+            'ABRECHNUNGS API:
+            '-------------------------------------------------------------------------------
+            Try
+                If Not SRDruckWiederholen Then
+                    Dim KUNDE_ERW As New VERAG_PROG_ALLGEMEIN.cKundenErweitert(dt.Rows(0)("RechnungsKundenNr"))
+                    If KUNDE_ERW IsNot Nothing Then
+
+                        'TRADESHIFT:
+                        Try
+                            If KUNDE_ERW.kde_API_Tradeshift Then
+                                Select Case dt.Rows(0)("Firma_ID")
+                                    Case 21, 22, 23
+                                        System.IO.File.Copy(pathPDF, "\\srv01.unisu.at\Unisped\___AR_PDF\Sammelrechnung_" & RechnungsNr & ".pdf", True)
+                                End Select
+                            End If
+                        Catch ex As Exception
+                            MsgBox("Tradeshift Export fehlgeschalgen! " & ex.Message & ex.StackTrace)
+                        End Try
+                    End If
+                End If
+            Catch ex As Exception
+                MsgBox("API Fehler!" & ex.Message & ex.StackTrace)
+            End Try
+            '-------------------------------------------------------------------------------
+
+
         End If
         '-------------- ENDE -------------- 
     End Function
diff --git a/SDL/Fakturierung/frmAbrechnungsMaske.vb b/SDL/Fakturierung/frmAbrechnungsMaske.vb
index 3d300447..0528b34a 100644
--- a/SDL/Fakturierung/frmAbrechnungsMaske.vb
+++ b/SDL/Fakturierung/frmAbrechnungsMaske.vb
@@ -317,11 +317,16 @@ Public Class frmAbrechnungsMaske
         If MyDatagridview1.SelectedRows.Count > 0 Then
             If vbYes = MsgBox("Es werden " & MyDatagridview1.SelectedRows.Count & " Rechnungen in ein PDF gewandelt." & vbNewLine & "Möchten Sie fortfahren?", vbYesNoCancel) Then
 
+                'Rechnungsdatum festlegen:
+                Dim RechnungsDatumTMP As Date = Now
+                cFakturierung.getRgDatInput("", RechnungsDatumTMP)
+
+
                 Dim list As New List(Of String) ' Sammlung PDFs
 
                 For Each r As DataGridViewRow In MyDatagridview1.SelectedRows
                     Dim path = ""
-                    cFakturierung.doRechnungsDruck(r.Cells("RK_ID").Value,,, 4, path, cboPrinter.Text)
+                    cFakturierung.doRechnungsDruck(r.Cells("RK_ID").Value, RechnungsDatumTMP,, 4, path, cboPrinter.Text)
                     If path <> "" Then list.Add(path)
                 Next
 
@@ -368,11 +373,18 @@ Public Class frmAbrechnungsMaske
         ElseIf MyDatagridview1.SelectedRows.Count > 1 Then
 
             If vbYes = MsgBox("Es werden " & MyDatagridview1.SelectedRows.Count & " Rechnungen ans Mail angefügt." & vbNewLine & "Möchten Sie fortfahren?", vbYesNoCancel) Then
+
+                'Rechnungsdatum festlegen:
+                Dim RechnungsDatumTMP As Date = Now
+                cFakturierung.getRgDatInput("", RechnungsDatumTMP)
+
+
+
                 Dim list As New List(Of String) ' Sammlung PDFs
 
                 For Each r As DataGridViewRow In MyDatagridview1.SelectedRows
                     Dim path = ""
-                    cFakturierung.doRechnungsDruck(r.Cells("RK_ID").Value,,, 4, path, cboPrinter.Text)
+                    cFakturierung.doRechnungsDruck(r.Cells("RK_ID").Value, RechnungsDatumTMP,, 4, path, cboPrinter.Text)
                     If path <> "" Then list.Add(path)
                 Next
 
@@ -459,8 +471,15 @@ Public Class frmAbrechnungsMaske
     Private Sub Button7_Click2(sender As Object, e As EventArgs) Handles Button7.Click
         If MyDatagridview1.SelectedRows.Count > 0 Then
             If vbYes = MsgBox("Es werden " & MyDatagridview1.SelectedRows.Count & " Rechnungen ans Mail gedruckt." & vbNewLine & "Möchten Sie fortfahren?", vbYesNoCancel) Then
+
+                'Rechnungsdatum festlegen:
+                Dim RechnungsDatumTMP As Date = Now
+                cFakturierung.getRgDatInput("", RechnungsDatumTMP)
+
+
+
                 For Each r As DataGridViewRow In MyDatagridview1.SelectedRows
-                    cFakturierung.doRechnungsDruck(r.Cells("RK_ID").Value,,, 0, cboPrinter.Text)
+                    cFakturierung.doRechnungsDruck(r.Cells("RK_ID").Value, RechnungsDatumTMP,, 0, cboPrinter.Text)
                 Next
                 'merge PDFs path
                 initDGV()
diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb
index 5284f471..236b31a1 100644
--- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb
+++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb
@@ -1078,29 +1078,31 @@ Public Class usrCntlFaktAbrechnung
                 If RECHNUNG Is Nothing Then loaded = loadedtmp : Exit Sub
                 '  MsgBox(RECHNUNG.POSITIONEN.Count)
                 For Each POS In RECHNUNG.POSITIONEN
-                    If POS.Anzahl > 0 And POS.Preis <> 0 Then 'HIER WIRD GEFILTERT --> Nur wo etwas zu verrechnen ist!
+                    If .Columns.Count > 0 Then
+                        If POS.Anzahl > 0 And POS.Preis <> 0 Then 'HIER WIRD GEFILTERT --> Nur wo etwas zu verrechnen ist!
 
 
-                        'If RECHNUNG.Steuersatz_Proz = 0 Then
-                        '    .Rows.Add(POS.LeistungsNr & " " & POS.LeistungsBez, POS.Anzahl, POS.Preis, 0, (If(POS.SteuerfreierBetrag, 0) + If(POS.SteuerpflichtigerBetrag, 0)), POS.AufschubkontoNr)
-                        'Else
-                        '    .Rows.Add(POS.LeistungsNr & " " & POS.LeistungsBez, POS.Anzahl, POS.Preis, POS.SteuerpflichtigerBetrag, POS.SteuerfreierBetrag, POS.AufschubkontoNr)
-                        'End If
+                            'If RECHNUNG.Steuersatz_Proz = 0 Then
+                            '    .Rows.Add(POS.LeistungsNr & " " & POS.LeistungsBez, POS.Anzahl, POS.Preis, 0, (If(POS.SteuerfreierBetrag, 0) + If(POS.SteuerpflichtigerBetrag, 0)), POS.AufschubkontoNr)
+                            'Else
+                            '    .Rows.Add(POS.LeistungsNr & " " & POS.LeistungsBez, POS.Anzahl, POS.Preis, POS.SteuerpflichtigerBetrag, POS.SteuerfreierBetrag, POS.AufschubkontoNr)
+                            'End If
 
 
-                        .Rows.Add(POS.LeistungsNr & " " & POS.LeistungsBez, POS.Anzahl, POS.Preis * vorzeichen, If(POS.SteuerpflichtigerBetrag = 0, "", POS.SteuerpflichtigerBetrag * vorzeichen), If(POS.SteuerfreierBetrag = 0, "", POS.SteuerfreierBetrag * vorzeichen), POS.AufschubkontoNr)
+                            .Rows.Add(POS.LeistungsNr & " " & POS.LeistungsBez, POS.Anzahl, POS.Preis * vorzeichen, If(POS.SteuerpflichtigerBetrag = 0, "", POS.SteuerpflichtigerBetrag * vorzeichen), If(POS.SteuerfreierBetrag = 0, "", POS.SteuerfreierBetrag * vorzeichen), POS.AufschubkontoNr)
 
-                        If CBool(POS.Steuerpflichtig) Then
-                            steuerPflichtigerBetrag += POS.SteuerpflichtigerBetrag
-                        Else
-                            steuerFreierBetrag += POS.SteuerfreierBetrag
-                        End If
+                            If CBool(POS.Steuerpflichtig) Then
+                                steuerPflichtigerBetrag += POS.SteuerpflichtigerBetrag
+                            Else
+                                steuerFreierBetrag += POS.SteuerfreierBetrag
+                            End If
 
-                        If CBool(SQL.DLookup("[Abfertigungskosten]", "Leistungen", "[LeistungsNr]=" & POS.[LeistungsNr], "FMZOLL", False)) Then
+                            If CBool(SQL.DLookup("[Abfertigungskosten]", "Leistungen", "[LeistungsNr]=" & POS.[LeistungsNr], "FMZOLL", False)) Then
 
-                            Abfertigungskosten += VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(POS.[SteuerpflichtigerBetrag], RECHNUNG.Währungscode, "EUR")
-                            Abfertigungskosten += VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(POS.[SteuerfreierBetrag], RECHNUNG.Währungscode, "EUR")
+                                Abfertigungskosten += VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(POS.[SteuerpflichtigerBetrag], RECHNUNG.Währungscode, "EUR")
+                                Abfertigungskosten += VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(POS.[SteuerfreierBetrag], RECHNUNG.Währungscode, "EUR")
 
+                            End If
                         End If
                     End If
                 Next
@@ -1248,9 +1250,9 @@ Public Class usrCntlFaktAbrechnung
 
         'Die 0-Einträge löschen:
         RECHNUNG.POSITIONEN.RemoveAll(Function(p) p.Anzahl = 0 Or p.Preis = 0)
-
         initDGVRechnungenPositionen()
 
+
         'loaded = True
         loaded = loadedTmp
 
diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.Designer.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.Designer.vb
index 7ae35c10..eec59af3 100644
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.Designer.vb
+++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.Designer.vb
@@ -73,6 +73,7 @@ Partial Class usrcntlVorauskasse
         Me.Label40 = New System.Windows.Forms.Label()
         Me.Label41 = New System.Windows.Forms.Label()
         Me.pnlBottom = New System.Windows.Forms.Panel()
+        Me.Button4 = New System.Windows.Forms.Button()
         Me.cboFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Label44 = New System.Windows.Forms.Label()
         Me.txtAbfertigungsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -149,7 +150,6 @@ Partial Class usrcntlVorauskasse
         Me.txtAdresse2 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtAdresse1 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtFirma = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.Button4 = New System.Windows.Forms.Button()
         CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.pnlBottom.SuspendLayout()
         Me.Panel4.SuspendLayout()
@@ -160,72 +160,80 @@ Partial Class usrcntlVorauskasse
         '
         Me.lblVollmachtDE.AutoSize = True
         Me.lblVollmachtDE.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblVollmachtDE.Location = New System.Drawing.Point(43, 9)
+        Me.lblVollmachtDE.Location = New System.Drawing.Point(64, 14)
+        Me.lblVollmachtDE.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblVollmachtDE.Name = "lblVollmachtDE"
-        Me.lblVollmachtDE.Size = New System.Drawing.Size(256, 20)
-        Me.lblVollmachtDE.TabIndex = 1
+        Me.lblVollmachtDE.Size = New System.Drawing.Size(367, 29)
+        Me.lblVollmachtDE.TabIndex = 2
         Me.lblVollmachtDE.Text = "IMPORTAVISO Vorauszahlung"
         '
         'lblHerrFrau
         '
         Me.lblHerrFrau.AutoSize = True
-        Me.lblHerrFrau.Location = New System.Drawing.Point(170, 37)
+        Me.lblHerrFrau.Location = New System.Drawing.Point(255, 57)
+        Me.lblHerrFrau.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblHerrFrau.Name = "lblHerrFrau"
-        Me.lblHerrFrau.Size = New System.Drawing.Size(56, 13)
+        Me.lblHerrFrau.Size = New System.Drawing.Size(81, 20)
         Me.lblHerrFrau.TabIndex = 8
         Me.lblHerrFrau.Text = "Herr/Frau:"
         '
         'Label1
         '
         Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(170, 75)
+        Me.Label1.Location = New System.Drawing.Point(255, 115)
+        Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(48, 13)
+        Me.Label1.Size = New System.Drawing.Size(72, 20)
         Me.Label1.TabIndex = 16
         Me.Label1.Text = "Adresse:"
         '
         'Label2
         '
         Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(170, 120)
+        Me.Label2.Location = New System.Drawing.Point(255, 185)
+        Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(43, 13)
+        Me.Label2.Size = New System.Drawing.Size(63, 20)
         Me.Label2.TabIndex = 19
         Me.Label2.Text = "UID-Nr:"
         '
         'Label3
         '
         Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(582, 120)
+        Me.Label3.Location = New System.Drawing.Point(873, 185)
+        Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(50, 13)
+        Me.Label3.Size = New System.Drawing.Size(74, 20)
         Me.Label3.TabIndex = 21
         Me.Label3.Text = "EORI-Nr:"
         '
         'Label4
         '
         Me.Label4.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(582, 139)
+        Me.Label4.Location = New System.Drawing.Point(873, 214)
+        Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(27, 13)
+        Me.Label4.Size = New System.Drawing.Size(39, 20)
         Me.Label4.TabIndex = 25
         Me.Label4.Text = "Fax:"
         '
         'Label5
         '
         Me.Label5.AutoSize = True
-        Me.Label5.Location = New System.Drawing.Point(170, 139)
+        Me.Label5.Location = New System.Drawing.Point(255, 214)
+        Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(28, 13)
+        Me.Label5.Size = New System.Drawing.Size(38, 20)
         Me.Label5.TabIndex = 23
         Me.Label5.Text = "Tel.:"
         '
         'Label6
         '
         Me.Label6.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(170, 158)
+        Me.Label6.Location = New System.Drawing.Point(255, 243)
+        Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(39, 13)
+        Me.Label6.Size = New System.Drawing.Size(57, 20)
         Me.Label6.TabIndex = 27
         Me.Label6.Text = "E-Mail:"
         '
@@ -234,27 +242,30 @@ Partial Class usrcntlVorauskasse
         Me.btn.BackgroundImage = Global.SDL.My.Resources.Resources.search
         Me.btn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btn.Location = New System.Drawing.Point(937, 53)
+        Me.btn.Location = New System.Drawing.Point(1406, 82)
+        Me.btn.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.btn.Name = "btn"
-        Me.btn.Size = New System.Drawing.Size(26, 20)
+        Me.btn.Size = New System.Drawing.Size(39, 31)
         Me.btn.TabIndex = 15
         Me.btn.UseVisualStyleBackColor = True
         '
         'Label8
         '
         Me.Label8.AutoSize = True
-        Me.Label8.Location = New System.Drawing.Point(513, 12)
+        Me.Label8.Location = New System.Drawing.Point(770, 18)
+        Me.Label8.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label8.Name = "Label8"
-        Me.Label8.Size = New System.Drawing.Size(134, 13)
+        Me.Label8.Size = New System.Drawing.Size(204, 20)
         Me.Label8.TabIndex = 4
         Me.Label8.Text = "Ansprechpartner (VERAG):"
         '
         'Label11
         '
         Me.Label11.AutoSize = True
-        Me.Label11.Location = New System.Drawing.Point(582, 158)
+        Me.Label11.Location = New System.Drawing.Point(873, 243)
+        Me.Label11.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label11.Name = "Label11"
-        Me.Label11.Size = New System.Drawing.Size(56, 13)
+        Me.Label11.Size = New System.Drawing.Size(84, 20)
         Me.Label11.TabIndex = 29
         Me.Label11.Text = "FA-St.-Nr.:"
         '
@@ -263,9 +274,10 @@ Partial Class usrcntlVorauskasse
         Me.pic.BackgroundImage = Global.SDL.My.Resources.Resources.pdf
         Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
         Me.pic.Cursor = System.Windows.Forms.Cursors.Hand
-        Me.pic.Location = New System.Drawing.Point(5, 5)
+        Me.pic.Location = New System.Drawing.Point(8, 8)
+        Me.pic.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.pic.Name = "pic"
-        Me.pic.Size = New System.Drawing.Size(32, 32)
+        Me.pic.Size = New System.Drawing.Size(48, 49)
         Me.pic.TabIndex = 30
         Me.pic.TabStop = False
         '
@@ -275,9 +287,10 @@ Partial Class usrcntlVorauskasse
         Me.btnDown.BackgroundImage = Global.SDL.My.Resources.Resources.pfeil_unten
         Me.btnDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.btnDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnDown.Location = New System.Drawing.Point(976, 42)
+        Me.btnDown.Location = New System.Drawing.Point(1464, 65)
+        Me.btnDown.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.btnDown.Name = "btnDown"
-        Me.btnDown.Size = New System.Drawing.Size(25, 21)
+        Me.btnDown.Size = New System.Drawing.Size(38, 32)
         Me.btnDown.TabIndex = 10
         Me.btnDown.UseVisualStyleBackColor = True
         '
@@ -287,9 +300,10 @@ Partial Class usrcntlVorauskasse
         Me.btnUp.BackgroundImage = Global.SDL.My.Resources.Resources.pfeil_oben
         Me.btnUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.btnUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnUp.Location = New System.Drawing.Point(976, 22)
+        Me.btnUp.Location = New System.Drawing.Point(1464, 34)
+        Me.btnUp.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.btnUp.Name = "btnUp"
-        Me.btnUp.Size = New System.Drawing.Size(25, 21)
+        Me.btnUp.Size = New System.Drawing.Size(38, 32)
         Me.btnUp.TabIndex = 7
         Me.btnUp.UseVisualStyleBackColor = True
         '
@@ -299,124 +313,138 @@ Partial Class usrcntlVorauskasse
         Me.btnDel.BackgroundImage = Global.SDL.My.Resources.Resources.del
         Me.btnDel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.btnDel.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnDel.Location = New System.Drawing.Point(976, -1)
+        Me.btnDel.Location = New System.Drawing.Point(1464, -2)
+        Me.btnDel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.btnDel.Name = "btnDel"
-        Me.btnDel.Size = New System.Drawing.Size(25, 21)
+        Me.btnDel.Size = New System.Drawing.Size(38, 32)
         Me.btnDel.TabIndex = 0
         Me.btnDel.UseVisualStyleBackColor = True
         '
         'Panel3
         '
         Me.Panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.Panel3.Location = New System.Drawing.Point(17, 297)
+        Me.Panel3.Location = New System.Drawing.Point(26, 457)
+        Me.Panel3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.Panel3.Name = "Panel3"
-        Me.Panel3.Size = New System.Drawing.Size(257, 2)
-        Me.Panel3.TabIndex = 32
+        Me.Panel3.Size = New System.Drawing.Size(384, 2)
+        Me.Panel3.TabIndex = 33
         '
         'Panel2
         '
         Me.Panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.Panel2.Location = New System.Drawing.Point(17, 81)
+        Me.Panel2.Location = New System.Drawing.Point(26, 125)
+        Me.Panel2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.Panel2.Name = "Panel2"
-        Me.Panel2.Size = New System.Drawing.Size(257, 2)
+        Me.Panel2.Size = New System.Drawing.Size(384, 2)
         Me.Panel2.TabIndex = 7
         '
         'Label13
         '
         Me.Label13.AutoSize = True
-        Me.Label13.Location = New System.Drawing.Point(18, 304)
+        Me.Label13.Location = New System.Drawing.Point(27, 468)
+        Me.Label13.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label13.Name = "Label13"
-        Me.Label13.Size = New System.Drawing.Size(76, 13)
-        Me.Label13.TabIndex = 33
+        Me.Label13.Size = New System.Drawing.Size(118, 20)
+        Me.Label13.TabIndex = 34
         Me.Label13.Text = "Gesamtsumme"
         '
         'Label14
         '
         Me.Label14.AutoSize = True
-        Me.Label14.Location = New System.Drawing.Point(18, 259)
+        Me.Label14.Location = New System.Drawing.Point(27, 432)
+        Me.Label14.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label14.Name = "Label14"
-        Me.Label14.Size = New System.Drawing.Size(98, 13)
-        Me.Label14.TabIndex = 27
+        Me.Label14.Size = New System.Drawing.Size(144, 20)
+        Me.Label14.TabIndex = 30
         Me.Label14.Text = "MWSt. aus Dienstl."
         '
         'Label15
         '
         Me.Label15.AutoSize = True
-        Me.Label15.Location = New System.Drawing.Point(18, 221)
+        Me.Label15.Location = New System.Drawing.Point(27, 340)
+        Me.Label15.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label15.Name = "Label15"
-        Me.Label15.Size = New System.Drawing.Size(28, 13)
-        Me.Label15.TabIndex = 22
+        Me.Label15.Size = New System.Drawing.Size(42, 20)
+        Me.Label15.TabIndex = 23
         Me.Label15.Text = "SVS"
         '
         'Label16
         '
         Me.Label16.AutoSize = True
-        Me.Label16.Location = New System.Drawing.Point(18, 278)
+        Me.Label16.Location = New System.Drawing.Point(27, 370)
+        Me.Label16.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label16.Name = "Label16"
-        Me.Label16.Size = New System.Drawing.Size(67, 13)
-        Me.Label16.TabIndex = 30
+        Me.Label16.Size = New System.Drawing.Size(99, 20)
+        Me.Label16.TabIndex = 26
         Me.Label16.Text = "Papiere Porti"
         '
         'Label18
         '
         Me.Label18.AutoSize = True
-        Me.Label18.Location = New System.Drawing.Point(18, 183)
+        Me.Label18.Location = New System.Drawing.Point(27, 282)
+        Me.Label18.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label18.Name = "Label18"
-        Me.Label18.Size = New System.Drawing.Size(115, 13)
-        Me.Label18.TabIndex = 18
+        Me.Label18.Size = New System.Drawing.Size(171, 20)
+        Me.Label18.TabIndex = 19
         Me.Label18.Text = "Ãœbersetung Rechnung"
         '
         'Label19
         '
         Me.Label19.AutoSize = True
-        Me.Label19.Location = New System.Drawing.Point(18, 202)
+        Me.Label19.Location = New System.Drawing.Point(27, 311)
+        Me.Label19.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label19.Name = "Label19"
-        Me.Label19.Size = New System.Drawing.Size(33, 13)
-        Me.Label19.TabIndex = 20
+        Me.Label19.Size = New System.Drawing.Size(47, 20)
+        Me.Label19.TabIndex = 21
         Me.Label19.Text = "Aviso"
         '
         'Label20
         '
         Me.Label20.AutoSize = True
-        Me.Label20.Location = New System.Drawing.Point(18, 164)
+        Me.Label20.Location = New System.Drawing.Point(27, 252)
+        Me.Label20.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label20.Name = "Label20"
-        Me.Label20.Size = New System.Drawing.Size(129, 13)
-        Me.Label20.TabIndex = 16
+        Me.Label20.Size = New System.Drawing.Size(191, 20)
+        Me.Label20.TabIndex = 17
         Me.Label20.Text = "korr. Rechnung anfordern"
         '
         'Label21
         '
         Me.Label21.AutoSize = True
-        Me.Label21.Location = New System.Drawing.Point(18, 145)
+        Me.Label21.Location = New System.Drawing.Point(27, 223)
+        Me.Label21.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label21.Name = "Label21"
-        Me.Label21.Size = New System.Drawing.Size(45, 13)
-        Me.Label21.TabIndex = 14
+        Me.Label21.Size = New System.Drawing.Size(67, 20)
+        Me.Label21.TabIndex = 15
         Me.Label21.Text = "Clearing"
         '
         'Label22
         '
         Me.Label22.AutoSize = True
-        Me.Label22.Location = New System.Drawing.Point(18, 126)
+        Me.Label22.Location = New System.Drawing.Point(27, 194)
+        Me.Label22.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label22.Name = "Label22"
-        Me.Label22.Size = New System.Drawing.Size(41, 13)
-        Me.Label22.TabIndex = 12
+        Me.Label22.Size = New System.Drawing.Size(60, 20)
+        Me.Label22.TabIndex = 13
         Me.Label22.Text = "ATLAS"
         '
         'Label23
         '
         Me.Label23.AutoSize = True
-        Me.Label23.Location = New System.Drawing.Point(18, 107)
+        Me.Label23.Location = New System.Drawing.Point(27, 165)
+        Me.Label23.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label23.Name = "Label23"
-        Me.Label23.Size = New System.Drawing.Size(89, 13)
-        Me.Label23.TabIndex = 10
+        Me.Label23.Size = New System.Drawing.Size(131, 20)
+        Me.Label23.TabIndex = 11
         Me.Label23.Text = "weitere Tarif-Pos."
         '
         'Label24
         '
         Me.Label24.AutoSize = True
-        Me.Label24.Location = New System.Drawing.Point(18, 88)
+        Me.Label24.Location = New System.Drawing.Point(27, 135)
+        Me.Label24.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label24.Name = "Label24"
-        Me.Label24.Size = New System.Drawing.Size(93, 13)
+        Me.Label24.Size = New System.Drawing.Size(140, 20)
         Me.Label24.TabIndex = 8
         Me.Label24.Text = "Verzollungskosten"
         '
@@ -424,9 +452,10 @@ Partial Class usrcntlVorauskasse
         '
         Me.Label25.AutoSize = True
         Me.Label25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label25.Location = New System.Drawing.Point(18, 43)
+        Me.Label25.Location = New System.Drawing.Point(27, 66)
+        Me.Label25.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label25.Name = "Label25"
-        Me.Label25.Size = New System.Drawing.Size(40, 13)
+        Me.Label25.Size = New System.Drawing.Size(57, 20)
         Me.Label25.TabIndex = 3
         Me.Label25.Text = "EUST"
         '
@@ -434,9 +463,10 @@ Partial Class usrcntlVorauskasse
         '
         Me.Label27.AutoSize = True
         Me.Label27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Underline), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label27.Location = New System.Drawing.Point(18, 4)
+        Me.Label27.Location = New System.Drawing.Point(27, 6)
+        Me.Label27.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label27.Name = "Label27"
-        Me.Label27.Size = New System.Drawing.Size(108, 13)
+        Me.Label27.Size = New System.Drawing.Size(159, 20)
         Me.Label27.TabIndex = 0
         Me.Label27.Text = "Kostenaufstellung"
         '
@@ -444,9 +474,10 @@ Partial Class usrcntlVorauskasse
         '
         Me.Label28.AutoSize = True
         Me.Label28.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Underline), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label28.Location = New System.Drawing.Point(170, 4)
+        Me.Label28.Location = New System.Drawing.Point(255, 6)
+        Me.Label28.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label28.Name = "Label28"
-        Me.Label28.Size = New System.Drawing.Size(124, 13)
+        Me.Label28.Size = New System.Drawing.Size(178, 20)
         Me.Label28.TabIndex = 0
         Me.Label28.Text = "Abgabenberechnung"
         '
@@ -454,35 +485,39 @@ Partial Class usrcntlVorauskasse
         '
         Me.Label29.AutoSize = True
         Me.Label29.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label29.Location = New System.Drawing.Point(18, 24)
+        Me.Label29.Location = New System.Drawing.Point(27, 37)
+        Me.Label29.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label29.Name = "Label29"
-        Me.Label29.Size = New System.Drawing.Size(38, 13)
+        Me.Label29.Size = New System.Drawing.Size(55, 20)
         Me.Label29.TabIndex = 1
         Me.Label29.Text = "ZOLL"
         '
         'Panel1
         '
         Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.Panel1.Location = New System.Drawing.Point(170, 145)
+        Me.Panel1.Location = New System.Drawing.Point(255, 223)
+        Me.Panel1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(220, 2)
+        Me.Panel1.Size = New System.Drawing.Size(329, 2)
         Me.Panel1.TabIndex = 16
         '
         'pnl
         '
         Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.pnl.Location = New System.Drawing.Point(170, 62)
+        Me.pnl.Location = New System.Drawing.Point(255, 95)
+        Me.pnl.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.pnl.Name = "pnl"
-        Me.pnl.Size = New System.Drawing.Size(220, 2)
+        Me.pnl.Size = New System.Drawing.Size(329, 2)
         Me.pnl.TabIndex = 5
         '
         'Label30
         '
         Me.Label30.AutoSize = True
         Me.Label30.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label30.Location = New System.Drawing.Point(170, 171)
+        Me.Label30.Location = New System.Drawing.Point(255, 263)
+        Me.Label30.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label30.Name = "Label30"
-        Me.Label30.Size = New System.Drawing.Size(40, 13)
+        Me.Label30.Size = New System.Drawing.Size(57, 20)
         Me.Label30.TabIndex = 19
         Me.Label30.Text = "EUST"
         '
@@ -490,117 +525,130 @@ Partial Class usrcntlVorauskasse
         '
         Me.Label31.AutoSize = True
         Me.Label31.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label31.Location = New System.Drawing.Point(170, 88)
+        Me.Label31.Location = New System.Drawing.Point(255, 135)
+        Me.Label31.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label31.Name = "Label31"
-        Me.Label31.Size = New System.Drawing.Size(38, 13)
+        Me.Label31.Size = New System.Drawing.Size(55, 20)
         Me.Label31.TabIndex = 8
         Me.Label31.Text = "ZOLL"
         '
         'Label32
         '
         Me.Label32.AutoSize = True
-        Me.Label32.Location = New System.Drawing.Point(170, 43)
+        Me.Label32.Location = New System.Drawing.Point(255, 66)
+        Me.Label32.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label32.Name = "Label32"
-        Me.Label32.Size = New System.Drawing.Size(110, 13)
+        Me.Label32.Size = New System.Drawing.Size(165, 20)
         Me.Label32.TabIndex = 3
         Me.Label32.Text = "Frachtkosten Ausland"
         '
         'Label33
         '
         Me.Label33.AutoSize = True
-        Me.Label33.Location = New System.Drawing.Point(170, 152)
+        Me.Label33.Location = New System.Drawing.Point(255, 234)
+        Me.Label33.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label33.Name = "Label33"
-        Me.Label33.Size = New System.Drawing.Size(42, 13)
+        Me.Label33.Size = New System.Drawing.Size(64, 20)
         Me.Label33.TabIndex = 17
         Me.Label33.Text = "Summe"
         '
         'Label34
         '
         Me.Label34.AutoSize = True
-        Me.Label34.Location = New System.Drawing.Point(170, 107)
+        Me.Label34.Location = New System.Drawing.Point(255, 165)
+        Me.Label34.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label34.Name = "Label34"
-        Me.Label34.Size = New System.Drawing.Size(101, 13)
-        Me.Label34.TabIndex = 12
+        Me.Label34.Size = New System.Drawing.Size(151, 20)
+        Me.Label34.TabIndex = 11
         Me.Label34.Text = "Frachtkosten Inland"
         '
         'Label35
         '
         Me.Label35.AutoSize = True
-        Me.Label35.Location = New System.Drawing.Point(170, 69)
+        Me.Label35.Location = New System.Drawing.Point(255, 106)
+        Me.Label35.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label35.Name = "Label35"
-        Me.Label35.Size = New System.Drawing.Size(86, 13)
+        Me.Label35.Size = New System.Drawing.Size(128, 20)
         Me.Label35.TabIndex = 6
         Me.Label35.Text = "Zwischensumme"
         '
         'Label36
         '
         Me.Label36.AutoSize = True
-        Me.Label36.Location = New System.Drawing.Point(170, 24)
+        Me.Label36.Location = New System.Drawing.Point(255, 37)
+        Me.Label36.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label36.Name = "Label36"
-        Me.Label36.Size = New System.Drawing.Size(92, 13)
+        Me.Label36.Size = New System.Drawing.Size(137, 20)
         Me.Label36.TabIndex = 1
         Me.Label36.Text = "Rechnungsbetrag"
         '
         'Label26
         '
         Me.Label26.AutoSize = True
-        Me.Label26.Location = New System.Drawing.Point(170, 56)
+        Me.Label26.Location = New System.Drawing.Point(255, 86)
+        Me.Label26.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label26.Name = "Label26"
-        Me.Label26.Size = New System.Drawing.Size(78, 13)
+        Me.Label26.Size = New System.Drawing.Size(118, 20)
         Me.Label26.TabIndex = 12
         Me.Label26.Text = "Firmenwortlaut:"
         '
         'Label7
         '
         Me.Label7.AutoSize = True
-        Me.Label7.Location = New System.Drawing.Point(832, 250)
+        Me.Label7.Location = New System.Drawing.Point(1248, 385)
+        Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label7.Name = "Label7"
-        Me.Label7.Size = New System.Drawing.Size(49, 13)
+        Me.Label7.Size = New System.Drawing.Size(71, 20)
         Me.Label7.TabIndex = 47
         Me.Label7.Text = "Gewicht:"
         '
         'Label9
         '
         Me.Label9.AutoSize = True
-        Me.Label9.Location = New System.Drawing.Point(170, 250)
+        Me.Label9.Location = New System.Drawing.Point(255, 385)
+        Me.Label9.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label9.Name = "Label9"
-        Me.Label9.Size = New System.Drawing.Size(61, 13)
+        Me.Label9.Size = New System.Drawing.Size(87, 20)
         Me.Label9.TabIndex = 43
         Me.Label9.Text = "Anz./Verp.:"
         '
         'Label10
         '
         Me.Label10.AutoSize = True
-        Me.Label10.Location = New System.Drawing.Point(582, 231)
+        Me.Label10.Location = New System.Drawing.Point(873, 355)
+        Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label10.Name = "Label10"
-        Me.Label10.Size = New System.Drawing.Size(71, 13)
+        Me.Label10.Size = New System.Drawing.Size(107, 20)
         Me.Label10.TabIndex = 40
         Me.Label10.Text = "Unternehmer:"
         '
         'Label37
         '
         Me.Label37.AutoSize = True
-        Me.Label37.Location = New System.Drawing.Point(170, 231)
+        Me.Label37.Location = New System.Drawing.Point(255, 355)
+        Me.Label37.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label37.Name = "Label37"
-        Me.Label37.Size = New System.Drawing.Size(70, 13)
+        Me.Label37.Size = New System.Drawing.Size(101, 20)
         Me.Label37.TabIndex = 38
         Me.Label37.Text = "LKW-Kennz.:"
         '
         'Label38
         '
         Me.Label38.AutoSize = True
-        Me.Label38.Location = New System.Drawing.Point(582, 212)
+        Me.Label38.Location = New System.Drawing.Point(873, 326)
+        Me.Label38.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label38.Name = "Label38"
-        Me.Label38.Size = New System.Drawing.Size(66, 13)
+        Me.Label38.Size = New System.Drawing.Size(93, 20)
         Me.Label38.TabIndex = 36
         Me.Label38.Text = "ATR/EUR1:"
         '
         'Label39
         '
         Me.Label39.AutoSize = True
-        Me.Label39.Location = New System.Drawing.Point(170, 212)
+        Me.Label39.Location = New System.Drawing.Point(255, 326)
+        Me.Label39.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label39.Name = "Label39"
-        Me.Label39.Size = New System.Drawing.Size(55, 13)
+        Me.Label39.Size = New System.Drawing.Size(82, 20)
         Me.Label39.TabIndex = 34
         Me.Label39.Text = "Absender:"
         '
@@ -608,18 +656,20 @@ Partial Class usrcntlVorauskasse
         '
         Me.Label40.AutoSize = True
         Me.Label40.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label40.Location = New System.Drawing.Point(44, 193)
+        Me.Label40.Location = New System.Drawing.Point(66, 297)
+        Me.Label40.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label40.Name = "Label40"
-        Me.Label40.Size = New System.Drawing.Size(99, 13)
+        Me.Label40.Size = New System.Drawing.Size(143, 20)
         Me.Label40.TabIndex = 31
         Me.Label40.Text = "Sendungsdaten:"
         '
         'Label41
         '
         Me.Label41.AutoSize = True
-        Me.Label41.Location = New System.Drawing.Point(390, 250)
+        Me.Label41.Location = New System.Drawing.Point(585, 385)
+        Me.Label41.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label41.Name = "Label41"
-        Me.Label41.Size = New System.Drawing.Size(62, 13)
+        Me.Label41.Size = New System.Drawing.Size(90, 20)
         Me.Label41.TabIndex = 45
         Me.Label41.Text = "Warenbez.:"
         '
@@ -661,11 +711,23 @@ Partial Class usrcntlVorauskasse
         Me.pnlBottom.Controls.Add(Me.Panel4)
         Me.pnlBottom.Controls.Add(Me.Panel5)
         Me.pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.pnlBottom.Location = New System.Drawing.Point(0, 272)
+        Me.pnlBottom.Location = New System.Drawing.Point(0, 418)
+        Me.pnlBottom.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.pnlBottom.Name = "pnlBottom"
-        Me.pnlBottom.Size = New System.Drawing.Size(1000, 354)
+        Me.pnlBottom.Size = New System.Drawing.Size(1500, 545)
         Me.pnlBottom.TabIndex = 49
         '
+        'Button4
+        '
+        Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button4.Location = New System.Drawing.Point(594, 186)
+        Me.Button4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.Button4.Name = "Button4"
+        Me.Button4.Size = New System.Drawing.Size(150, 35)
+        Me.Button4.TabIndex = 15
+        Me.Button4.Text = "Zoll berechnen"
+        Me.Button4.UseVisualStyleBackColor = True
+        '
         'cboFiliale
         '
         Me.cboFiliale._allowedValuesFreiText = Nothing
@@ -673,19 +735,21 @@ Partial Class usrcntlVorauskasse
         Me.cboFiliale._value = ""
         Me.cboFiliale.DropDownWidth = 200
         Me.cboFiliale.FormattingEnabled = True
-        Me.cboFiliale.Location = New System.Drawing.Point(173, 221)
+        Me.cboFiliale.Location = New System.Drawing.Point(260, 340)
+        Me.cboFiliale.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.cboFiliale.Name = "cboFiliale"
-        Me.cboFiliale.Size = New System.Drawing.Size(67, 21)
-        Me.cboFiliale.TabIndex = 26
+        Me.cboFiliale.Size = New System.Drawing.Size(98, 28)
+        Me.cboFiliale.TabIndex = 25
         '
         'Label44
         '
         Me.Label44.AutoSize = True
         Me.Label44.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label44.Location = New System.Drawing.Point(170, 206)
+        Me.Label44.Location = New System.Drawing.Point(255, 317)
+        Me.Label44.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label44.Name = "Label44"
-        Me.Label44.Size = New System.Drawing.Size(303, 13)
-        Me.Label44.TabIndex = 25
+        Me.Label44.Size = New System.Drawing.Size(453, 20)
+        Me.Label44.TabIndex = 24
         Me.Label44.Text = "Filiale / Abfertigungsnummer (für Banküberweisung):"
         '
         'txtAbfertigungsNr
@@ -700,24 +764,26 @@ Partial Class usrcntlVorauskasse
         Me.txtAbfertigungsNr._value = ""
         Me.txtAbfertigungsNr._Waehrung = False
         Me.txtAbfertigungsNr._WaehrungZeichen = True
-        Me.txtAbfertigungsNr.Location = New System.Drawing.Point(239, 221)
+        Me.txtAbfertigungsNr.Location = New System.Drawing.Point(358, 340)
+        Me.txtAbfertigungsNr.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtAbfertigungsNr.MaxLength = 8
         Me.txtAbfertigungsNr.MaxLineLength = -1
         Me.txtAbfertigungsNr.MaxLines_Warning = ""
         Me.txtAbfertigungsNr.MaxLines_Warning_Label = Nothing
         Me.txtAbfertigungsNr.Multiline = True
         Me.txtAbfertigungsNr.Name = "txtAbfertigungsNr"
-        Me.txtAbfertigungsNr.Size = New System.Drawing.Size(257, 21)
-        Me.txtAbfertigungsNr.TabIndex = 27
+        Me.txtAbfertigungsNr.Size = New System.Drawing.Size(384, 30)
+        Me.txtAbfertigungsNr.TabIndex = 26
         '
         'lklEintragAufheben
         '
         Me.lklEintragAufheben.AutoSize = True
         Me.lklEintragAufheben.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.lklEintragAufheben.Location = New System.Drawing.Point(36, 309)
+        Me.lklEintragAufheben.Location = New System.Drawing.Point(54, 475)
+        Me.lklEintragAufheben.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lklEintragAufheben.Name = "lklEintragAufheben"
-        Me.lklEintragAufheben.Size = New System.Drawing.Size(100, 13)
-        Me.lklEintragAufheben.TabIndex = 32
+        Me.lklEintragAufheben.Size = New System.Drawing.Size(148, 20)
+        Me.lklEintragAufheben.TabIndex = 31
         Me.lklEintragAufheben.TabStop = True
         Me.lklEintragAufheben.Text = "Kopplung aufheben"
         Me.lklEintragAufheben.Visible = False
@@ -727,10 +793,11 @@ Partial Class usrcntlVorauskasse
         Me.btnDelFD.BackgroundImage = Global.SDL.My.Resources.Resources.del
         Me.btnDelFD.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.btnDelFD.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnDelFD.Location = New System.Drawing.Point(5, 305)
+        Me.btnDelFD.Location = New System.Drawing.Point(8, 469)
+        Me.btnDelFD.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.btnDelFD.Name = "btnDelFD"
-        Me.btnDelFD.Size = New System.Drawing.Size(25, 20)
-        Me.btnDelFD.TabIndex = 31
+        Me.btnDelFD.Size = New System.Drawing.Size(38, 31)
+        Me.btnDelFD.TabIndex = 30
         Me.btnDelFD.UseVisualStyleBackColor = True
         Me.btnDelFD.Visible = False
         '
@@ -739,10 +806,11 @@ Partial Class usrcntlVorauskasse
         Me.btnSaveFD.BackgroundImage = Global.SDL.My.Resources.Resources.save
         Me.btnSaveFD.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.btnSaveFD.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnSaveFD.Location = New System.Drawing.Point(142, 286)
+        Me.btnSaveFD.Location = New System.Drawing.Point(213, 440)
+        Me.btnSaveFD.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.btnSaveFD.Name = "btnSaveFD"
-        Me.btnSaveFD.Size = New System.Drawing.Size(25, 20)
-        Me.btnSaveFD.TabIndex = 30
+        Me.btnSaveFD.Size = New System.Drawing.Size(38, 31)
+        Me.btnSaveFD.TabIndex = 29
         Me.btnSaveFD.UseVisualStyleBackColor = True
         '
         'Button1
@@ -750,10 +818,11 @@ Partial Class usrcntlVorauskasse
         Me.Button1.BackgroundImage = Global.SDL.My.Resources.Resources.search
         Me.Button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button1.Location = New System.Drawing.Point(142, 305)
+        Me.Button1.Location = New System.Drawing.Point(213, 469)
+        Me.Button1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(25, 20)
-        Me.Button1.TabIndex = 33
+        Me.Button1.Size = New System.Drawing.Size(38, 31)
+        Me.Button1.TabIndex = 32
         Me.Button1.UseVisualStyleBackColor = True
         '
         'txtVorlage
@@ -769,22 +838,24 @@ Partial Class usrcntlVorauskasse
         Me.txtVorlage._Waehrung = False
         Me.txtVorlage._WaehrungZeichen = True
         Me.txtVorlage.ForeColor = System.Drawing.Color.Black
-        Me.txtVorlage.Location = New System.Drawing.Point(5, 286)
+        Me.txtVorlage.Location = New System.Drawing.Point(8, 440)
+        Me.txtVorlage.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtVorlage.MaxLineLength = -1
         Me.txtVorlage.MaxLines_Warning = ""
         Me.txtVorlage.MaxLines_Warning_Label = Nothing
         Me.txtVorlage.Name = "txtVorlage"
-        Me.txtVorlage.Size = New System.Drawing.Size(138, 20)
-        Me.txtVorlage.TabIndex = 29
+        Me.txtVorlage.Size = New System.Drawing.Size(205, 26)
+        Me.txtVorlage.TabIndex = 28
         '
         'Label43
         '
         Me.Label43.AutoSize = True
         Me.Label43.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label43.Location = New System.Drawing.Point(2, 270)
+        Me.Label43.Location = New System.Drawing.Point(3, 415)
+        Me.Label43.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label43.Name = "Label43"
-        Me.Label43.Size = New System.Drawing.Size(134, 13)
-        Me.Label43.TabIndex = 28
+        Me.Label43.Size = New System.Drawing.Size(200, 20)
+        Me.Label43.TabIndex = 27
         Me.Label43.Text = "Als Vorlage speichern:"
         '
         'txtEustProzent
@@ -793,9 +864,10 @@ Partial Class usrcntlVorauskasse
         Me.txtEustProzent._allowFreiText = True
         Me.txtEustProzent._value = ""
         Me.txtEustProzent.FormattingEnabled = True
-        Me.txtEustProzent.Location = New System.Drawing.Point(246, 167)
+        Me.txtEustProzent.Location = New System.Drawing.Point(369, 257)
+        Me.txtEustProzent.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtEustProzent.Name = "txtEustProzent"
-        Me.txtEustProzent.Size = New System.Drawing.Size(52, 21)
+        Me.txtEustProzent.Size = New System.Drawing.Size(76, 28)
         Me.txtEustProzent.TabIndex = 20
         '
         'MyComboBox1
@@ -804,20 +876,22 @@ Partial Class usrcntlVorauskasse
         Me.MyComboBox1._allowFreiText = False
         Me.MyComboBox1._value = ""
         Me.MyComboBox1.FormattingEnabled = True
-        Me.MyComboBox1.Location = New System.Drawing.Point(20, 194)
+        Me.MyComboBox1.Location = New System.Drawing.Point(30, 298)
+        Me.MyComboBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.MyComboBox1.Name = "MyComboBox1"
-        Me.MyComboBox1.Size = New System.Drawing.Size(81, 21)
-        Me.MyComboBox1.TabIndex = 24
+        Me.MyComboBox1.Size = New System.Drawing.Size(120, 28)
+        Me.MyComboBox1.TabIndex = 23
         Me.MyComboBox1.Visible = False
         '
         'Label12
         '
         Me.Label12.AutoSize = True
         Me.Label12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label12.Location = New System.Drawing.Point(17, 177)
+        Me.Label12.Location = New System.Drawing.Point(26, 272)
+        Me.Label12.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label12.Name = "Label12"
-        Me.Label12.Size = New System.Drawing.Size(72, 13)
-        Me.Label12.TabIndex = 23
+        Me.Label12.Size = New System.Drawing.Size(103, 20)
+        Me.Label12.TabIndex = 22
         Me.Label12.Text = "Bankdaten:"
         Me.Label12.Visible = False
         '
@@ -833,14 +907,15 @@ Partial Class usrcntlVorauskasse
         Me.txtEustSonstText._value = Nothing
         Me.txtEustSonstText._Waehrung = False
         Me.txtEustSonstText._WaehrungZeichen = True
-        Me.txtEustSonstText.Location = New System.Drawing.Point(173, 123)
+        Me.txtEustSonstText.Location = New System.Drawing.Point(260, 189)
+        Me.txtEustSonstText.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtEustSonstText.MaxLength = 200
         Me.txtEustSonstText.MaxLineLength = -1
         Me.txtEustSonstText.MaxLines_Warning = ""
         Me.txtEustSonstText.MaxLines_Warning_Label = Nothing
         Me.txtEustSonstText.Name = "txtEustSonstText"
-        Me.txtEustSonstText.Size = New System.Drawing.Size(125, 20)
-        Me.txtEustSonstText.TabIndex = 14
+        Me.txtEustSonstText.Size = New System.Drawing.Size(186, 26)
+        Me.txtEustSonstText.TabIndex = 13
         '
         'txtZollProzent
         '
@@ -855,12 +930,13 @@ Partial Class usrcntlVorauskasse
         Me.txtZollProzent._Waehrung = False
         Me.txtZollProzent._WaehrungZeichen = True
         Me.txtZollProzent.ForeColor = System.Drawing.Color.Black
-        Me.txtZollProzent.Location = New System.Drawing.Point(246, 85)
+        Me.txtZollProzent.Location = New System.Drawing.Point(369, 131)
+        Me.txtZollProzent.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtZollProzent.MaxLineLength = -1
         Me.txtZollProzent.MaxLines_Warning = ""
         Me.txtZollProzent.MaxLines_Warning_Label = Nothing
         Me.txtZollProzent.Name = "txtZollProzent"
-        Me.txtZollProzent.Size = New System.Drawing.Size(48, 20)
+        Me.txtZollProzent.Size = New System.Drawing.Size(70, 26)
         Me.txtZollProzent.TabIndex = 9
         Me.txtZollProzent.Text = "0,00 %"
         Me.txtZollProzent.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
@@ -878,12 +954,13 @@ Partial Class usrcntlVorauskasse
         Me.lblRechnungsbetrag._Waehrung = True
         Me.lblRechnungsbetrag._WaehrungZeichen = True
         Me.lblRechnungsbetrag.ForeColor = System.Drawing.Color.Black
-        Me.lblRechnungsbetrag.Location = New System.Drawing.Point(306, 21)
+        Me.lblRechnungsbetrag.Location = New System.Drawing.Point(459, 32)
+        Me.lblRechnungsbetrag.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.lblRechnungsbetrag.MaxLineLength = -1
         Me.lblRechnungsbetrag.MaxLines_Warning = ""
         Me.lblRechnungsbetrag.MaxLines_Warning_Label = Nothing
         Me.lblRechnungsbetrag.Name = "lblRechnungsbetrag"
-        Me.lblRechnungsbetrag.Size = New System.Drawing.Size(78, 20)
+        Me.lblRechnungsbetrag.Size = New System.Drawing.Size(115, 26)
         Me.lblRechnungsbetrag.TabIndex = 2
         Me.lblRechnungsbetrag.Text = "0,00 €"
         Me.lblRechnungsbetrag.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
@@ -901,12 +978,13 @@ Partial Class usrcntlVorauskasse
         Me.txtFrachtkostenAusl._Waehrung = True
         Me.txtFrachtkostenAusl._WaehrungZeichen = True
         Me.txtFrachtkostenAusl.ForeColor = System.Drawing.Color.Black
-        Me.txtFrachtkostenAusl.Location = New System.Drawing.Point(306, 40)
+        Me.txtFrachtkostenAusl.Location = New System.Drawing.Point(459, 62)
+        Me.txtFrachtkostenAusl.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtFrachtkostenAusl.MaxLineLength = -1
         Me.txtFrachtkostenAusl.MaxLines_Warning = ""
         Me.txtFrachtkostenAusl.MaxLines_Warning_Label = Nothing
         Me.txtFrachtkostenAusl.Name = "txtFrachtkostenAusl"
-        Me.txtFrachtkostenAusl.Size = New System.Drawing.Size(78, 20)
+        Me.txtFrachtkostenAusl.Size = New System.Drawing.Size(115, 26)
         Me.txtFrachtkostenAusl.TabIndex = 4
         Me.txtFrachtkostenAusl.Text = "0,00 €"
         Me.txtFrachtkostenAusl.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
@@ -924,13 +1002,14 @@ Partial Class usrcntlVorauskasse
         Me.txtZwischensumme._Waehrung = True
         Me.txtZwischensumme._WaehrungZeichen = True
         Me.txtZwischensumme.ForeColor = System.Drawing.Color.Black
-        Me.txtZwischensumme.Location = New System.Drawing.Point(306, 66)
+        Me.txtZwischensumme.Location = New System.Drawing.Point(459, 102)
+        Me.txtZwischensumme.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtZwischensumme.MaxLineLength = -1
         Me.txtZwischensumme.MaxLines_Warning = ""
         Me.txtZwischensumme.MaxLines_Warning_Label = Nothing
         Me.txtZwischensumme.Name = "txtZwischensumme"
         Me.txtZwischensumme.ReadOnly = True
-        Me.txtZwischensumme.Size = New System.Drawing.Size(78, 20)
+        Me.txtZwischensumme.Size = New System.Drawing.Size(115, 26)
         Me.txtZwischensumme.TabIndex = 7
         Me.txtZwischensumme.Text = "0,00 €"
         Me.txtZwischensumme.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
@@ -948,13 +1027,14 @@ Partial Class usrcntlVorauskasse
         Me.txtZoll._Waehrung = True
         Me.txtZoll._WaehrungZeichen = True
         Me.txtZoll.ForeColor = System.Drawing.Color.Black
-        Me.txtZoll.Location = New System.Drawing.Point(306, 85)
+        Me.txtZoll.Location = New System.Drawing.Point(459, 131)
+        Me.txtZoll.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtZoll.MaxLineLength = -1
         Me.txtZoll.MaxLines_Warning = ""
         Me.txtZoll.MaxLines_Warning_Label = Nothing
         Me.txtZoll.Name = "txtZoll"
         Me.txtZoll.ReadOnly = True
-        Me.txtZoll.Size = New System.Drawing.Size(78, 20)
+        Me.txtZoll.Size = New System.Drawing.Size(115, 26)
         Me.txtZoll.TabIndex = 10
         Me.txtZoll.Text = "0,00 €"
         Me.txtZoll.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
@@ -972,13 +1052,14 @@ Partial Class usrcntlVorauskasse
         Me.txtFrachtkostenInl._Waehrung = True
         Me.txtFrachtkostenInl._WaehrungZeichen = True
         Me.txtFrachtkostenInl.ForeColor = System.Drawing.Color.Black
-        Me.txtFrachtkostenInl.Location = New System.Drawing.Point(306, 104)
+        Me.txtFrachtkostenInl.Location = New System.Drawing.Point(459, 160)
+        Me.txtFrachtkostenInl.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtFrachtkostenInl.MaxLineLength = -1
         Me.txtFrachtkostenInl.MaxLines_Warning = ""
         Me.txtFrachtkostenInl.MaxLines_Warning_Label = Nothing
         Me.txtFrachtkostenInl.Name = "txtFrachtkostenInl"
-        Me.txtFrachtkostenInl.Size = New System.Drawing.Size(78, 20)
-        Me.txtFrachtkostenInl.TabIndex = 13
+        Me.txtFrachtkostenInl.Size = New System.Drawing.Size(115, 26)
+        Me.txtFrachtkostenInl.TabIndex = 12
         Me.txtFrachtkostenInl.Text = "0,00 €"
         Me.txtFrachtkostenInl.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
         '
@@ -995,13 +1076,14 @@ Partial Class usrcntlVorauskasse
         Me.txtEustSonstBetrag._Waehrung = True
         Me.txtEustSonstBetrag._WaehrungZeichen = True
         Me.txtEustSonstBetrag.ForeColor = System.Drawing.Color.Black
-        Me.txtEustSonstBetrag.Location = New System.Drawing.Point(306, 123)
+        Me.txtEustSonstBetrag.Location = New System.Drawing.Point(459, 189)
+        Me.txtEustSonstBetrag.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtEustSonstBetrag.MaxLineLength = -1
         Me.txtEustSonstBetrag.MaxLines_Warning = ""
         Me.txtEustSonstBetrag.MaxLines_Warning_Label = Nothing
         Me.txtEustSonstBetrag.Name = "txtEustSonstBetrag"
-        Me.txtEustSonstBetrag.Size = New System.Drawing.Size(78, 20)
-        Me.txtEustSonstBetrag.TabIndex = 15
+        Me.txtEustSonstBetrag.Size = New System.Drawing.Size(115, 26)
+        Me.txtEustSonstBetrag.TabIndex = 14
         Me.txtEustSonstBetrag.Text = "0,00 €"
         Me.txtEustSonstBetrag.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
         '
@@ -1018,13 +1100,14 @@ Partial Class usrcntlVorauskasse
         Me.txtSumme._Waehrung = True
         Me.txtSumme._WaehrungZeichen = True
         Me.txtSumme.ForeColor = System.Drawing.Color.Black
-        Me.txtSumme.Location = New System.Drawing.Point(306, 149)
+        Me.txtSumme.Location = New System.Drawing.Point(459, 229)
+        Me.txtSumme.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtSumme.MaxLineLength = -1
         Me.txtSumme.MaxLines_Warning = ""
         Me.txtSumme.MaxLines_Warning_Label = Nothing
         Me.txtSumme.Name = "txtSumme"
         Me.txtSumme.ReadOnly = True
-        Me.txtSumme.Size = New System.Drawing.Size(78, 20)
+        Me.txtSumme.Size = New System.Drawing.Size(115, 26)
         Me.txtSumme.TabIndex = 18
         Me.txtSumme.Text = "0,00 €"
         Me.txtSumme.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
@@ -1042,13 +1125,14 @@ Partial Class usrcntlVorauskasse
         Me.txtEUST._Waehrung = True
         Me.txtEUST._WaehrungZeichen = True
         Me.txtEUST.ForeColor = System.Drawing.Color.Black
-        Me.txtEUST.Location = New System.Drawing.Point(306, 168)
+        Me.txtEUST.Location = New System.Drawing.Point(459, 258)
+        Me.txtEUST.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtEUST.MaxLineLength = -1
         Me.txtEUST.MaxLines_Warning = ""
         Me.txtEUST.MaxLines_Warning_Label = Nothing
         Me.txtEUST.Name = "txtEUST"
         Me.txtEUST.ReadOnly = True
-        Me.txtEUST.Size = New System.Drawing.Size(78, 20)
+        Me.txtEUST.Size = New System.Drawing.Size(115, 26)
         Me.txtEUST.TabIndex = 21
         Me.txtEUST.Text = "0,00 €"
         Me.txtEUST.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
@@ -1063,17 +1147,19 @@ Partial Class usrcntlVorauskasse
         Me.Panel4.Controls.Add(Me.lblCRsaved)
         Me.Panel4.Controls.Add(Me.cbxBeimErstellenSpeichern)
         Me.Panel4.Controls.Add(Me.txtVKVermerk)
-        Me.Panel4.Location = New System.Drawing.Point(173, 256)
+        Me.Panel4.Location = New System.Drawing.Point(260, 394)
+        Me.Panel4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.Panel4.Name = "Panel4"
-        Me.Panel4.Size = New System.Drawing.Size(323, 85)
-        Me.Panel4.TabIndex = 34
+        Me.Panel4.Size = New System.Drawing.Size(484, 130)
+        Me.Panel4.TabIndex = 33
         '
         'Button3
         '
         Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button3.Location = New System.Drawing.Point(258, 3)
+        Me.Button3.Location = New System.Drawing.Point(387, 5)
+        Me.Button3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.Button3.Name = "Button3"
-        Me.Button3.Size = New System.Drawing.Size(60, 23)
+        Me.Button3.Size = New System.Drawing.Size(90, 35)
         Me.Button3.TabIndex = 1
         Me.Button3.Text = "Liste"
         Me.Button3.UseVisualStyleBackColor = True
@@ -1081,18 +1167,20 @@ Partial Class usrcntlVorauskasse
         'Label45
         '
         Me.Label45.AutoSize = True
-        Me.Label45.Location = New System.Drawing.Point(3, 32)
+        Me.Label45.Location = New System.Drawing.Point(4, 49)
+        Me.Label45.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label45.Name = "Label45"
-        Me.Label45.Size = New System.Drawing.Size(49, 13)
+        Me.Label45.Size = New System.Drawing.Size(73, 20)
         Me.Label45.TabIndex = 2
         Me.Label45.Text = "Vermerk:"
         '
         'btnStandardPreiseLaden
         '
         Me.btnStandardPreiseLaden.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnStandardPreiseLaden.Location = New System.Drawing.Point(3, 53)
+        Me.btnStandardPreiseLaden.Location = New System.Drawing.Point(4, 82)
+        Me.btnStandardPreiseLaden.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.btnStandardPreiseLaden.Name = "btnStandardPreiseLaden"
-        Me.btnStandardPreiseLaden.Size = New System.Drawing.Size(160, 23)
+        Me.btnStandardPreiseLaden.Size = New System.Drawing.Size(240, 35)
         Me.btnStandardPreiseLaden.TabIndex = 4
         Me.btnStandardPreiseLaden.Text = "jetzt speichern"
         Me.btnStandardPreiseLaden.UseVisualStyleBackColor = True
@@ -1101,9 +1189,10 @@ Partial Class usrcntlVorauskasse
         '
         Me.lblCRsaved.AutoSize = True
         Me.lblCRsaved.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblCRsaved.Location = New System.Drawing.Point(169, 58)
+        Me.lblCRsaved.Location = New System.Drawing.Point(254, 89)
+        Me.lblCRsaved.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblCRsaved.Name = "lblCRsaved"
-        Me.lblCRsaved.Size = New System.Drawing.Size(113, 13)
+        Me.lblCRsaved.Size = New System.Drawing.Size(159, 20)
         Me.lblCRsaved.TabIndex = 5
         Me.lblCRsaved.Text = "(nicht gespeichert)"
         '
@@ -1113,9 +1202,10 @@ Partial Class usrcntlVorauskasse
         Me.cbxBeimErstellenSpeichern.Checked = True
         Me.cbxBeimErstellenSpeichern.CheckState = System.Windows.Forms.CheckState.Checked
         Me.cbxBeimErstellenSpeichern.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.0!)
-        Me.cbxBeimErstellenSpeichern.Location = New System.Drawing.Point(3, 3)
+        Me.cbxBeimErstellenSpeichern.Location = New System.Drawing.Point(4, 5)
+        Me.cbxBeimErstellenSpeichern.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.cbxBeimErstellenSpeichern.Name = "cbxBeimErstellenSpeichern"
-        Me.cbxBeimErstellenSpeichern.Size = New System.Drawing.Size(190, 22)
+        Me.cbxBeimErstellenSpeichern.Size = New System.Drawing.Size(280, 30)
         Me.cbxBeimErstellenSpeichern.TabIndex = 0
         Me.cbxBeimErstellenSpeichern.Text = "Beim Erstellen speichern"
         Me.cbxBeimErstellenSpeichern.UseVisualStyleBackColor = True
@@ -1133,12 +1223,13 @@ Partial Class usrcntlVorauskasse
         Me.txtVKVermerk._Waehrung = False
         Me.txtVKVermerk._WaehrungZeichen = True
         Me.txtVKVermerk.ForeColor = System.Drawing.Color.Black
-        Me.txtVKVermerk.Location = New System.Drawing.Point(58, 30)
+        Me.txtVKVermerk.Location = New System.Drawing.Point(87, 46)
+        Me.txtVKVermerk.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtVKVermerk.MaxLineLength = -1
         Me.txtVKVermerk.MaxLines_Warning = ""
         Me.txtVKVermerk.MaxLines_Warning_Label = Nothing
         Me.txtVKVermerk.Name = "txtVKVermerk"
-        Me.txtVKVermerk.Size = New System.Drawing.Size(260, 20)
+        Me.txtVKVermerk.Size = New System.Drawing.Size(388, 26)
         Me.txtVKVermerk.TabIndex = 3
         '
         'Panel5
@@ -1152,7 +1243,6 @@ Partial Class usrcntlVorauskasse
         Me.Panel5.Controls.Add(Me.txtATLAS)
         Me.Panel5.Controls.Add(Me.txtKorrRechnung)
         Me.Panel5.Controls.Add(Me.Label20)
-        Me.Panel5.Controls.Add(Me.Label16)
         Me.Panel5.Controls.Add(Me.Label21)
         Me.Panel5.Controls.Add(Me.Label15)
         Me.Panel5.Controls.Add(Me.Label22)
@@ -1164,7 +1254,6 @@ Partial Class usrcntlVorauskasse
         Me.Panel5.Controls.Add(Me.Label23)
         Me.Panel5.Controls.Add(Me.Label13)
         Me.Panel5.Controls.Add(Me.Label24)
-        Me.Panel5.Controls.Add(Me.txtPapierePorti)
         Me.Panel5.Controls.Add(Me.txtEust2)
         Me.Panel5.Controls.Add(Me.txtClearing)
         Me.Panel5.Controls.Add(Me.txtZoll2)
@@ -1179,10 +1268,13 @@ Partial Class usrcntlVorauskasse
         Me.Panel5.Controls.Add(Me.Panel3)
         Me.Panel5.Controls.Add(Me.txtMwstProzent)
         Me.Panel5.Controls.Add(Me.txtAndereAbgabenBetrag)
-        Me.Panel5.Location = New System.Drawing.Point(564, 0)
+        Me.Panel5.Controls.Add(Me.Label16)
+        Me.Panel5.Controls.Add(Me.txtPapierePorti)
+        Me.Panel5.Location = New System.Drawing.Point(846, 0)
+        Me.Panel5.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.Panel5.Name = "Panel5"
-        Me.Panel5.Size = New System.Drawing.Size(436, 354)
-        Me.Panel5.TabIndex = 22
+        Me.Panel5.Size = New System.Drawing.Size(654, 545)
+        Me.Panel5.TabIndex = 34
         '
         'txtSonstigeKostenText
         '
@@ -1197,14 +1289,15 @@ Partial Class usrcntlVorauskasse
         Me.txtSonstigeKostenText._Waehrung = False
         Me.txtSonstigeKostenText._WaehrungZeichen = True
         Me.txtSonstigeKostenText.ForeColor = System.Drawing.Color.Black
-        Me.txtSonstigeKostenText.Location = New System.Drawing.Point(17, 237)
+        Me.txtSonstigeKostenText.Location = New System.Drawing.Point(26, 395)
+        Me.txtSonstigeKostenText.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtSonstigeKostenText.MaxLength = 100
         Me.txtSonstigeKostenText.MaxLineLength = -1
         Me.txtSonstigeKostenText.MaxLines_Warning = ""
         Me.txtSonstigeKostenText.MaxLines_Warning_Label = Nothing
         Me.txtSonstigeKostenText.Name = "txtSonstigeKostenText"
-        Me.txtSonstigeKostenText.Size = New System.Drawing.Size(168, 20)
-        Me.txtSonstigeKostenText.TabIndex = 35
+        Me.txtSonstigeKostenText.Size = New System.Drawing.Size(250, 26)
+        Me.txtSonstigeKostenText.TabIndex = 28
         Me.txtSonstigeKostenText.Text = "Sonstige Kosten"
         '
         'cbxSVS
@@ -1214,20 +1307,22 @@ Partial Class usrcntlVorauskasse
         Me.cbxSVS.CheckState = System.Windows.Forms.CheckState.Checked
         Me.cbxSVS.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.cbxSVS.ForeColor = System.Drawing.Color.Red
-        Me.cbxSVS.Location = New System.Drawing.Point(168, 221)
+        Me.cbxSVS.Location = New System.Drawing.Point(252, 340)
+        Me.cbxSVS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.cbxSVS.Name = "cbxSVS"
-        Me.cbxSVS.Size = New System.Drawing.Size(15, 14)
-        Me.cbxSVS.TabIndex = 23
+        Me.cbxSVS.Size = New System.Drawing.Size(22, 21)
+        Me.cbxSVS.TabIndex = 24
         Me.cbxSVS.UseVisualStyleBackColor = True
         '
         'LinkLabel1
         '
         Me.LinkLabel1.AutoSize = True
         Me.LinkLabel1.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.LinkLabel1.Location = New System.Drawing.Point(268, 88)
+        Me.LinkLabel1.Location = New System.Drawing.Point(402, 135)
+        Me.LinkLabel1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.LinkLabel1.Name = "LinkLabel1"
-        Me.LinkLabel1.Size = New System.Drawing.Size(39, 13)
-        Me.LinkLabel1.TabIndex = 11
+        Me.LinkLabel1.Size = New System.Drawing.Size(59, 20)
+        Me.LinkLabel1.TabIndex = 10
         Me.LinkLabel1.TabStop = True
         Me.LinkLabel1.Text = "Offerte"
         Me.LinkLabel1.Visible = False
@@ -1245,13 +1340,14 @@ Partial Class usrcntlVorauskasse
         Me.txtATLAS._Waehrung = True
         Me.txtATLAS._WaehrungZeichen = True
         Me.txtATLAS.ForeColor = System.Drawing.Color.Black
-        Me.txtATLAS.Location = New System.Drawing.Point(184, 123)
+        Me.txtATLAS.Location = New System.Drawing.Point(276, 189)
+        Me.txtATLAS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtATLAS.MaxLineLength = -1
         Me.txtATLAS.MaxLines_Warning = ""
         Me.txtATLAS.MaxLines_Warning_Label = Nothing
         Me.txtATLAS.Name = "txtATLAS"
-        Me.txtATLAS.Size = New System.Drawing.Size(78, 20)
-        Me.txtATLAS.TabIndex = 13
+        Me.txtATLAS.Size = New System.Drawing.Size(115, 26)
+        Me.txtATLAS.TabIndex = 14
         Me.txtATLAS.Text = "0,00 €"
         Me.txtATLAS.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
         '
@@ -1268,13 +1364,14 @@ Partial Class usrcntlVorauskasse
         Me.txtKorrRechnung._Waehrung = True
         Me.txtKorrRechnung._WaehrungZeichen = True
         Me.txtKorrRechnung.ForeColor = System.Drawing.Color.Black
-        Me.txtKorrRechnung.Location = New System.Drawing.Point(184, 161)
+        Me.txtKorrRechnung.Location = New System.Drawing.Point(276, 248)
+        Me.txtKorrRechnung.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtKorrRechnung.MaxLineLength = -1
         Me.txtKorrRechnung.MaxLines_Warning = ""
         Me.txtKorrRechnung.MaxLines_Warning_Label = Nothing
         Me.txtKorrRechnung.Name = "txtKorrRechnung"
-        Me.txtKorrRechnung.Size = New System.Drawing.Size(78, 20)
-        Me.txtKorrRechnung.TabIndex = 17
+        Me.txtKorrRechnung.Size = New System.Drawing.Size(115, 26)
+        Me.txtKorrRechnung.TabIndex = 18
         Me.txtKorrRechnung.Text = "0,00 €"
         Me.txtKorrRechnung.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
         '
@@ -1291,13 +1388,14 @@ Partial Class usrcntlVorauskasse
         Me.txtAviso._Waehrung = True
         Me.txtAviso._WaehrungZeichen = True
         Me.txtAviso.ForeColor = System.Drawing.Color.Black
-        Me.txtAviso.Location = New System.Drawing.Point(184, 199)
+        Me.txtAviso.Location = New System.Drawing.Point(276, 306)
+        Me.txtAviso.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtAviso.MaxLineLength = -1
         Me.txtAviso.MaxLines_Warning = ""
         Me.txtAviso.MaxLines_Warning_Label = Nothing
         Me.txtAviso.Name = "txtAviso"
-        Me.txtAviso.Size = New System.Drawing.Size(78, 20)
-        Me.txtAviso.TabIndex = 21
+        Me.txtAviso.Size = New System.Drawing.Size(115, 26)
+        Me.txtAviso.TabIndex = 22
         Me.txtAviso.Text = "0,00 €"
         Me.txtAviso.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
         '
@@ -1314,13 +1412,14 @@ Partial Class usrcntlVorauskasse
         Me.txtWeitereTarifPos._Waehrung = True
         Me.txtWeitereTarifPos._WaehrungZeichen = True
         Me.txtWeitereTarifPos.ForeColor = System.Drawing.Color.Black
-        Me.txtWeitereTarifPos.Location = New System.Drawing.Point(184, 104)
+        Me.txtWeitereTarifPos.Location = New System.Drawing.Point(276, 160)
+        Me.txtWeitereTarifPos.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtWeitereTarifPos.MaxLineLength = -1
         Me.txtWeitereTarifPos.MaxLines_Warning = ""
         Me.txtWeitereTarifPos.MaxLines_Warning_Label = Nothing
         Me.txtWeitereTarifPos.Name = "txtWeitereTarifPos"
-        Me.txtWeitereTarifPos.Size = New System.Drawing.Size(78, 20)
-        Me.txtWeitereTarifPos.TabIndex = 11
+        Me.txtWeitereTarifPos.Size = New System.Drawing.Size(115, 26)
+        Me.txtWeitereTarifPos.TabIndex = 12
         Me.txtWeitereTarifPos.Text = "0,00 €"
         Me.txtWeitereTarifPos.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
         '
@@ -1337,12 +1436,13 @@ Partial Class usrcntlVorauskasse
         Me.txtVerzollungskosten._Waehrung = True
         Me.txtVerzollungskosten._WaehrungZeichen = True
         Me.txtVerzollungskosten.ForeColor = System.Drawing.Color.Black
-        Me.txtVerzollungskosten.Location = New System.Drawing.Point(184, 85)
+        Me.txtVerzollungskosten.Location = New System.Drawing.Point(276, 131)
+        Me.txtVerzollungskosten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtVerzollungskosten.MaxLineLength = -1
         Me.txtVerzollungskosten.MaxLines_Warning = ""
         Me.txtVerzollungskosten.MaxLines_Warning_Label = Nothing
         Me.txtVerzollungskosten.Name = "txtVerzollungskosten"
-        Me.txtVerzollungskosten.Size = New System.Drawing.Size(78, 20)
+        Me.txtVerzollungskosten.Size = New System.Drawing.Size(115, 26)
         Me.txtVerzollungskosten.TabIndex = 9
         Me.txtVerzollungskosten.Text = "0,00 €"
         Me.txtVerzollungskosten.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
@@ -1360,13 +1460,14 @@ Partial Class usrcntlVorauskasse
         Me.txtSonstigeKosten._Waehrung = True
         Me.txtSonstigeKosten._WaehrungZeichen = True
         Me.txtSonstigeKosten.ForeColor = System.Drawing.Color.Black
-        Me.txtSonstigeKosten.Location = New System.Drawing.Point(184, 237)
+        Me.txtSonstigeKosten.Location = New System.Drawing.Point(276, 395)
+        Me.txtSonstigeKosten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtSonstigeKosten.MaxLineLength = -1
         Me.txtSonstigeKosten.MaxLines_Warning = ""
         Me.txtSonstigeKosten.MaxLines_Warning_Label = Nothing
         Me.txtSonstigeKosten.Name = "txtSonstigeKosten"
-        Me.txtSonstigeKosten.Size = New System.Drawing.Size(78, 20)
-        Me.txtSonstigeKosten.TabIndex = 26
+        Me.txtSonstigeKosten.Size = New System.Drawing.Size(115, 26)
+        Me.txtSonstigeKosten.TabIndex = 29
         Me.txtSonstigeKosten.Text = "0,00 €"
         Me.txtSonstigeKosten.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
         '
@@ -1383,13 +1484,14 @@ Partial Class usrcntlVorauskasse
         Me.txtPapierePorti._Waehrung = True
         Me.txtPapierePorti._WaehrungZeichen = True
         Me.txtPapierePorti.ForeColor = System.Drawing.Color.Black
-        Me.txtPapierePorti.Location = New System.Drawing.Point(184, 275)
+        Me.txtPapierePorti.Location = New System.Drawing.Point(276, 365)
+        Me.txtPapierePorti.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtPapierePorti.MaxLineLength = -1
         Me.txtPapierePorti.MaxLines_Warning = ""
         Me.txtPapierePorti.MaxLines_Warning_Label = Nothing
         Me.txtPapierePorti.Name = "txtPapierePorti"
-        Me.txtPapierePorti.Size = New System.Drawing.Size(78, 20)
-        Me.txtPapierePorti.TabIndex = 31
+        Me.txtPapierePorti.Size = New System.Drawing.Size(115, 26)
+        Me.txtPapierePorti.TabIndex = 27
         Me.txtPapierePorti.Text = "0,00 €"
         Me.txtPapierePorti.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
         '
@@ -1406,13 +1508,14 @@ Partial Class usrcntlVorauskasse
         Me.txtEust2._Waehrung = True
         Me.txtEust2._WaehrungZeichen = True
         Me.txtEust2.ForeColor = System.Drawing.Color.Black
-        Me.txtEust2.Location = New System.Drawing.Point(184, 40)
+        Me.txtEust2.Location = New System.Drawing.Point(276, 62)
+        Me.txtEust2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtEust2.MaxLineLength = -1
         Me.txtEust2.MaxLines_Warning = ""
         Me.txtEust2.MaxLines_Warning_Label = Nothing
         Me.txtEust2.Name = "txtEust2"
         Me.txtEust2.ReadOnly = True
-        Me.txtEust2.Size = New System.Drawing.Size(78, 20)
+        Me.txtEust2.Size = New System.Drawing.Size(115, 26)
         Me.txtEust2.TabIndex = 4
         Me.txtEust2.Text = "0,00 €"
         Me.txtEust2.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
@@ -1430,13 +1533,14 @@ Partial Class usrcntlVorauskasse
         Me.txtClearing._Waehrung = True
         Me.txtClearing._WaehrungZeichen = True
         Me.txtClearing.ForeColor = System.Drawing.Color.Black
-        Me.txtClearing.Location = New System.Drawing.Point(184, 142)
+        Me.txtClearing.Location = New System.Drawing.Point(276, 218)
+        Me.txtClearing.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtClearing.MaxLineLength = -1
         Me.txtClearing.MaxLines_Warning = ""
         Me.txtClearing.MaxLines_Warning_Label = Nothing
         Me.txtClearing.Name = "txtClearing"
-        Me.txtClearing.Size = New System.Drawing.Size(78, 20)
-        Me.txtClearing.TabIndex = 15
+        Me.txtClearing.Size = New System.Drawing.Size(115, 26)
+        Me.txtClearing.TabIndex = 16
         Me.txtClearing.Text = "0,00 €"
         Me.txtClearing.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
         '
@@ -1453,13 +1557,14 @@ Partial Class usrcntlVorauskasse
         Me.txtZoll2._Waehrung = True
         Me.txtZoll2._WaehrungZeichen = True
         Me.txtZoll2.ForeColor = System.Drawing.Color.Black
-        Me.txtZoll2.Location = New System.Drawing.Point(184, 21)
+        Me.txtZoll2.Location = New System.Drawing.Point(276, 32)
+        Me.txtZoll2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtZoll2.MaxLineLength = -1
         Me.txtZoll2.MaxLines_Warning = ""
         Me.txtZoll2.MaxLines_Warning_Label = Nothing
         Me.txtZoll2.Name = "txtZoll2"
         Me.txtZoll2.ReadOnly = True
-        Me.txtZoll2.Size = New System.Drawing.Size(78, 20)
+        Me.txtZoll2.Size = New System.Drawing.Size(115, 26)
         Me.txtZoll2.TabIndex = 2
         Me.txtZoll2.Text = "0,00 €"
         Me.txtZoll2.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
@@ -1477,13 +1582,14 @@ Partial Class usrcntlVorauskasse
         Me.txtUebersetzungRg._Waehrung = True
         Me.txtUebersetzungRg._WaehrungZeichen = True
         Me.txtUebersetzungRg.ForeColor = System.Drawing.Color.Black
-        Me.txtUebersetzungRg.Location = New System.Drawing.Point(184, 180)
+        Me.txtUebersetzungRg.Location = New System.Drawing.Point(276, 277)
+        Me.txtUebersetzungRg.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtUebersetzungRg.MaxLineLength = -1
         Me.txtUebersetzungRg.MaxLines_Warning = ""
         Me.txtUebersetzungRg.MaxLines_Warning_Label = Nothing
         Me.txtUebersetzungRg.Name = "txtUebersetzungRg"
-        Me.txtUebersetzungRg.Size = New System.Drawing.Size(78, 20)
-        Me.txtUebersetzungRg.TabIndex = 19
+        Me.txtUebersetzungRg.Size = New System.Drawing.Size(115, 26)
+        Me.txtUebersetzungRg.TabIndex = 20
         Me.txtUebersetzungRg.Text = "0,00 €"
         Me.txtUebersetzungRg.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
         '
@@ -1499,13 +1605,14 @@ Partial Class usrcntlVorauskasse
         Me.txtAndereAbgabenText._value = Nothing
         Me.txtAndereAbgabenText._Waehrung = False
         Me.txtAndereAbgabenText._WaehrungZeichen = True
-        Me.txtAndereAbgabenText.Location = New System.Drawing.Point(21, 59)
+        Me.txtAndereAbgabenText.Location = New System.Drawing.Point(32, 91)
+        Me.txtAndereAbgabenText.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtAndereAbgabenText.MaxLength = 200
         Me.txtAndereAbgabenText.MaxLineLength = -1
         Me.txtAndereAbgabenText.MaxLines_Warning = ""
         Me.txtAndereAbgabenText.MaxLines_Warning_Label = Nothing
         Me.txtAndereAbgabenText.Name = "txtAndereAbgabenText"
-        Me.txtAndereAbgabenText.Size = New System.Drawing.Size(125, 20)
+        Me.txtAndereAbgabenText.Size = New System.Drawing.Size(186, 26)
         Me.txtAndereAbgabenText.TabIndex = 5
         '
         'txtSvs
@@ -1521,13 +1628,14 @@ Partial Class usrcntlVorauskasse
         Me.txtSvs._Waehrung = True
         Me.txtSvs._WaehrungZeichen = True
         Me.txtSvs.ForeColor = System.Drawing.Color.Black
-        Me.txtSvs.Location = New System.Drawing.Point(184, 218)
+        Me.txtSvs.Location = New System.Drawing.Point(276, 335)
+        Me.txtSvs.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtSvs.MaxLineLength = -1
         Me.txtSvs.MaxLines_Warning = ""
         Me.txtSvs.MaxLines_Warning_Label = Nothing
         Me.txtSvs.Name = "txtSvs"
-        Me.txtSvs.Size = New System.Drawing.Size(78, 20)
-        Me.txtSvs.TabIndex = 24
+        Me.txtSvs.Size = New System.Drawing.Size(115, 26)
+        Me.txtSvs.TabIndex = 25
         Me.txtSvs.Text = "0,00 €"
         Me.txtSvs.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
         '
@@ -1544,14 +1652,15 @@ Partial Class usrcntlVorauskasse
         Me.txtMWST._Waehrung = True
         Me.txtMWST._WaehrungZeichen = True
         Me.txtMWST.ForeColor = System.Drawing.Color.Black
-        Me.txtMWST.Location = New System.Drawing.Point(184, 256)
+        Me.txtMWST.Location = New System.Drawing.Point(276, 428)
+        Me.txtMWST.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtMWST.MaxLineLength = -1
         Me.txtMWST.MaxLines_Warning = ""
         Me.txtMWST.MaxLines_Warning_Label = Nothing
         Me.txtMWST.Name = "txtMWST"
         Me.txtMWST.ReadOnly = True
-        Me.txtMWST.Size = New System.Drawing.Size(78, 20)
-        Me.txtMWST.TabIndex = 29
+        Me.txtMWST.Size = New System.Drawing.Size(115, 26)
+        Me.txtMWST.TabIndex = 32
         Me.txtMWST.Text = "0,00 €"
         Me.txtMWST.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
         '
@@ -1568,14 +1677,15 @@ Partial Class usrcntlVorauskasse
         Me.txtGesamtsumme._Waehrung = True
         Me.txtGesamtsumme._WaehrungZeichen = True
         Me.txtGesamtsumme.ForeColor = System.Drawing.Color.Black
-        Me.txtGesamtsumme.Location = New System.Drawing.Point(184, 301)
+        Me.txtGesamtsumme.Location = New System.Drawing.Point(276, 463)
+        Me.txtGesamtsumme.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtGesamtsumme.MaxLineLength = -1
         Me.txtGesamtsumme.MaxLines_Warning = ""
         Me.txtGesamtsumme.MaxLines_Warning_Label = Nothing
         Me.txtGesamtsumme.Name = "txtGesamtsumme"
         Me.txtGesamtsumme.ReadOnly = True
-        Me.txtGesamtsumme.Size = New System.Drawing.Size(78, 20)
-        Me.txtGesamtsumme.TabIndex = 34
+        Me.txtGesamtsumme.Size = New System.Drawing.Size(115, 26)
+        Me.txtGesamtsumme.TabIndex = 35
         Me.txtGesamtsumme.Text = "0,00 €"
         Me.txtGesamtsumme.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
         '
@@ -1592,13 +1702,14 @@ Partial Class usrcntlVorauskasse
         Me.txtMwstProzent._Waehrung = False
         Me.txtMwstProzent._WaehrungZeichen = True
         Me.txtMwstProzent.ForeColor = System.Drawing.Color.Black
-        Me.txtMwstProzent.Location = New System.Drawing.Point(133, 256)
+        Me.txtMwstProzent.Location = New System.Drawing.Point(200, 428)
+        Me.txtMwstProzent.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtMwstProzent.MaxLineLength = -1
         Me.txtMwstProzent.MaxLines_Warning = ""
         Me.txtMwstProzent.MaxLines_Warning_Label = Nothing
         Me.txtMwstProzent.Name = "txtMwstProzent"
-        Me.txtMwstProzent.Size = New System.Drawing.Size(45, 20)
-        Me.txtMwstProzent.TabIndex = 28
+        Me.txtMwstProzent.Size = New System.Drawing.Size(66, 26)
+        Me.txtMwstProzent.TabIndex = 31
         Me.txtMwstProzent.Text = "20,00 %"
         Me.txtMwstProzent.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
         '
@@ -1615,12 +1726,13 @@ Partial Class usrcntlVorauskasse
         Me.txtAndereAbgabenBetrag._Waehrung = True
         Me.txtAndereAbgabenBetrag._WaehrungZeichen = True
         Me.txtAndereAbgabenBetrag.ForeColor = System.Drawing.Color.Black
-        Me.txtAndereAbgabenBetrag.Location = New System.Drawing.Point(184, 59)
+        Me.txtAndereAbgabenBetrag.Location = New System.Drawing.Point(276, 91)
+        Me.txtAndereAbgabenBetrag.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtAndereAbgabenBetrag.MaxLineLength = -1
         Me.txtAndereAbgabenBetrag.MaxLines_Warning = ""
         Me.txtAndereAbgabenBetrag.MaxLines_Warning_Label = Nothing
         Me.txtAndereAbgabenBetrag.Name = "txtAndereAbgabenBetrag"
-        Me.txtAndereAbgabenBetrag.Size = New System.Drawing.Size(78, 20)
+        Me.txtAndereAbgabenBetrag.Size = New System.Drawing.Size(115, 26)
         Me.txtAndereAbgabenBetrag.TabIndex = 6
         Me.txtAndereAbgabenBetrag.Text = "0,00 €"
         Me.txtAndereAbgabenBetrag.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
@@ -1629,18 +1741,20 @@ Partial Class usrcntlVorauskasse
         '
         Me.Label42.AutoSize = True
         Me.Label42.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label42.Location = New System.Drawing.Point(316, 12)
+        Me.Label42.Location = New System.Drawing.Point(474, 18)
+        Me.Label42.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label42.Name = "Label42"
-        Me.Label42.Size = New System.Drawing.Size(26, 13)
-        Me.Label42.TabIndex = 2
+        Me.Label42.Size = New System.Drawing.Size(38, 20)
+        Me.Label42.TabIndex = 3
         Me.Label42.Text = "für:"
         '
         'LinkLabel3
         '
         Me.LinkLabel3.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.LinkLabel3.Location = New System.Drawing.Point(39, 56)
+        Me.LinkLabel3.Location = New System.Drawing.Point(58, 86)
+        Me.LinkLabel3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.LinkLabel3.Name = "LinkLabel3"
-        Me.LinkLabel3.Size = New System.Drawing.Size(125, 13)
+        Me.LinkLabel3.Size = New System.Drawing.Size(188, 20)
         Me.LinkLabel3.TabIndex = 11
         Me.LinkLabel3.TabStop = True
         Me.LinkLabel3.Text = "Kopplung aufheben"
@@ -1652,9 +1766,10 @@ Partial Class usrcntlVorauskasse
         Me.Button2.BackgroundImage = Global.SDL.My.Resources.Resources.person
         Me.Button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button2.Location = New System.Drawing.Point(914, 53)
+        Me.Button2.Location = New System.Drawing.Point(1371, 82)
+        Me.Button2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.Button2.Name = "Button2"
-        Me.Button2.Size = New System.Drawing.Size(24, 20)
+        Me.Button2.Size = New System.Drawing.Size(36, 31)
         Me.Button2.TabIndex = 14
         Me.Button2.UseVisualStyleBackColor = True
         Me.Button2.Visible = False
@@ -1662,9 +1777,10 @@ Partial Class usrcntlVorauskasse
         'Label46
         '
         Me.Label46.AutoSize = True
-        Me.Label46.Location = New System.Drawing.Point(170, 193)
+        Me.Label46.Location = New System.Drawing.Point(255, 297)
+        Me.Label46.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label46.Name = "Label46"
-        Me.Label46.Size = New System.Drawing.Size(41, 13)
+        Me.Label46.Size = New System.Drawing.Size(59, 20)
         Me.Label46.TabIndex = 32
         Me.Label46.Text = "Rg-Nr.:"
         '
@@ -1673,9 +1789,10 @@ Partial Class usrcntlVorauskasse
         Me.cbxLKWWartet.AutoSize = True
         Me.cbxLKWWartet.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.cbxLKWWartet.ForeColor = System.Drawing.Color.Red
-        Me.cbxLKWWartet.Location = New System.Drawing.Point(47, 245)
+        Me.cbxLKWWartet.Location = New System.Drawing.Point(70, 377)
+        Me.cbxLKWWartet.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.cbxLKWWartet.Name = "cbxLKWWartet"
-        Me.cbxLKWWartet.Size = New System.Drawing.Size(96, 17)
+        Me.cbxLKWWartet.Size = New System.Drawing.Size(139, 24)
         Me.cbxLKWWartet.TabIndex = 42
         Me.cbxLKWWartet.Text = "LKW wartet!"
         Me.cbxLKWWartet.UseVisualStyleBackColor = True
@@ -1693,13 +1810,14 @@ Partial Class usrcntlVorauskasse
         Me.txtRechnungsnummern._Waehrung = False
         Me.txtRechnungsnummern._WaehrungZeichen = True
         Me.txtRechnungsnummern.ForeColor = System.Drawing.Color.Black
-        Me.txtRechnungsnummern.Location = New System.Drawing.Point(254, 190)
+        Me.txtRechnungsnummern.Location = New System.Drawing.Point(381, 292)
+        Me.txtRechnungsnummern.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtRechnungsnummern.MaxLength = 200
         Me.txtRechnungsnummern.MaxLineLength = -1
         Me.txtRechnungsnummern.MaxLines_Warning = ""
         Me.txtRechnungsnummern.MaxLines_Warning_Label = Nothing
         Me.txtRechnungsnummern.Name = "txtRechnungsnummern"
-        Me.txtRechnungsnummern.Size = New System.Drawing.Size(709, 20)
+        Me.txtRechnungsnummern.Size = New System.Drawing.Size(1062, 26)
         Me.txtRechnungsnummern.TabIndex = 33
         '
         'txtDW
@@ -1715,12 +1833,13 @@ Partial Class usrcntlVorauskasse
         Me.txtDW._Waehrung = False
         Me.txtDW._WaehrungZeichen = True
         Me.txtDW.ForeColor = System.Drawing.Color.Black
-        Me.txtDW.Location = New System.Drawing.Point(937, 9)
+        Me.txtDW.Location = New System.Drawing.Point(1406, 14)
+        Me.txtDW.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtDW.MaxLineLength = -1
         Me.txtDW.MaxLines_Warning = ""
         Me.txtDW.MaxLines_Warning_Label = Nothing
         Me.txtDW.Name = "txtDW"
-        Me.txtDW.Size = New System.Drawing.Size(26, 20)
+        Me.txtDW.Size = New System.Drawing.Size(37, 26)
         Me.txtDW.TabIndex = 6
         Me.txtDW.Text = "0"
         Me.txtDW.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
@@ -1731,10 +1850,11 @@ Partial Class usrcntlVorauskasse
         Me.cboFirma._allowFreiText = False
         Me.cboFirma._value = ""
         Me.cboFirma.FormattingEnabled = True
-        Me.cboFirma.Location = New System.Drawing.Point(348, 8)
+        Me.cboFirma.Location = New System.Drawing.Point(522, 12)
+        Me.cboFirma.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.cboFirma.Name = "cboFirma"
-        Me.cboFirma.Size = New System.Drawing.Size(159, 21)
-        Me.cboFirma.TabIndex = 3
+        Me.cboFirma.Size = New System.Drawing.Size(236, 28)
+        Me.cboFirma.TabIndex = 1
         '
         'txtWarenbez
         '
@@ -1749,13 +1869,14 @@ Partial Class usrcntlVorauskasse
         Me.txtWarenbez._Waehrung = False
         Me.txtWarenbez._WaehrungZeichen = True
         Me.txtWarenbez.ForeColor = System.Drawing.Color.Black
-        Me.txtWarenbez.Location = New System.Drawing.Point(458, 247)
+        Me.txtWarenbez.Location = New System.Drawing.Point(687, 380)
+        Me.txtWarenbez.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtWarenbez.MaxLength = 200
         Me.txtWarenbez.MaxLineLength = -1
         Me.txtWarenbez.MaxLines_Warning = ""
         Me.txtWarenbez.MaxLines_Warning_Label = Nothing
         Me.txtWarenbez.Name = "txtWarenbez"
-        Me.txtWarenbez.Size = New System.Drawing.Size(368, 20)
+        Me.txtWarenbez.Size = New System.Drawing.Size(550, 26)
         Me.txtWarenbez.TabIndex = 46
         '
         'txtGewicht
@@ -1771,13 +1892,14 @@ Partial Class usrcntlVorauskasse
         Me.txtGewicht._Waehrung = False
         Me.txtGewicht._WaehrungZeichen = True
         Me.txtGewicht.ForeColor = System.Drawing.Color.Black
-        Me.txtGewicht.Location = New System.Drawing.Point(887, 247)
+        Me.txtGewicht.Location = New System.Drawing.Point(1330, 380)
+        Me.txtGewicht.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtGewicht.MaxLength = 200
         Me.txtGewicht.MaxLineLength = -1
         Me.txtGewicht.MaxLines_Warning = ""
         Me.txtGewicht.MaxLines_Warning_Label = Nothing
         Me.txtGewicht.Name = "txtGewicht"
-        Me.txtGewicht.Size = New System.Drawing.Size(76, 20)
+        Me.txtGewicht.Size = New System.Drawing.Size(112, 26)
         Me.txtGewicht.TabIndex = 48
         '
         'txtAnzVerp
@@ -1793,13 +1915,14 @@ Partial Class usrcntlVorauskasse
         Me.txtAnzVerp._Waehrung = False
         Me.txtAnzVerp._WaehrungZeichen = True
         Me.txtAnzVerp.ForeColor = System.Drawing.Color.Black
-        Me.txtAnzVerp.Location = New System.Drawing.Point(254, 247)
+        Me.txtAnzVerp.Location = New System.Drawing.Point(381, 380)
+        Me.txtAnzVerp.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtAnzVerp.MaxLength = 200
         Me.txtAnzVerp.MaxLineLength = -1
         Me.txtAnzVerp.MaxLines_Warning = ""
         Me.txtAnzVerp.MaxLines_Warning_Label = Nothing
         Me.txtAnzVerp.Name = "txtAnzVerp"
-        Me.txtAnzVerp.Size = New System.Drawing.Size(130, 20)
+        Me.txtAnzVerp.Size = New System.Drawing.Size(193, 26)
         Me.txtAnzVerp.TabIndex = 44
         '
         'txtUnternehmer
@@ -1815,13 +1938,14 @@ Partial Class usrcntlVorauskasse
         Me.txtUnternehmer._Waehrung = False
         Me.txtUnternehmer._WaehrungZeichen = True
         Me.txtUnternehmer.ForeColor = System.Drawing.Color.Black
-        Me.txtUnternehmer.Location = New System.Drawing.Point(653, 228)
+        Me.txtUnternehmer.Location = New System.Drawing.Point(980, 351)
+        Me.txtUnternehmer.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtUnternehmer.MaxLength = 200
         Me.txtUnternehmer.MaxLineLength = -1
         Me.txtUnternehmer.MaxLines_Warning = ""
         Me.txtUnternehmer.MaxLines_Warning_Label = Nothing
         Me.txtUnternehmer.Name = "txtUnternehmer"
-        Me.txtUnternehmer.Size = New System.Drawing.Size(310, 20)
+        Me.txtUnternehmer.Size = New System.Drawing.Size(463, 26)
         Me.txtUnternehmer.TabIndex = 41
         '
         'txtLKWKennz
@@ -1837,13 +1961,14 @@ Partial Class usrcntlVorauskasse
         Me.txtLKWKennz._Waehrung = False
         Me.txtLKWKennz._WaehrungZeichen = True
         Me.txtLKWKennz.ForeColor = System.Drawing.Color.Black
-        Me.txtLKWKennz.Location = New System.Drawing.Point(254, 228)
+        Me.txtLKWKennz.Location = New System.Drawing.Point(381, 351)
+        Me.txtLKWKennz.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtLKWKennz.MaxLength = 200
         Me.txtLKWKennz.MaxLineLength = -1
         Me.txtLKWKennz.MaxLines_Warning = ""
         Me.txtLKWKennz.MaxLines_Warning_Label = Nothing
         Me.txtLKWKennz.Name = "txtLKWKennz"
-        Me.txtLKWKennz.Size = New System.Drawing.Size(310, 20)
+        Me.txtLKWKennz.Size = New System.Drawing.Size(463, 26)
         Me.txtLKWKennz.TabIndex = 39
         '
         'txtATUEur1
@@ -1859,13 +1984,14 @@ Partial Class usrcntlVorauskasse
         Me.txtATUEur1._Waehrung = False
         Me.txtATUEur1._WaehrungZeichen = True
         Me.txtATUEur1.ForeColor = System.Drawing.Color.Black
-        Me.txtATUEur1.Location = New System.Drawing.Point(653, 209)
+        Me.txtATUEur1.Location = New System.Drawing.Point(980, 322)
+        Me.txtATUEur1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtATUEur1.MaxLength = 200
         Me.txtATUEur1.MaxLineLength = -1
         Me.txtATUEur1.MaxLines_Warning = ""
         Me.txtATUEur1.MaxLines_Warning_Label = Nothing
         Me.txtATUEur1.Name = "txtATUEur1"
-        Me.txtATUEur1.Size = New System.Drawing.Size(310, 20)
+        Me.txtATUEur1.Size = New System.Drawing.Size(463, 26)
         Me.txtATUEur1.TabIndex = 37
         '
         'txtAbsender
@@ -1881,13 +2007,14 @@ Partial Class usrcntlVorauskasse
         Me.txtAbsender._Waehrung = False
         Me.txtAbsender._WaehrungZeichen = True
         Me.txtAbsender.ForeColor = System.Drawing.Color.Black
-        Me.txtAbsender.Location = New System.Drawing.Point(254, 209)
+        Me.txtAbsender.Location = New System.Drawing.Point(381, 322)
+        Me.txtAbsender.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtAbsender.MaxLength = 200
         Me.txtAbsender.MaxLineLength = -1
         Me.txtAbsender.MaxLines_Warning = ""
         Me.txtAbsender.MaxLines_Warning_Label = Nothing
         Me.txtAbsender.Name = "txtAbsender"
-        Me.txtAbsender.Size = New System.Drawing.Size(310, 20)
+        Me.txtAbsender.Size = New System.Drawing.Size(463, 26)
         Me.txtAbsender.TabIndex = 35
         '
         'txtHerrFrau
@@ -1903,12 +2030,13 @@ Partial Class usrcntlVorauskasse
         Me.txtHerrFrau._Waehrung = False
         Me.txtHerrFrau._WaehrungZeichen = True
         Me.txtHerrFrau.ForeColor = System.Drawing.Color.Black
-        Me.txtHerrFrau.Location = New System.Drawing.Point(254, 34)
+        Me.txtHerrFrau.Location = New System.Drawing.Point(381, 52)
+        Me.txtHerrFrau.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtHerrFrau.MaxLineLength = -1
         Me.txtHerrFrau.MaxLines_Warning = ""
         Me.txtHerrFrau.MaxLines_Warning_Label = Nothing
         Me.txtHerrFrau.Name = "txtHerrFrau"
-        Me.txtHerrFrau.Size = New System.Drawing.Size(684, 20)
+        Me.txtHerrFrau.Size = New System.Drawing.Size(1024, 26)
         Me.txtHerrFrau.TabIndex = 9
         '
         'txtFaStNr
@@ -1924,13 +2052,14 @@ Partial Class usrcntlVorauskasse
         Me.txtFaStNr._Waehrung = False
         Me.txtFaStNr._WaehrungZeichen = True
         Me.txtFaStNr.ForeColor = System.Drawing.Color.Black
-        Me.txtFaStNr.Location = New System.Drawing.Point(653, 155)
+        Me.txtFaStNr.Location = New System.Drawing.Point(980, 238)
+        Me.txtFaStNr.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtFaStNr.MaxLength = 200
         Me.txtFaStNr.MaxLineLength = -1
         Me.txtFaStNr.MaxLines_Warning = ""
         Me.txtFaStNr.MaxLines_Warning_Label = Nothing
         Me.txtFaStNr.Name = "txtFaStNr"
-        Me.txtFaStNr.Size = New System.Drawing.Size(310, 20)
+        Me.txtFaStNr.Size = New System.Drawing.Size(463, 26)
         Me.txtFaStNr.TabIndex = 30
         '
         'txtAnsprechpartnerVERAG
@@ -1946,12 +2075,13 @@ Partial Class usrcntlVorauskasse
         Me.txtAnsprechpartnerVERAG._Waehrung = False
         Me.txtAnsprechpartnerVERAG._WaehrungZeichen = True
         Me.txtAnsprechpartnerVERAG.ForeColor = System.Drawing.Color.Black
-        Me.txtAnsprechpartnerVERAG.Location = New System.Drawing.Point(653, 9)
+        Me.txtAnsprechpartnerVERAG.Location = New System.Drawing.Point(980, 14)
+        Me.txtAnsprechpartnerVERAG.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtAnsprechpartnerVERAG.MaxLineLength = -1
         Me.txtAnsprechpartnerVERAG.MaxLines_Warning = ""
         Me.txtAnsprechpartnerVERAG.MaxLines_Warning_Label = Nothing
         Me.txtAnsprechpartnerVERAG.Name = "txtAnsprechpartnerVERAG"
-        Me.txtAnsprechpartnerVERAG.Size = New System.Drawing.Size(285, 20)
+        Me.txtAnsprechpartnerVERAG.Size = New System.Drawing.Size(426, 26)
         Me.txtAnsprechpartnerVERAG.TabIndex = 5
         '
         'txtEmail
@@ -1967,13 +2097,14 @@ Partial Class usrcntlVorauskasse
         Me.txtEmail._Waehrung = False
         Me.txtEmail._WaehrungZeichen = True
         Me.txtEmail.ForeColor = System.Drawing.Color.Black
-        Me.txtEmail.Location = New System.Drawing.Point(254, 155)
+        Me.txtEmail.Location = New System.Drawing.Point(381, 238)
+        Me.txtEmail.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtEmail.MaxLength = 200
         Me.txtEmail.MaxLineLength = -1
         Me.txtEmail.MaxLines_Warning = ""
         Me.txtEmail.MaxLines_Warning_Label = Nothing
         Me.txtEmail.Name = "txtEmail"
-        Me.txtEmail.Size = New System.Drawing.Size(310, 20)
+        Me.txtEmail.Size = New System.Drawing.Size(463, 26)
         Me.txtEmail.TabIndex = 28
         '
         'txtFax
@@ -1989,13 +2120,14 @@ Partial Class usrcntlVorauskasse
         Me.txtFax._Waehrung = False
         Me.txtFax._WaehrungZeichen = True
         Me.txtFax.ForeColor = System.Drawing.Color.Black
-        Me.txtFax.Location = New System.Drawing.Point(653, 136)
+        Me.txtFax.Location = New System.Drawing.Point(980, 209)
+        Me.txtFax.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtFax.MaxLength = 200
         Me.txtFax.MaxLineLength = -1
         Me.txtFax.MaxLines_Warning = ""
         Me.txtFax.MaxLines_Warning_Label = Nothing
         Me.txtFax.Name = "txtFax"
-        Me.txtFax.Size = New System.Drawing.Size(310, 20)
+        Me.txtFax.Size = New System.Drawing.Size(463, 26)
         Me.txtFax.TabIndex = 26
         '
         'txtTel
@@ -2011,13 +2143,14 @@ Partial Class usrcntlVorauskasse
         Me.txtTel._Waehrung = False
         Me.txtTel._WaehrungZeichen = True
         Me.txtTel.ForeColor = System.Drawing.Color.Black
-        Me.txtTel.Location = New System.Drawing.Point(254, 136)
+        Me.txtTel.Location = New System.Drawing.Point(381, 209)
+        Me.txtTel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtTel.MaxLength = 200
         Me.txtTel.MaxLineLength = -1
         Me.txtTel.MaxLines_Warning = ""
         Me.txtTel.MaxLines_Warning_Label = Nothing
         Me.txtTel.Name = "txtTel"
-        Me.txtTel.Size = New System.Drawing.Size(310, 20)
+        Me.txtTel.Size = New System.Drawing.Size(463, 26)
         Me.txtTel.TabIndex = 24
         '
         'txtEori
@@ -2033,13 +2166,14 @@ Partial Class usrcntlVorauskasse
         Me.txtEori._Waehrung = False
         Me.txtEori._WaehrungZeichen = True
         Me.txtEori.ForeColor = System.Drawing.Color.Black
-        Me.txtEori.Location = New System.Drawing.Point(653, 117)
+        Me.txtEori.Location = New System.Drawing.Point(980, 180)
+        Me.txtEori.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtEori.MaxLength = 200
         Me.txtEori.MaxLineLength = -1
         Me.txtEori.MaxLines_Warning = ""
         Me.txtEori.MaxLines_Warning_Label = Nothing
         Me.txtEori.Name = "txtEori"
-        Me.txtEori.Size = New System.Drawing.Size(310, 20)
+        Me.txtEori.Size = New System.Drawing.Size(463, 26)
         Me.txtEori.TabIndex = 22
         '
         'txtUid
@@ -2055,13 +2189,14 @@ Partial Class usrcntlVorauskasse
         Me.txtUid._Waehrung = False
         Me.txtUid._WaehrungZeichen = True
         Me.txtUid.ForeColor = System.Drawing.Color.Black
-        Me.txtUid.Location = New System.Drawing.Point(254, 117)
+        Me.txtUid.Location = New System.Drawing.Point(381, 180)
+        Me.txtUid.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtUid.MaxLength = 200
         Me.txtUid.MaxLineLength = -1
         Me.txtUid.MaxLines_Warning = ""
         Me.txtUid.MaxLines_Warning_Label = Nothing
         Me.txtUid.Name = "txtUid"
-        Me.txtUid.Size = New System.Drawing.Size(310, 20)
+        Me.txtUid.Size = New System.Drawing.Size(463, 26)
         Me.txtUid.TabIndex = 20
         '
         'txtAdresse2
@@ -2077,12 +2212,13 @@ Partial Class usrcntlVorauskasse
         Me.txtAdresse2._Waehrung = False
         Me.txtAdresse2._WaehrungZeichen = True
         Me.txtAdresse2.ForeColor = System.Drawing.Color.Black
-        Me.txtAdresse2.Location = New System.Drawing.Point(254, 91)
+        Me.txtAdresse2.Location = New System.Drawing.Point(381, 140)
+        Me.txtAdresse2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtAdresse2.MaxLineLength = -1
         Me.txtAdresse2.MaxLines_Warning = ""
         Me.txtAdresse2.MaxLines_Warning_Label = Nothing
         Me.txtAdresse2.Name = "txtAdresse2"
-        Me.txtAdresse2.Size = New System.Drawing.Size(709, 20)
+        Me.txtAdresse2.Size = New System.Drawing.Size(1062, 26)
         Me.txtAdresse2.TabIndex = 18
         '
         'txtAdresse1
@@ -2098,12 +2234,13 @@ Partial Class usrcntlVorauskasse
         Me.txtAdresse1._Waehrung = False
         Me.txtAdresse1._WaehrungZeichen = True
         Me.txtAdresse1.ForeColor = System.Drawing.Color.Black
-        Me.txtAdresse1.Location = New System.Drawing.Point(254, 72)
+        Me.txtAdresse1.Location = New System.Drawing.Point(381, 111)
+        Me.txtAdresse1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtAdresse1.MaxLineLength = -1
         Me.txtAdresse1.MaxLines_Warning = ""
         Me.txtAdresse1.MaxLines_Warning_Label = Nothing
         Me.txtAdresse1.Name = "txtAdresse1"
-        Me.txtAdresse1.Size = New System.Drawing.Size(709, 20)
+        Me.txtAdresse1.Size = New System.Drawing.Size(1062, 26)
         Me.txtAdresse1.TabIndex = 17
         '
         'txtFirma
@@ -2119,27 +2256,18 @@ Partial Class usrcntlVorauskasse
         Me.txtFirma._Waehrung = False
         Me.txtFirma._WaehrungZeichen = True
         Me.txtFirma.ForeColor = System.Drawing.Color.Black
-        Me.txtFirma.Location = New System.Drawing.Point(254, 53)
+        Me.txtFirma.Location = New System.Drawing.Point(381, 82)
+        Me.txtFirma.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.txtFirma.MaxLineLength = -1
         Me.txtFirma.MaxLines_Warning = ""
         Me.txtFirma.MaxLines_Warning_Label = Nothing
         Me.txtFirma.Name = "txtFirma"
-        Me.txtFirma.Size = New System.Drawing.Size(684, 20)
+        Me.txtFirma.Size = New System.Drawing.Size(1024, 26)
         Me.txtFirma.TabIndex = 13
         '
-        'Button4
-        '
-        Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button4.Location = New System.Drawing.Point(396, 121)
-        Me.Button4.Name = "Button4"
-        Me.Button4.Size = New System.Drawing.Size(100, 23)
-        Me.Button4.TabIndex = 35
-        Me.Button4.Text = "Zoll berechnen"
-        Me.Button4.UseVisualStyleBackColor = True
-        '
         'usrcntlVorauskasse
         '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.WhiteSmoke
         Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
@@ -2194,8 +2322,9 @@ Partial Class usrcntlVorauskasse
         Me.Controls.Add(Me.txtFirma)
         Me.Controls.Add(Me.lblHerrFrau)
         Me.Controls.Add(Me.lblVollmachtDE)
+        Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.Name = "usrcntlVorauskasse"
-        Me.Size = New System.Drawing.Size(1000, 626)
+        Me.Size = New System.Drawing.Size(1500, 963)
         CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit()
         Me.pnlBottom.ResumeLayout(False)
         Me.pnlBottom.PerformLayout()
diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb
index 039e7b9a..9d2f7684 100644
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb
+++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb
@@ -108,18 +108,22 @@
             txtAnzVerp.Text = If(SENDUNG.tblSnd_Colli, "")
             txtGewicht.Text = If(SENDUNG.tblSnd_Gewicht, "")
             txtAbsender.Text = If(SENDUNG.tblSnd_Absender, "")
-            If SENDUNG.AbfertigungsNr > 0 Then
-                '   txtAbfertigungsNr.Text = SENDUNG.FilialenNr & "/" & SENDUNG.AbfertigungsNr
-                txtAbfertigungsNr.Text = SENDUNG.AbfertigungsNr
-                If SENDUNG.FilialenNr > 0 Then
-                    cboFiliale.changeItem(SENDUNG.FilialenNr)
-                    Dim VK = VERAG_PROG_ALLGEMEIN.cVorauskasse.LOADByFilialeAbfNr(SENDUNG.FilialenNr, SENDUNG.AbfertigungsNr, ROLLE)
-                    If VK IsNot Nothing Then setValues(VK)
-                    initBerechnung()
+                If SENDUNG.AbfertigungsNr > 0 Then
+                    '   txtAbfertigungsNr.Text = SENDUNG.FilialenNr & "/" & SENDUNG.AbfertigungsNr
+                    txtAbfertigungsNr.Text = SENDUNG.AbfertigungsNr
+                    If SENDUNG.FilialenNr > 0 Then
+                        cboFiliale.changeItem(SENDUNG.FilialenNr)
+                        Dim VK = VERAG_PROG_ALLGEMEIN.cVorauskasse.LOADByFilialeAbfNr(SENDUNG.FilialenNr, SENDUNG.AbfertigungsNr, ROLLE)
+                        If VK IsNot Nothing Then setValues(VK)
+                        initBerechnung()
+                    End If
                 End If
-            End If
 
-        End If
+                If IsNumeric(If(SENDUNG.tblSnd_Frachtkosten, "")) Then
+                    txtFrachtkostenAusl._value = CDbl(SENDUNG.tblSnd_Frachtkosten)
+                End If
+
+            End If
             If AVISO IsNot Nothing Then
                 txtLKWKennz.Text = If(AVISO.LKW_Nr, "")
                 txtUnternehmer.Text = If(AVISO.Frächter, "")
@@ -188,12 +192,13 @@
         If CDate(Now.ToShortDateString) >= CDate("01.07.2020") And CDate(Now.ToShortDateString) <= CDate("31.12.2020") Then
 
             txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("0%", "0"))
-            txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("5%", "0,05"))
-            txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("16%", "0,16"))
+            'txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("5%", "0,05"))
+            'txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("16%", "0,16"))
             txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("7%", "0,07"))
             txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("19%", "0,19"))
             txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("20%", "0,20"))
-            txtEustProzent.changeItem("0,16")
+            txtEustProzent.changeItem("0,19")
+            ' txtEustProzent.changeItem("0,16")
         Else
 
             txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("0%", "0"))
@@ -261,27 +266,27 @@
         End If
 
         Dim zwTMP As Double =
-            Vl(txtVerzollungskosten) +
-            Vl(txtWeitereTarifPos) +
-            Vl(txtATLAS) +
-            Vl(txtClearing) +
-            Vl(txtKorrRechnung) +
-            Vl(txtUebersetzungRg) +
-            Vl(txtAviso) +
-            Vl(txtSvs) +
-        Vl(txtSonstigeKosten)
+                Vl(txtVerzollungskosten) +
+                Vl(txtWeitereTarifPos) +
+                Vl(txtATLAS) +
+                Vl(txtClearing) +
+                Vl(txtKorrRechnung) +
+                Vl(txtUebersetzungRg) +
+                Vl(txtAviso) +
+                Vl(txtSvs) +
+                Vl(txtSonstigeKosten) +
+                Vl(txtPapierePorti)
         ' Vl(txtMWST) +
         'Vl(txtPapierePorti)
         txtMWST._value = Vl(txtMwstProzent) * zwTMP
         txtGesamtsumme._value =
-            Vl(txtZoll2) +
-            Vl(txtEust2) +
-            Vl(txtAndereAbgabenBetrag) +
-            zwTMP +
-            Vl(txtMWST) +
-            Vl(txtPapierePorti)
+                Vl(txtZoll2) +
+                Vl(txtEust2) +
+                Vl(txtAndereAbgabenBetrag) +
+                zwTMP +
+                Vl(txtMWST)
+
 
-     
         '----------------------------------------------------------------
     End Sub
 
@@ -338,7 +343,7 @@
                 Case "CS"
                     txtEustProzent.changeItem("0,20")
                 Case "AG"
-                    If CDate(Now.ToShortDateString) >= CDate("01.07.2020") And CDate(Now.ToShortDateString) <= CDate("31.12.2020") Then
+                    If CDate(Now.ToShortDateString) >= CDate("01.07.2020") And CDate(Now.ToShortDateString) <= CDate("20.12.2020") Then
                         txtEustProzent.changeItem("0,16")
                     Else
                         txtEustProzent.changeItem("0,19")
diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb
index 1c77ece7..ded06706 100644
--- a/SDL/Formulare/KDFormulare/frmFormulare.vb
+++ b/SDL/Formulare/KDFormulare/frmFormulare.vb
@@ -3140,11 +3140,17 @@ Public Class FormularManagerNEU
 
         listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAviso.Text, 170, top + 37, 30, 6, "normal", 10, , iTextSharp.text.Element.ALIGN_RIGHT))
         listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtSvs.Text, 170, top + 41, 30, 6, "normal", 10, , iTextSharp.text.Element.ALIGN_RIGHT))
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtSonstigeKostenText.Text, 116.5, top + 45, 30, 6, "normal", 10, , iTextSharp.text.Element.ALIGN_LEFT))
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtSonstigeKosten.Text, 170, top + 45, 30, 6, "normal", 10, , iTextSharp.text.Element.ALIGN_RIGHT))
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtMwstProzent.Text, 140, top + 49, 30, 6, "normal", 10, , iTextSharp.text.Element.ALIGN_RIGHT))
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtMWST.Text, 170, top + 49, 30, 6, "normal", 10, , iTextSharp.text.Element.ALIGN_RIGHT))
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtPapierePorti.Text, 170, top + 56, 30, 6, "normal", 10, , iTextSharp.text.Element.ALIGN_RIGHT))
+        'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtSonstigeKostenText.Text, 116.5, top + 45, 30, 6, "normal", 10, , iTextSharp.text.Element.ALIGN_LEFT))
+        'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtSonstigeKosten.Text, 170, top + 45, 30, 6, "normal", 10, , iTextSharp.text.Element.ALIGN_RIGHT))
+        'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtMwstProzent.Text, 140, top + 49, 30, 6, "normal", 10, , iTextSharp.text.Element.ALIGN_RIGHT))
+        'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtMWST.Text, 170, top + 49, 30, 6, "normal", 10, , iTextSharp.text.Element.ALIGN_RIGHT))
+        'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtPapierePorti.Text, 170, top + 56, 30, 6, "normal", 10, , iTextSharp.text.Element.ALIGN_RIGHT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtPapierePorti.Text, 170, top + 45, 30, 6, "normal", 10, , iTextSharp.text.Element.ALIGN_RIGHT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtSonstigeKostenText.Text, 116.5, top + 49, 30, 6, "normal", 10, , iTextSharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtSonstigeKosten.Text, 170, top + 49, 30, 6, "normal", 10, , iTextSharp.text.Element.ALIGN_RIGHT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtMwstProzent.Text, 140, top + 53, 30, 6, "normal", 10, , iTextSharp.text.Element.ALIGN_RIGHT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtMWST.Text, 170, top + 53, 30, 6, "normal", 10, , iTextSharp.text.Element.ALIGN_RIGHT))
+
 
         listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtGesamtsumme.Text, 170, top + 61, 30, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_RIGHT))
 
@@ -4268,6 +4274,19 @@ Public Class FormularManagerNEU
     End Function
 
 
+    Shared Function Zollstopp(Zollstop, Entladestelle, Kommentare, Absender) As String
+        Dim fm As New VERAG_PROG_ALLGEMEIN.cFormularManager
+
+        Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues)
+
+
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(Absender, 70, 44, 100, 10, "normal", 14, , iTextSharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(Zollstop, 50, 80, 110, 30, "bold", 14, , iTextSharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(Entladestelle, 50, 145, 110, 30, "bold", 14, , iTextSharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(Kommentare, 50, 212, 110, 30, "normal", 12, , iTextSharp.text.Element.ALIGN_LEFT))
+
+        Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "Zollstopp", listTowrite)
+    End Function
 
     Shared Function Bonitaetsauskunft(usrCntl As usrcntlCreditreformBoniAuskunft) As String
         Dim fm As New VERAG_PROG_ALLGEMEIN.cFormularManager
@@ -4310,14 +4329,14 @@ Public Class FormularManagerNEU
 
     Public Shared Function getUO2() As String
         Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
-            Case "IMEX", "ATILLA", "UNISPED" : Return VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+            Case "IMEX", "ATILLA", "UNISPED", "AMBAR" : Return VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
             Case Else : Return ""
         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 "IMEX", "ATILLA", "UNISPED", "AMBAR", "FRONTOFFICE" : Return VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
             Case Else : Return ""
         End Select
     End Function
diff --git a/SDL/My Project/Resources.Designer.vb b/SDL/My Project/Resources.Designer.vb
index ae8bfcff..90a868f7 100644
--- a/SDL/My Project/Resources.Designer.vb	
+++ b/SDL/My Project/Resources.Designer.vb	
@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
      Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
@@ -349,6 +349,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property brexit() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("brexit", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -1683,6 +1693,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die  ähnelt.
+        '''</summary>
+        Friend ReadOnly Property sdf3sdfewr3edcvbn() As String
+            Get
+                Return ResourceManager.GetString("sdf3sdfewr3edcvbn", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -2202,7 +2221,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die 1.1.8.4 ähnelt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die 1.1.8.5 ähnelt.
         '''</summary>
         Friend ReadOnly Property Version() As String
             Get
diff --git a/SDL/My Project/Resources.resx b/SDL/My Project/Resources.resx
index 4cb7c16d..8e322551 100644
--- a/SDL/My Project/Resources.resx	
+++ b/SDL/My Project/Resources.resx	
@@ -638,7 +638,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.8.4</value>
+    <value>1.1.8.5</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>
@@ -799,4 +799,10 @@
   <data name="Unisped_ZS_logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Unisped_ZS_logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="brexit" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\brexit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="sdf3sdfewr3edcvbn" xml:space="preserve">
+    <value />
+  </data>
 </root>
\ No newline at end of file
diff --git a/SDL/Reports/Zoll/subrptKontrolleLKW_NCTSTR_Abrechnung.vb b/SDL/Reports/Zoll/subrptKontrolleLKW_NCTSTR_Abrechnung.vb
index 92513ce2..9b58934f 100644
--- a/SDL/Reports/Zoll/subrptKontrolleLKW_NCTSTR_Abrechnung.vb
+++ b/SDL/Reports/Zoll/subrptKontrolleLKW_NCTSTR_Abrechnung.vb
@@ -67,7 +67,6 @@ Public Class subrptKontrolleLKW_NCTSTR_Abrechnung
     End Sub
 
     Private Sub ReportFooter1_Format(sender As Object, e As EventArgs) Handles ReportFooter1.Format
-
         lblGesamtsumme.Text = "€ " & GesSumme.ToString("N2", CultureInfo.InvariantCulture)
     End Sub
 End Class
diff --git a/SDL/Resources/RG_ZF.xlsx b/SDL/Resources/RG_ZF.xlsx
index c65c6974..77b361cb 100644
Binary files a/SDL/Resources/RG_ZF.xlsx and b/SDL/Resources/RG_ZF.xlsx differ
diff --git a/SDL/Resources/brexit.png b/SDL/Resources/brexit.png
new file mode 100644
index 00000000..1688ddd9
Binary files /dev/null and b/SDL/Resources/brexit.png differ
diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj
index 35df17bb..80692e64 100644
--- a/SDL/SDL.vbproj
+++ b/SDL/SDL.vbproj
@@ -4151,6 +4151,9 @@
     <None Include="Resources\android-add-contact1.png" />
     <None Include="Resources\aviso_messenger.png" />
     <None Include="Resources\flagge_tr.png" />
+    <None Include="Resources\brexit.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <Content Include="Resources\GS\gsdll32.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
diff --git a/SDL/SMS/frmSendSMS.Designer.vb b/SDL/SMS/frmSendSMS.Designer.vb
index b2ae2357..80a692dc 100644
--- a/SDL/SMS/frmSendSMS.Designer.vb
+++ b/SDL/SMS/frmSendSMS.Designer.vb
@@ -45,6 +45,8 @@ Partial Class frmSendSMS
         Me.Button12 = New System.Windows.Forms.Button()
         Me.pic = New System.Windows.Forms.PictureBox()
         Me.cbxLKWOK = New System.Windows.Forms.CheckBox()
+        Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Label3 = New System.Windows.Forms.Label()
         CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
@@ -78,7 +80,7 @@ Partial Class frmSendSMS
         Me.txtHandyNummer.Multiline = True
         Me.txtHandyNummer.Name = "txtHandyNummer"
         Me.txtHandyNummer.Size = New System.Drawing.Size(384, 28)
-        Me.txtHandyNummer.TabIndex = 3
+        Me.txtHandyNummer.TabIndex = 2
         '
         'Label1
         '
@@ -101,7 +103,7 @@ Partial Class frmSendSMS
         Me.cboLandVorwahl.Location = New System.Drawing.Point(207, 187)
         Me.cboLandVorwahl.Name = "cboLandVorwahl"
         Me.cboLandVorwahl.Size = New System.Drawing.Size(64, 28)
-        Me.cboLandVorwahl.TabIndex = 2
+        Me.cboLandVorwahl.TabIndex = 7
         Me.cboLandVorwahl.Visible = False
         '
         'txtNachricht
@@ -114,7 +116,7 @@ Partial Class frmSendSMS
         Me.txtNachricht.MaxLines_Warning_Label = Nothing
         Me.txtNachricht.Name = "txtNachricht"
         Me.txtNachricht.Size = New System.Drawing.Size(534, 144)
-        Me.txtNachricht.TabIndex = 5
+        Me.txtNachricht.TabIndex = 6
         Me.txtNachricht.Text = ""
         '
         'btnAbbrechen
@@ -126,7 +128,7 @@ Partial Class frmSendSMS
         Me.btnAbbrechen.Location = New System.Drawing.Point(405, 339)
         Me.btnAbbrechen.Name = "btnAbbrechen"
         Me.btnAbbrechen.Size = New System.Drawing.Size(144, 25)
-        Me.btnAbbrechen.TabIndex = 9
+        Me.btnAbbrechen.TabIndex = 22
         Me.btnAbbrechen.Text = "       Abbrechen"
         Me.btnAbbrechen.UseVisualStyleBackColor = True
         '
@@ -138,7 +140,7 @@ Partial Class frmSendSMS
         Me.btnOK.Location = New System.Drawing.Point(405, 265)
         Me.btnOK.Name = "btnOK"
         Me.btnOK.Size = New System.Drawing.Size(144, 51)
-        Me.btnOK.TabIndex = 10
+        Me.btnOK.TabIndex = 14
         Me.btnOK.Text = "          SMS senden"
         Me.btnOK.UseVisualStyleBackColor = True
         '
@@ -146,10 +148,10 @@ Partial Class frmSendSMS
         '
         Me.Label2.AutoSize = True
         Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
-        Me.Label2.Location = New System.Drawing.Point(12, 99)
+        Me.Label2.Location = New System.Drawing.Point(12, 91)
         Me.Label2.Name = "Label2"
         Me.Label2.Size = New System.Drawing.Size(72, 17)
-        Me.Label2.TabIndex = 4
+        Me.Label2.TabIndex = 3
         Me.Label2.Text = "Nachricht:"
         '
         'Button1
@@ -158,7 +160,7 @@ Partial Class frmSendSMS
         Me.Button1.Location = New System.Drawing.Point(15, 267)
         Me.Button1.Name = "Button1"
         Me.Button1.Size = New System.Drawing.Size(300, 25)
-        Me.Button1.TabIndex = 6
+        Me.Button1.TabIndex = 8
         Me.Button1.Text = "Bitte zu VERAG kommen!"
         Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.Button1.UseVisualStyleBackColor = True
@@ -180,7 +182,7 @@ Partial Class frmSendSMS
         Me.Button3.Location = New System.Drawing.Point(15, 315)
         Me.Button3.Name = "Button3"
         Me.Button3.Size = New System.Drawing.Size(300, 25)
-        Me.Button3.TabIndex = 14
+        Me.Button3.TabIndex = 15
         Me.Button3.Text = "Bitte zu VERAG kommen und den Stempel mitnehmen!"
         Me.Button3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.Button3.UseVisualStyleBackColor = True
@@ -191,7 +193,7 @@ Partial Class frmSendSMS
         Me.Button4.Location = New System.Drawing.Point(15, 339)
         Me.Button4.Name = "Button4"
         Me.Button4.Size = New System.Drawing.Size(300, 25)
-        Me.Button4.TabIndex = 17
+        Me.Button4.TabIndex = 19
         Me.Button4.Text = "Bitte zu VERAG kommen und Bargeld mitnehmen: €" & Global.Microsoft.VisualBasic.ChrW(10) & " ..." & Global.Microsoft.VisualBasic.ChrW(10)
         Me.Button4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.Button4.UseVisualStyleBackColor = True
@@ -202,7 +204,7 @@ Partial Class frmSendSMS
         Me.Button5.Location = New System.Drawing.Point(314, 339)
         Me.Button5.Name = "Button5"
         Me.Button5.Size = New System.Drawing.Size(43, 25)
-        Me.Button5.TabIndex = 18
+        Me.Button5.TabIndex = 20
         Me.Button5.Text = "TR"
         Me.Button5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.Button5.UseVisualStyleBackColor = True
@@ -213,7 +215,7 @@ Partial Class frmSendSMS
         Me.Button6.Location = New System.Drawing.Point(314, 315)
         Me.Button6.Name = "Button6"
         Me.Button6.Size = New System.Drawing.Size(43, 25)
-        Me.Button6.TabIndex = 15
+        Me.Button6.TabIndex = 16
         Me.Button6.Text = "TR"
         Me.Button6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.Button6.UseVisualStyleBackColor = True
@@ -235,7 +237,7 @@ Partial Class frmSendSMS
         Me.Button8.Location = New System.Drawing.Point(314, 267)
         Me.Button8.Name = "Button8"
         Me.Button8.Size = New System.Drawing.Size(43, 25)
-        Me.Button8.TabIndex = 7
+        Me.Button8.TabIndex = 9
         Me.Button8.Text = "TR"
         Me.Button8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.Button8.UseVisualStyleBackColor = True
@@ -246,7 +248,7 @@ Partial Class frmSendSMS
         Me.Button9.Location = New System.Drawing.Point(356, 339)
         Me.Button9.Name = "Button9"
         Me.Button9.Size = New System.Drawing.Size(43, 25)
-        Me.Button9.TabIndex = 19
+        Me.Button9.TabIndex = 21
         Me.Button9.Text = "YU"
         Me.Button9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.Button9.UseVisualStyleBackColor = True
@@ -257,7 +259,7 @@ Partial Class frmSendSMS
         Me.Button10.Location = New System.Drawing.Point(356, 315)
         Me.Button10.Name = "Button10"
         Me.Button10.Size = New System.Drawing.Size(43, 25)
-        Me.Button10.TabIndex = 16
+        Me.Button10.TabIndex = 17
         Me.Button10.Text = "YU"
         Me.Button10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.Button10.UseVisualStyleBackColor = True
@@ -279,7 +281,7 @@ Partial Class frmSendSMS
         Me.Button12.Location = New System.Drawing.Point(356, 267)
         Me.Button12.Name = "Button12"
         Me.Button12.Size = New System.Drawing.Size(43, 25)
-        Me.Button12.TabIndex = 8
+        Me.Button12.TabIndex = 10
         Me.Button12.Text = "YU"
         Me.Button12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.Button12.UseVisualStyleBackColor = True
@@ -302,16 +304,41 @@ Partial Class frmSendSMS
         Me.cbxLKWOK.Location = New System.Drawing.Point(406, 320)
         Me.cbxLKWOK.Name = "cbxLKWOK"
         Me.cbxLKWOK.Size = New System.Drawing.Size(120, 17)
-        Me.cbxLKWOK.TabIndex = 21
+        Me.cbxLKWOK.TabIndex = 18
         Me.cbxLKWOK.Text = "LKW auf OK setzen"
         Me.cbxLKWOK.UseVisualStyleBackColor = True
         '
+        'cboFirma
+        '
+        Me.cboFirma._allowedValuesFreiText = Nothing
+        Me.cboFirma._allowFreiText = True
+        Me.cboFirma._value = ""
+        Me.cboFirma.DropDownWidth = 250
+        Me.cboFirma.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
+        Me.cboFirma.FormattingEnabled = True
+        Me.cboFirma.Location = New System.Drawing.Point(285, 88)
+        Me.cboFirma.Name = "cboFirma"
+        Me.cboFirma.Size = New System.Drawing.Size(114, 24)
+        Me.cboFirma.TabIndex = 5
+        '
+        'Label3
+        '
+        Me.Label3.AutoSize = True
+        Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
+        Me.Label3.Location = New System.Drawing.Point(232, 91)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(47, 17)
+        Me.Label3.TabIndex = 4
+        Me.Label3.Text = "Firma:"
+        '
         'frmSendSMS
         '
         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(560, 371)
+        Me.Controls.Add(Me.Label3)
+        Me.Controls.Add(Me.cboFirma)
         Me.Controls.Add(Me.cbxLKWOK)
         Me.Controls.Add(Me.cboLandVorwahl)
         Me.Controls.Add(Me.pic)
@@ -365,4 +392,6 @@ Partial Class frmSendSMS
     Friend WithEvents Button12 As System.Windows.Forms.Button
     Friend WithEvents pic As System.Windows.Forms.PictureBox
     Friend WithEvents cbxLKWOK As CheckBox
+    Friend WithEvents cboFirma As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Label3 As Label
 End Class
diff --git a/SDL/SMS/frmSendSMS.vb b/SDL/SMS/frmSendSMS.vb
index 61a8bd65..1205bac0 100644
--- a/SDL/SMS/frmSendSMS.vb
+++ b/SDL/SMS/frmSendSMS.vb
@@ -56,13 +56,12 @@ Public Class frmSendSMS
             End If
         End If
 
-        If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "VERAG" Then
-            Button1.Text = Button1.Text.Replace("VERAG", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
-            Button2.Text = Button2.Text.Replace("VERAG", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
-            Button3.Text = Button3.Text.Replace("VERAG", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
-            Button4.Text = Button4.Text.Replace("VERAG", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
+        cboFirma.Items.Clear()
+        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA))
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER <> "" AndAlso VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER <> VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Then
+            cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER, VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER))
         End If
-
+        cboFirma.SelectedIndex = 0
 
         cboLandVorwahl.Items.Clear()
         cboLandVorwahl.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
@@ -95,6 +94,15 @@ Public Class frmSendSMS
 
     End Sub
 
+    Sub initFirma()
+        Dim FIRMATmp = cboFirma._value
+
+        Button1.Text = Button1.Text.Replace("VERAG", FIRMATmp)
+        Button2.Text = Button2.Text.Replace("VERAG", FIRMATmp)
+        Button3.Text = Button3.Text.Replace("VERAG", FIRMATmp)
+        Button4.Text = Button4.Text.Replace("VERAG", FIRMATmp)
+
+    End Sub
     '
 
     Private Sub btnAbbrechen_Click(sender As Object, e As EventArgs) Handles btnAbbrechen.Click
@@ -129,26 +137,26 @@ Public Class frmSendSMS
         Dim absenderAccount = ""
         Dim absenderFirma = ""
 
-        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
-            Case "VERAG", "BEIDE"
-                Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_abteilung
-                    Case "ZOLL", "QS" : absenderAccount = "EX0252513" : absenderFirma = "VERAG Spedition"
-                    Case "MDM" : absenderAccount = "EX0252747" : absenderFirma = "VERAG 360"
-                    Case Else : absenderAccount = "EX0252513" : absenderFirma = "VERAG Spedition"
-                        'Case Else : MsgBox("Fehler bei der Datenprüfung: Abteilung.") : Exit Sub
-                End Select
-            Case "ATILLA" : absenderAccount = "EX0252746" : absenderFirma = "ATILLA Spedition"
-            Case "IMEX" : absenderAccount = "EX0272082" : absenderFirma = "IMEX Spedition"
-            Case "UNISPED" : absenderAccount = "EX0300174" : absenderFirma = "UNISPED Spedition"
+            Select Case cboFirma._value
+                Case "VERAG" ', "BEIDE"
+                    Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_abteilung
+                        Case "ZOLL", "QS" : absenderAccount = "EX0252513" : absenderFirma = "VERAG Spedition"
+                        Case "MDM" : absenderAccount = "EX0252747" : absenderFirma = "VERAG 360"
+                        Case Else : absenderAccount = "EX0252513" : absenderFirma = "VERAG Spedition"
+                            'Case Else : MsgBox("Fehler bei der Datenprüfung: Abteilung.") : Exit Sub
+                    End Select
+                Case "ATILLA" : absenderAccount = "EX0252746" : absenderFirma = "ATILLA Spedition"
+                Case "IMEX" : absenderAccount = "EX0272082" : absenderFirma = "IMEX Spedition"
+                Case "UNISPED" : absenderAccount = "EX0300174" : absenderFirma = "UNISPED Spedition"
                 Case "FRONTOFFICE" : absenderAccount = "EX0300173" : absenderFirma = "FRONT-OFFICE SUBEN"
                 Case "AMBAR" : absenderAccount = "EX0315223" : absenderFirma = "AMBAR"
                 Case Else : MsgBox("Fehler bei der Datenprüfung: Firmendaten.") : Exit Sub
-        End Select
+            End Select
 
 
 
-        ' If vbYes = MsgBox("Soll die Nachricht gesendet werden?" & vbNewLine & "Handy-Nummer: " & nr, MsgBoxStyle.YesNo) Then
-        SMS = New VERAG_PROG_ALLGEMEIN.cSMS
+            ' If vbYes = MsgBox("Soll die Nachricht gesendet werden?" & vbNewLine & "Handy-Nummer: " & nr, MsgBoxStyle.YesNo) Then
+            SMS = New VERAG_PROG_ALLGEMEIN.cSMS
 
 
         SMS.sms_Vorwahl = cboLandVorwahl._value
@@ -216,8 +224,9 @@ Public Class frmSendSMS
     End Sub
 
     Sub fillTXT(s, Optional lkwTxt = "LKW/TIR: ")
-        If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "VERAG" Then
-            txtNachricht.Text = s.ToString.Replace("VERAG", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA.Replace("FRONTOFFICE", "FRONT-OFFICE SUBEN"))
+        Dim FirmaTmp = cboFirma._value
+        If FirmaTmp <> "VERAG" Then
+            txtNachricht.Text = s.ToString.Replace("VERAG", FirmaTmp.Replace("FRONTOFFICE", "FRONT-OFFICE SUBEN"))
         Else
             txtNachricht.Text = s
         End If
@@ -226,8 +235,8 @@ Public Class frmSendSMS
             txtNachricht.Text &= vbNewLine & lkwTxt & Kennzeichen
         End If
 
-        If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then
-            txtNachricht.Text &= vbNewLine & "VERAG | UNISPED | IMEX"
+        If FirmaTmp = "FRONTOFFICE" Then
+            txtNachricht.Text &= vbNewLine & "VERAG - UNISPED - IMEX"
         End If
 
 
@@ -297,6 +306,10 @@ Public Class frmSendSMS
         End If
 
     End Sub
+
+    Private Sub cboFirma_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboFirma.SelectedIndexChanged
+        initFirma()
+    End Sub
 End Class
 
 Public Class cSMSOptions
diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
index 2763cf8d..33f1e44b 100644
--- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
+++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
@@ -1878,7 +1878,7 @@ Public Class usrCntlSpeditionsBuchSuche
                     Datei = .Workbooks.Open(Path) 'Anpassen
                     Blatt = Datei.Worksheets(1) 'Anpassen
 
-                    Blatt.Range("H1").Value = txtAbfertDat.Text & "-" & txtAbfertDatBis.Text
+                    Blatt.Range("I1").Value = txtAbfertDat.Text & "-" & txtAbfertDatBis.Text
 
                     Dim cnt = 3
                     For Each r In dt.Rows
@@ -1895,6 +1895,8 @@ Public Class usrCntlSpeditionsBuchSuche
                         If ZOLLANMELDUNG.getDataByBezugsnummer(r("FilialenNr") & "/" & r("AbfertigungsNr"), r("Abfertigungsart"), "") Then
                             Blatt.Range("F" & cnt).Value = ZOLLANMELDUNG.Rechnungspreis
                             Blatt.Range("G" & cnt).Value = ZOLLANMELDUNG.Handelsrechnung.Replace(", ", "," & vbNewLine)
+                            Blatt.Range("I" & cnt).Value = ZOLLANMELDUNG.ABGABEN_ZOLL
+                            Blatt.Range("J" & cnt).Value = ZOLLANMELDUNG.ANZ_POS
                         End If
 
                         lblKdAusFortschritt.Text = (cnt - 2) & "/" & dt.Rows.Count
diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb
index 012c06e5..2800f6c9 100644
--- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb
+++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb
@@ -681,6 +681,7 @@ Public Class usrCntlATLAS_EZA
                 EZA.eza_Erstellung_SB = DY_ANM.dy_Erstellung_SB
                 EZA.eza_LetzteBearbeitung = Now
                 EZA.eza_LetzteBearbeitung_SB = DY_ANM.dy_LetzteBearbeitung_SB
+                EZA.eza_firma = Me.FIRMA_DY
                 DAKOSY_Interface_SEND.loadInClass_VersandanmeldungEZA(EZA, Me, DY_ANM)
                 If Not EZA.SAVE_ALL() Then Exit Sub
                 Dim saveFile = ""
diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS.vb
index 7defbff1..8e474bb0 100644
--- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS.vb
+++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS.vb
@@ -507,14 +507,15 @@ Public Class usrCntlATLAS_NCTS
                 ncts_OUT.ncts_Erstellung_SB = DY_ANM.dy_Erstellung_SB
                 ncts_OUT.ncts_LetzteBearbeitung = Now
                 ncts_OUT.ncts_LetzteBearbeitung_SB = DY_ANM.dy_LetzteBearbeitung_SB
-                DAKOSY_Interface_SEND.loadInClass_VersandanmeldungNCTSDE_003(ncts_OUT, Me, DY_ANM, FIRMA_DY)
+                ncts_OUT.ncts_firma = Me.FIRMA_DY
+                DAKOSY_Interface_SEND.loadInClass_VersandanmeldungNCTSDE_003(ncts_OUT, Me, DY_ANM, Me.FIRMA_DY)
 
                 If Not ncts_OUT.SAVE_ALL() Then Exit Sub
 
                 Dim saveFile = ""
                 If DAKOSY_Interface_SEND.generateVersandanmeldungNCTSDE_003(ncts_OUT, saveFile, cboDakosyAction._value) Then
                     If saveFile <> "" Then
-                        If cDakosyFunftions.send_Data_To_Dakosy_FTP(saveFile, BezugsNr, DY_ANM.dy_Id, FIRMA_DY) Then
+                        If cDakosyFunftions.send_Data_To_Dakosy_FTP(saveFile, BezugsNr, DY_ANM.dy_Id, Me.FIRMA_DY) Then
                             DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_ANM, DAKOSY_Worker.cDY_Statusliste.S_03)
                         Else
                             DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_ANM, DAKOSY_Worker.cDY_Statusliste.S_09)
diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/cDakosyInterface_Send.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/cDakosyInterface_Send.vb
index 74bf7049..a9812b20 100644
--- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/cDakosyInterface_Send.vb
+++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/cDakosyInterface_Send.vb
@@ -12,6 +12,7 @@ Class DAKOSY_Interface_SEND
                     cDY.ncts_Trans_Partner = "VERA"
             End Select
 
+            cDY.ncts_firma = FIRMA_DY
             cDY.ncts_Trans_DatumZeit = Now
             cDY.ncts_Gestellt = False
             cDY.ncts_Status = "00"
@@ -187,6 +188,8 @@ Class DAKOSY_Interface_SEND
                     Return "IMEX"
                 Case "UNISPED"
                     Return "UNAT"
+                Case "AMBAR"
+                    Return "VRAS" 'warum auch immer.. irgendwie wg der eigenen EORI von AMBAR..
                 Case Else : Return "VERG"
             End Select
         End If
diff --git a/SDL/cProgramFunctions.vb b/SDL/cProgramFunctions.vb
index 7541140c..502dd56b 100644
--- a/SDL/cProgramFunctions.vb
+++ b/SDL/cProgramFunctions.vb
@@ -181,7 +181,8 @@ Public Class cProgramFunctions
             If Filiale = 4801 Then
                 docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1)  FROM [Therefore].[dbo].[TheCat17] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON")
             Else
-                docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1)  FROM [Therefore].[dbo].[TheCat153] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON")
+                docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1)  FROM [Therefore].[dbo].[TheCat291] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON")
+                If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1)  FROM [Therefore].[dbo].[TheCat153] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON")
                 If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1)  FROM [Therefore].[dbo].[TheCat119] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON")
                 If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1)  FROM [Therefore].[dbo].[TheCat109] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON")
                 If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1)  FROM [Therefore].[dbo].[TheCat101] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON")
diff --git a/SDL/kassenbuch/frmNacherfassungLeihgeld.vb b/SDL/kassenbuch/frmNacherfassungLeihgeld.vb
index 259ef296..f7d81b32 100644
--- a/SDL/kassenbuch/frmNacherfassungLeihgeld.vb
+++ b/SDL/kassenbuch/frmNacherfassungLeihgeld.vb
@@ -583,7 +583,7 @@ Public Class frmNacherfassungLeihgeld
             If barcodeLKW IsNot Nothing Then VALUES.barcodeLKW = barcodeLKW
             If barcode IsNot Nothing Then VALUES.barcodeSendung = barcode
 
-            Dim rpt As New Gemeinsames.rptSendungen(VALUES, imgpath, Nothing, Nothing)
+            Dim rpt As New Gemeinsames.rptSendungen(VALUES, imgpath, Nothing, Nothing, Nothing)
             '  rpt.Document.CacheToDisk = True
             'rpt.Document.CacheToDiskLocation = "C:\\Temp"
             '  rpt.Run()
diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb
index 23f60cb8..af29ff6f 100644
--- a/SDL/kunden/frmKundenblatt.vb
+++ b/SDL/kunden/frmKundenblatt.vb
@@ -1202,6 +1202,8 @@ Public Class frmKundenblatt
                     scanErstbestellung.Visible = True
                 Case 203 : scanErstbestellung.Visible = True
                 Case 209 : scanErstbestellung.Visible = True
+                Case 215 : scanErstbestellung.Visible = True' PLOSE IT
+                Case 214 : scanErstbestellung.Visible = True 'PLOSE Roadmaster
                 Case 211
                     '    scanErstbestellung.Visible = True
                     scanMWSTAgreement.Visible = True
diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb
index b7e15016..20f4b0e2 100644
--- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb
+++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb
@@ -34,6 +34,7 @@ Partial Class usrcntlKundeBearbeitenFull
         Dim DataGridViewCellStyle10 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.lblHinweisKdNr = New System.Windows.Forms.Label()
         Me.cboFremdspedition = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.cbxVerzolltBei = New System.Windows.Forms.CheckBox()
         Me.cbxBesonderheitenNEU = New System.Windows.Forms.CheckBox()
@@ -291,6 +292,7 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.Label50 = New System.Windows.Forms.Label()
         Me.Label68 = New System.Windows.Forms.Label()
         Me.pnlNeukunde = New System.Windows.Forms.Panel()
+        Me.Button2 = New System.Windows.Forms.Button()
         Me.cboFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.cboKundenkreis = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Label77 = New System.Windows.Forms.Label()
@@ -303,7 +305,8 @@ 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.lblHinweisKdNr = New System.Windows.Forms.Label()
+        Me.Label94 = New System.Windows.Forms.Label()
+        Me.cbxAPITradeshift = New System.Windows.Forms.CheckBox()
         Me.tbcntrDetails.SuspendLayout()
         Me.tbAbfertigung.SuspendLayout()
         Me.tbcntrAbf.SuspendLayout()
@@ -383,6 +386,17 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.tbAbfertigung.Text = " Abfertigung"
         Me.tbAbfertigung.UseVisualStyleBackColor = True
         '
+        'lblHinweisKdNr
+        '
+        Me.lblHinweisKdNr.AutoSize = True
+        Me.lblHinweisKdNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblHinweisKdNr.Location = New System.Drawing.Point(168, 94)
+        Me.lblHinweisKdNr.Name = "lblHinweisKdNr"
+        Me.lblHinweisKdNr.Size = New System.Drawing.Size(137, 13)
+        Me.lblHinweisKdNr.TabIndex = 239
+        Me.lblHinweisKdNr.Text = "Kunden-Nummer vergeben!"
+        Me.lblHinweisKdNr.Visible = False
+        '
         'cboFremdspedition
         '
         Me.cboFremdspedition._allowedValuesFreiText = Nothing
@@ -965,6 +979,8 @@ Partial Class usrcntlKundeBearbeitenFull
         '
         'tbVerrechnung
         '
+        Me.tbVerrechnung.Controls.Add(Me.cbxAPITradeshift)
+        Me.tbVerrechnung.Controls.Add(Me.Label94)
         Me.tbVerrechnung.Controls.Add(Me.cbxVeranlagungskunde)
         Me.tbVerrechnung.Controls.Add(Me.Label93)
         Me.tbVerrechnung.Controls.Add(Me.txtDebKdNr)
@@ -3864,16 +3880,27 @@ Partial Class usrcntlKundeBearbeitenFull
         '
         'pnlNeukunde
         '
+        Me.pnlNeukunde.Controls.Add(Me.Button2)
         Me.pnlNeukunde.Controls.Add(Me.Label50)
         Me.pnlNeukunde.Controls.Add(Me.cboFiliale)
         Me.pnlNeukunde.Controls.Add(Me.cboKundenkreis)
         Me.pnlNeukunde.Controls.Add(Me.Label68)
-        Me.pnlNeukunde.Location = New System.Drawing.Point(717, 487)
+        Me.pnlNeukunde.Location = New System.Drawing.Point(705, 487)
         Me.pnlNeukunde.Name = "pnlNeukunde"
-        Me.pnlNeukunde.Size = New System.Drawing.Size(303, 73)
+        Me.pnlNeukunde.Size = New System.Drawing.Size(315, 80)
         Me.pnlNeukunde.TabIndex = 15
         Me.pnlNeukunde.Visible = False
         '
+        'Button2
+        '
+        Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button2.Location = New System.Drawing.Point(194, 7)
+        Me.Button2.Name = "Button2"
+        Me.Button2.Size = New System.Drawing.Size(105, 30)
+        Me.Button2.TabIndex = 19
+        Me.Button2.Text = "Wunsch-KdNr"
+        Me.Button2.UseVisualStyleBackColor = True
+        '
         'cboFiliale
         '
         Me.cboFiliale._allowedValuesFreiText = Nothing
@@ -3887,7 +3914,7 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.cboFiliale.FormattingEnabled = True
         Me.cboFiliale.Location = New System.Drawing.Point(104, 8)
         Me.cboFiliale.Name = "cboFiliale"
-        Me.cboFiliale.Size = New System.Drawing.Size(195, 28)
+        Me.cboFiliale.Size = New System.Drawing.Size(84, 28)
         Me.cboFiliale.TabIndex = 1
         '
         'cboKundenkreis
@@ -4037,16 +4064,26 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.cbxFiBuLG.UseVisualStyleBackColor = True
         Me.cbxFiBuLG.Visible = False
         '
-        'lblHinweisKdNr
+        'Label94
         '
-        Me.lblHinweisKdNr.AutoSize = True
-        Me.lblHinweisKdNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblHinweisKdNr.Location = New System.Drawing.Point(168, 94)
-        Me.lblHinweisKdNr.Name = "lblHinweisKdNr"
-        Me.lblHinweisKdNr.Size = New System.Drawing.Size(137, 13)
-        Me.lblHinweisKdNr.TabIndex = 239
-        Me.lblHinweisKdNr.Text = "Kunden-Nummer vergeben!"
-        Me.lblHinweisKdNr.Visible = False
+        Me.Label94.AutoSize = True
+        Me.Label94.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label94.Location = New System.Drawing.Point(414, 358)
+        Me.Label94.Name = "Label94"
+        Me.Label94.Size = New System.Drawing.Size(168, 13)
+        Me.Label94.TabIndex = 35
+        Me.Label94.Text = "Fremd-Abrechnungssysteme:"
+        '
+        'cbxAPITradeshift
+        '
+        Me.cbxAPITradeshift.AutoSize = True
+        Me.cbxAPITradeshift.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cbxAPITradeshift.Location = New System.Drawing.Point(417, 382)
+        Me.cbxAPITradeshift.Name = "cbxAPITradeshift"
+        Me.cbxAPITradeshift.Size = New System.Drawing.Size(157, 17)
+        Me.cbxAPITradeshift.TabIndex = 36
+        Me.cbxAPITradeshift.Text = "Rechnungskopie Tradeshift"
+        Me.cbxAPITradeshift.UseVisualStyleBackColor = True
         '
         'usrcntlKundeBearbeitenFull
         '
@@ -4078,7 +4115,7 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.Controls.Add(Me.lblKundennr)
         Me.Controls.Add(Me.Label77)
         Me.Name = "usrcntlKundeBearbeitenFull"
-        Me.Size = New System.Drawing.Size(1152, 560)
+        Me.Size = New System.Drawing.Size(1152, 570)
         Me.tbcntrDetails.ResumeLayout(False)
         Me.tbAbfertigung.ResumeLayout(False)
         Me.tbAbfertigung.PerformLayout()
@@ -4403,4 +4440,7 @@ Partial Class usrcntlKundeBearbeitenFull
     Friend WithEvents txtDebKdNr As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents cbxVeranlagungskunde As CheckBox
     Friend WithEvents lblHinweisKdNr As Label
+    Friend WithEvents Button2 As Button
+    Friend WithEvents cbxAPITradeshift As CheckBox
+    Friend WithEvents Label94 As Label
 End Class
diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb
index ce2435c1..ddd3756c 100644
--- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb
+++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb
@@ -9,7 +9,8 @@ Public Class usrcntlKundeBearbeitenFull
     ' Dim USRCNTL_FISK As usrCntlKundeFiskaldaten
     Dim EMAIL_ANKUNFT As cEmailBenachrichtigungList = Nothing
     Dim EMAIL_FREIGABE As cEmailBenachrichtigungList = Nothing
-     Dim sql As New SQL
+    Dim sql As New SQL
+    Dim WunschKdNr As Integer = -1
     '  Dim kdnr = -1
 
     Public Event KD_SAVED(kdnr)
@@ -172,6 +173,7 @@ Public Class usrcntlKundeBearbeitenFull
         cbxAbf_ZollVM.Checked = loadValue(KUNDE.Zollvollmacht, False)
         txtAbf_ZollVmVom._value = loadValue(KUNDE.Zollvollmacht_vom, "")
         txtAbf_Planzahl.Text = loadValue(KUNDE.Planzahl, "")
+
         cbxAbf_Lastschrift.Checked = loadValue(KUNDE.Lastschrift, False)
         txtAbf_LastschriftVon._value = loadValue(KUNDE.Lastschrift_von, "")
         txtAbf_LastschriftBis._value = loadValue(KUNDE.Lastschrift_bis, "")
@@ -275,6 +277,8 @@ Public Class usrcntlKundeBearbeitenFull
         cbxAutoFakturierung.Checked = KUNDE_ERW.AutoFakturierung
         cbxVeranlagungskunde.Checked = KUNDE_ERW.Veranlagungskunde
 
+        cbxAPITradeshift.Checked = loadValue(KUNDE_ERW.kde_API_Tradeshift, False)
+
 
         txtVERAG_Schnittstellen_ID.Text = If(KUNDE_ERW.kde_VERAG_INTERFACE_ID, "")
         ' ----- Abfertigungsverbot -----
@@ -333,6 +337,7 @@ Public Class usrcntlKundeBearbeitenFull
         txtAbfVerb_RechtsanwaltSeit.Enabled = cboAbfVerb_Rechtsanwalt.Checked
 
 
+
         ' -------- EMAIL --------
 
 
@@ -377,7 +382,8 @@ Public Class usrcntlKundeBearbeitenFull
             End Select
 
             Dim s_KdNr = kundenkreis.Split("-")
-            Dim kdnr = VERAG_PROG_ALLGEMEIN.cAdressen.getHoechsteKdNr(s_KdNr(0), s_KdNr(1)) '+ 1
+            Dim kdnr = WunschKdNr 'Wenn Wunschkdnr, sonst neue vergeben:
+            If WunschKdNr <= 0 Then kdnr = VERAG_PROG_ALLGEMEIN.cAdressen.getHoechsteKdNr(s_KdNr(0), s_KdNr(1)) '+ 1
 
             If kdnr > 0 Then
                 ' Dim ADRESSE As New VERAG_PROG_ALLGEMEIN.cAdressen(kdnr)
@@ -540,6 +546,7 @@ Public Class usrcntlKundeBearbeitenFull
         KUNDE_ERW.kde_VERAG_INTERFACE_ID = isLeerNothing(txtVERAG_Schnittstellen_ID.Text)
         KUNDE_ERW.kde_BesonderheitenNeu = cbxBesonderheitenNEU.Checked
 
+        KUNDE_ERW.kde_API_Tradeshift = cbxAPITradeshift.Checked
 
         ' ----- Fremdsped -----
         KUNDE_ERW.kde_KundeFremdspedition = cbxVerzolltBei.Checked
@@ -1236,5 +1243,33 @@ Public Class usrcntlKundeBearbeitenFull
         cboFremdspedition.Enabled = cbxVerzolltBei.Checked
     End Sub
 
+    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
+        Dim WunschKdnr = InputBox("Bitte geben Sie die gewünschte Kundennummer ein:")
 
+        If WunschKdnr <> "" Then
+            If Not IsNumeric(WunschKdnr) Then MsgBox("Falsches Format!") : Exit Sub
+            If CInt(WunschKdnr) < 100000 Or CInt(WunschKdnr) > 9999999 Then MsgBox("Falsches Format!") : Exit Sub
+
+            Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+                Case "IMEX"
+                    If CInt(WunschKdnr) < 1000000 Or CInt(WunschKdnr) > 1999999 Then MsgBox("Falscher Nummernkreis!") : Exit Sub
+                Case "UNISPED"
+                    If CInt(WunschKdnr) < 2000000 Or CInt(WunschKdnr) > 2999999 Then MsgBox("Falscher Nummernkreis!") : Exit Sub
+                Case "AMBAR"
+                    If CInt(WunschKdnr) < 3000000 Or CInt(WunschKdnr) > 3999999 Then MsgBox("Falscher Nummernkreis!") : Exit Sub
+                Case Else
+                    If CInt(WunschKdnr) < 100000 Or CInt(WunschKdnr) > 999999 Then MsgBox("Falscher Nummernkreis!") : Exit Sub
+            End Select
+
+
+            Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+            If SQL.DLookup("COUNT(*)", "Adressen", "AdressenNr='" & WunschKdnr & "'", "FMZOLL", 0) > 0 Then
+                MsgBox("Kundennummer existiert bereits!") : Exit Sub
+            End If
+            Me.WunschKdNr = CInt(WunschKdnr)
+            lblKundennr.Text = WunschKdnr
+            pnlNeukunde.Visible = False
+        End If
+
+    End Sub
 End Class
diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungPLOSE.Designer.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungPLOSE.Designer.vb
index 1070a175..f3ee6786 100644
--- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungPLOSE.Designer.vb
+++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungPLOSE.Designer.vb
@@ -55,6 +55,7 @@ Partial Class usrCntlSDLLeistungPLOSE
         Me.scanSonstiges = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
         Me.scanRetourniert = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
         Me.cbxArchiviert = New VERAG_PROG_ALLGEMEIN.MyCheckBoxValue(Me.components)
+        Me.scanBestellung = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
         Me.Panel2.SuspendLayout()
         Me.tbcntr.SuspendLayout()
         Me.TabPage1.SuspendLayout()
@@ -438,6 +439,7 @@ Partial Class usrCntlSDLLeistungPLOSE
         '
         'TabPage2
         '
+        Me.TabPage2.Controls.Add(Me.scanBestellung)
         Me.TabPage2.Controls.Add(Me.scanPIN)
         Me.TabPage2.Controls.Add(Me.scanLieferschein)
         Me.TabPage2.Controls.Add(Me.scanSonstiges)
@@ -501,10 +503,10 @@ Partial Class usrCntlSDLLeistungPLOSE
         Me.scanSonstiges.BackColor = System.Drawing.Color.White
         Me.scanSonstiges.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.scanSonstiges.Cursor = System.Windows.Forms.Cursors.Hand
-        Me.scanSonstiges.Location = New System.Drawing.Point(3, 31)
+        Me.scanSonstiges.Location = New System.Drawing.Point(3, 56)
         Me.scanSonstiges.Margin = New System.Windows.Forms.Padding(0)
         Me.scanSonstiges.Name = "scanSonstiges"
-        Me.scanSonstiges.Size = New System.Drawing.Size(250, 130)
+        Me.scanSonstiges.Size = New System.Drawing.Size(250, 108)
         Me.scanSonstiges.TabIndex = 21
         '
         'scanRetourniert
@@ -539,6 +541,25 @@ Partial Class usrCntlSDLLeistungPLOSE
         Me.cbxArchiviert.Text = "ARCHIVIERT"
         Me.cbxArchiviert.UseVisualStyleBackColor = True
         '
+        'scanBestellung
+        '
+        Me.scanBestellung._ARCHIV = True
+        Me.scanBestellung._DATENSERVER_KATEGORIE = "DOKUMENTE"
+        Me.scanBestellung._DATENSERVER_ORDNER = "MDM"
+        Me.scanBestellung._DATENSERVER_UOrdner1 = Nothing
+        Me.scanBestellung._DATENSERVER_UOrdner2 = Nothing
+        Me.scanBestellung._DATENSERVER_UOrdner3 = Nothing
+        Me.scanBestellung._MULTI_FILES = True
+        Me.scanBestellung._TEXT_PDF = "Bestellung"
+        Me.scanBestellung.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+        Me.scanBestellung.BackColor = System.Drawing.Color.White
+        Me.scanBestellung.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.scanBestellung.Cursor = System.Windows.Forms.Cursors.Default
+        Me.scanBestellung.Location = New System.Drawing.Point(3, 30)
+        Me.scanBestellung.Name = "scanBestellung"
+        Me.scanBestellung.Size = New System.Drawing.Size(94, 24)
+        Me.scanBestellung.TabIndex = 26
+        '
         'usrCntlSDLLeistungPLOSE
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -609,4 +630,5 @@ Partial Class usrCntlSDLLeistungPLOSE
     Friend WithEvents scanLieferschein As VERAG_PROG_ALLGEMEIN.usrcntlPDFScan
     Friend WithEvents cbxArchiviert As VERAG_PROG_ALLGEMEIN.MyCheckBoxValue
     Friend WithEvents scanPIN As VERAG_PROG_ALLGEMEIN.usrcntlPDFScan
+    Friend WithEvents scanBestellung As VERAG_PROG_ALLGEMEIN.usrcntlPDFScan
 End Class
diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungPLOSE.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungPLOSE.vb
index b6945294..42af3238 100644
--- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungPLOSE.vb
+++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungPLOSE.vb
@@ -51,6 +51,7 @@ Public Class usrCntlSDLLeistungPLOSE
         scanLieferschein.INIT(kdNr, KfzKennzeichen, "SDL_" & SDLNr, "HIST_" & History)
         scanRetourniert.INIT(kdNr, KfzKennzeichen, "SDL_" & SDLNr, "HIST_" & History)
         scanSonstiges.INIT(kdNr, KfzKennzeichen, "SDL_" & SDLNr, "HIST_" & History)
+        scanBestellung.INIT(kdNr, KfzKennzeichen, "SDL_" & SDLNr, "HIST_" & History)
         scanPIN.INIT(kdNr, KfzKennzeichen, "SDL_" & SDLNr, "HIST_" & History)
 
         initDataBinding()
diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_IT.Designer.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_IT.Designer.vb
index 4763ed98..2b4a69df 100644
--- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_IT.Designer.vb
+++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_IT.Designer.vb
@@ -52,6 +52,7 @@ Partial Class usrCntlSDLLeistungenPLOSE_IT
         Me.txtVIACard = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtTelepassNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.cbxArchiviert = New VERAG_PROG_ALLGEMEIN.MyCheckBoxValue(Me.components)
+        Me.scanBestellung = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
         Me.Panel2.SuspendLayout()
         Me.tbcntr.SuspendLayout()
         Me.TabPage1.SuspendLayout()
@@ -191,6 +192,7 @@ Partial Class usrCntlSDLLeistungenPLOSE_IT
         '
         'TabPage2
         '
+        Me.TabPage2.Controls.Add(Me.scanBestellung)
         Me.TabPage2.Controls.Add(Me.scanLieferscheinVIA)
         Me.TabPage2.Controls.Add(Me.scanLieferscheinTP)
         Me.TabPage2.Controls.Add(Me.scanSonstiges)
@@ -248,6 +250,8 @@ Partial Class usrCntlSDLLeistungenPLOSE_IT
         Me.scanSonstiges._DATENSERVER_UOrdner1 = ""
         Me.scanSonstiges._DATENSERVER_UOrdner2 = ""
         Me.scanSonstiges._DATENSERVER_UOrdner3 = ""
+        Me.scanSonstiges._OPEN_ORIGINAL = False
+        Me.scanSonstiges._TYPE = "PDF"
         Me.scanSonstiges.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
         Me.scanSonstiges.BackColor = System.Drawing.Color.White
         Me.scanSonstiges.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
@@ -477,6 +481,25 @@ Partial Class usrCntlSDLLeistungenPLOSE_IT
         Me.cbxArchiviert.Text = "ARCHIVIERT"
         Me.cbxArchiviert.UseVisualStyleBackColor = True
         '
+        'scanBestellung
+        '
+        Me.scanBestellung._ARCHIV = True
+        Me.scanBestellung._DATENSERVER_KATEGORIE = "DOKUMENTE"
+        Me.scanBestellung._DATENSERVER_ORDNER = "MDM"
+        Me.scanBestellung._DATENSERVER_UOrdner1 = Nothing
+        Me.scanBestellung._DATENSERVER_UOrdner2 = Nothing
+        Me.scanBestellung._DATENSERVER_UOrdner3 = Nothing
+        Me.scanBestellung._MULTI_FILES = True
+        Me.scanBestellung._TEXT_PDF = "Bestellung"
+        Me.scanBestellung.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+        Me.scanBestellung.BackColor = System.Drawing.Color.White
+        Me.scanBestellung.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.scanBestellung.Cursor = System.Windows.Forms.Cursors.Default
+        Me.scanBestellung.Location = New System.Drawing.Point(163, 4)
+        Me.scanBestellung.Name = "scanBestellung"
+        Me.scanBestellung.Size = New System.Drawing.Size(90, 24)
+        Me.scanBestellung.TabIndex = 25
+        '
         'usrCntlSDLLeistungenPLOSE_IT
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -541,5 +564,5 @@ Partial Class usrCntlSDLLeistungenPLOSE_IT
     Friend WithEvents scanLieferscheinVIA As VERAG_PROG_ALLGEMEIN.usrcntlPDFScan
     Friend WithEvents cbxErsatztelepass As VERAG_PROG_ALLGEMEIN.MyCheckBoxValue
     Friend WithEvents cbxArchiviert As VERAG_PROG_ALLGEMEIN.MyCheckBoxValue
-
+    Friend WithEvents scanBestellung As VERAG_PROG_ALLGEMEIN.usrcntlPDFScan
 End Class
diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_IT.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_IT.vb
index 99d2231d..2617bda6 100644
--- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_IT.vb
+++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_IT.vb
@@ -45,6 +45,7 @@ Public Class usrCntlSDLLeistungenPLOSE_IT
         scanLieferscheinVIA.INIT(kdNr, KfzKennzeichen, "SDL_" & SDLNr, "HIST_" & History)
         scanRetourniert.INIT(kdNr, KfzKennzeichen, "SDL_" & SDLNr, "HIST_" & History)
         scanSonstiges.INIT(kdNr, KfzKennzeichen, "SDL_" & SDLNr, "HIST_" & History)
+        scanBestellung.INIT(kdNr, KfzKennzeichen, "SDL_" & SDLNr, "HIST_" & History)
 
         initDataBinding()
 
diff --git a/SDL/zoll/usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER.vb b/SDL/zoll/usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER.vb
index e70b2fbc..23efc5c6 100644
--- a/SDL/zoll/usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER.vb
+++ b/SDL/zoll/usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER.vb
@@ -77,7 +77,9 @@ Public Class usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER
                         Dim datum As Date = CDate(line.Substring(53, 10).Trim)
                         Dim betrag As Double = CDbl(line.Substring(63, 16).Trim)
 
-                        Dim fakturiert = CDbl(SQL.DLookup("Betrag", "Zkteing", "[Status]='F' AND [Registriernummer]='" & atc & "' AND [AKTO]=" & AKTONr & "", "FMZOLL", "0"))
+                        '  Dim fakturiert = CDbl(SQL.DLookup("Betrag", "Zkteing", "[Status]='F' AND [Registriernummer]='" & atc & "' AND [AKTO]=" & AKTONr & "", "FMZOLL", "0"))
+                        Dim fakturiert = CDbl(SQL.DLookup("sum(Preis)", "Rechnungsausgang inner join [RechnungsausgangPositionen] On Rechnungsausgang.RK_ID=[RechnungsausgangPositionen].RK_ID", " [Status]<>0 and DruckDatumZeit is not null  and left([RechnungsausgangPositionen].Belegdaten,21)='" & atc & "' ", "FMZOLL", "0"))
+
                         Dim differenz = fakturiert - betrag
 
                         If Not cbx.Checked OrElse differenz <> 0 Then
@@ -121,7 +123,7 @@ Public Class usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER
                     Dim sum = 0
                     rpt.lblKontoBez.Text = srchAufschubnehmer
                     rpt.lblFaelligkeit.Text = Faelligkeit
-                    rpt.lblAnzahl.Text = cnt
+                    ' rpt.lblAnzahl.Text = cnt
                     rpt.lblDetails.Text = Now.ToLongDateString & ", " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
 
                     Dim sumBetrag As Double = 0
@@ -174,7 +176,7 @@ Public Class usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER
                                                          rpt.lblBetragSum.Text = sumBetrag.ToString("N2", CultureInfo.CurrentCulture)
                                                          rpt.lblFakturiertSum.Text = sumFakturiert.ToString("N2", CultureInfo.CurrentCulture)
                                                          rpt.lblDifferenzSum.Text = sumDifferenz.ToString("N2", CultureInfo.CurrentCulture)
-                                                         '   rpt.lblGesGesSumAnzahl.Text = gesAnz.ToString("N0")
+                                                         rpt.lblAnzahl.Text = Anz.ToString("N0") & "(" & Anz.ToString("N0") & " im Datensatz)"
 
                                                      End Sub
 
diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb
index 820037fb..41010449 100644
--- a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb
@@ -60,6 +60,7 @@ Public Class cKundenErweitert
     Property kde_InfoAuftragsNr As Object = Nothing
     Property kde_KundeFremdspedition As Boolean = False
     Property kde_verzolltBei As Object = Nothing
+    Property kde_API_Tradeshift As Boolean = False
 
     Dim SQL As New SQL
 
@@ -120,6 +121,7 @@ Public Class cKundenErweitert
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_InfoAuftragsNr", kde_InfoAuftragsNr))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_KundeFremdspedition", kde_KundeFremdspedition))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_verzolltBei", kde_verzolltBei))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_API_Tradeshift", kde_API_Tradeshift))
 
         Return list
     End Function
diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb
index bd63051e..69816403 100644
--- a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb
@@ -458,6 +458,10 @@ Public Class cRechnungsausgang
 
         'MsgBox(SQL.getValueTxtBySql(sqlstr, "FMZOLL",,, 0))
 
+        If Not CBool(SQL.DLookup("isnull([MitgliedslandEU],0)", "Währungstabelle", "LandKz='" & If(RechnungsLandKz, "") & "'", "FMZOLL", 0)) Then
+            Return False
+        End If
+
         Return If(SQL.getValueTxtBySql(sqlstr, "FMZOLL",,, 0) = 0, False, True)
     End Function
 
diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cSendVorkosten.vb b/VERAG_PROG_ALLGEMEIN/Classes/cSendVorkosten.vb
new file mode 100644
index 00000000..9d9b0177
--- /dev/null
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cSendVorkosten.vb
@@ -0,0 +1,129 @@
+
+Imports System.Data.SqlClient
+    Imports System.Reflection
+
+Public Class cSendVorkosten
+    Property sndvk_id As Integer
+    Property sndvk_sendId As Object = Nothing
+    Property sndvk_LeistungsNr As Object = Nothing
+    Property sndvk_LeistungsBez As Object = Nothing
+    Property sndvk_Preis As Object = Nothing
+    Property sndvk_Firma As Object = Nothing
+
+
+    Public hasEntry = False
+
+    Dim SQL As New SQL
+
+    Sub New()
+
+    End Sub
+    Sub New(sndvk_id)
+        Me.sndvk_id = sndvk_id
+        LOAD()
+    End Sub
+    Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
+        Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sndvk_id", sndvk_id,, True))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sndvk_sendId", sndvk_sendId))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sndvk_LeistungsNr", sndvk_LeistungsNr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sndvk_LeistungsBez", sndvk_LeistungsBez))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sndvk_Preis", sndvk_Preis))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sndvk_Firma", sndvk_Firma))
+
+        Return list
+    End Function
+
+
+
+    Public Function SAVE() As Boolean
+        Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+
+        Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblSendVorkosten  WHERE sndvk_id=@sndvk_id) " &
+                       " BEGIN " & getUpdateCmd() & " END " &
+                       " Else " &
+                       " BEGIN " & getInsertCmd() & " END " &
+                       " commit tran "
+
+        Return SQL.doSQLVarList(sqlstr, "AVISO", , list)
+    End Function
+
+    Public Sub LOAD()
+        Try
+            hasEntry = False
+            Using conn As SqlConnection = SQL.GetNewOpenConnectionAVISO()
+                Using cmd As New SqlCommand("SELECT * FROM tblSendVorkosten WHERE sndvk_id=@sndvk_id  ", conn)
+                    cmd.Parameters.AddWithValue("@sndvk_id", sndvk_id)
+                    Dim dr = cmd.ExecuteReader()
+                    If dr.Read Then
+                        For Each l In getParameterList()
+                            Dim propInfo As PropertyInfo = Me.GetType.GetProperty(l.Scalarvariable)
+
+                            If dr.Item(l.Text) Is DBNull.Value Then
+                                propInfo.SetValue(Me, Nothing)
+                            Else
+                                propInfo.SetValue(Me, dr.Item(l.Text))
+                            End If
+
+                        Next
+                        hasEntry = True
+                    End If
+                    dr.Close()
+                End Using
+            End Using
+        Catch ex As Exception
+            MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+    End Sub
+
+
+
+    Public Function getUpdateCmd() As String
+        Try
+            Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+
+            Dim str As String = ""
+            For Each i In list
+                If Not i.isPrimaryParam Then
+                    str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
+                End If
+            Next
+            str = str.Substring(0, str.Length - 1) 'wg. ','
+            Return (" UPDATE [tblSendVorkosten] SET " & str & " WHERE sndvk_id=@sndvk_id ")
+
+        Catch ex As Exception
+            MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+        Return ""
+    End Function
+
+
+    Public Function getInsertCmd() As String
+        Try
+            Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+            Dim str As String = ""
+            Dim values As String = ""
+            For Each i In list
+                If Not i.isPrimaryParam Then
+                    str &= "[" & i.Text & "],"
+                    values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
+                End If
+            Next
+            str = str.Substring(0, str.Length - 1) 'wg. ','
+            values = values.Substring(0, values.Length - 1) 'wg. ','
+            Return (" INSERT INTO tblSendVorkosten  (" & str & ") VALUES(" & values & ")  ")
+        Catch ex As Exception
+                MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+            End Try
+            Return ""
+        End Function
+
+    Public Function INSERT() As Boolean
+        Try
+            Return SQL.doSQLVarList(getInsertCmd, "AVISO", , getParameterList)
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & " 'cSENDUNGEN'", System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+        Return False
+    End Function
+End Class
diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb b/VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb
index e9748fd7..bb64d496 100644
--- a/VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb
@@ -98,12 +98,14 @@ Public Class cSendungen
     Property tblSnd_Vorpapier2_Pos As Object = Nothing
     Property tblSnd_Vorpapier3 As Object = Nothing
     Property tblSnd_Vorpapier3_Pos As Object = Nothing
+    Property tblSnd_Frachtkosten As Object = Nothing
 
 
     Public saveSachbearbeiter As Boolean = False
 
     Property ABRECHNUNG As New List(Of cSendungAbrechnung)
     Property HANDLING As New List(Of cSendHandling)
+    Property VORKOSTEN As New List(Of cSendVorkosten)
 
     'Dim cDatenbank As New cDatenbank
 
@@ -347,6 +349,7 @@ Public Class cSendungen
                     Me.tblSnd_Vorpapier2_Pos = SQL.checkNullReturnValue(dr.Item("tblSnd_Vorpapier2_Pos"), Nothing)
                     Me.tblSnd_Vorpapier3 = SQL.checkNullReturnValue(dr.Item("tblSnd_Vorpapier3"), Nothing)
                     Me.tblSnd_Vorpapier3_Pos = SQL.checkNullReturnValue(dr.Item("tblSnd_Vorpapier3_Pos"), Nothing)
+                    Me.tblSnd_Frachtkosten = SQL.checkNullReturnValue(dr.Item("tblSnd_Frachtkosten"), Nothing)
 
                 End If
 
@@ -432,6 +435,39 @@ Public Class cSendungen
         '  Return Nothing
     End Sub
 
+    Public Sub LOAD_VORKOSTEN()
+        Try
+            Me.VORKOSTEN.Clear()
+            Dim conn As SqlConnection = SQL.GetNewOpenConnectionAVISO()
+            Using cmd2 As New SqlCommand("SELECT * FROM tblSendVorkosten WHERE sndvk_sendId=@sndvk_sendId ", conn)
+                cmd2.Parameters.AddWithValue("@sndvk_sendId", Me.tblSnd_SendungID)
+                Dim dr2 = cmd2.ExecuteReader()
+
+                While dr2.Read
+                    Dim a As New cSendVorkosten()
+
+                    a.sndvk_LeistungsNr = SQL.checkNullReturnValue(dr2.Item("sndvk_LeistungsNr"), Nothing)
+                    a.sndvk_sendId = SQL.checkNullReturnValue(dr2.Item("sndvk_sendId"), Nothing)
+                    a.sndvk_LeistungsBez = SQL.checkNullReturnValue(dr2.Item("sndvk_LeistungsBez"), Nothing)
+                    a.sndvk_Firma = SQL.checkNullReturnValue(dr2.Item("sndvk_Firma"), Nothing)
+
+                    a.sndvk_Preis = SQL.checkNullReturnValue(dr2.Item("sndvk_Preis"), 0)
+
+                    Me.VORKOSTEN.Add(a)
+                End While
+                dr2.Close()
+            End Using
+
+            conn.Close()
+            'End Using
+            'Return Nothing
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & " 'cSENDUNGEN'", System.Reflection.MethodInfo.GetCurrentMethod.Name)
+            '  MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+        '  Return Nothing
+    End Sub
+
 
     Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
         Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
@@ -527,6 +563,7 @@ Public Class cSendungen
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Vorpapier2_Pos", tblSnd_Vorpapier2_Pos))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Vorpapier3", tblSnd_Vorpapier3))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Vorpapier3_Pos", tblSnd_Vorpapier3_Pos))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Frachtkosten", tblSnd_Frachtkosten))
 
 
 
@@ -608,6 +645,23 @@ Public Class cSendungen
     End Function
 
 
+    Public Function SAVE_VORKOSTEN() As Boolean 'obj As Object, tablename As String, where As String) As Boolean
+        '   Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+        SAVE_VORKOSTEN = False
+        Dim sqlstr = " DELETE FROM tblSendVorkosten WHERE sndvk_sendId=" & Me.tblSnd_SendungID
+        '   MsgBox(sqlstr)
+        If SQL.doSQL(sqlstr, "AVISO") Then
+            SAVE_VORKOSTEN = True
+            For Each a In VORKOSTEN
+                a.sndvk_sendId = Me.tblSnd_SendungID
+                If Not a.INSERT() Then SAVE_VORKOSTEN = False
+            Next
+        End If
+
+        '   Return b
+    End Function
+
+
     Public Shared Function SET_SpedbuchEntry(tblSnd_SendungID As Integer, tblSnd_SpeditionsbuchEingetragen As Boolean) As String
         Try
             Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
@@ -620,6 +674,39 @@ Public Class cSendungen
         Return ""
     End Function
 
+    Public Function getNCTSAdress(Optional htmlOptimized As Boolean = False, Optional ansprechpartner As Boolean = True, Optional Bestimmungszollstelle As Boolean = True) As String
+        Dim adresse = ""
+        adresse &= If(Me.tblSnd_NCTSVerzollungsadresse, "") & vbNewLine
+        adresse &= If(Me.NCTS_Verzollungsadresse_Strasse, "") & vbNewLine
+        adresse &= If(Me.NCTS_Verzollungsadresse_Land, "") & " " & If(Me.NCTS_Verzollungsadresse_PLZ, "") & " " & If(Me.NCTS_Verzollungsadresse_Ort, "") & vbNewLine
+
+        If ansprechpartner Then adresse &= If(Me.NCTS_Verzollungsadresse_Ansprechpartner, "") & vbNewLine
+
+        If Bestimmungszollstelle And If(Me.NCTS_Bestimmungszollstelle, "") <> "" Then
+            adresse &= SQL.getValueTxtBySql("SELECT basncd_dstnr +' - ' + [basncd_name]  FROM basncd WHERE basncd_dstnr='" & Me.NCTS_Bestimmungszollstelle & "' ", "ATLAS")
+        End If
+
+        If htmlOptimized Then adresse = adresse.Trim.Replace(vbNewLine, "<br/>")
+        Return adresse.Trim
+    End Function
+
+
+    Public Function getEmpfaengerAdress(Optional htmlOptimized As Boolean = False, Optional ansprechpartner As Boolean = False) As String
+        If tblSnd_EmpfaengerKdNr > 0 Then
+            Dim AD As New cAdressen(tblSnd_EmpfaengerKdNr)
+            Dim adresse = ""
+            adresse &= If(AD.Name_1, "") & If(AD.Name_2, "") & vbNewLine
+            If If(AD.Straße, "") <> "" Then adresse &= If(AD.Straße, "") & vbNewLine
+            adresse &= If(AD.LandKz, "") & " " & If(AD.PLZ, "").ToString.ToUpper.Replace("OHNE", "") & " " & If(AD.Ort, "")
+
+            If htmlOptimized Then adresse = adresse.Trim.Replace(vbNewLine, "<br/>")
+            Return adresse.Trim
+        Else
+            Return tblSnd_Empfaenger
+        End If
+
+    End Function
+
 End Class
 
 Public Class cSendungAbrechnung
diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cTrdInvoice.vb b/VERAG_PROG_ALLGEMEIN/Classes/cTrdInvoice.vb
index a5024442..3c32dfed 100644
--- a/VERAG_PROG_ALLGEMEIN/Classes/cTrdInvoice.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cTrdInvoice.vb
@@ -499,8 +499,7 @@ Class TrdInvoice_FUNCTIONS
 
         Select Case Firma_Id
             Case 20 'IMEX --> Andere Sachkonten in Tbl Leistungen!
-                If [RK_RechnungsLandKz] Is Nothing _
-                                              OrElse [RK_RechnungsLandKz].trim = "" _
+                If [RK_RechnungsLandKz] Is Nothing OrElse [RK_RechnungsLandKz] Is DBNull.Value OrElse [RK_RechnungsLandKz].trim = "" _
                           OrElse [RK_RechnungsLandKz] = "A" _
                           OrElse [RK_RechnungsLandKz] = "AT" Then
                     If CBool([RP_Steuerpflichtig]) Then
@@ -524,7 +523,7 @@ Class TrdInvoice_FUNCTIONS
 
             Case 21, 22, 23, 24 '--> cLeistungenBUKonten!
                 Dim BU_KTO As New VERAG_PROG_ALLGEMEIN.cLeistungenBUKonten(RP_LeistungsNr, Firma_Id)
-                If [RK_RechnungsLandKz] Is Nothing OrElse [RK_RechnungsLandKz].trim = "" OrElse
+                If [RK_RechnungsLandKz] Is Nothing OrElse [RK_RechnungsLandKz] Is DBNull.Value OrElse [RK_RechnungsLandKz].trim = "" OrElse
                     [RK_RechnungsLandKz] = FIRMA.Firma_LandKz.ToString.Replace("AT", "A").Replace("DE", "D") Then
 
                     If CBool([RP_Steuerpflichtig]) Then
@@ -547,8 +546,7 @@ Class TrdInvoice_FUNCTIONS
                 If getSachkonto = "" Then getSachkonto = "9999" 'DEFAULT!
 
             Case Else
-                If [RK_RechnungsLandKz] Is Nothing _
-                                              OrElse [RK_RechnungsLandKz].trim = "" _
+                If [RK_RechnungsLandKz] Is Nothing OrElse [RK_RechnungsLandKz] Is DBNull.Value OrElse [RK_RechnungsLandKz].trim = "" _
                           OrElse [RK_RechnungsLandKz] = "A" _
                           OrElse [RK_RechnungsLandKz] = "AT" Then
                     If CBool([RP_Steuerpflichtig]) Then
diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cBMD_Interface.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cBMD_Interface.vb
index 65b01e61..7aab1182 100644
--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cBMD_Interface.vb
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cBMD_Interface.vb
@@ -341,7 +341,6 @@
             End Select
 
 
-
             '----------------- Buchungssätze -----------------
             If True Then 'boolBuchungen Then
                 TrdInvoice_FUNCTIONS.TrdinSchreiben(FIRMA.Firma_ID) 'Lädt die Daten aus der Tabelle Rechnungsausgang in die Tabelle trdInvoice (nur für 20 = IMEX )
diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cTherefore.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cTherefore.vb
index 97436442..7266d4eb 100644
--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cTherefore.vb
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cTherefore.vb
@@ -11,7 +11,8 @@ Public Class cTherefore
                 Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Atilla ab Juni 2011",, deleteFileAfterImport)
             Case 1, 11, 20 ', 15,20
                 '   Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import an Jänner 2019", "Import ab Jänner 2019", deleteFileAfterImport)
-                Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import ab Jänner 2020", "Import ab Jänner 2020", deleteFileAfterImport)
+                Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import ab Jänner 2021", "Import ab Jänner 2021", deleteFileAfterImport)
+                '  Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import ab Jänner 2020", "Import ab Jänner 2020", deleteFileAfterImport)
             Case Else
                 Return False
         End Select
diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
index a3201551..8f4b678f 100644
--- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
+++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
@@ -327,6 +327,7 @@
     <Compile Include="Classes\cSDL.vb" />
     <Compile Include="Classes\cSDL_LKW.vb" />
     <Compile Include="Classes\cSendMailAttach.vb" />
+    <Compile Include="Classes\cSendVorkosten.vb" />
     <Compile Include="Classes\cSession.vb" />
     <Compile Include="Classes\cSMS.vb" />
     <Compile Include="Classes\cSpeditionsbuch.vb" />