neu

2020-06-22 13:33:07 +02:00
parent f4e823ec69
commit 9b52ab1b61
43 changed files with 1985 additions and 250 deletions
--- a/SDL/Administration/Auswertungen/frmZollUserStat.Designer.vb
+++ b/SDL/Administration/Auswertungen/frmZollUserStat.Designer.vb
@@ -38,6 +38,7 @@ Partial Class frmZollUserStat
        Me.MyListBox1 = New VERAG_PROG_ALLGEMEIN.MyListBox()
        Me.DataGridView1 = New System.Windows.Forms.DataGridView()
        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.Button9 = New System.Windows.Forms.Button()
        Me.Label4 = New System.Windows.Forms.Label()
        Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Button8 = New System.Windows.Forms.Button()
@@ -45,7 +46,7 @@ Partial Class frmZollUserStat
        Me.Label5 = New System.Windows.Forms.Label()
        Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Panel2 = New System.Windows.Forms.Panel()
-        Me.Button9 = New System.Windows.Forms.Button()
+        Me.cbxgekuendigt = New System.Windows.Forms.CheckBox()
        CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        Me.Panel2.SuspendLayout()
@@ -221,6 +222,7 @@ Partial Class frmZollUserStat
        '
        'Panel1
        '
+        Me.Panel1.Controls.Add(Me.cbxgekuendigt)
        Me.Panel1.Controls.Add(Me.Button9)
        Me.Panel1.Controls.Add(Me.Label4)
        Me.Panel1.Controls.Add(Me.MyComboBox1)
@@ -244,6 +246,16 @@ Partial Class frmZollUserStat
        Me.Panel1.Size = New System.Drawing.Size(841, 186)
        Me.Panel1.TabIndex = 10
        '
+        'Button9
+        '
+        Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button9.Location = New System.Drawing.Point(427, 132)
+        Me.Button9.Name = "Button9"
+        Me.Button9.Size = New System.Drawing.Size(174, 40)
+        Me.Button9.TabIndex = 13
+        Me.Button9.Text = "AUSWERTUNG QS"
+        Me.Button9.UseVisualStyleBackColor = True
+        '
        'Label4
        '
        Me.Label4.AutoSize = True
@@ -319,15 +331,18 @@ Partial Class frmZollUserStat
        Me.Panel2.Size = New System.Drawing.Size(234, 716)
        Me.Panel2.TabIndex = 11
        '
-        'Button9
+        'cbxgekuendigt
        '
-        Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button9.Location = New System.Drawing.Point(427, 132)
-        Me.Button9.Name = "Button9"
-        Me.Button9.Size = New System.Drawing.Size(174, 40)
-        Me.Button9.TabIndex = 13
-        Me.Button9.Text = "AUSWERTUNG QS"
-        Me.Button9.UseVisualStyleBackColor = True
+        Me.cbxgekuendigt.AutoSize = True
+        Me.cbxgekuendigt.Checked = True
+        Me.cbxgekuendigt.CheckState = System.Windows.Forms.CheckState.Indeterminate
+        Me.cbxgekuendigt.Location = New System.Drawing.Point(427, 108)
+        Me.cbxgekuendigt.Name = "cbxgekuendigt"
+        Me.cbxgekuendigt.Size = New System.Drawing.Size(73, 17)
+        Me.cbxgekuendigt.TabIndex = 14
+        Me.cbxgekuendigt.Text = "gekündigt"
+        Me.cbxgekuendigt.ThreeState = True
+        Me.cbxgekuendigt.UseVisualStyleBackColor = True
        '
        'frmZollUserStat
        '
@@ -371,4 +386,5 @@ Partial Class frmZollUserStat
    Friend WithEvents Label4 As System.Windows.Forms.Label
    Friend WithEvents MyComboBox1 As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents Button9 As Button
+    Friend WithEvents cbxgekuendigt As CheckBox
 End Class
--- a/SDL/Administration/Auswertungen/frmZollUserStat.vb
+++ b/SDL/Administration/Auswertungen/frmZollUserStat.vb
@@ -26,7 +26,12 @@ Public Class frmZollUserStat
            sql &= " FROM " & VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & ".ADMIN.dbo.tblMitarbeiter " 'left join " & VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & ".ADMIN.dbo.tblDienstMitarb ON [dstma_mitId]=mit_id"
            sql &= " WHERE 1=1  "
            sql &= " and mit_abteilung IN ('ZOLL','QS') and mit_pseudoUser=0"
-            sql &= " and mit_gekuendigt = 0"
+
+            Select Case cbxgekuendigt.CheckState
+                Case CheckState.Unchecked : sql &= " and mit_gekuendigt = 0 "
+                Case CheckState.Checked : sql &= " and mit_gekuendigt = 1 "
+            End Select
+            ' sql &= " and mit_gekuendigt = 0 "
            Dim filter As String = ""
            '    If MyTextBox1.Text <> "" And MyTextBox3.Text <> "" Then
            'filter += " Abfertigungsdatum BETWEEN '" & MyTextBox1.Text & "' AND '" & MyTextBox3.Text & "' "
@@ -35,7 +40,9 @@ Public Class frmZollUserStat

            'If MyComboBox1.Text <> "" Then filter += " AND FilialenNr IN (" & DirectCast(MyComboBox1.SelectedItem, VERAG_PROG_ALLGEMEIN.MyListItem).Value & ") "
            If MyComboBox2.Text <> "" Then filter += " AND mit_niederlassung IN ('" & DirectCast(MyComboBox2.SelectedItem, VERAG_PROG_ALLGEMEIN.MyListItem).Value & "') "
-            If MyComboBox1.Text <> "" Then filter += " AND mit_firma IN ('" & DirectCast(MyComboBox1.SelectedItem, VERAG_PROG_ALLGEMEIN.MyListItem).Value & "') "
+            If MyComboBox1.Text <> "" Then
+                filter += " AND (mit_firma IN ('" & DirectCast(MyComboBox1.SelectedItem, VERAG_PROG_ALLGEMEIN.MyListItem).Value & "')  OR (mit_firma='ALL' AND mit_firmaHaupt  IN ('" & DirectCast(MyComboBox1.SelectedItem, VERAG_PROG_ALLGEMEIN.MyListItem).Value & "') )) "
+            End If


            ' filter += " AND [Personalnummer] is not null "
--- a/SDL/Classes/cFinanzOnlineWebService.vb
+++ b/SDL/Classes/cFinanzOnlineWebService.vb
@@ -9,24 +9,39 @@ Public Class cFinanzOnlineWebService
    ' Private benid As String = My.Resources.benid
    '  Private pin As String = My.Resources.pin

-    Shared tid As String = "1000103u3032"
-    Shared benid As String = "webserv99"
-    Shared pin As String = "webserv99"
+    ' 'VERAG:
+    'Shared tid As String = "1000103u3032"
+    'Shared benid As String = "webserv99"
+    'Shared pin As String = "webserv99"
+    'Shared uid As String = "ATU53187000"
+
+    ''FRONT-Office:
+    'Shared tid As String = "67493371k039"
+    'Shared benid As String = "WEBserv99"
+    'Shared pin As String = "WEBserv99"
+    'Shared uid As String = "ATU74813856"


-    Shared SESSION_ID As String = ""
+    'IMEX:
+    Shared tid As String = "19435107n654"
+    Shared benid As String = "WEBserv99"
+    Shared pin As String = "WEBserv99"
+    Shared uid As String = "ATU68490714"
+
+
+    Public Shared SESSION_ID As String = ""

    Shared Function Call_Web_Service_MethodUID_Login() As Integer
        Dim CallWebService As New SDL.at.gv.bmf.finanzonlineLogin.sessionService
        Try
            Dim rc = ""
            Dim msg = ""
-            SESSION_ID = CallWebService.login(tid, benid, pin, "ATU53187000", rc, msg)
+            SESSION_ID = CallWebService.login(tid, benid, pin, uid, rc, msg)
            MsgBox("msg " & msg)
            MsgBox(SESSION_ID)
            Return rc
        Catch ex As Exception
-            MsgBox(ex.Message)
+            MsgBox(ex.Message & ex.StackTrace)
        End Try
        Return -99
    End Function
@@ -37,14 +52,14 @@ Public Class cFinanzOnlineWebService
            ' Return CallWebService.uidAbfrage(session, tid, benid, My.Resources.UID_Nr, txtUid.Text, uidAbfrageRequestStufe.Item2, "", "", "", "", "", "", "")
            'Dim s() As Object = CallWebService.uidAbfrage(session, tid, benid, My.Resources.UID_Nr, txtUid.Text, uidAbfrageRequestStufe.Item2, "", "", "", "", "", "", "")

-            Dim msg As String
-            Dim name As String
-            Dim adrz1 As String
-            Dim adrz2 As String
-            Dim adrz3 As String
-            Dim adrz4 As String
-            Dim adrz5 As String
-            Dim adrz6 As String
+            Dim msg As String = ""
+            Dim name As String = ""
+            Dim adrz1 As String = ""
+            Dim adrz2 As String = ""
+            Dim adrz3 As String = ""
+            Dim adrz4 As String = ""
+            Dim adrz5 As String = ""
+            Dim adrz6 As String = ""


            Dim returnInt As Integer = CallWebService.uidAbfrage(session, tid, benid, My.Resources.UID_Nr, txtUid, at.gv.bmf.finanzonline.uidAbfrageServiceRequestStufe.Item2, msg, name, adrz1, adrz2, adrz3, adrz4, adrz5, adrz6)
@@ -66,7 +81,7 @@ Public Class cFinanzOnlineWebService
            End If
            Return returnInt
        Catch ex As Exception
-            MsgBox(ex.Message)
+            MsgBox(ex.Message & ex.StackTrace)
        End Try
        Return "-1"
    End Function
@@ -82,4 +97,164 @@ Public Class cFinanzOnlineWebService
        Return ""
    End Function

+
+
+    Shared Function Call_Web_Service_MethodUID_Login_NEU2020() As Integer
+        Dim CallWebService As New VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.session.sessionService
+        Try
+            Dim rc As Integer = -1
+            Dim msg = ""
+            SESSION_ID = CallWebService.login(tid, benid, pin, uid, rc, msg)
+
+            Return rc
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
+        Return -99
+    End Function
+
+
+    Shared Function genUID_Formular(ByVal txtUid As String, Optional AvisoId As Integer = -1, Optional SendungsId As Integer = -1) As String 'SESSION_ID wir nur zurückgegeben
+        Try
+
+            Dim msgErgebnis = ""
+        Dim tmp_SESSION_ID = ""
+        Dim Firma = ""
+
+            Dim UID_ERG = Call_Web_Service_MethodUID_Abfrage_NEU2020(txtUid, Firma, tmp_SESSION_ID, msgErgebnis)
+            If UID_ERG = 0 Or UID_ERG = 1 Then
+                Select Case UID_ERG
+                    Case 0 : msgErgebnis = "UID-Nr. GÜLTIG   -   OK"
+                    Case 1 : msgErgebnis = "UID-Nr. UNGÜLTIG"
+                End Select
+
+                Dim PdfTmp = SDL.FormularManagerNEU.UID_PRUEFUNG(msgErgebnis, Firma, tmp_SESSION_ID, uid, txtUid, tid, AvisoId, SendungsId)
+                If PdfTmp <> "" Then
+
+                    Dim fileName = txtUid & ".pdf"
+                    Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "UID_PRUEFUNG", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, txtUid, Now.ToString("ddMMyy_HHmmss.ffff"), fileName, -1, False) 'Now.ToString("ddMMyy_HHmmss.ffff")
+                    If Not DS.uploadDataToDATENSERVER(PdfTmp) Then MsgBox("Fehler beim Speichern: Datenserver!") : Return False
+                    If DS.da_id <= 0 Then MsgBox("Keine DocId!") : Return False
+                    Dim da_id = DS.da_id
+                    Dim destPath = DS.GET_TOP1_PATH
+
+                    If AvisoId > 0 And SendungsId > 0 Then
+                        Dim ANH As New VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge(AvisoId, fileName, DS.da_id, "PDF", "UID", SendungsId)
+                        If Not ANH.SAVE Then MsgBox("Fehler beim Anhang speichern!") : Return False
+                        Dim anhId = ANH.anh_id
+                    End If
+                    Return destPath
+
+
+                End If
+            Else
+                MsgBox(msgErgebnis)
+            End If
+
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
+        Return ""
+
+    End Function
+
+
+    Shared Function Call_Web_Service_MethodUID_Abfrage_NEU2020(ByVal txtUid As String, Optional ByRef Firma As String = "", Optional ByRef tmp_SESSION_ID As String = "", Optional ByRef msgErgebnis As String = "") As String 'SESSION_ID wir nur zurückgegeben
+        If Call_Web_Service_MethodUID_Login_NEU2020() <> 0 Then
+            Return -1
+        End If
+        tmp_SESSION_ID = SESSION_ID
+        Dim CallWebService As New VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.uidAbfrageService
+        Try
+            ' Return CallWebService.uidAbfrage(session, tid, benid, My.Resources.UID_Nr, txtUid.Text, uidAbfrageRequestStufe.Item2, "", "", "", "", "", "", "")
+            'Dim s() As Object = CallWebService.uidAbfrage(session, tid, benid, My.Resources.UID_Nr, txtUid.Text, uidAbfrageRequestStufe.Item2, "", "", "", "", "", "", "")
+
+            Dim msg As String
+            Dim name As String
+            Dim adrz1 As String
+            Dim adrz2 As String
+            Dim adrz3 As String
+            Dim adrz4 As String
+            Dim adrz5 As String
+            Dim adrz6 As String
+
+            Dim returnInt As Integer = CallWebService.uidAbfrage(tid, benid, SESSION_ID, uid, txtUid, VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.uidAbfrageServiceRequestStufe.Item2, msg, name, adrz1, adrz2, adrz3, adrz4, adrz5, adrz6)
+
+            If returnInt = 0 Then
+                Firma = name & vbNewLine & adrz1
+                If adrz2 <> "" Then Firma = Firma & vbNewLine & adrz2
+                If adrz3 <> "" Then Firma = Firma & vbNewLine & adrz3
+                If adrz4 <> "" Then Firma = Firma & vbNewLine & adrz4
+                If adrz5 <> "" Then Firma = Firma & vbNewLine & adrz5
+                If adrz6 <> "" Then Firma = Firma & vbNewLine & adrz6
+
+                '  frmUIDCheck.firmaUIDFinanzOnline = firma
+                ' frmUIDCheck.firmaUIDProgramm = txtFirma
+                ' frmUIDCheck.uidnr = txtUid
+                ' frmUIDCheck.Show()
+
+            Else
+                MsgBox(GetCodeText(returnInt))
+            End If
+            msgErgebnis = msg
+            Call_Web_Service_MethodUID_Logout_NEU2020()
+            Return returnInt
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+            Call_Web_Service_MethodUID_Logout_NEU2020()
+        End Try
+        Return "-1"
+    End Function
+
+
+    Shared Function GetCodeText(rc As Integer)
+        Select Case rc
+            Case 0 : Return "Die UID des Erwerbers ist gültig."
+            Case -1 : Return "Die Session ID ist ungültig oder abgelaufen."
+            Case -2 : Return "Der Aufruf des Webservices ist derzeit wegen Wartungsarbeiten nicht möglich."
+            Case -3 : Return "Es ist ein technischer Fehler aufgetreten."
+            Case -4 : Return "Dieser Teilnehmer ist für diese Funktion nicht berechtigt."
+            Case 1 : Return "Die UID des Erwerbers ist nicht gültig."
+            Case 4 : Return "Die UID-Nummer des Erwerbers ist falsch."
+            Case 5 : Return "Die UID-Nummer des Antragstellers ist ungültig."
+            Case 10 : Return "Der angegebene Mitgliedstaat verbietet diese Abfrage."
+            Case 101 : Return "UID beginnt nicht mit ATU."
+            Case 103 : Return "Die angefragte UID-Nummer kann im FinanzOnline nur in Stufe 1 bestätigt werden,
+                    da diese UID-Nummer zu einer Unternehmensgruppe (Umsatzsteuergruppe) gehört.
+                    Aus technischen Gründen werden aus Tschechien keine Firmendaten angezeigt. Für
+                    eine gültige Stufe 2 Abfrage ist es daher erforderlich, dass Sie unter
+                    http://adisreg.mfcr.cz die Daten der CZ-Umsatzsteuergruppe aufrufen und
+                    kontrollieren, ob das angefragte Unternehmen auch tatsächlich zu dieser Gruppe
+                    gehört.Bitte bewahren Sie den Ausdruck dieser Anfrage in Ihren Unterlagen als
+                    Beleg gemäß § 132 BAO auf. Für jede Anfrage Stufe 2 ist sowohl das
+                    Bestätigungsverfahren in Stufe 1 im FinanzOnline als auch das Gruppenregister im
+                    anderen Mitgliedsstaat laut o.a. Link zu konsultieren. Im Falle von Fragen wenden
+                    Sie sich bitte an Ihr zuständiges Finanzamt."
+            Case 104 : Return "Die angefragte UID-Nummer kann im FinanzOnline nur in Stufe 1 bestätigt werden,
+                    da diese UID-Nummer zu einer Unternehmensgruppe (Umsatzsteuergruppe) gehört.
+                    Aus technischen Gründen werden aus der Slowakei keine Firmendaten angezeigt.
+                    Für eine gültige Stufe 2 Abfrage ist es daher erforderlich, dass Sie unter
+                    http://www.drsr.sk die Daten der SK-Umsatzsteuergruppe aufrufen und kontrollieren,
+                    ob das angefragte Unternehmen auch tatsächlich zu dieser Gruppe gehört. Bitte
+                    bewahren Sie den Ausdruck dieser Anfrage in Ihren Unterlagen als Beleg gemäß §Bundesministerium für Finanzen Seite 3 von 3
+                    Stand: 27.10.2016 BAO auf. Für jede Anfrage Stufe 2 ist sowohl das Bestätigungsverfahren In Stufe
+                    1 im FinanzOnline als auch das Gruppenregister im anderen Mitgliedsstaat laut o.a.
+                    Link zu konsultieren. Im Falle von Fragen wenden Sie sich bitte an Ihr zuständiges
+                    Finanzamt."
+            Case 105 : Return "Die UID-Nummer ist über FinanzOnline einzeln abzufragen."
+            Case 1511 : Return "Der angegebene Mitgliedstaat ist derzeit nicht erreichbar"
+            Case Else : Return "Unbekannter Fehler:  " & rc
+        End Select
+    End Function
+    Shared Function Call_Web_Service_MethodUID_Logout_NEU2020() As String
+        Dim CallWebService As New VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.session.sessionService
+        Try
+            Dim msg = ""
+            Dim sGetValue As String = CallWebService.logout(tid, benid, SESSION_ID, msg)
+            Return sGetValue
+        Catch ex As Exception
+            MsgBox(ex.Message)
+        End Try
+        Return ""
+    End Function
 End Class
--- a/SDL/Fakturierung/cFakturierung.vb
+++ b/SDL/Fakturierung/cFakturierung.vb
@@ -471,8 +471,9 @@ Public Class cFakturierung
        rpt.lblUID.Text = If(FIRMA.Firma_UID, "")
        rpt.lblEORI.Text = If(FIRMA.Firma_EORI, "")

-        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
-            Case "IMEX"
+        '  Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+        Select Case FIRMA.Firma_ID
+            Case 20 '"IMEX"
                If RechnungsLandKz = "TR" Then
                    rpt.txtBank1.Text = "Garanti Bank " & vbNewLine & "IBAN:TR84 0006 2001 6040 0009 0987 13 " & vbNewLine & "BLZ Sube.: 1604 - Beykent Ticari - Hesap: 9098713"
                    rpt.txtBank2.Text = ""
@@ -513,8 +514,9 @@ Public Class cFakturierung
        rpt.lblUID.Text = If(FIRMA.Firma_UID, "")
        rpt.lblEORI.Text = If(FIRMA.Firma_EORI, "")

-        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
-            Case "IMEX"
+        '  Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+        Select Case FIRMA.Firma_ID
+            Case 20 '"IMEX"
                If RechnungsLandKz = "TR" Then
                    rpt.txtBank1.Text = "Garanti Bank " & vbNewLine & "IBAN:TR84 0006 2001 6040 0009 0987 13 " & vbNewLine & "BLZ Sube.: 1604 - Beykent Ticari - Hesap: 9098713"
                    rpt.txtBank2.Text = ""
@@ -659,10 +661,14 @@ Public Class cFakturierung
            If rpt.txtAvisierer.Text = String.Empty Then rpt.lblAvisiererUeberschrift.Visible = False

            rpt.txtZollbelegNr.Text = If(RECHNUNG.BelegNr, "")
+
+            Dim waehrungCode As String = SQL.getValueTxtBySql("SELECT isnull(Währungscode,'') FROM Währungstabelle WHERE Währungsschlüssel = " & If(RECHNUNG.[WährungsNr], -1) & ";", "FMZOLL")
            If IsNumeric(If(RECHNUNG.Wert, "")) Then
-                rpt.txtWarenwert.Text = CDbl(RECHNUNG.Wert).ToString("N2") & " " & If(RECHNUNG.Währungscode, "")
+                '  rpt.txtWarenwert.Text = CDbl(RECHNUNG.Wert).ToString("N2") & " " & If(RECHNUNG.Währungscode, "")
+                rpt.txtWarenwert.Text = CDbl(RECHNUNG.Wert).ToString("N2") & " " & waehrungCode
            Else
-                rpt.txtWarenwert.Text = If(RECHNUNG.Wert, "") & " " & If(RECHNUNG.Währungscode, "")
+                ' rpt.txtWarenwert.Text = If(RECHNUNG.Wert, "") & " " & If(RECHNUNG.Währungscode, "")
+                rpt.txtWarenwert.Text = If(RECHNUNG.Wert, "") & " " & waehrungCode
            End If
            rpt.txtSendungsdaten.Text = If(RECHNUNG.Packstücke_und_Warenbezeichnung, "")
            If rpt.txtSendungsdaten.Text.Length > 200 Then rpt.txtSendungsdaten.Text = rpt.txtSendungsdaten.Text.Substring(0, 200)
@@ -1290,7 +1296,8 @@ Public Class cFakturierung

        If list.Count > 0 Then
            '            pathPDF = ""        'PAD Pfad zurückgeben!!!!!!
-            pathPDF = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "_Sammelrechnung_" & RechnungsNr & ".pdf", ".pdf", False, False)
+            pathPDF = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Sammelrechnung_" & RechnungsNr & ".pdf", ".pdf", False, False)
+            'pathPDF = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "_Sammelrechnung_" & RechnungsNr & ".pdf", ".pdf", False, False)

            If Not FormularManagerNEU.MergePdfFiles(list, pathPDF) Then
                pathPDF = "" : MsgBox("Fehler PDF")
@@ -1560,9 +1567,11 @@ Public Class cFakturierung
                        Dim outl As New Outlook.Application
                        Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
                        Mail = outl.CreateItem(0)
-                        Mail.Subject = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & " Rechnung Nr. " & ROW("RechnungsNr")
+                        Mail.Subject = " Rechnung Nr. " & ROW("RechnungsNr")
+                        ' Mail.Subject = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & " Rechnung Nr. " & ROW("RechnungsNr")
                        Mail.HTMLBody = "Sehr geehrte Damen und Herren,<br><br>anbei erhalten Sie die Rechnung Nr. " & ROW("RechnungsNr") & "."
-                        Mail.Attachments.Add(tmpPath, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "_Formular.pdf")
+                        ' Mail.Attachments.Add(tmpPath, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "_Formular.pdf")
+                        Mail.Attachments.Add(tmpPath, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , "Formular.pdf")
                        Mail.Display()

                    Catch ex As Exception
@@ -1868,9 +1877,9 @@ Public Class cFakturierung
                            Dim outl As New Outlook.Application
                            Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
                            Mail = outl.CreateItem(0)
-                            Mail.Subject = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & " Rechnung Nr. " & ROW("RechnungsNr")
+                            Mail.Subject = "Rechnung Nr. " & ROW("RechnungsNr")
                            Mail.HTMLBody = "Sehr geehrte Damen und Herren,<br><br>anbei erhalten Sie die Rechnung Nr. " & ROW("RechnungsNr") & "."
-                            Mail.Attachments.Add(tmpPath, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "_Formular.pdf")
+                            Mail.Attachments.Add(tmpPath, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , "Formular.pdf")
                            Mail.Display()

                        Catch ex As Exception
--- a/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb
+++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb
@@ -1045,6 +1045,7 @@ Partial Class usrCntlFaktAbrechnung
        Me.kdFirmaAvisierer.Size = New System.Drawing.Size(283, 20)
        Me.kdFirmaAvisierer.TabIndex = 3
        Me.kdFirmaAvisierer.TabStop = False
+        Me.kdFirmaAvisierer.TIMER_SEARCH = True
        Me.kdFirmaAvisierer.usrcntl = Nothing
        '
        'FlatButton5
@@ -1423,6 +1424,7 @@ Partial Class usrCntlFaktAbrechnung
        Me.kdFirmaAuftraggeber.Size = New System.Drawing.Size(283, 20)
        Me.kdFirmaAuftraggeber.TabIndex = 3
        Me.kdFirmaAuftraggeber.TabStop = False
+        Me.kdFirmaAuftraggeber.TIMER_SEARCH = True
        Me.kdFirmaAuftraggeber.usrcntl = Nothing
        '
        'txtAuftraggeberName2
@@ -1846,6 +1848,7 @@ Partial Class usrCntlFaktAbrechnung
        Me.kdFirmaRechnungAn.Size = New System.Drawing.Size(283, 20)
        Me.kdFirmaRechnungAn.TabIndex = 5
        Me.kdFirmaRechnungAn.TabStop = False
+        Me.kdFirmaRechnungAn.TIMER_SEARCH = True
        Me.kdFirmaRechnungAn.usrcntl = Nothing
        '
        'FlatButton3
@@ -2178,6 +2181,7 @@ Partial Class usrCntlFaktAbrechnung
        Me.kdFirmaAbsender.Size = New System.Drawing.Size(283, 20)
        Me.kdFirmaAbsender.TabIndex = 3
        Me.kdFirmaAbsender.TabStop = False
+        Me.kdFirmaAbsender.TIMER_SEARCH = True
        Me.kdFirmaAbsender.usrcntl = Nothing
        '
        'txtAbsenderName2
@@ -2335,6 +2339,7 @@ Partial Class usrCntlFaktAbrechnung
        '
        Me.sbLeistung._allowFreitext = False
        Me.sbLeistung._AllowSetValue = False
+        Me.sbLeistung._allowSpaceAsSplitter = False
        Me.sbLeistung._autoSizeGross = False
        Me.sbLeistung._hideIfListEmpty = True
        Me.sbLeistung._value = Nothing
@@ -2844,6 +2849,7 @@ Partial Class usrCntlFaktAbrechnung
        Me.kdFirmaEmpfaenger.Size = New System.Drawing.Size(283, 20)
        Me.kdFirmaEmpfaenger.TabIndex = 3
        Me.kdFirmaEmpfaenger.TabStop = False
+        Me.kdFirmaEmpfaenger.TIMER_SEARCH = True
        Me.kdFirmaEmpfaenger.usrcntl = Nothing
        '
        'FlatButton2
--- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb
+++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb
@@ -2507,7 +2507,9 @@ Public Class usrCntlFaktAbrechnung
            ' Dim vorzeichen = If(RECHNUNG.Vorzeichen = "-", -1, 1)
            ' SVSRVSPOS.Preis = cFakturierung.fktSVSRVS(SVSRVS_Berechnungbetrag, "EUR") '= ??????
            If SVSRVS_Berechnungbetrag > 150 Then
-                SVSRVSPOS.Preis = cFakturierung.fktSVSRVS(RECHNUNG.Wert * ur, "EUR") '*vorzeichen
+                'Dim waehrungCode As String = SQL.getValueTxtBySql("SELECT isnull(Währungscode,'') FROM Währungstabelle WHERE Währungsschlüssel = " & If(RECHNUNG.[WährungsNr], 900) & ";", "FMZOLL")
+                'SVSRVSPOS.Preis = cFakturierung.fktSVSRVS(RECHNUNG.Wert * ur, waehrungCode) '*vorzeichen
+                SVSRVSPOS.Preis = cFakturierung.fktSVSRVS(SVSRVS_Berechnungbetrag) '*vorzeichen
            Else
                SVSRVSPOS.Preis = 0
            End If
@@ -2605,11 +2607,10 @@ Public Class usrCntlFaktAbrechnung

    Sub WarenwertUmrechnung()
        Try
-
            If cboWaehrung._value = "" Then Exit Sub
            If Not IsNumeric(txtWarenwert._value) Then Exit Sub

-            Dim rg_Umrechnung = 0
+            Dim rg_Umrechnung As Double = 1
            Dim euro As Double = txtWarenwert._value
            If cboWaehrung._value <> "900" Then
                Dim kurs = (SQL.getValueTxtBySql("SELECT  TOP 1 isnull([Eurokurs] ,0)  FROM [Währungstabelle]  where Währungsschlüssel='" & cboWaehrung._value & "' AND Eurokurs is not null ", "FMZOLL"))
@@ -2626,7 +2627,7 @@ Public Class usrCntlFaktAbrechnung
                rg_Umrechnung *= kurs_Umrechnung
            End If

-            RECHNUNG.Umrechnungskurs = If(rg_Umrechnung = 0, Nothing, rg_Umrechnung)
+            RECHNUNG.Umrechnungskurs = If(rg_Umrechnung = 1, Nothing, rg_Umrechnung)
            txtWarenwertUmrechnung._value = umrechnung

            If loaded Then przRefreshDGV_Positionen() 'wegen SVS
@@ -3397,7 +3398,7 @@ Nächste_Textzeile_lesen:
        For Each r As DataGridViewRow In dgvOfferteDetailsUebersicht.Rows
            If r.Cells("BerechnungsartNr").Value = 10 Then
                Dim AnzahlTmp = PosAnzahl - BerechnungsartPosInkludiert
-                If AnzahlTmp<=0 Then AnzahlTmp=0
+                If AnzahlTmp <= 0 Then AnzahlTmp = 0
                '      MsgBox(PosAnzahl - BerechnungsartPosInkludiert)
                r.Cells("Anzahl").Value = AnzahlTmp
                If r.Cells("Anzahl").Value < 0 Then r.Cells("Anzahl").Value = 0
@@ -3423,6 +3424,4 @@ Nächste_Textzeile_lesen:
    Private Sub Label53_Click(sender As Object, e As EventArgs) Handles Label53.Click
        Label53.Visible = False
    End Sub
-
-
 End Class
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen_BAR.Designer.vb
+++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen_BAR.Designer.vb
@@ -42,6 +42,8 @@ Partial Class usrcntlVerzollungsunterlagen_BAR
        Me.Label12 = New System.Windows.Forms.Label()
        Me.cboSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cbx = New System.Windows.Forms.CheckBox()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.txtLKWContainer = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
@@ -143,6 +145,7 @@ Partial Class usrcntlVerzollungsunterlagen_BAR
        '
        'txtFirma
        '
+        Me.txtFirma._AlleFirmenCLUSTER = False
        Me.txtFirma._AllowSetValue = True
        Me.txtFirma._autoSizeGross = False
        Me.txtFirma._display_Name1 = True
@@ -151,6 +154,7 @@ Partial Class usrcntlVerzollungsunterlagen_BAR
        Me.txtFirma._displayWoelflKd = False
        Me.txtFirma._hideIfListEmpty = True
        Me.txtFirma._loadKdData = True
+        Me.txtFirma._UseFIRMA = ""
        Me.txtFirma._ValueKdAndName = False
        Me.txtFirma.dgvpos = "LEFT"
        Me.txtFirma.KdName = Nothing
@@ -163,6 +167,7 @@ Partial Class usrcntlVerzollungsunterlagen_BAR
        Me.txtFirma.searchActive = True
        Me.txtFirma.Size = New System.Drawing.Size(709, 20)
        Me.txtFirma.TabIndex = 15
+        Me.txtFirma.TIMER_SEARCH = True
        Me.txtFirma.usrcntl = Nothing
        '
        'cboFiliale
@@ -247,10 +252,10 @@ Partial Class usrcntlVerzollungsunterlagen_BAR
        'Label2
        '
        Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(170, 109)
+        Me.Label2.Location = New System.Drawing.Point(170, 135)
        Me.Label2.Name = "Label2"
        Me.Label2.Size = New System.Drawing.Size(31, 13)
-        Me.Label2.TabIndex = 17
+        Me.Label2.TabIndex = 19
        Me.Label2.Text = "Text:"
        '
        'cboTEXT
@@ -259,10 +264,10 @@ Partial Class usrcntlVerzollungsunterlagen_BAR
        Me.cboTEXT._allowFreiText = False
        Me.cboTEXT._value = ""
        Me.cboTEXT.FormattingEnabled = True
-        Me.cboTEXT.Location = New System.Drawing.Point(254, 106)
+        Me.cboTEXT.Location = New System.Drawing.Point(254, 132)
        Me.cboTEXT.Name = "cboTEXT"
        Me.cboTEXT.Size = New System.Drawing.Size(183, 21)
-        Me.cboTEXT.TabIndex = 18
+        Me.cboTEXT.TabIndex = 20
        '
        'Label12
        '
@@ -296,12 +301,44 @@ Partial Class usrcntlVerzollungsunterlagen_BAR
        Me.cbx.Text = "Anhänge zurücksetzen"
        Me.cbx.UseVisualStyleBackColor = True
        '
+        'Label3
+        '
+        Me.Label3.AutoSize = True
+        Me.Label3.Location = New System.Drawing.Point(170, 108)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(84, 13)
+        Me.Label3.TabIndex = 17
+        Me.Label3.Text = "LKW/Container:"
+        '
+        'txtLKWContainer
+        '
+        Me.txtLKWContainer._DateTimeOnly = False
+        Me.txtLKWContainer._numbersOnly = False
+        Me.txtLKWContainer._numbersOnlyKommastellen = ""
+        Me.txtLKWContainer._Prozent = False
+        Me.txtLKWContainer._ShortDateNew = False
+        Me.txtLKWContainer._ShortDateOnly = False
+        Me.txtLKWContainer._TimeOnly = False
+        Me.txtLKWContainer._value = Nothing
+        Me.txtLKWContainer._Waehrung = False
+        Me.txtLKWContainer._WaehrungZeichen = True
+        Me.txtLKWContainer.ForeColor = System.Drawing.Color.Black
+        Me.txtLKWContainer.Location = New System.Drawing.Point(254, 105)
+        Me.txtLKWContainer.MaxLineLength = -1
+        Me.txtLKWContainer.MaxLines_Warning = ""
+        Me.txtLKWContainer.MaxLines_Warning_Label = Nothing
+        Me.txtLKWContainer.Name = "txtLKWContainer"
+        Me.txtLKWContainer.Size = New System.Drawing.Size(709, 20)
+        Me.txtLKWContainer.TabIndex = 18
+        '
        'usrcntlVerzollungsunterlagen_BAR
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.BackColor = System.Drawing.Color.WhiteSmoke
        Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Controls.Add(Me.txtLKWContainer)
+        Me.Controls.Add(Me.Label3)
        Me.Controls.Add(Me.Label12)
        Me.Controls.Add(Me.cboSprache)
        Me.Controls.Add(Me.Label2)
@@ -323,7 +360,7 @@ Partial Class usrcntlVerzollungsunterlagen_BAR
        Me.Controls.Add(Me.Label6)
        Me.Controls.Add(Me.cbx)
        Me.Name = "usrcntlVerzollungsunterlagen_BAR"
-        Me.Size = New System.Drawing.Size(1000, 147)
+        Me.Size = New System.Drawing.Size(1000, 171)
        CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()
@@ -349,4 +386,6 @@ Partial Class usrcntlVerzollungsunterlagen_BAR
    Friend WithEvents Label12 As Label
    Friend WithEvents cboSprache As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents cbx As CheckBox
+    Friend WithEvents Label3 As Label
+    Friend WithEvents txtLKWContainer As VERAG_PROG_ALLGEMEIN.MyTextBox
 End Class
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen_BAR.vb
+++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen_BAR.vb
@@ -125,16 +125,16 @@
    Private Sub cboRechnungAn_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboRechnungAn.SelectedIndexChanged
        If SPEDBUCH IsNot Nothing Then
            Select Case cboRechnungAn._value
-                Case "1" : loadAdressen(SPEDBUCH.AbsenderKundenNr)
-                Case "2" : loadAdressen(SPEDBUCH.EmpfängerKundenNr)
-                Case "3" : loadAdressen(SPEDBUCH.VermittlerKundenNr)
-                Case "4" : loadAdressen(SPEDBUCH.AvisiererKundenNr)
-                Case Else : loadAdressen(-1)
+                Case "1" : loadAdressen(SPEDBUCH.AbsenderKundenNr, SPEDBUCH.LKW_Kennzeichen)
+                Case "2" : loadAdressen(SPEDBUCH.EmpfängerKundenNr, SPEDBUCH.LKW_Kennzeichen)
+                Case "3" : loadAdressen(SPEDBUCH.VermittlerKundenNr, SPEDBUCH.LKW_Kennzeichen)
+                Case "4" : loadAdressen(SPEDBUCH.AvisiererKundenNr, SPEDBUCH.LKW_Kennzeichen)
+                Case Else : loadAdressen(-1, "")
            End Select
        End If
    End Sub

-    Sub loadAdressen(KdNr)
+    Sub loadAdressen(KdNr, Optional LKW_Kz = Nothing)
        Me.KdNR = KdNr
        If KdNr IsNot Nothing AndAlso IsNumeric(KdNr) AndAlso KdNr > 0 Then
            Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(KdNr)
@@ -147,7 +147,7 @@
            '   txtFirma2.Text = ""
            txtAdresse1.Text = ""
        End If
-
+        If LKW_Kz IsNot Nothing Then txtLKWContainer.Text = LKW_Kz.ToString

    End Sub

--- a/SDL/Formulare/KDFormulare/frmFormulare.vb
+++ b/SDL/Formulare/KDFormulare/frmFormulare.vb
@@ -1104,6 +1104,7 @@ Public Class frmFormulare
                Case FormularVorlagenGruppe.NeukundeDEFiskal
                    MyFlowLayoutPanel1.Controls.Clear()
                    addForm(FormularManagerArten.DE_Fiskal)
+                    addForm(FormularManagerArten.DE_Vollmacht)
                    addForm(FormularManagerArten.Verzollungspreise, {"VZ_FISKAL_DE"})
                    addForm(FormularManagerArten.VUB_AG)
                    addForm(FormularManagerArten.DE_InformationsblattFiskalverzollung)
@@ -1130,6 +1131,7 @@ Public Class frmFormulare
                Case FormularVorlagenGruppe.NeukundeDEFiskal_IMEX
                    MyFlowLayoutPanel1.Controls.Clear()
                    addForm(FormularManagerArten.DE_Fiskal)
+                    addForm(FormularManagerArten.DE_Vollmacht)
                    addForm(FormularManagerArten.Verzollungspreise, {"VZ_FISKAL_DE"})
                    addForm(FormularManagerArten.VUB_IMEX)
                    addForm(FormularManagerArten.DE_InformationsblattFiskalverzollung)
@@ -1530,6 +1532,7 @@ Public Class FormularManagerNEU
                                                  rpt.txtPosNr.Text = SND.tblSnd_FremdspeditionText
                                              Else
                                                  rpt.txtPosNr.Text = If(SND.FilialenNr > 0, SND.FilialenNr & "/", "") & If(SND.AbfertigungsNr > 0, SND.AbfertigungsNr, "-")
+                                                  rpt.txtPosNr.Text &= vbNewLine & VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(SND.FilialenNr, False)
                                                  ' rpt.txtPosNr.Text &=  VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(SND.FilialenNr, True)
                                                  If anmerkung <> "" Then
                                                      rpt.txtAnmerkung.Text = "Anmerkung: " & anmerkung.Replace(vbNewLine, "; ").Replace(Chr(10), "; ").Replace(Chr(13), "; ")
@@ -1562,6 +1565,7 @@ Public Class FormularManagerNEU
                                                  Case "IMEX" : rpt.txtPosNr.Text &= vbNewLine & SND.tblSnd_KdAuftragsNrAvisierer
                                              End Select

+
                                              rpt.txtAbsender.Text = If(SND.tblSnd_Absender, "-")
                                              ' rpt.txtEmpfänger.Text = (If(SND.tblSnd_EmpfaengerKdNr > 0, SND.tblSnd_EmpfaengerKdNr, "") & " " & If(SND.tblSnd_Empfaenger, "")).Trim
                                              rpt.txtEmpfänger.Text = If(SND.tblSnd_Empfaenger, "").Trim
@@ -2438,6 +2442,38 @@ Public Class FormularManagerNEU
        Return ""
    End Function

+
+    Shared Function UID_PRUEFUNG(ErgebnisTXT, firma, sessionID, uidAntragsteller, uidAbfrage, tid, Optional AvisoId = -1, Optional SendungsId = -1) As String
+        Try
+            'Dim list As New List(Of VERAG_PROG_ALLGEMEIN.MyListItem)
+            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(ErgebnisTXT, 73, 110, 150, 10, "bold", 14, , iTextSharp.text.Element.ALIGN_LEFT))
+
+            listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(Now.ToShortDateString & " " & Now.ToShortTimeString & " Uhr", 73, 118, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
+            listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(uidAbfrage, 73, 126, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
+            listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(firma, 73, 133, 150, 30, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
+
+
+            listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(tid, 73, 163, 55, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
+
+            listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(uidAntragsteller, 73, 170, 55, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
+            listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME, 73, 179, 70, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
+            listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(sessionID, 73, 191, 70, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
+
+            ' Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "UID_Prüfung", listTowrite)
+            Dim PdfTmp = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "UID_Prufung", listTowrite)
+
+            Return PdfTmp
+
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+            Return ""
+        End Try
+    End Function
+
    Shared Function VM_AT_EV(usrCntl As usrcntlVollmacht_AT_EV) As String
        'Dim list As New List(Of VERAG_PROG_ALLGEMEIN.MyListItem)
        Dim fm As New VERAG_PROG_ALLGEMEIN.cFormularManager
@@ -3288,6 +3324,12 @@ Public Class FormularManagerNEU
                posNr = "  Pos.Nr.: " & posNr
            End If

+            'LKW/Constainer-Nr. im Betreff angebgen:
+            If usrCntl.txtLKWContainer.Text <> "" Then
+                posNr &= " | LKW/Container.: " & usrCntl.txtLKWContainer.Text
+            End If
+
+
            Dim bool_StbFA = False

            MailHTMLText = "<div style=""font-family:Calibri, Arial"">"
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -728,6 +728,15 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die  ähnelt.
+        '''</summary>
+        Friend ReadOnly Property hjkgv5tghj() As String
+            Get
+                Return ResourceManager.GetString("hjkgv5tghj", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
@@ -2072,7 +2081,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die 1.1.5.4 ähnelt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die 1.1.5.7 ähnelt.
        '''</summary>
        Friend ReadOnly Property Version() As String
            Get
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -623,7 +623,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.5.4</value>
+    <value>1.1.5.7</value>
  </data>
  <data name="axxes1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\axxes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -760,4 +760,7 @@
  <data name="aviso_messenger" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\aviso_messenger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="hjkgv5tghj" xml:space="preserve">
+    <value />
+  </data>
 </root>
--- a/SDL/SDL.vbproj
+++ b/SDL/SDL.vbproj
@@ -141,8 +141,16 @@
    <Reference Include="Microsoft.Office.Tools.Outlook, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
-    <Reference Include="Microsoft.ReportViewer.Common, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
-    <Reference Include="Microsoft.ReportViewer.WinForms, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
+    <Reference Include="Microsoft.ReportViewer.Common, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91">
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.ReportViewer.ProcessingObjectModel, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>C:\Windows\assembly\GAC_MSIL\Microsoft.ReportViewer.ProcessingObjectModel\11.0.0.0__89845dcd8080cc91\Microsoft.ReportViewer.ProcessingObjectModel.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.ReportViewer.WinForms, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91">
+      <Private>True</Private>
+    </Reference>
    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
      <HintPath>..\..\..\AVISO\Aviso\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
--- a/SDL/SMS/frmSendSMS.vb
+++ b/SDL/SMS/frmSendSMS.vb
@@ -138,8 +138,9 @@ Public Class frmSendSMS
            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 Else : MsgBox("Fehler bei der Datenprüfung: Firmendaten.") : Exit Sub
+                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


--- a/SDL/SMS/usrCntlSMS.vb
+++ b/SDL/SMS/usrCntlSMS.vb
@@ -44,6 +44,12 @@
                cboAbsedner.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX Spedition", "EX0272082"))
            Case "ATILLA"
                cboAbsedner.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA Spedition", "EX0252746"))
+            Case "UNISPED"
+                cboAbsedner.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED Spedition", "EX0300174"))
+            Case "FRONTOFFICE"
+                cboAbsedner.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FRONT-OFFICE", "EX0300173"))
+            Case "AMBAR"
+                cboAbsedner.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "EX0315223"))
            Case Else
                cboAbsedner.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG Spedition AG", "EX0252513"))
                cboAbsedner.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG 360", "EX0252747"))
@@ -51,11 +57,18 @@
                    cboAbsedner.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA Spedition", "EX0252746"))
                    cboAbsedner.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX Spedition", "EX0272082"))
                End If
+                cboAbsedner.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED Spedition", "EX0300174"))
+                cboAbsedner.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FRONT-OFFICE", "EX0300173"))
+                cboAbsedner.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "EX0315223"))
        End Select


        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
            Case "ATILLA" : cboAbsedner.changeItem("EX0252746")
+            Case "IMEX" : cboAbsedner.changeItem("EX0272082")
+            Case "UNISPED" : cboAbsedner.changeItem("EX0300174")
+            Case "FRONTOFFICE" : cboAbsedner.changeItem("EX0300173")
+            Case "AMBAR" : cboAbsedner.changeItem("EX0315223")
            Case Else
                Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_abteilung
                    Case "MDM" : cboAbsedner.changeItem("EX0252747")
@@ -272,10 +285,12 @@


    Private Sub MyDatagridview1_CellMouseClick(sender As Object, e As DataGridViewCellMouseEventArgs) Handles MyDatagridview1.CellMouseClick
+        Exit Sub
        If e.Button = Windows.Forms.MouseButtons.Right Then
            MyDatagridview1.ClearSelection()
            MyDatagridview1.Rows(e.RowIndex).Selected = True
-            MyDatagridview1.CurrentCell = MyDatagridview1.Rows(e.RowIndex).Cells(0)
+            ' MyDatagridview1.CurrentCell = MyDatagridview1.Rows(e.RowIndex).Cells("sms_Handynummer")
+            MyDatagridview1.Rows(e.RowIndex).Selected = True
            cntxtOptionen.Show(System.Windows.Forms.Cursor.Position)
        End If
    End Sub
--- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/cDakosyInterface_Send.vb
+++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/cDakosyInterface_Send.vb
@@ -378,11 +378,17 @@ Class DAKOSY_Interface_SEND
                If u.ezaAd_AdressCode IsNot Nothing Then ADR.AdressCode = u.ezaAd_AdressCode
                If u.ezaAd_TeilnehmerEORI IsNot Nothing Then ADR.TeilnehmerEORI = u.ezaAd_TeilnehmerEORI
                If u.ezaAd_TeilnehmerNLNR IsNot Nothing AndAlso IsNumeric(u.ezaAd_TeilnehmerNLNR) Then ADR.TeilnehmerNLNR = u.ezaAd_TeilnehmerNLNR
-                If u.ezaAd_NameFirma1 IsNot Nothing Then ADR.NameFirma.Add(u.ezaAd_NameFirma1)
-                If u.ezaAd_NameFirma2 IsNot Nothing Then ADR.NameFirma.Add(u.ezaAd_NameFirma2)
-                If u.ezaAd_NameFirma3 IsNot Nothing Then ADR.NameFirma.Add(u.ezaAd_NameFirma3)
-                If u.ezaAd_StrasseHausNr1 IsNot Nothing Then ADR.StrasseHausNr.Add(u.ezaAd_StrasseHausNr1)
-                If u.ezaAd_StrasseHausNr2 IsNot Nothing Then ADR.StrasseHausNr.Add(u.ezaAd_StrasseHausNr2)
+                If u.ezaAd_NameFirma1 IsNot Nothing Then
+                    ADR.NameFirma = u.ezaAd_NameFirma1 & If(u.ezaAd_NameFirma2, "") & If(u.ezaAd_NameFirma3, "")
+                End If
+                'If u.ezaAd_NameFirma1 IsNot Nothing Then ADR.NameFirma.Add(u.ezaAd_NameFirma1)
+                'If u.ezaAd_NameFirma2 IsNot Nothing Then ADR.NameFirma.Add(u.ezaAd_NameFirma2)
+                'If u.ezaAd_NameFirma3 IsNot Nothing Then ADR.NameFirma.Add(u.ezaAd_NameFirma3)
+                If u.ezaAd_StrasseHausNr1 IsNot Nothing Then
+                    ADR.StrasseHausNr = u.ezaAd_StrasseHausNr1 & If(u.ezaAd_StrasseHausNr2, "")
+                End If
+                'If u.ezaAd_StrasseHausNr1 IsNot Nothing Then ADR.StrasseHausNr.Add(u.ezaAd_StrasseHausNr1)
+                'If u.ezaAd_StrasseHausNr2 IsNot Nothing Then ADR.StrasseHausNr.Add(u.ezaAd_StrasseHausNr2)
                If u.ezaAd_Ortsteil IsNot Nothing Then ADR.Ortsteil = u.ezaAd_Ortsteil
                If u.ezaAd_LandCode IsNot Nothing Then ADR.LandCode = u.ezaAd_LandCode
                If u.ezaAd_PLZ IsNot Nothing Then ADR.PLZS = u.ezaAd_PLZ
--- a/SDL/kunden/Vorauskasse/frmVorauskasse.vb
+++ b/SDL/kunden/Vorauskasse/frmVorauskasse.vb
@@ -327,11 +327,10 @@
        If MyDatagridview1.SelectedRows.Count > 0 Then
            Dim VK As New VERAG_PROG_ALLGEMEIN.cVorauskasse(MyDatagridview1.SelectedRows(0).Cells("vk_id").Value)
            VK.SET_GELDEINGANG(True, txtBemerkung.Text)
+            cVorauskasseOptions.insertVermerk(MyDatagridview1.SelectedRows(0).Cells("vk_FilialeNr").Value, MyDatagridview1.SelectedRows(0).Cells("vk_AbfertigungsNr").Value, 14)
            txtBemerkung.Text = ""
            MyDatagridview1.RELOAD()
            setDGVOptions()
-            cVorauskasseOptions.insertVermerk(MyDatagridview1.SelectedRows(0).Cells("vk_FilialeNr").Value, MyDatagridview1.SelectedRows(0).Cells("vk_AbfertigungsNr").Value, 14)
-
        End If
    End Sub

@@ -455,11 +454,11 @@
        If MyDatagridview1.SelectedRows.Count > 0 Then
            Dim VK As New VERAG_PROG_ALLGEMEIN.cVorauskasse(MyDatagridview1.SelectedRows(0).Cells("vk_id").Value)
            VK.SET_FREIGEGEBEN(True, txtBemerkung.Text)
+            cVorauskasseOptions.insertVermerk(MyDatagridview1.SelectedRows(0).Cells("vk_FilialeNr").Value, MyDatagridview1.SelectedRows(0).Cells("vk_AbfertigungsNr").Value, 59,, True, If(VK.vk_VermerkId, -1), If(VK.vk_SendungId, -1))
            txtBemerkung.Text = ""
            MyDatagridview1.RELOAD()
            setDGVOptions()

-            cVorauskasseOptions.insertVermerk(MyDatagridview1.SelectedRows(0).Cells("vk_FilialeNr").Value, MyDatagridview1.SelectedRows(0).Cells("vk_AbfertigungsNr").Value, 59,, True, If(VK.vk_VermerkId, -1), If(VK.vk_SendungId, -1))

        End If
    End Sub
--- a/SDL/kunden/frmKundenUebersichtZOLL.vb
+++ b/SDL/kunden/frmKundenUebersichtZOLL.vb
@@ -809,6 +809,9 @@ Public Class frmKundenUebersichtZOLL
        'Create an object that calls the name for the 
        'Web service used in the added Web Reference. 

+
+
+
        sender.BackgroundImage = My.Resources.wait
        ' Button4.Visible = False
        Dim sGetValu2e As New validation
--- a/SDL/kunden/frmSDLDetails.Designer.vb
+++ b/SDL/kunden/frmSDLDetails.Designer.vb
@@ -46,7 +46,7 @@ Partial Class frmSDLDetails
        Me.TextBox1.Location = New System.Drawing.Point(217, 34)
        Me.TextBox1.Name = "TextBox1"
        Me.TextBox1.ReadOnly = True
-        Me.TextBox1.Size = New System.Drawing.Size(85, 20)
+        Me.TextBox1.Size = New System.Drawing.Size(118, 20)
        Me.TextBox1.TabIndex = 4
        '
        'ComboBox1
--- a/SDL/kunden/frmSDLDetails.vb
+++ b/SDL/kunden/frmSDLDetails.vb
@@ -37,7 +37,8 @@
        '  Me.KundenSDLTableAdapter.Fill(bindingSDL.bindingdataTable, KdNr, sdlNr)
        setCbo(bindingSDL.bindingdataTable.Rows(0).Item("Sperre").ToString)
        DS_sperreOLD = DirectCast(ComboBox1.SelectedItem, VERAG_PROG_ALLGEMEIN.MyListItem).Value
-        If IsDate(TextBox1.Text) Then DS_sperreDatOLD = CDate(TextBox1.Text)
+        TextBox1.Text = bindingSDL.bindingdataTable.Rows(0).Item("Sperrdatum").ToString
+        If IsDate(TextBox1.Text) Then DS_sperreDatOLD = CDate(TextBox1.Text) ' : MsgBox("sperre: " & DS_sperreDatOLD)

        DateTimePicker1.Checked = bindingSDL.bindingdataTable.Rows(0).Item("Antragsdatum").ToString <> ""
        If DateTimePicker1.Checked Then
--- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb
+++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb
@@ -22,16 +22,16 @@ Partial Class usrcntlKundeBearbeitenFull
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
-        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Me.tbcntrDetails = New System.Windows.Forms.TabControl()
        Me.tbAbfertigung = New System.Windows.Forms.TabPage()
        Me.tbcntrAbf = New System.Windows.Forms.TabControl()
@@ -2247,8 +2247,8 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.dgvUmsatzbericht.AllowUserToDeleteRows = False
        Me.dgvUmsatzbericht.AllowUserToOrderColumns = True
        Me.dgvUmsatzbericht.AllowUserToResizeRows = False
-        DataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
        Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White
        Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvUmsatzbericht.Location = New System.Drawing.Point(6, 25)
@@ -2345,8 +2345,8 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.dgvOffenePosten.AllowUserToDeleteRows = False
        Me.dgvOffenePosten.AllowUserToOrderColumns = True
        Me.dgvOffenePosten.AllowUserToResizeRows = False
-        DataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle12
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
        Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White
        Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvOffenePosten.Location = New System.Drawing.Point(6, 38)
@@ -2502,41 +2502,41 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.dgvKreditkarten.AllowUserToDeleteRows = False
        Me.dgvKreditkarten.AllowUserToOrderColumns = True
        Me.dgvKreditkarten.AllowUserToResizeRows = False
-        DataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle13
+        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
        Me.dgvKreditkarten.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle14
+        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
        Me.dgvKreditkarten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle15
+        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle5
        Me.dgvKreditkarten.Location = New System.Drawing.Point(9, 20)
        Me.dgvKreditkarten.MultiSelect = False
        Me.dgvKreditkarten.Name = "dgvKreditkarten"
        Me.dgvKreditkarten.ReadOnly = True
-        DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle16
+        DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle6
        Me.dgvKreditkarten.RowHeadersVisible = False
-        DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle17
+        DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle7
        Me.dgvKreditkarten.RowTemplate.DefaultCellStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.dgvKreditkarten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
        Me.dgvKreditkarten.Size = New System.Drawing.Size(642, 312)
@@ -2674,8 +2674,8 @@ Partial Class usrcntlKundeBearbeitenFull
        '
        'dgvUstv_LaenderUndSteuernummern
        '
-        DataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle18
+        DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8
        Me.dgvUstv_LaenderUndSteuernummern.BackgroundColor = System.Drawing.Color.White
        Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvUstv_LaenderUndSteuernummern.Location = New System.Drawing.Point(9, 94)
@@ -2888,8 +2888,8 @@ Partial Class usrcntlKundeBearbeitenFull
        'dgvSonst_IDSKunden
        '
        Me.dgvSonst_IDSKunden.AllowUserToResizeRows = False
-        DataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle19
+        DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
        Me.dgvSonst_IDSKunden.BackgroundColor = System.Drawing.Color.White
        Me.dgvSonst_IDSKunden.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvSonst_IDSKunden.Location = New System.Drawing.Point(9, 251)
@@ -3092,8 +3092,8 @@ Partial Class usrcntlKundeBearbeitenFull
        'DataGridView1
        '
        Me.DataGridView1.AllowUserToResizeRows = False
-        DataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle20
+        DataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10
        Me.DataGridView1.BackgroundColor = System.Drawing.Color.White
        Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.DataGridView1.Enabled = False
--- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb
+++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb
@@ -160,9 +160,11 @@ Public Class usrcntlKundeBearbeitenFull


        Label28.Text = If(KUNDE.DakosyExport, "-")
-        cbxFiBu.Checked = KUNDE.FiBuSchnittstelle
-        cbxFiBuLG.Checked = KUNDE_ERW.FiBuSchnittstelleLG
-        cboFirma.changeItem(If(KUNDE.FiBuSchnittstelleNr, ""))
+        If KUNDE.KundenNr > 0 Then
+            cbxFiBu.Checked = KUNDE.FiBuSchnittstelle
+            cbxFiBuLG.Checked = KUNDE_ERW.FiBuSchnittstelleLG
+            cboFirma.changeItem(If(KUNDE.FiBuSchnittstelleNr, ""))
+        End If
        ' ----- Abfertigung -----
        rtbAbf_Besonderheiten.Text = loadValue(KUNDE.Besonderheiten, "")
        rtbLKWFreigabeSenden.Text = loadValue(KUNDE.DokumenteLKWFreigabe, "")
@@ -1160,4 +1162,6 @@ Public Class usrcntlKundeBearbeitenFull
            txtInkassoUebergebenAm._value = ""
        End If
    End Sub
+
+
 End Class
--- a/SDL/mdm/frmMDMDatenverarbetiung.vb
+++ b/SDL/mdm/frmMDMDatenverarbetiung.vb
@@ -382,47 +382,6 @@ Public Class frmMDMDatenverarbetiung
            Dim reader As OleDbDataReader = Nothing


-            'Dim sqlstrACCDB As String = "SELECT count(*) FROM tblMaut WHERE 1=1"
-            'Try
-
-
-            '    con.Open()
-
-            '    cmd = New OleDbCommand(sqlstrACCDB, con)
-            '    'reader = cmd.ExecuteReader()
-            '    'MsgBox("da issa ")
-
-            '    Using oRDR As OleDbDataReader = cmd.ExecuteReader
-            '        While (oRDR.Read)
-            '            MsgBox(oRDR.GetValue(0)) 'gets the first returned column
-            '        End While
-            '    End Using
-
-            '    'While reader.Read
-            '    '    MsgBox("da issa2 ")
-
-            '    '    MessageBox.Show(reader.GetString(0).ToString & vbTab & vbTab & reader.GetString(1).ToString)
-            '    'End While
-            '    'MsgBox("da issa3 ")
-
-            'Catch ex2 As System.Exception
-            '    MsgBox("err: " & ex2.Message & ex2.StackTrace)
-
-            'Finally
-            '    If reader IsNot Nothing Then reader.Close()
-            'End Try
-
-
-
-            'reader.Close()
-            'cmd.Connection = con
-            'cmd.CommandText = "SELECT * FROM tblMaut"
-
-            'cmd.ExecuteReader()
-
-            'cmd.CommandText = "INSERT INTO table1(Neyms) VALUES('" + var1 + "')"
-            'cmd.ExecuteNonQuery()
-

            If dt IsNot Nothing Then
                con.Open()