neu

SDL/Classes/cGenWord.vb

@@ -269,6 +269,7 @@ Public Class cGenWord
             odoc.FormFields("KundenNr").Range.Text = KUNDE.AdressenNr
             odoc.FormFields("AuftragsNr").Range.Text = AuftragsNr.ToString("000000.##")
 
+            Dim pinVisible = False
             If odoc.Range.Bookmarks.Exists("TabelleKarten") Then
                 If odoc.Bookmarks("TabelleKarten").Range.Tables.Count > 0 Then
                     oTable = odoc.Bookmarks("TabelleKarten").Range.Tables(1)
@@ -289,6 +290,10 @@ Public Class cGenWord
                             If i < dt.Rows.Count Then oTable.Rows.Add()
                             '    MsgBox(cSqlDb.checkNullStr(r("KarteBoxBezeichnung")))
                             i += 1
+
+                            Select Case r("SDLNr").ToString
+                                Case "100", "212", "213", "214" : pinVisible = True
+                            End Select
                         End If
                     Next
                 End If
@@ -296,6 +301,13 @@ Public Class cGenWord
                 MessageBox.Show("Textmarke nicht vorhanden!")
             End If
 
+            Try
+                If Not pinVisible Then
+                    odoc.FormFields("PIN").Range.Text = ""
+                    odoc.FormFields("InfoPIN").Range.Text = ""
+                End If
+            Catch ex As Exception
+            End Try
 
             odoc.Save() : odoc.Activate()
 

SDL/Classes/cRKSV.vb

@@ -393,7 +393,7 @@ Public Class cRKSV
     Public Shared Function printKundenBeleg(BELEG As EABeleg, KASSE As cRKSV_Kasse, PERSONAL As cPersonal, printername As String, showDok As Boolean) As Boolean
 
         'Dim print As New frmPrintLayout
-       
+
         Dim rpt As New rptKundenBeleg
         rpt.lblRgNr.Text = BELEG.rksv_BelegId '"12345 / TR"
         rpt.lblRgDatum.Text = BELEG.BelegDat.ToString("dd.MM.yyyy") ' HH:mm")
@@ -520,7 +520,7 @@ Public Class cRKSV
                 rpt.lblFirma_Details.Text = "A 4975 Suben  |  Suben 14" & vbNewLine & "UID: ATU74813856 "
         End Select
 
-        If KASSE.rksv_aktiv Then
+        If KASSE.rksv_aktiv Or KASSE.rksvDE_aktiv Then
             If BELEG.rksv_qr Is Nothing OrElse BELEG.rksv_qr = "" Then
                 MsgBox("Fehler: QR-Code wurde nicht richtig erstellt!")
             Else
@@ -739,7 +739,7 @@ Public Class cRKSV
             End Select
 
 
-            If KASSE.rksv_aktiv Then
+            If KASSE.rksv_aktiv Or KASSE.rksvDE_aktiv Then
                 If BELEG.rksv_qr Is Nothing OrElse BELEG.rksv_qr = "" Then
                     MsgBox("Fehler: QR-Code wurde nicht richtig erstellt!")
                 Else
@@ -781,7 +781,7 @@ Public Class cRKSV
 
                                              End Sub
 
-       rpt.Run(False)
+        rpt.Run(False)
 
         If printername <> "" Then
             rpt.Document.Printer.PrinterName = printername
@@ -905,13 +905,32 @@ Public Class cRKSV
                 KASSE.SET_LAST_QR_JWS(LastJWS, QR_CodeString)
             End If
 
+            If KASSE.rksvDE_aktiv Then ' WENN für die Kasse die DEUTSCHLAND gilt
+                Dim answer = ""
+
+                If Not cRKSV_DE.insertRKSV_DE(KASSE, KASSE.rksv_CompanyGUID, KASSE.rksv_Umsatzzaehler, BELEG.BelegDat, BELEG.Steuerschlüssel, RKSV_Beleg_Id, 0, QR_CodeString, LastJWS, TESTBUCHUNG, answer) Then 'Digitale Signierung und Erfassung in die RKSV-Datenbank mittels ITG-Service
+                    If Not TESTBUCHUNG Then
+                        KASSE.DECREASE_BELEG_UMSATZ(oldBelegZaehler, summe * -1)
+                        cRKSV.DELETE(BELEG)
+                    End If
+                    MsgBox("Programmfehler bei der digitalen Signatur." & vbNewLine & vbNewLine & answer, MsgBoxStyle.Critical)
+                    ' Me.Cursor = Cursors.Default
+                    'BELEG = cRKSV.STORNO(BELEG, "Programmfehler")
+                    ' MsgBox("Programmfehler bei der digitalen Signatur.")
+
+                    Return False
+                End If
+                KASSE.SET_LAST_QR_JWS(LastJWS, QR_CodeString)
+            End If
+
+
             'RKSV-Daten beim Beleg ergänzen:
             BELEG.rksv_jws = LastJWS
             BELEG.rksv_qr = QR_CodeString
             BELEG.rksv_BelegId = RKSV_Beleg_Id
             BELEG.rksv_id = KASSE.rksv_id
             BELEG.rksv_umsatz = summe
-            BELEG.rksv_aktiv = KASSE.rksv_aktiv
+            BELEG.rksv_aktiv = (KASSE.rksv_aktiv Or KASSE.rksvDE_aktiv)
             BELEG.SAVE()
 
 
@@ -978,7 +997,7 @@ Public Class cRKSV
 
         ' Dim QR As String = ""
 
-        If KASSE.rksv_aktiv And BELEG.rksv_BelegId > 0 Then
+        If (KASSE.rksv_aktiv Or KASSE.rksvDE_aktiv) And BELEG.rksv_BelegId > 0 Then
             If BELEG.rksv_qr Is Nothing OrElse BELEG.rksv_qr = "" Then
                 MsgBox("Fehler: QR-Code wurde nicht richtig erstellt!")
             Else
@@ -1579,4 +1598,168 @@ Public Class cRKSV
             Case Else : Return "Leistungen.Gl_account"
         End Select
     End Function
+End Class
+
+
+
+Public Class cRKSV_DE
+    Shared SQL As New SQL
+
+    Shared Function getBelegSting_BAR(summeBRUTTO As Double, steuerSchluessel As Integer) As String
+
+
+        Dim steuersatz As Double = SQL.getValueTxtBySql("SELECT isnull(tblSteuersätze.Steuersatz,0) FROM tblSteuersätze WHERE tblSteuersätze.Nr='" & steuerSchluessel & "' ", "FMZOLL")
+
+
+        Dim BetragSatzNormal = IIf(steuersatz = 0.19, summeBRUTTO, 0.0)
+        Dim BetragSatzErm1 = IIf(steuersatz = 0.1, summeBRUTTO, 0.0)
+        Dim BetragSatzNull = IIf(steuersatz = 0, summeBRUTTO, 0.0)
+
+
+        BetragSatzNormal += IIf(steuersatz = 0.16, summeBRUTTO, 0.0)
+        BetragSatzErm1 += IIf(steuersatz = 0.05, summeBRUTTO, 0.0)
+        BetragSatzNormal += IIf(steuersatz = 0.2, summeBRUTTO, 0.0) ' Eig Nur AT
+        'Dim BetragSatzNormal = IIf(steuersatz = 0.2, summeBRUTTO, 0.0) 'summe
+        'Dim BetragSatzErm2 = IIf(steuersatz = 0.13, summeBRUTTO, 0.0)
+        'Dim BetragSatzNull = IIf(steuersatz = 0.0, summeBRUTTO, 0.0)
+
+        Dim sum = BetragSatzNormal
+        sum += BetragSatzErm1
+        sum += BetragSatzNull
+        MsgBox("Beleg^" & BetragSatzNormal.ToString("0.00") & "_" & BetragSatzErm1.ToString("0.00") & "_0.00_0.00_" & BetragSatzNull.ToString("0.00") & "^" & sum.ToString("0.00") & ":Bar")
+        Return "Beleg^" & BetragSatzNormal.ToString("0.00") & "_" & BetragSatzErm1.ToString("0.00") & "_0.00_0.00_" & BetragSatzNull.ToString("0.00") & "^" & sum.ToString("0.00") & ":Bar"
+
+    End Function
+
+
+    Shared Function insertRKSV_DE(ByVal kasse As cRKSV_Kasse, CompanyGUID As String, ByVal umsatzZaehler As Double, ByVal belegDat As DateTime, ByVal steuerSchluessel As Integer, ByVal RKSV_Beleg_Id As Integer, ByVal summeBRUTTO As Double, ByRef QR_CodeString As String, ByRef LastJWS As String, TEST As Boolean, ByRef answer As String) As Boolean
+        Try
+
+
+
+            ' COM-Objekt anlegen
+
+            '   Dim licenseKey As String = kasse.rksv_DE_license '"07.11.2020;MEUCIQDfTvMPWQo4IVvTtuTbU9YHNwJ7EdMbogfGqmAp+rdw4gIgPJoEDE0OCfac/nCOKdksWvOZq+xvkFoYI0HFxJPkldU="
+            '  Dim TSESerialNumber As String = "77A9D25F044A89E87578A8CD52D2A92564CC09214CC6448465414008D31C1CF1"
+            Dim m_ksv As ItgKsV.KsVCom = New ItgKsV.KsVCom()
+            '  Dim result As Integer = m_ksv.InitialiseLibrary("F:", "SwissbitDemo", "12345", licenseKey)
+
+            MsgBox(kasse.rksv_ipAdresse & "  --- " & kasse.rksv_DE_TSE_Serial & "  --- " & kasse.rksv_DE_apiToken & "  --- " & kasse.rksv_DE_user & "  --- " & kasse.rksv_DE_pwd & "  --- " & kasse.rksv_DE_license)
+
+            Dim result As Integer = m_ksv.InitialiseLibraryLan(kasse.rksv_ipAdresse, kasse.rksv_DE_TSE_Serial, kasse.rksv_DE_apiToken, kasse.rksv_DE_user, kasse.rksv_DE_pwd, kasse.rksv_DE_license) '--> ClientId/User "Admin" mit KsVCom Demo registriert
+
+            If result <> &H0 Then
+            MessageBox.Show(m_ksv.StringifyErrorCode(result), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error])
+            Return False
+        End If
+
+
+
+        '' Setup bei erstmaliger Verwendung der Swissbit-TSE !!!
+
+        'result = m_ksv.SetupTSEForFirstUse("123456", "12345", "98765", "SwissbitDemo")
+
+        'If result <> &H0 Then
+        '    MessageBox.Show(m_ksv.StringifyErrorCode(result), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error])
+        'Else
+        '    MessageBox.Show("TSE setup succeeded.", "Information", MessageBoxButtons.OK, MessageBoxIcon.Information)
+        'End If
+
+
+
+        ' BeginTransaction: für jede neue Rechnung wird eine Transaktion gestartet
+
+        Dim transactionNumber As Long = 0
+        result = m_ksv.StartTransaction(transactionNumber)
+
+        If result <> &H0 Then
+            MessageBox.Show(m_ksv.StringifyErrorCode(result), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error])
+            Return False
+        End If
+
+
+
+        ' UpdateTransaction: processData bleibt leer
+
+        result = m_ksv.UpdateTransaction(transactionNumber, "", "KassenBeleg-V1")
+
+        If result <> &H0 Then
+            MessageBox.Show(m_ksv.StringifyErrorCode(result), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error])
+        End If
+
+
+
+            ' FinishTransaction: Abschluss einer Rechnung, processData nach vorgegebenem Format
+
+            result = m_ksv.FinishTransaction(transactionNumber, getBelegSting_BAR(summeBRUTTO, steuerSchluessel), "KassenBeleg-V1")
+
+            If result <> &H0 Then
+            MessageBox.Show(m_ksv.StringifyErrorCode(result), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error])
+        End If
+
+
+
+        ' QR-Code und weitere Werte, die auf der Rechnung angedruckt werden müssen
+
+        ' QR-Code wird als base64 kodiertes bitmap geliefert
+
+        Dim qrCode As String = String.Empty
+
+        ' QR-Code Inhalt für die Ablage in der Datenbank, falls eine Rechnung nochmals gedruckt werden muss
+
+        Dim qrCodeContent As String = String.Empty
+        m_ksv.GetLastReceiptQrCode(qrCode)
+        m_ksv.GetLastReceiptQrCodeContent(qrCodeContent)
+        Dim sTransactionNumber As String = String.Empty
+        Dim serialNumber As String = String.Empty
+        Dim signature As String = String.Empty
+        Dim sigCounter As String = String.Empty
+        Dim dtStartTransaction As Date = Date.MinValue
+        Dim dtFinishTransaction As Date = Date.MinValue
+        m_ksv.GetLastReceiptValues(sTransactionNumber, serialNumber, signature, dtStartTransaction, dtFinishTransaction, sigCounter)
+
+            QR_CodeString = qrCode
+            LastJWS = signature
+            '' Anzeige der gestarteten/noch möglichen Transaktionen
+
+            'Dim maxTransactions As Integer = 0
+            'Dim openTransactions As Integer = 0
+            'm_ksv.GetMaxStartedTransactions(maxTransactions)
+            'm_ksv.GetStartedTransactions(openTransactions)
+            'Dim startedTransactions As Integer() = Nothing
+            'result = m_ksv.GetStartedTransactionNumbers(startedTransactions)
+
+            'If result <> &H0 Then
+            '    MessageBox.Show(m_ksv.StringifyErrorCode(result), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error])
+            'End If
+
+
+
+            '' Export der TSE-Daten im TAR-Format
+
+            'result = m_ksv.ExportAsTarFile("d:\export.tar")
+
+            'If result <> 0 Then
+            '    MessageBox.Show(m_ksv.StringifyErrorCode(result), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error])
+            'End If
+
+
+
+            '' Bibliothek aufräumen, andernfalls wird ein power-cycle der TSE erforderlich um sie wieder einsetzen zu können
+
+            ''result = CSharpImpl.__Assign(,, m_ksv.CleanupLibrary())
+            'result = m_ksv.CleanupLibrary()
+
+            'If result <> 0 Then
+            '    MessageBox.Show(m_ksv.StringifyErrorCode(result), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error])
+            'End If
+
+
+
+        Catch ex As Exception
+            MsgBox("Es ist ein Fehler bei der Signatur aufgetreten (insertRKSV): " & vbNewLine & ex.Message & ex.StackTrace)
+        End Try
+        Return False
+    End Function
+
 End Class

SDL/Classes/cRKSV_Kasse.vb

@@ -9,6 +9,7 @@ Public Class cRKSV_Kasse
     Property rksv_firma As String = ""
     Property rksv_startdatum As Object = Nothing
     Property rksv_aktiv As Boolean = True
+    Property rksvDE_aktiv As Boolean = True
     Property rksv_BelegIdZaehler As Integer = 0
     Property rksv_Umsatzzaehler As Double = 0.0
     Property rksv_lastJWS As String = ""
@@ -21,6 +22,8 @@ Public Class cRKSV_Kasse
     Property rksv_DE_TSE_Serial As Object = Nothing
     Property rksv_DE_user As Object = Nothing
     Property rksv_DE_pwd As Object = Nothing
+    Property rksv_DE_apiToken As Object = Nothing
+    Property rksv_DE_license As Object = Nothing
 
 
     Dim SQL As New SQL
@@ -204,6 +207,7 @@ Public Class cRKSV_Kasse
                         Me.rksv_firma = cSqlDb.checkNullReturnValue(dr.Item("rksv_firma"), Nothing)
                         Me.rksv_startdatum = cSqlDb.checkNullReturnValue(dr.Item("rksv_startdatum"), Nothing)
                         Me.rksv_aktiv = cSqlDb.checkNullReturnValue(dr.Item("rksv_aktiv"), Nothing)
+                        Me.rksvDE_aktiv = cSqlDb.checkNullReturnValue(dr.Item("rksvDE_aktiv"), Nothing)
                         Me.rksv_BelegIdZaehler = cSqlDb.checkNullReturnValue(dr.Item("rksv_BelegIdZaehler"), Nothing)
                         Me.rksv_Umsatzzaehler = cSqlDb.checkNullReturnValue(dr.Item("rksv_Umsatzzaehler"), Nothing)
                         Me.rksv_lastJWS = cSqlDb.checkNullReturnValue(dr.Item("rksv_lastJWS"), Nothing)
@@ -216,6 +220,8 @@ Public Class cRKSV_Kasse
                         Me.rksv_DE_TSE_Serial = cSqlDb.checkNullReturnValue(dr.Item("rksv_DE_TSE_Serial"), Nothing)
                         Me.rksv_DE_user = cSqlDb.checkNullReturnValue(dr.Item("rksv_DE_user"), Nothing)
                         Me.rksv_DE_pwd = cSqlDb.checkNullReturnValue(dr.Item("rksv_DE_pwd"), Nothing)
+                        Me.rksv_DE_apiToken = cSqlDb.checkNullReturnValue(dr.Item("rksv_DE_apiToken"), Nothing)
+                        Me.rksv_DE_license = cSqlDb.checkNullReturnValue(dr.Item("rksv_DE_license"), Nothing)
 
                     End If
                     dr.Close()
@@ -237,6 +243,7 @@ Public Class cRKSV_Kasse
         list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_firma", rksv_firma))
         list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_startdatum", rksv_startdatum))
         list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_aktiv", rksv_aktiv))
+        list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksvDE_aktiv", rksvDE_aktiv))
         list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_BelegIdZaehler", rksv_BelegIdZaehler))
         list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_Umsatzzaehler", rksv_Umsatzzaehler))
         list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_lastJWS", rksv_lastJWS))
@@ -249,7 +256,8 @@ Public Class cRKSV_Kasse
         list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_DE_TSE_Serial", rksv_DE_TSE_Serial))
         list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_DE_user", rksv_DE_user))
         list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_DE_pwd", rksv_DE_pwd))
-
+        list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_DE_apiToken", rksv_DE_apiToken))
+        list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_DE_license", rksv_DE_license))
 
 
         Return list

SDL/Formulare/KDFormulare/FormulareBaukasten/subRptLaufzettelZollDE_ATZOLL.vb

@@ -56,8 +56,9 @@ Public Class subRptLaufzettelZollDE_ATA
                     If IsNumeric(barcodeString) Then barcodeString = CInt(barcodeString).ToString()
                     txtATNr.Value = ACD & " " & barcodeString & " / " & monat
                     picBarcodeATAMRN.Visible = False
-                Else
+                ElseIf barcodeString.Length > 10 Then 'grobe Pr<50>fung der L<>nge, ob es eine g<>ltige ATA Nr sein kann..
                     txtATNr.Visible = False
+
                     Dim barcodeATA As Image = Code128Rendering.MakeBarcodeImage(barcodeString, 1, True, 20)
                     'barcodeATA.RotateFlip(RotateFlipType.Rotate270FlipNone)
                     picBarcodeATAMRN.Image = barcodeATA

SDL/My Project/Resources.Designer.vb

@@ -944,6 +944,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property logo() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("logo", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -1343,6 +1353,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property plose_1() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("plose_1", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -2102,7 +2122,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die 1.1.7.2 ähnelt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die 1.1.7.6 ähnelt.
         '''</summary>
         Friend ReadOnly Property Version() As String
             Get

SDL/My Project/Resources.resx

@@ -151,9 +151,6 @@
   <data name="word" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\word.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="pdf1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\pdf1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="mse" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\mse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -163,12 +160,12 @@
   <data name="positionen" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\liste-logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="fax" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\fax.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="axxes" 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>
   </data>
+  <data name="Plakette1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Plakette1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="WAI" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\WAI.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -181,9 +178,6 @@
   <data name="statistik2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\statistik2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="FrontOfficeSUB_Horizontal" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Logo_blue_globe_Horizontal.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="IMEX_LOGO_AEO_sig" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\IMEX-LOGO-AEO_sig.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -196,6 +190,9 @@
   <data name="uhr_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\uhr_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="beleg" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\beleg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="kunden" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\kunden.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -214,6 +211,9 @@
   <data name="add_person" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\android-add-contact.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="zoll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\zoll.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="_exit" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\exit.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -244,21 +244,12 @@
   <data name="pfeil_oben" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\pfeil_oben.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="flagge_tr" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\flagge_tr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Route5" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Route5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="warenkorb1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\warenkorb1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Atilla" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Atilla.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="plose_big" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\plose_big.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="picboxZoomIn_Enter1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\picboxZoomIn_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -268,9 +259,6 @@
   <data name="person_default" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\person_default.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Einheitspapier_0735_Position" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Einheitspapier-0735_Position.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="entwurf" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\entwurf.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -280,11 +268,11 @@
   <data name="email11" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\email11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Einheitspapier_0735_top" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="abc_obu" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Einheitspapier-0735_top.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\abc_obu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="IMEX-LOGO_simple" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="flagge_tr" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\IMEX-LOGO_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\flagge_tr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="telefon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\telefon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -298,9 +286,6 @@
   <data name="frejus" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\frejus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ok_gray" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ok_gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="Plakette" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Plakette.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -316,17 +301,17 @@
   <data name="Atilla_big_med" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Atilla_big1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="list_new_small2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\list_new_small2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="Einheitspapier_0777_kurz" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Einheitspapier-0777_kurz.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="lorry_motion" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\lorry_motion.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="picboxRotateLeft_Enter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Route1_IR" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\picboxRotateLeft_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Route1_IR.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="zoll" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\zoll.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="uhr_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\uhr_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -346,9 +331,6 @@
   <data name="NKD" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\NKD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Route1_IR" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Route1_IR.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="passpic" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\passpic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -406,14 +388,20 @@
   <data name="Excel_logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Excel_2013_logo-155x110.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="compose" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\compose.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="picboxNext_Enter" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\picboxNext_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="handy" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\handy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="beleg_rot" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="changeKd" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\beleg_rot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\android-friends.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="plose_big" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\plose_big.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="LKW_klein" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Aviso.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -421,36 +409,36 @@
   <data name="cards1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\cards1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="picboxRotateRight_Enter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\picboxRotateRight_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="spedbuch1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\spedbuch1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="toll_collect" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\toll-collect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="flagge_D" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\flagge_D.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="VERAG_AEO_MailSig" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\VERAG_AEO_MailSig.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="printer21" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\printer21.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="Route5_IR" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Route5_IR.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="checklist" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\checklist.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Verag_AG_Logo_med" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Verag-AG-Logo21.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="uta" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\uta.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="data" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\data.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="ambar_simple" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ambar_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="house1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\house1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="person1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\person.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -520,6 +508,9 @@
   <data name="person" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\person.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="email_big" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\email_big.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="aktiveVeredelung1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\aktiveVeredelung1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -535,6 +526,9 @@
   <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="beleg_rot" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\beleg_rot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="dakosy" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\dakosy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -550,8 +544,8 @@
   <data name="transp" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\transp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="changeKd" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="uta" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\android-friends.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\uta.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="LKW" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\LKW1.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -583,12 +577,15 @@
   <data name="ids_bg" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ids_bg.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="warning2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ok_gray" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\warning2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\ok_gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="sicherheit" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sicherheit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="oregon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\oregon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="Atilla__sig" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Atilla _sig.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -613,14 +610,17 @@
   <data name="passpic_sw" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\passpic_sw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="today" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\today.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="Verag_Customs_Service_GMBH_Logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Verag-Customs-Service-GMBH-Logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Route3" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Route3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="compose" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="FrontOfficeSUB_Horizontal" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\compose.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Logo_blue_globe_Horizontal.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="transfer" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\transfer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -629,16 +629,16 @@
     <value>..\Resources\email.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Version" xml:space="preserve">
-    <value>1.1.7.2</value>
+    <value>1.1.7.6</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>
   </data>
-  <data name="toll_collect" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Route5" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\toll-collect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Route5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="abc_obu" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="picboxRotateLeft_Enter" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\abc_obu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\picboxRotateLeft_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="vorauszahlung1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\vorauszahlung1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -646,8 +646,8 @@
   <data name="Info" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
-  <data name="picboxRotateRight_Enter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="fax" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\picboxRotateRight_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\fax.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="aeo_DE" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\aeo_DE.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -658,8 +658,8 @@
   <data name="Einheitspapier_0735_bottom" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Einheitspapier-0735_bottom.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="today" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Einheitspapier_0735_top" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\today.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Einheitspapier-0735_top.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="android-note12" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\android-note12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -673,14 +673,14 @@
   <data name="road" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\road.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="email_big" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Einheitspapier_0735_Position" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\email_big.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Einheitspapier-0735_Position.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="beleg_rot_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\beleg_rot1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="list_new_small2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="pdf1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\list_new_small2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\pdf1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="pfeil_rechts" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\pfeil_rechts.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -700,8 +700,8 @@
   <data name="plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="printer21" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="warning2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\printer21.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\warning2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="lorry" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\lorry.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -709,6 +709,9 @@
   <data name="Route2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Route2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="unisped_aeo_AT" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\unisped_aeo_AT.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="verag_only" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\verag_only.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -718,8 +721,8 @@
   <data name="Verag_Customs_Service_GMBH_Logo_med" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Verag-Customs-Service-GMBH-Logo2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="beleg" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="IMEX-LOGO_simple" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\beleg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\IMEX-LOGO_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="pin" xml:space="preserve">
     <value>VERAGZoll1</value>
@@ -742,11 +745,14 @@
   <data name="picboxZoomOut_Enter" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\picboxZoomOut_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="del_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\del1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="scanner1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\scanner1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="del_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="house1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\del1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\house1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="rechnung" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\rechnung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -757,16 +763,16 @@
   <data name="checklist1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\checklist.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Plakette1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Verag_AG_Logo_med" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Plakette1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Verag-AG-Logo21.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="flagge_A" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\flagge_A.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="oregon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\oregon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="unisped_aeo_AT" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="plose_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\unisped_aeo_AT.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\plose_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>

SDL/Reports/Zoll/rptKontrolleLKW_NCTSTR.Designer.vb

@@ -369,7 +369,7 @@ Partial Public Class rptKontrolleLKW_NCTSTR
         Me.Label10.HyperLink = Nothing
         Me.Label10.Left = 2.909843!
         Me.Label10.Name = "Label10"
-        Me.Label10.Style = "font-weight: bold"
+        Me.Label10.Style = "font-weight: bold; text-justify: auto"
         Me.Label10.Text = "ZOLL AT" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Daten aus ZOLARIS / E-ZOLL"
         Me.Label10.Top = 0.0472441!
         Me.Label10.Width = 1.965748!

SDL/Reports/Zoll/rptKontrolleLKW_NCTSTR.vb

@@ -47,17 +47,25 @@ Public Class rptKontrolleLKW_NCTSTR
         Dim brg_AT As String = "05AT510000G000FP7"
         Dim brg_DE As String = "05DE0000000009345"
         Dim brg_DE_NEU As String = "17DE0000000071678"
+        'Dim brg_DE_IMEX As String = 
+        '   Dim brg_DE_ATILLA As String = "20AT520000G000092"
 
 
         Dim firmaStr = ""
-        If FIRMA = "MAVI" Then
+        If FIRMA = "VERIMEX_MAVI" Then
             firmaStr = " AND [ncts_Partnersystem] IN('MAVI') "
+            LIST_NCTSABR = New VERAG_PROG_ALLGEMEIN.cAbrechnung_NCTSBrg_LIST("VERIMEX_MAVI")
+            Label10.Text = " Auswertung MAVI"
+        ElseIf FIRMA = "VERIMEX_OREGON" Then
+            firmaStr = " AND [ncts_Partnersystem] IN('OREGON') "
+            LIST_NCTSABR = New VERAG_PROG_ALLGEMEIN.cAbrechnung_NCTSBrg_LIST("VERIMEX_OREGON")
+            Label10.Text = " Auswertung OREGON"
         ElseIf FIRMA = "ATEZ" Then
             firmaStr = " AND [ncts_Partnersystem] IN('ATEZ') "
+            Label10.Text = " Auswertung ATEZ"
         End If
 
         If True Then '"OREGON"
-            LIST_NCTSABR = New VERAG_PROG_ALLGEMEIN.cAbrechnung_NCTSBrg_LIST("OREGON")
         End If
 
         '     If FIRMA = "ATILLA" Then operatorID = "'5','6'"
@@ -71,7 +79,6 @@ Public Class rptKontrolleLKW_NCTSTR
         sqlStr &= " group by cast(ncts_Eroeffnung as date),ncts_Befoerderungsmittel_KennzeichenAbgang"
         sqlStr &= "  order by  cast(ncts_Eroeffnung as date)"
 
-
         Me.DataSource = kundenSQL.loadDgvBySql(sqlStr, "FMZOLL", 1000)
 
 
@@ -138,21 +145,63 @@ Public Class rptKontrolleLKW_NCTSTR
         End If
 
         If LIST_NCTSABR IsNot Nothing Then
-            For Each l In LIST_NCTSABR.LIST
-                If CDbl(Fields.Item("GarantieWert").Value) < l.abrg_GarantiewertBis Then
 
-                    Select Case l.abrg_artAbrechnung
+            'per LKW
-                        Case "LKW" : l._ANZAHL += 1 : Exit For
+            For Each l In LIST_NCTSABR.LIST
-                        Case "%"
+
+                Dim GarantieWertLKW As Double = CDbl(Fields.Item("GarantieWert").Value)
+                Select Case l.abrg_artAbrechnung
+                    Case "LKW"
+                        If GarantieWertLKW < l.abrg_GarantiewertBis Then
+                            l._ANZAHL += 1 : Exit For
+                        End If
+                    'Case "Versandschein"
+                    '    If SUB_DATA IsNot Nothing Then
+                    '        For Each r In SUB_DATA.Rows
+                    '            Dim GarantieWertSND As Double = CDbl(r("GarantieWert"))
+                    '            If r("AnmeldungsDatum") = Fields.Item("AnmeldungsDatum").Value And r("Kennzeichen") = Fields.Item("Kennzeichen").Value Then
+                    '                If GarantieWertSND < l.abrg_GarantiewertBis Then
+                    '                    l._ANZAHL += 1
+                    '                End If
+                    '            End If
+                    '        Next
+                    '    End If
+                    Case "%" 'LKW
+                        If GarantieWertLKW < l.abrg_GarantiewertBis Then
                             l._ANZAHL += 1
                             Dim prozent As Double = 0.001
                             If l.abrg_prozent IsNot Nothing Then prozent = CDbl(l.abrg_prozent)
-                            l._BETRAG += (CDbl(Fields.Item("GarantieWert").Value)) * prozent : Exit For
+                            l._BETRAG += (CDbl(Fields.Item("GarantieWert").Value)) * prozent
-                    End Select
+                            Exit For
+                        End If
+                End Select
+
+            Next
+
+            'per VERSANDSCHEIN
+            For Each r In SUB_DATA.Rows
+                'Dim next_SND = False
+                If SUB_DATA IsNot Nothing Then
+                    For Each l In LIST_NCTSABR.LIST
+                        'If Not next_SND Then
+                        Select Case l.abrg_artAbrechnung
+                                Case "Versandschein"
+                                    Dim GarantieWertSND As Double = CDbl(r("GarantieWert"))
+                                    If r("AnmeldungsDatum") = Fields.Item("AnmeldungsDatum").Value And r("Kennzeichen") = Fields.Item("Kennzeichen").Value Then
+                                        If GarantieWertSND < l.abrg_GarantiewertBis Then
+                                            l._ANZAHL += 1
+                                        'next_SND = True
+                                        Exit For
+                                    End If
+                                    End If
+                            End Select
+                        ' End If
+                    Next
                 End If
             Next
         End If
 
+
         'Abwechselnd grauen und wei<65>en Hintergrund
         If (dummycount Mod 2) = 0 Then
             Detail.BackColor = Drawing.Color.White

SDL/Reports/Zoll/subrptKontrolleLKW_NCTSTR_Abrechnung.Designer.vb

@@ -37,6 +37,8 @@ Partial Public Class subrptKontrolleLKW_NCTSTR_Abrechnung
         Me.Label11 = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.Line1 = New GrapeCity.ActiveReports.SectionReportModel.Line()
         Me.Line2 = New GrapeCity.ActiveReports.SectionReportModel.Line()
+        Me.Label6 = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.lblAbrechnugnsart = New GrapeCity.ActiveReports.SectionReportModel.Label()
         CType(Me.Label1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.Label2, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.Label3, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -48,6 +50,8 @@ Partial Public Class subrptKontrolleLKW_NCTSTR_Abrechnung
         CType(Me.Label5, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblGesamtsumme, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.Label11, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.Label6, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.lblAbrechnugnsart, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me, System.ComponentModel.ISupportInitialize).BeginInit()
         '
         'PageHeader
@@ -59,7 +63,7 @@ Partial Public Class subrptKontrolleLKW_NCTSTR_Abrechnung
         '
         Me.Label1.Height = 0.2208662!
         Me.Label1.HyperLink = Nothing
-        Me.Label1.Left = 0!
+        Me.Label1.Left = 1.487008!
         Me.Label1.Name = "Label1"
         Me.Label1.Style = "font-size: 9pt; font-weight: bold; ddo-char-set: 1"
         Me.Label1.Text = "Garantiewert"
@@ -70,7 +74,7 @@ Partial Public Class subrptKontrolleLKW_NCTSTR_Abrechnung
         '
         Me.Label2.Height = 0.2208662!
         Me.Label2.HyperLink = Nothing
-        Me.Label2.Left = 1.48937!
+        Me.Label2.Left = 2.976378!
         Me.Label2.Name = "Label2"
         Me.Label2.Style = "font-size: 9pt; font-weight: bold; ddo-char-set: 1"
         Me.Label2.Text = "Anzahl"
@@ -81,7 +85,7 @@ Partial Public Class subrptKontrolleLKW_NCTSTR_Abrechnung
         '
         Me.Label3.Height = 0.2208662!
         Me.Label3.HyperLink = Nothing
-        Me.Label3.Left = 2.530709!
+        Me.Label3.Left = 4.017717!
         Me.Label3.Name = "Label3"
         Me.Label3.Style = "font-size: 9pt; font-weight: bold; text-align: right; ddo-char-set: 1"
         Me.Label3.Text = "Einzelpreis"
@@ -92,7 +96,7 @@ Partial Public Class subrptKontrolleLKW_NCTSTR_Abrechnung
         '
         Me.Label4.Height = 0.2208662!
         Me.Label4.HyperLink = Nothing
-        Me.Label4.Left = 3.572048!
+        Me.Label4.Left = 5.059056!
         Me.Label4.Name = "Label4"
         Me.Label4.Style = "font-size: 9pt; font-weight: bold; text-align: right; ddo-char-set: 1"
         Me.Label4.Text = "Gesamtpreis"
@@ -101,7 +105,7 @@ Partial Public Class subrptKontrolleLKW_NCTSTR_Abrechnung
         '
         'Detail
         '
-        Me.Detail.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblGarantieBis, Me.lblAnzahl, Me.lblEinzelpreis, Me.lblGesamtpreis})
+        Me.Detail.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblGarantieBis, Me.lblAnzahl, Me.lblEinzelpreis, Me.lblGesamtpreis, Me.lblAbrechnugnsart})
         Me.Detail.Height = 0.168504!
         Me.Detail.KeepTogether = True
         Me.Detail.Name = "Detail"
@@ -110,7 +114,7 @@ Partial Public Class subrptKontrolleLKW_NCTSTR_Abrechnung
         '
         Me.lblGarantieBis.Height = 0.168504!
         Me.lblGarantieBis.HyperLink = Nothing
-        Me.lblGarantieBis.Left = 0!
+        Me.lblGarantieBis.Left = 1.487008!
         Me.lblGarantieBis.Name = "lblGarantieBis"
         Me.lblGarantieBis.Style = "font-size: 9pt; font-weight: normal; ddo-char-set: 1"
         Me.lblGarantieBis.Text = "Garantiewert bis"
@@ -121,7 +125,7 @@ Partial Public Class subrptKontrolleLKW_NCTSTR_Abrechnung
         '
         Me.lblAnzahl.Height = 0.168504!
         Me.lblAnzahl.HyperLink = Nothing
-        Me.lblAnzahl.Left = 1.48937!
+        Me.lblAnzahl.Left = 2.976378!
         Me.lblAnzahl.Name = "lblAnzahl"
         Me.lblAnzahl.Style = "font-size: 9pt; font-weight: normal; ddo-char-set: 1"
         Me.lblAnzahl.Text = "Anzahl"
@@ -132,7 +136,7 @@ Partial Public Class subrptKontrolleLKW_NCTSTR_Abrechnung
         '
         Me.lblEinzelpreis.Height = 0.168504!
         Me.lblEinzelpreis.HyperLink = Nothing
-        Me.lblEinzelpreis.Left = 2.530709!
+        Me.lblEinzelpreis.Left = 4.017717!
         Me.lblEinzelpreis.Name = "lblEinzelpreis"
         Me.lblEinzelpreis.Style = "font-size: 9pt; font-weight: normal; text-align: right; ddo-char-set: 1"
         Me.lblEinzelpreis.Text = "Einzelpreis"
@@ -143,7 +147,7 @@ Partial Public Class subrptKontrolleLKW_NCTSTR_Abrechnung
         '
         Me.lblGesamtpreis.Height = 0.168504!
         Me.lblGesamtpreis.HyperLink = Nothing
-        Me.lblGesamtpreis.Left = 3.572048!
+        Me.lblGesamtpreis.Left = 5.059056!
         Me.lblGesamtpreis.Name = "lblGesamtpreis"
         Me.lblGesamtpreis.Style = "font-size: 9pt; font-weight: normal; text-align: right; ddo-char-set: 1"
         Me.lblGesamtpreis.Text = "Gesamtpreis"
@@ -157,7 +161,7 @@ Partial Public Class subrptKontrolleLKW_NCTSTR_Abrechnung
         '
         'ReportHeader1
         '
-        Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Label5, Me.Label1, Me.Label2, Me.Label3, Me.Label4, Me.Line})
+        Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Label6, Me.Label5, Me.Label1, Me.Label2, Me.Label3, Me.Label4, Me.Line})
         Me.ReportHeader1.Height = 0.7811025!
         Me.ReportHeader1.Name = "ReportHeader1"
         '
@@ -174,16 +178,16 @@ Partial Public Class subrptKontrolleLKW_NCTSTR_Abrechnung
         '
         'Line
         '
-        Me.Line.Height = 0!
+        Me.Line.Height = 0.00000005960464!
         Me.Line.Left = 0!
         Me.Line.LineWeight = 1.0!
         Me.Line.Name = "Line"
-        Me.Line.Top = 0.7653544!
+        Me.Line.Top = 0.7811024!
-        Me.Line.Width = 4.613386!
+        Me.Line.Width = 6.100394!
         Me.Line.X1 = 0!
-        Me.Line.X2 = 4.613386!
+        Me.Line.X2 = 6.100394!
-        Me.Line.Y1 = 0.7653544!
+        Me.Line.Y1 = 0.7811024!
-        Me.Line.Y2 = 0.7653544!
+        Me.Line.Y2 = 0.7811024!
         '
         'ReportFooter1
         '
@@ -195,7 +199,7 @@ Partial Public Class subrptKontrolleLKW_NCTSTR_Abrechnung
         '
         Me.lblGesamtsumme.Height = 0.168504!
         Me.lblGesamtsumme.HyperLink = Nothing
-        Me.lblGesamtsumme.Left = 3.572047!
+        Me.lblGesamtsumme.Left = 5.059055!
         Me.lblGesamtsumme.Name = "lblGesamtsumme"
         Me.lblGesamtsumme.Style = "font-size: 9pt; font-weight: bold; text-align: right; ddo-char-set: 1"
         Me.lblGesamtsumme.Text = "Gesamtpreis"
@@ -206,7 +210,7 @@ Partial Public Class subrptKontrolleLKW_NCTSTR_Abrechnung
         '
         Me.Label11.Height = 0.168504!
         Me.Label11.HyperLink = Nothing
-        Me.Label11.Left = 2.529528!
+        Me.Label11.Left = 4.016536!
         Me.Label11.Name = "Label11"
         Me.Label11.Style = "font-size: 9pt; font-weight: normal; ddo-char-set: 1"
         Me.Label11.Text = "Gesamtsumme:"
@@ -229,16 +233,38 @@ Partial Public Class subrptKontrolleLKW_NCTSTR_Abrechnung
         'Line2
         '
         Me.Line2.Height = 0!
-        Me.Line2.Left = 3.572047!
+        Me.Line2.Left = 5.059055!
         Me.Line2.LineWeight = 1.0!
         Me.Line2.Name = "Line2"
         Me.Line2.Top = 0.2204725!
         Me.Line2.Width = 1.041339!
-        Me.Line2.X1 = 3.572047!
+        Me.Line2.X1 = 5.059055!
-        Me.Line2.X2 = 4.613386!
+        Me.Line2.X2 = 6.100394!
         Me.Line2.Y1 = 0.2204725!
         Me.Line2.Y2 = 0.2204725!
         '
+        'Label6
+        '
+        Me.Label6.Height = 0.2208662!
+        Me.Label6.HyperLink = Nothing
+        Me.Label6.Left = 0!
+        Me.Label6.Name = "Label6"
+        Me.Label6.Style = "font-size: 9pt; font-weight: bold; ddo-char-set: 1"
+        Me.Label6.Text = "Abrechnugsart"
+        Me.Label6.Top = 0.5602363!
+        Me.Label6.Width = 1.48937!
+        '
+        'lblAbrechnugnsart
+        '
+        Me.lblAbrechnugnsart.Height = 0.168504!
+        Me.lblAbrechnugnsart.HyperLink = Nothing
+        Me.lblAbrechnugnsart.Left = 0!
+        Me.lblAbrechnugnsart.Name = "lblAbrechnugnsart"
+        Me.lblAbrechnugnsart.Style = "font-size: 9pt; font-weight: normal; ddo-char-set: 1"
+        Me.lblAbrechnugnsart.Text = "per Versandschein"
+        Me.lblAbrechnugnsart.Top = 0!
+        Me.lblAbrechnugnsart.Width = 1.48937!
+        '
         'subrptKontrolleLKW_NCTSTR_Abrechnung
         '
         Me.MasterReport = False
@@ -267,6 +293,8 @@ Partial Public Class subrptKontrolleLKW_NCTSTR_Abrechnung
         CType(Me.Label5, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblGesamtsumme, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.Label11, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.Label6, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.lblAbrechnugnsart, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me, System.ComponentModel.ISupportInitialize).EndInit()
 
     End Sub
@@ -287,4 +315,6 @@ Partial Public Class subrptKontrolleLKW_NCTSTR_Abrechnung
     Public WithEvents lblGesamtsumme As GrapeCity.ActiveReports.SectionReportModel.Label
     Private WithEvents Label5 As GrapeCity.ActiveReports.SectionReportModel.Label
     Private WithEvents Line As GrapeCity.ActiveReports.SectionReportModel.Line
+    Private WithEvents lblAbrechnugnsart As GrapeCity.ActiveReports.SectionReportModel.Label
+    Private WithEvents Label6 As GrapeCity.ActiveReports.SectionReportModel.Label
 End Class

SDL/Reports/Zoll/subrptKontrolleLKW_NCTSTR_Abrechnung.vb

@@ -37,9 +37,15 @@ Public Class subrptKontrolleLKW_NCTSTR_Abrechnung
             Case "LKW"
                 lblEinzelpreis.Text = "<EFBFBD> " & CDbl(Fields.Item("EINZALBETRAG").Value).ToString("N2", CultureInfo.InvariantCulture)
                 lblGesamtpreis.Text = "<EFBFBD> " & CDbl(Fields.Item("GESAMTBETRAG").Value).ToString("N2", CultureInfo.InvariantCulture)
+                lblAbrechnugnsart.Text = "per LKW"
+            Case "Versandschein"
+                lblEinzelpreis.Text = "<EFBFBD> " & CDbl(Fields.Item("EINZALBETRAG").Value).ToString("N2", CultureInfo.InvariantCulture)
+                lblGesamtpreis.Text = "<EFBFBD> " & CDbl(Fields.Item("GESAMTBETRAG").Value).ToString("N2", CultureInfo.InvariantCulture)
+                lblAbrechnugnsart.Text = "per Versandschein"
             Case "%"
                 lblEinzelpreis.Text = ""
                 lblGesamtpreis.Text = "<EFBFBD> " & CDbl(Fields.Item("BETRAG").Value).ToString("N2", CultureInfo.InvariantCulture)
+                lblAbrechnugnsart.Text = "% vom Sicherheit"
         End Select
 
 

SDL/SDL.vbproj

@@ -215,6 +215,9 @@
     <Reference Include="jose-jwt">
       <HintPath>C:\Users\DEVELOPER1\Desktop\RK_ITG_TEST\c#\Tester\bin\x86\Release\jose-jwt.dll</HintPath>
     </Reference>
+    <Reference Include="KsVCom">
+      <HintPath>..\..\..\..\RKSV DE\KsVCom.dll</HintPath>
+    </Reference>
     <Reference Include="LiveCharts, Version=0.6.7.0, Culture=neutral, PublicKeyToken=d1901e6ed2eb0532, processorArchitecture=MSIL">
       <HintPath>..\..\..\AVISO\Aviso\packages\LiveCharts.0.6.7.0\lib\net40\LiveCharts.dll</HintPath>
       <Private>True</Private>
@@ -3875,6 +3878,9 @@
   <ItemGroup>
     <Content Include="My Project\logo_mdm.png" />
     <Content Include="My Project\zoll.png" />
+    <None Include="Resources\plose_1.png" />
+    <None Include="Resources\plose1.png" />
+    <None Include="Resources\logo.png" />
     <None Include="Resources\Unisped_logo.jpg" />
     <None Include="Resources\unisped_aeo_AT.jpg" />
     <None Include="Resources\oregon.png" />

SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb

@@ -62,7 +62,7 @@ Public Class frmNacherfassungNEU
                 If avisoLinkId > 0 Then SPEDITIONSBUCH.AvisoID = avisoLinkId 'AVisoId übernehmen
                 Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
                     Case "ATILLA" : sbWhere = " AND Niederlassung = 'SUA' "
-                    Case "IMEX" : sbWhere = " AND Mandant = 'IMEX' "
+                    Case "IMEX" : sbWhere = " AND Mandant <> 'UNAT'  AND Niederlassung <> 'SUA'  "'sbWhere = " AND Mandant = 'IMEX' "
                     Case "UNISPED" : sbWhere = " AND Mandant = 'UNAT' "
                     Case "FRONTOFFICE" : sbWhere = " AND Niederlassung <> 'SUA' "
                     Case Else
@@ -74,7 +74,7 @@ Public Class frmNacherfassungNEU
                         '        Case "WAI" : sbWhere = " AND Niederlassung IN ('WAI')"
                         '    End Select
                         'End If
-                        sbWhere = " AND Mandant <> 'IMEX' AND Mandant <> 'UNAT'  AND Niederlassung <> 'SUA' "
+                        sbWhere = " AND Mandant <> 'UNAT'  AND Niederlassung <> 'SUA'  " '" AND Mandant <> 'IMEX' AND Mandant <> 'UNAT'  AND Niederlassung <> 'SUA' "
                 End Select
                 'Else
                 '    Select Case SPEDITIONSBUCH.FilialenNr

SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Position.resx

@@ -190,34 +190,4 @@
   <metadata name="Marke.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="VpReferenz.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="VpZusatz.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="UlCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="DataGridViewComboBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="UlReferenz.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="UlZusatz.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="PkCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Anzahl.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Typ.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Marke.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>

SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Position.vb

@@ -53,10 +53,19 @@
         sbPkTyp.initSearchBox(Me.FindForm, " [Code] ,[Description] as Verpackungsart FROM tbl_DY_ZollDE_C0017_PackstueckeVerpackungsarten", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", , "FMZOLL", , 400, 200)
         sbUlArten.initSearchBox(Me.FindForm, " [Code] ,[Description] as Art FROM tbl_DY_ZollDE_C0013_UnterlagenArten", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", , "FMZOLL", , 400, 200)
         sbExportAusLand.initSearchBox(Me.FindForm, " [Code] ,[Description] as Land FROM tbl_DY_ZollDE_C0008_LaenderFull", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", "Code", "FMZOLL", , 400, 200)
+        sbBestimmungsland.initSearchBox(Me.FindForm, " [Code] ,[Description] as Land FROM tbl_DY_ZollDE_C0008_LaenderFull", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", "Code", "FMZOLL", , 400, 200)
+        sbVersendungsLand.initSearchBox(Me.FindForm, " [Code] ,[Description] as Land FROM tbl_DY_ZollDE_C0008_LaenderFull", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", "Code", "FMZOLL", , 400, 200)
 
         cboWaehrung.initSearchBox(Me.FindForm, " [Code] ,[Description] as Land FROM [tbl_DY_ZollDE_I0400_Waehrungsliste]", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", "Code", "FMZOLL", , 400, 200)
 
 
+
+        cboArtAnmeldung.Items.Clear()
+        cboArtAnmeldung.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
+        cboArtAnmeldung.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("T1 - Versandanmeldung T1 Waren, die im externen gemeinschaftlichen/gemeinsamen Versandverfahren befördert werden sollen.", "T1"))
+        cboArtAnmeldung.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("T2 - Versandanmeldung T2 Waren, die - soweit nicht das T2F-Verfahren vorgeschrieben ist - im internen gemeinschaftlichen Versandverfahren befördert werden sollen", "T2"))
+        cboArtAnmeldung.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("T2F - Versandanmeldung T2F Waren, die im Linienverkehr zwischen Teilen des Zollgebiets der Gemeinschaft, in denen die Richtlinie 77/388/EWG (6. Mehrwertsteuerrichtlinie) Anwendung findet und den Teilen des Zollgebiets der Gemeinschaft, in denen diese Richtlinie nicht gilt (siehe Titel I, Absatz 3) im internen gemeinschaftlichen Versandverfahren befördert werden sollen.", "T2F"))
+
         cboVpTyp.Items.Clear()
         For Each v In (New cVorpapierTypen).LIST
             cboVpTyp.Items.Add(v)

SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Positionen.vb

@@ -266,16 +266,14 @@
             '  POSITION.nctsWP_NctsId = NCTS.ncts_Id
             POSITION.nctsWP_PositionsNummer = cnt
             POSITION.nctsWP_Warennummer = cProgramFunctions.isLeerNothingDbl(P.txtWarennummer.Text)
-            'POSITION.nctsWP_ArtAnmeldungPositionCode = P.XXXXXXXXXXXX.Text
+            POSITION.nctsWP_ArtAnmeldungPositionCode = cProgramFunctions.isLeerNothing(P.cboArtAnmeldung._value)
             POSITION.nctsWP_Warenbezeichnung = P.txtWarenbezeichnung.Text
             POSITION.nctsWP_Warenwert = cProgramFunctions.isLeerNothingDbl(P.txtWarenwert._value)
             POSITION.nctsWP_WarenwertProzent = cProgramFunctions.isLeerNothingDbl(P.txtSiBetragProzent._value)
             POSITION.nctsWP_WarenwertWaehrung = cProgramFunctions.isLeerNothing(P.cboWaehrung._value)
             'POSITION.nctsWP_WarenwertWaehrung = P.XXXXXXXXXXXX.Text
             'POSITION.nctsWP_SchaetzKz = P.XXXXXXXXXXXX.Text
-            'POSITION.nctsWP_WarenwertProzent = P.XXXXXXXXXXXX.Text
+            'POSITION.nctsWP_WarenwertProzent = P.XXXXXXXXXXXX.Text 
-            'POSITION.nctsWP_VersendungslandPositionCode = P.XXXXXXXXXXXX.Text
-            'POSITION.nctsWP_BestimmungslandPositionCode = P.XXXXXXXXXXXX.Text
             POSITION.nctsWP_Rohmasse = cProgramFunctions.isLeerNothingDbl(P.txtRohmasse.Text)
             POSITION.nctsWP_Eigenmasse = cProgramFunctions.isLeerNothingDbl(P.txtEigenmasse.Text)
 
@@ -286,6 +284,8 @@
             POSITION.nctsWP_BesondereVermeke_ExportAbgaben = P.cbxEmportAbgaben.Checked
             POSITION.nctsWP_BesondereVermeke_ExportBeschraenkung = P.cbxEmportBeschraernkung.Checked
             POSITION.nctsWP_BesondereVermeke_ExportAusEU = P.cbxExportAusEU.Checked
+            POSITION.nctsWP_VersendungslandPositionCode = cProgramFunctions.isLeerNothing(P.sbVersendungsLand._value)
+            POSITION.nctsWP_BestimmungslandPositionCode = cProgramFunctions.isLeerNothing(P.sbBestimmungsland._value)
 
             If P.cbxExportAusEU.CheckState = CheckState.Checked Then
                 POSITION.nctsWP_BesondereVermeke_ExportAusEU = True

SDL/kassenbuch/frmBelegNeu.vb

@@ -782,7 +782,7 @@ Public Class frmBelegNeu
                 Dim QR_CodeString As String = ""
                 Dim LastJWS As String = ""
 
-                If KASSE.rksv_aktiv Then ' WENN für die Kasse die RKSV gilt
+                If KASSE.rksv_aktiv Then ' WENN für die Kasse die RKSV ÖSTERREICH gilt
                     Dim answer = ""
                     If Not cRKSV.insertRKSV(KASSE, KASSE.rksv_CompanyGUID, KASSE.rksv_Umsatzzaehler, BELEG.BelegDat, BELEG.Steuerschlüssel, RKSV_Beleg_Id, If(EA = "E", summeBRUTTO, summeBRUTTO * -1), QR_CodeString, LastJWS, TESTBUCHUNG, answer) Then 'Digitale Signierung und Erfassung in die RKSV-Datenbank mittels ITG-Service
                         If Not TESTBUCHUNG Then
@@ -795,6 +795,18 @@ Public Class frmBelegNeu
                     KASSE.SET_LAST_QR_JWS(LastJWS, QR_CodeString)
                 End If
 
+                If KASSE.rksvDE_aktiv Then ' WENN für die Kasse die RKSV DEUTSCHLAND gilt
+                    Dim answer = ""
+                    If Not cRKSV_DE.insertRKSV_DE(KASSE, KASSE.rksv_CompanyGUID, KASSE.rksv_Umsatzzaehler, BELEG.BelegDat, BELEG.Steuerschlüssel, RKSV_Beleg_Id, If(EA = "E", summeBRUTTO, summeBRUTTO * -1), QR_CodeString, LastJWS, TESTBUCHUNG, answer) Then 'Digitale Signierung und Erfassung in die RKSV-Datenbank mittels ITG-Service
+                        If Not TESTBUCHUNG Then
+                            KASSE.DECREASE_BELEG_UMSATZ(oldBelegZaehler, If(EA = "E", summeBRUTTO * -1, summeBRUTTO))
+                            cRKSV.DELETE(BELEG)
+                        End If
+                        MsgBox("Programmfehler bei der digitalen Signatur." & vbNewLine & vbNewLine & answer, MsgBoxStyle.Critical)
+                        Me.Cursor = Cursors.Default : warnClose = False : Me.Close() : Exit Sub
+                    End If
+                    KASSE.SET_LAST_QR_JWS(LastJWS, QR_CodeString)
+                End If
                 'RKSV-Daten beim Beleg ergänzen:
                 BELEG.rksv_jws = LastJWS
                 BELEG.rksv_qr = QR_CodeString

SDL/kassenbuch/frmFremdbeleg.vb

@@ -174,7 +174,7 @@ Public Class frmFremdbeleg
 
 
                 BELEG.Belegart = Art
-                BELEG.rksv_aktiv = KASSE.rksv_aktiv
+                BELEG.rksv_aktiv = (KASSE.rksv_aktiv Or KASSE.rksvDE_aktiv)
                 BELEG.Ordnungsbegriff = IIf(Art = 1, "* KASSEN-EINGANG *", "* KASSEN-AUSGANG *")
                 ' BELEG.BelegDat = Now.ToShortDateString
                 ' BELEG.BelegDat = Now.ToShortDateString ' datBelegdatum.Value.ToShortDateString
@@ -190,7 +190,7 @@ Public Class frmFremdbeleg
                 Dim KBEntry As cKassenbuch = Nothing
                 Dim KBEntryGB As cKassenbuch = Nothing
 
-                If Not insertKB(KASSE.rksv_id, RKSV_Beleg_Id, KBEntry, KBEntryGB, KASSE.rksv_aktiv) Then ' Eintrag ins Kassenbuch
+                If Not insertKB(KASSE.rksv_id, RKSV_Beleg_Id, KBEntry, KBEntryGB, (KASSE.rksv_aktiv Or KASSE.rksvDE_aktiv)) Then ' Eintrag ins Kassenbuch
                     MsgBox(BELEG, "Programmfehler bei Eintrag ins Kassenbuch.")
                     Me.Cursor = Cursors.Default : Me.Close() : Exit Sub
                 End If
@@ -231,6 +231,20 @@ Public Class frmFremdbeleg
                     End If
                 End If
 
+                If KASSE.rksvDE_aktiv Then
+                    If Not cRKSV_DE.insertRKSV_DE(KASSE, KASSE.rksv_CompanyGUID, KASSE.rksv_Umsatzzaehler, BELEG.BelegDat, BELEG.Steuerschlüssel, RKSV_Beleg_Id, summeBRUTTO, QR_CodeString, LastJWS, TESTBUCHUNG, answer) Then 'Digitale Signierung und Erfassung in die RKSV-Datenbank mittels ITG-Service
+                        If Not TESTBUCHUNG Then
+                            KASSE.DECREASE_BELEG_UMSATZ(oldBelegZaehler, BELEG.rksv_umsatz * -1)
+                            cRKSV.DELETE(BELEG)
+                        End If
+                        MsgBox("Programmfehler bei der digitalen Signatur." & vbNewLine & vbNewLine & answer, MsgBoxStyle.Critical)
+                        '  BELEG = cRKSV.STORNO(BELEG, "Programmfehler")
+                        'MsgBox("Programmfehler bei der digitalen Signatur.")
+                        Me.Cursor = Cursors.Default : Me.Close() : Exit Sub
+                    End If
+                End If
+
+
                 KASSE.SET_LAST_QR_JWS(LastJWS, QR_CodeString)
 
                 'RKSV-Daten beim Beleg ergänzen:

SDL/kassenbuch/frmKassenbuch.vb

@@ -65,7 +65,7 @@ Public Class frmKassenbuch
         KennwortTime = Now
         initDgv() 'nur set
         init()
-        cboKassen.fillWithSQL("SELECT [rksv_id], [rksv_bez] FROM [tblRKSV_Kassen] WHERE [rksv_aktiv]=1 ", False, "FMZOLL") ' [rksv_firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' AND
+        cboKassen.fillWithSQL("SELECT [rksv_id], [rksv_bez] FROM [tblRKSV_Kassen] WHERE ([rksv_aktiv]=1 OR [rksvde_aktiv]=1) ", False, "FMZOLL") ' [rksv_firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' AND
 
         If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("KASSE", Me) Then
             btnBelegKunde.Enabled = False

SDL/kassenbuch/frmNacherfassungLeihgeld.vb

@@ -320,7 +320,7 @@ Public Class frmNacherfassungLeihgeld
 
 
                 Dim JournalNr = 0
-                If Not cRKSV.insertKB(PERSONAL, BELEG, KASSE.rksv_id, RKSV_Beleg_Id, KASSE.rksv_aktiv, JournalNr) Then
+                If Not cRKSV.insertKB(PERSONAL, BELEG, KASSE.rksv_id, RKSV_Beleg_Id, (KASSE.rksv_aktiv Or KASSE.rksvDE_aktiv), JournalNr) Then
                     Me.Cursor = Cursors.Default : Me.Close() : Exit Sub
                 End If
 
@@ -349,13 +349,30 @@ Public Class frmNacherfassungLeihgeld
                     KASSE.SET_LAST_QR_JWS(LastJWS, QR_CodeString)
                 End If
 
+
+                If KASSE.rksvDE_aktiv Then ' WENN für die Kasse die RKSV gilt
+                    Dim answer = ""
+                    If Not cRKSV_DE.insertRKSV_DE(KASSE, KASSE.rksv_CompanyGUID, KASSE.rksv_Umsatzzaehler, BELEG.BelegDat, BELEG.Steuerschlüssel, RKSV_Beleg_Id, summeBRUTTO, QR_CodeString, LastJWS, TESTBUCHUNG, answer) Then 'Digitale Signierung und Erfassung in die RKSV-Datenbank mittels ITG-Service
+                        If Not TESTBUCHUNG Then
+                            KASSE.DECREASE_BELEG_UMSATZ(oldBelegZaehler, summeBRUTTO * -1)
+                            cRKSV.DELETE(BELEG)
+                        End If
+                        MsgBox("Programmfehler bei der digitalen Signatur." & vbNewLine & vbNewLine & answer, MsgBoxStyle.Critical)
+                        ' Me.Cursor = Cursors.Default
+                        'BELEG = cRKSV.STORNO(BELEG, "Programmfehler")
+                        '  MsgBox("Programmfehler bei der digitalen Signatur.")
+                        Me.Cursor = Cursors.Default : Me.Close() : Exit Sub
+                    End If
+                    KASSE.SET_LAST_QR_JWS(LastJWS, QR_CodeString)
+
+                End If
                 'RKSV-Daten beim Beleg ergänzen:
                 BELEG.rksv_jws = LastJWS
                 BELEG.rksv_qr = QR_CodeString
                 BELEG.rksv_BelegId = RKSV_Beleg_Id
                 BELEG.rksv_id = KASSE.rksv_id
                 BELEG.rksv_umsatz = summeBRUTTO
-                BELEG.rksv_aktiv = KASSE.rksv_aktiv
+                BELEG.rksv_aktiv = (KASSE.rksv_aktiv Or KASSE.rksvDE_aktiv)
                 BELEG.SAVE()
 
                 'Zuerst, damit Provisionsbetrag auf Aktendeckel gedruckt wird...

SDL/kunden/Berichte/rptKundeUebersicht.vb

@@ -3,15 +3,18 @@ Imports GrapeCity.ActiveReports.Document
 
 Public Class rptKundeUebersicht
 
-
+    Dim Firma_ID = "1"
+    Dim Firma = "1"
     Dim KdNr As Integer
 
-    Sub New(KdNr)
+    Sub New(KdNr, Optional Firma_ID = "1", Optional Firma = "VERAG")
 
         ' Dieser Aufruf ist f<>r den Designer erforderlich.
         InitializeComponent()
 
-        Me.KdNr = Kdnr
+        Me.KdNr = KdNr
+        Me.Firma_ID = Firma_ID
+        Me.Firma = Firma
         ' F<>gen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
 
     End Sub
@@ -31,7 +34,7 @@ Public Class rptKundeUebersicht
         lblDat.Text = Now.ToString("dddd, dd.MM.yyyy")
 
 
-        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+        Select Case Firma
             Case "IMEX" : Me.picVERAG.Image = My.Resources.IMEX_LOGO_simple : Me.Label28.Text = "IMEX Customs Service GmbH"
             Case "ATILLA" : Me.picVERAG.Image = My.Resources.Atilla : Me.Label28.Text = "ATILLA Spedition"
             Case Else
@@ -63,7 +66,7 @@ Public Class rptKundeUebersicht
         Dim s = New subRptOfferte(0, KdNr)
         subOffert.Report = s
 
-        Dim s2 = New subRptLeistungen(KdNr)
+        Dim s2 = New subRptLeistungen(KdNr, Firma_ID)
         subRptLeistungen.Report = s2
 
         Dim s3 = New subRptBonitaetsverlauf(KdNr)

SDL/kunden/Berichte/subRptLeistungen.vb

@@ -4,11 +4,14 @@ Imports GrapeCity.ActiveReports.Document
 Public Class subRptLeistungen
     Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
     Dim Kdnr As Integer
-    Sub New(Kdnr As Integer)
+    Dim [Firma_ID] = "1"
+
+    Sub New(Kdnr As Integer, Optional Firma_ID As String = "1")
 
         ' Dieser Aufruf ist f<>r den Designer erforderlich.
         InitializeComponent()
-         Me.Kdnr = Kdnr
+        Me.Kdnr = Kdnr
+        Me.Firma_ID = Firma_ID
         ' F<>gen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
     End Sub
 
@@ -41,7 +44,6 @@ Public Class subRptLeistungen
     Private Sub rptAuswertung_ReportStart(sender As System.Object, e As System.EventArgs) Handles MyBase.ReportStart
         If Kdnr <= 0 Then Exit Sub
 
-        Dim [Firma_ID] = "1"
 
         Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
             Case "IMEX" : [Firma_ID] = "20"

SDL/kunden/frmKundenUebersichtZOLL.Designer.vb

@@ -118,11 +118,13 @@ Partial Class frmKundenUebersichtZOLL
         Me.ToolStripMenuItem19 = New System.Windows.Forms.ToolStripMenuItem()
         Me.mnueFiskal = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem5 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.toolNeuerKunde = New System.Windows.Forms.ToolStripMenuItem()
         Me.toolOptionen = New System.Windows.Forms.ToolStripMenuItem()
         Me.BearbeitenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.AnDakosyÜbertragenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.AufschubEORIBearbeitenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem11 = New System.Windows.Forms.ToolStripMenuItem()
         Me.pnlTop = New System.Windows.Forms.Panel()
         Me.cbx = New System.Windows.Forms.CheckBox()
         Me.lblAbfertigungsverbot = New System.Windows.Forms.Label()
@@ -139,8 +141,7 @@ Partial Class frmKundenUebersichtZOLL
         Me.PDFLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.toolNeuerKunde = New System.Windows.Forms.ToolStripMenuItem()
+        Me.cboKundenblattFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox
-        Me.ToolStripMenuItem11 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ContextMenuStrip1.SuspendLayout()
         Me.tabZolltarife.SuspendLayout()
         Me.tabKundendaten.SuspendLayout()
@@ -276,6 +277,7 @@ Partial Class frmKundenUebersichtZOLL
         'tbStatistik
         '
         Me.tbStatistik.BackColor = System.Drawing.Color.White
+        Me.tbStatistik.Controls.Add(Me.cboKundenblattFirma)
         Me.tbStatistik.Controls.Add(Me.Button1)
         Me.tbStatistik.Controls.Add(Me.btnUbersicht)
         Me.tbStatistik.Controls.Add(Me.Label27)
@@ -1168,6 +1170,19 @@ Partial Class frmKundenUebersichtZOLL
         Me.ToolStripMenuItem5.TextAlign = System.Drawing.ContentAlignment.BottomCenter
         Me.ToolStripMenuItem5.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
         '
+        'toolNeuerKunde
+        '
+        Me.toolNeuerKunde.ForeColor = System.Drawing.Color.White
+        Me.toolNeuerKunde.Image = Global.SDL.My.Resources.Resources.plus
+        Me.toolNeuerKunde.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+        Me.toolNeuerKunde.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
+        Me.toolNeuerKunde.Margin = New System.Windows.Forms.Padding(0, 20, 0, 0)
+        Me.toolNeuerKunde.Name = "toolNeuerKunde"
+        Me.toolNeuerKunde.Size = New System.Drawing.Size(107, 47)
+        Me.toolNeuerKunde.Text = "Neuer Kunde"
+        Me.toolNeuerKunde.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+        Me.toolNeuerKunde.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
+        '
         'toolOptionen
         '
         Me.toolOptionen.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BearbeitenToolStripMenuItem, Me.AnDakosyÜbertragenToolStripMenuItem, Me.AufschubEORIBearbeitenToolStripMenuItem})
@@ -1201,6 +1216,20 @@ Partial Class frmKundenUebersichtZOLL
         Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
         Me.ToolStripMenuItem1.Size = New System.Drawing.Size(107, 4)
         '
+        'ToolStripMenuItem11
+        '
+        Me.ToolStripMenuItem11.Enabled = False
+        Me.ToolStripMenuItem11.ForeColor = System.Drawing.Color.White
+        Me.ToolStripMenuItem11.Image = Global.SDL.My.Resources.Resources.stift1
+        Me.ToolStripMenuItem11.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+        Me.ToolStripMenuItem11.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
+        Me.ToolStripMenuItem11.Margin = New System.Windows.Forms.Padding(0, 60, 0, 0)
+        Me.ToolStripMenuItem11.Name = "ToolStripMenuItem11"
+        Me.ToolStripMenuItem11.Size = New System.Drawing.Size(107, 44)
+        Me.ToolStripMenuItem11.Text = "Bearbeiten"
+        Me.ToolStripMenuItem11.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+        Me.ToolStripMenuItem11.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
+        '
         'pnlTop
         '
         Me.pnlTop.Controls.Add(Me.cbx)
@@ -1289,6 +1318,7 @@ Partial Class frmKundenUebersichtZOLL
         Me.KdSearchBox1.searchActive = True
         Me.KdSearchBox1.Size = New System.Drawing.Size(504, 30)
         Me.KdSearchBox1.TabIndex = 211
+        Me.KdSearchBox1.TIMER_SEARCH = True
         Me.KdSearchBox1.usrcntl = Nothing
         '
         'rtbInfo
@@ -1360,32 +1390,13 @@ Partial Class frmKundenUebersichtZOLL
         Me.DataGridViewTextBoxColumn2.HeaderText = "KundenNr"
         Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2"
         '
-        'toolNeuerKunde
+        'cboKundenblattFirma
         '
-        Me.toolNeuerKunde.ForeColor = System.Drawing.Color.White
+        Me.cboKundenblattFirma.FormattingEnabled = True
-        Me.toolNeuerKunde.Image = Global.SDL.My.Resources.Resources.plus
+        Me.cboKundenblattFirma.Location = New System.Drawing.Point(6, 331)
-        Me.toolNeuerKunde.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+        Me.cboKundenblattFirma.Name = "cboKundenblattFirma"
-        Me.toolNeuerKunde.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
+        Me.cboKundenblattFirma.Size = New System.Drawing.Size(224, 21)
-        Me.toolNeuerKunde.Margin = New System.Windows.Forms.Padding(0, 20, 0, 0)
+        Me.cboKundenblattFirma.TabIndex = 171
-        Me.toolNeuerKunde.Name = "toolNeuerKunde"
-        Me.toolNeuerKunde.Size = New System.Drawing.Size(107, 47)
-        Me.toolNeuerKunde.Text = "Neuer Kunde"
-        Me.toolNeuerKunde.TextAlign = System.Drawing.ContentAlignment.BottomCenter
-        Me.toolNeuerKunde.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
-        '
-        'ToolStripMenuItem11
-        '
-        Me.ToolStripMenuItem11.Enabled = False
-        Me.ToolStripMenuItem11.ForeColor = System.Drawing.Color.White
-        Me.ToolStripMenuItem11.Image = Global.SDL.My.Resources.Resources.stift1
-        Me.ToolStripMenuItem11.ImageAlign = System.Drawing.ContentAlignment.TopCenter
-        Me.ToolStripMenuItem11.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
-        Me.ToolStripMenuItem11.Margin = New System.Windows.Forms.Padding(0, 60, 0, 0)
-        Me.ToolStripMenuItem11.Name = "ToolStripMenuItem11"
-        Me.ToolStripMenuItem11.Size = New System.Drawing.Size(107, 44)
-        Me.ToolStripMenuItem11.Text = "Bearbeiten"
-        Me.ToolStripMenuItem11.TextAlign = System.Drawing.ContentAlignment.BottomCenter
-        Me.ToolStripMenuItem11.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
         '
         'frmKundenUebersichtZOLL
         '
@@ -1546,4 +1557,5 @@ Partial Class frmKundenUebersichtZOLL
     Friend WithEvents cbx As CheckBox
     Friend WithEvents toolNeuerKunde As ToolStripMenuItem
     Friend WithEvents ToolStripMenuItem11 As ToolStripMenuItem
+    Friend WithEvents cboKundenblattFirma As VERAG_PROG_ALLGEMEIN.MyComboBox
 End Class

SDL/kunden/frmKundenUebersichtZOLL.vb

@@ -113,7 +113,14 @@ Public Class frmKundenUebersichtZOLL
         End Select
 
         'End If
-
+        cboKundenblattFirma.Items.Clear()
+        cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG (alle)", "1,11,15"))
+        cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG (AG)", "1"))
+        cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG (CS)", "11"))
+        cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "7"))
+        cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG + ATILLA", "1,11,15,7"))
+        cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "20"))
+        cboKundenblattFirma.SelectedIndex = 0
 
         KdSearchBox1.initKdBox(Me) ', lblKdNr)
 
@@ -1155,7 +1162,14 @@ Public Class frmKundenUebersichtZOLL
     End Sub
 
     Private Sub btnUbersicht_Click(sender As Object, e As EventArgs) Handles btnUbersicht.Click
-        Dim rptKundeUebersicht As New SDL.rptKundeUebersicht(kdNr)
+        Dim Firma = "VERAG"
+        Select Case cboKundenblattFirma._value
+            Case "7" : Firma = "ATILLA"
+            Case "20" : Firma = "IMEX"
+        End Select
+
+
+        Dim rptKundeUebersicht As New SDL.rptKundeUebersicht(kdNr, cboKundenblattFirma._value, Firma)
         Dim rpt As New frmPrintLayout
         rpt.Text = ""
 

SDL/mdm/SDLAbholung/frmSDLAbholungEintrag.vb

@@ -258,7 +258,7 @@ Public Class frmSDLAbholungEintrag
                                  "       WHEN '210'      THEN cast([SERIE-Nr] as VARCHAR(200)) " &
                                  "       WHEN '212'      THEN cast(KartenNr as VARCHAR(200)) " &
                                  "       WHEN '213'      THEN cast(OBUID as VARCHAR(200)) " &
-                                 "       WHEN '214'     THEN cast(KartenNr as VARCHAR(200)) " &
+                                 "       WHEN '214'     THEN cast(OBUID as VARCHAR(200)) " &
                                  "       WHEN '215'      THEN cast([TELEPASS-Nr] as VARCHAR(200)) " &
                                  "       WHEN '216'      THEN cast(KartenNr as VARCHAR(200)) " &
                                  "       WHEN '203'      THEN cast(KartenNr as VARCHAR(200)) " &

SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungPLOSE.Designer.vb

@@ -50,11 +50,11 @@ Partial Class usrCntlSDLLeistungPLOSE
         Me.TabPage1 = New System.Windows.Forms.TabPage()
         Me.UsrCntlDetails = New SDL.usrCntlAllg()
         Me.TabPage2 = New System.Windows.Forms.TabPage()
+        Me.scanPIN = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
         Me.scanLieferschein = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
         Me.scanSonstiges = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
         Me.scanRetourniert = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
         Me.cbxArchiviert = New VERAG_PROG_ALLGEMEIN.MyCheckBoxValue(Me.components)
-        Me.scanPIN = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
         Me.Panel2.SuspendLayout()
         Me.tbcntr.SuspendLayout()
         Me.TabPage1.SuspendLayout()
@@ -109,14 +109,15 @@ Partial Class usrCntlSDLLeistungPLOSE
         Me.txtKartenNr._Waehrung = False
         Me.txtKartenNr._WaehrungZeichen = True
         Me.txtKartenNr.ForeColor = System.Drawing.Color.Black
-        Me.txtKartenNr.Location = New System.Drawing.Point(106, 96)
+        Me.txtKartenNr.Location = New System.Drawing.Point(196, 181)
         Me.txtKartenNr.MaxLength = 22
         Me.txtKartenNr.MaxLineLength = -1
         Me.txtKartenNr.MaxLines_Warning = ""
         Me.txtKartenNr.MaxLines_Warning_Label = Nothing
         Me.txtKartenNr.Name = "txtKartenNr"
-        Me.txtKartenNr.Size = New System.Drawing.Size(183, 20)
+        Me.txtKartenNr.Size = New System.Drawing.Size(93, 20)
         Me.txtKartenNr.TabIndex = 2
+        Me.txtKartenNr.Visible = False
         '
         'txtOBUID
         '
@@ -131,7 +132,7 @@ Partial Class usrCntlSDLLeistungPLOSE
         Me.txtOBUID._Waehrung = False
         Me.txtOBUID._WaehrungZeichen = True
         Me.txtOBUID.ForeColor = System.Drawing.Color.Black
-        Me.txtOBUID.Location = New System.Drawing.Point(106, 140)
+        Me.txtOBUID.Location = New System.Drawing.Point(106, 96)
         Me.txtOBUID.MaxLength = 18
         Me.txtOBUID.MaxLineLength = -1
         Me.txtOBUID.MaxLines_Warning = ""
@@ -154,17 +155,18 @@ Partial Class usrCntlSDLLeistungPLOSE
         '
         Me.Label1.AutoSize = True
         Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label1.Location = New System.Drawing.Point(3, 99)
+        Me.Label1.Location = New System.Drawing.Point(121, 184)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(69, 13)
         Me.Label1.TabIndex = 9
         Me.Label1.Text = "Karten-Nr.:"
+        Me.Label1.Visible = False
         '
         'Label9
         '
         Me.Label9.AutoSize = True
         Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label9.Location = New System.Drawing.Point(3, 143)
+        Me.Label9.Location = New System.Drawing.Point(3, 99)
         Me.Label9.Name = "Label9"
         Me.Label9.Size = New System.Drawing.Size(52, 13)
         Me.Label9.TabIndex = 12
@@ -448,6 +450,25 @@ Partial Class usrCntlSDLLeistungPLOSE
         Me.TabPage2.Text = "Dokumente"
         Me.TabPage2.UseVisualStyleBackColor = True
         '
+        'scanPIN
+        '
+        Me.scanPIN._ARCHIV = True
+        Me.scanPIN._DATENSERVER_KATEGORIE = "DOKUMENTE"
+        Me.scanPIN._DATENSERVER_ORDNER = "MDM"
+        Me.scanPIN._DATENSERVER_UOrdner1 = Nothing
+        Me.scanPIN._DATENSERVER_UOrdner2 = Nothing
+        Me.scanPIN._DATENSERVER_UOrdner3 = Nothing
+        Me.scanPIN._MULTI_FILES = True
+        Me.scanPIN._TEXT_PDF = "PIN"
+        Me.scanPIN.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+        Me.scanPIN.BackColor = System.Drawing.Color.White
+        Me.scanPIN.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.scanPIN.Cursor = System.Windows.Forms.Cursors.Default
+        Me.scanPIN.Location = New System.Drawing.Point(192, 4)
+        Me.scanPIN.Name = "scanPIN"
+        Me.scanPIN.Size = New System.Drawing.Size(58, 24)
+        Me.scanPIN.TabIndex = 24
+        '
         'scanLieferschein
         '
         Me.scanLieferschein._ARCHIV = True
@@ -475,6 +496,7 @@ Partial Class usrCntlSDLLeistungPLOSE
         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
@@ -517,25 +539,6 @@ Partial Class usrCntlSDLLeistungPLOSE
         Me.cbxArchiviert.Text = "ARCHIVIERT"
         Me.cbxArchiviert.UseVisualStyleBackColor = True
         '
-        'scanPIN
-        '
-        Me.scanPIN._ARCHIV = True
-        Me.scanPIN._DATENSERVER_KATEGORIE = "DOKUMENTE"
-        Me.scanPIN._DATENSERVER_ORDNER = "MDM"
-        Me.scanPIN._DATENSERVER_UOrdner1 = Nothing
-        Me.scanPIN._DATENSERVER_UOrdner2 = Nothing
-        Me.scanPIN._DATENSERVER_UOrdner3 = Nothing
-        Me.scanPIN._MULTI_FILES = True
-        Me.scanPIN._TEXT_PDF = "PIN"
-        Me.scanPIN.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
-        Me.scanPIN.BackColor = System.Drawing.Color.White
-        Me.scanPIN.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.scanPIN.Cursor = System.Windows.Forms.Cursors.Default
-        Me.scanPIN.Location = New System.Drawing.Point(192, 4)
-        Me.scanPIN.Name = "scanPIN"
-        Me.scanPIN.Size = New System.Drawing.Size(58, 24)
-        Me.scanPIN.TabIndex = 24
-        '
         'usrCntlSDLLeistungPLOSE
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -549,7 +552,6 @@ Partial Class usrCntlSDLLeistungPLOSE
         Me.Controls.Add(Me.Label6)
         Me.Controls.Add(Me.Label7)
         Me.Controls.Add(Me.Label11)
-        Me.Controls.Add(Me.txtVermerk)
         Me.Controls.Add(Me.Label4)
         Me.Controls.Add(Me.cbxGestohlen)
         Me.Controls.Add(Me.cbxVerloren)
@@ -563,6 +565,7 @@ Partial Class usrCntlSDLLeistungPLOSE
         Me.Controls.Add(Me.Label3)
         Me.Controls.Add(Me.Label1)
         Me.Controls.Add(Me.Label9)
+        Me.Controls.Add(Me.txtVermerk)
         Me.Name = "usrCntlSDLLeistungPLOSE"
         Me.Size = New System.Drawing.Size(760, 220)
         Me.Panel2.ResumeLayout(False)

SDL/mdm/usrCntlKartenDaten.Designer.vb

@@ -74,13 +74,13 @@ Partial Class usrCntlKartenDaten
         Me.Panel3 = New System.Windows.Forms.Panel()
         Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
         Me.dgvSDL = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
-        Me.UsrCntlDatenDetails1 = New SDL.usrCntlDatenDetails()
         Me.Panel4 = New System.Windows.Forms.Panel()
         Me.pnlTest = New System.Windows.Forms.Panel()
         Me.dgvFILTER = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.cntxtExcel = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.UsrCntlDatenDetails1 = New SDL.usrCntlDatenDetails()
         Me.FlowLayoutPanel.SuspendLayout()
         Me.ContextMenuStrip1.SuspendLayout()
         Me.Panel1.SuspendLayout()
@@ -473,14 +473,14 @@ Partial Class usrCntlKartenDaten
         Me.btnSDL_PLOSE.FlatAppearance.BorderSize = 0
         Me.btnSDL_PLOSE.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnSDL_PLOSE.ForeColor = System.Drawing.Color.Black
-        Me.btnSDL_PLOSE.Image = Global.SDL.My.Resources.Resources.plose
+        Me.btnSDL_PLOSE.Image = Global.SDL.My.Resources.Resources.plose_1
         Me.btnSDL_PLOSE.ImageAlign = System.Drawing.ContentAlignment.TopCenter
         Me.btnSDL_PLOSE.Location = New System.Drawing.Point(156, 64)
         Me.btnSDL_PLOSE.Margin = New System.Windows.Forms.Padding(0)
         Me.btnSDL_PLOSE.Name = "btnSDL_PLOSE"
-        Me.btnSDL_PLOSE.Size = New System.Drawing.Size(78, 64)
+        Me.btnSDL_PLOSE.Size = New System.Drawing.Size(92, 64)
         Me.btnSDL_PLOSE.TabIndex = 41
-        Me.btnSDL_PLOSE.Text = "PLOSE"
+        Me.btnSDL_PLOSE.Text = "RoadMaster" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "PLOSE"
         Me.btnSDL_PLOSE.TextAlign = System.Drawing.ContentAlignment.BottomCenter
         Me.btnSDL_PLOSE.UseVisualStyleBackColor = True
         '
@@ -492,7 +492,7 @@ Partial Class usrCntlKartenDaten
         Me.btnSDL_PLOSE_IT.ForeColor = System.Drawing.Color.Black
         Me.btnSDL_PLOSE_IT.Image = Global.SDL.My.Resources.Resources.plose_it
         Me.btnSDL_PLOSE_IT.ImageAlign = System.Drawing.ContentAlignment.TopCenter
-        Me.btnSDL_PLOSE_IT.Location = New System.Drawing.Point(234, 64)
+        Me.btnSDL_PLOSE_IT.Location = New System.Drawing.Point(248, 64)
         Me.btnSDL_PLOSE_IT.Margin = New System.Windows.Forms.Padding(0)
         Me.btnSDL_PLOSE_IT.Name = "btnSDL_PLOSE_IT"
         Me.btnSDL_PLOSE_IT.Size = New System.Drawing.Size(78, 64)
@@ -509,7 +509,7 @@ Partial Class usrCntlKartenDaten
         Me.btnSDL_PLOSE_CZ.ForeColor = System.Drawing.Color.Black
         Me.btnSDL_PLOSE_CZ.Image = Global.SDL.My.Resources.Resources.plose_cz
         Me.btnSDL_PLOSE_CZ.ImageAlign = System.Drawing.ContentAlignment.TopCenter
-        Me.btnSDL_PLOSE_CZ.Location = New System.Drawing.Point(312, 64)
+        Me.btnSDL_PLOSE_CZ.Location = New System.Drawing.Point(326, 64)
         Me.btnSDL_PLOSE_CZ.Margin = New System.Windows.Forms.Padding(0)
         Me.btnSDL_PLOSE_CZ.Name = "btnSDL_PLOSE_CZ"
         Me.btnSDL_PLOSE_CZ.Size = New System.Drawing.Size(78, 64)
@@ -855,15 +855,6 @@ Partial Class usrCntlKartenDaten
         Me.dgvSDL.Size = New System.Drawing.Size(1354, 599)
         Me.dgvSDL.TabIndex = 29
         '
-        'UsrCntlDatenDetails1
-        '
-        Me.UsrCntlDatenDetails1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrCntlDatenDetails1.Location = New System.Drawing.Point(0, 0)
-        Me.UsrCntlDatenDetails1.Name = "UsrCntlDatenDetails1"
-        Me.UsrCntlDatenDetails1.Size = New System.Drawing.Size(1354, 234)
-        Me.UsrCntlDatenDetails1.TabIndex = 0
-        Me.UsrCntlDatenDetails1.Visible = False
-        '
         'Panel4
         '
         Me.Panel4.BackColor = System.Drawing.Color.White
@@ -922,6 +913,15 @@ Partial Class usrCntlKartenDaten
         Me.ToolStripMenuItem6.Size = New System.Drawing.Size(210, 22)
         Me.ToolStripMenuItem6.Text = "Formatiert (dauert länger)"
         '
+        'UsrCntlDatenDetails1
+        '
+        Me.UsrCntlDatenDetails1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrCntlDatenDetails1.Location = New System.Drawing.Point(0, 0)
+        Me.UsrCntlDatenDetails1.Name = "UsrCntlDatenDetails1"
+        Me.UsrCntlDatenDetails1.Size = New System.Drawing.Size(1354, 234)
+        Me.UsrCntlDatenDetails1.TabIndex = 0
+        Me.UsrCntlDatenDetails1.Visible = False
+        '
         'usrCntlKartenDaten
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

SDL/mdm/usrCntlKartenDaten.vb

@@ -465,7 +465,7 @@ Public Class usrCntlKartenDaten
             Case 202 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, [TELEPASS-Kd-Nr], VIACARD,[TELEPASS-Nr], Vermerk,Gesperrt, Defekt, Verloren, Gestohlen, Retourniert,TelepassErsatzkarte,  SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=202"
             Case 203 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, KartenNr, Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=203"
             Case 213 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, KartenNr, OBUID, PIN, /*GültigBis,*/Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=213"
-            Case 214 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, KartenNr, OBUID, PIN, PLOSEKundenNr, /*GültigBis,*/Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL INNER JOIN [VERAG].[dbo].Adressen ON [VERAG].[dbo].Adressen.AdressenNr=SDL.KundenNr  WHERE SDLNr=214"
+            Case 214 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, /*KartenNr,*/ OBUID, PIN, PLOSEKundenNr, /*GültigBis,*/Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL INNER JOIN [VERAG].[dbo].Adressen ON [VERAG].[dbo].Adressen.AdressenNr=SDL.KundenNr  WHERE SDLNr=214"
             Case 215 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, VIACARD, [TELEPASS-Nr], PLOSEKundenNr, /*GültigBis,*/Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL INNER JOIN [VERAG].[dbo].Adressen ON [VERAG].[dbo].Adressen.AdressenNr=SDL.KundenNr   WHERE SDLNr=215"
             Case 216 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, KartenNr, OBUID, PIN, PLOSEKundenNr, /*GültigBis,*/Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL INNER JOIN [VERAG].[dbo].Adressen ON [VERAG].[dbo].Adressen.AdressenNr=SDL.KundenNr   WHERE SDLNr=216"
             Case 209 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, [MSE-Kd-Nr], KartenNr, Vermerk,Gesperrt, Defekt, Verloren, Gestohlen, Retourniert,  SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=209"

SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb

@@ -116,6 +116,7 @@ Partial Class usrCntlZOLLAuswertungen
         Me.TabPage1 = New System.Windows.Forms.TabPage()
         Me.Label76 = New System.Windows.Forms.Label()
         Me.GroupBox11 = New System.Windows.Forms.GroupBox()
+        Me.Button19 = New System.Windows.Forms.Button()
         Me.Button18 = New System.Windows.Forms.Button()
         Me.PictureBox10 = New System.Windows.Forms.PictureBox()
         Me.txtJahr_NCTSTR = New System.Windows.Forms.NumericUpDown()
@@ -191,13 +192,8 @@ Partial Class usrCntlZOLLAuswertungen
         Me.datVonImex = New System.Windows.Forms.DateTimePicker()
         Me.Label43 = New System.Windows.Forms.Label()
         Me.TabPage2 = New System.Windows.Forms.TabPage()
-        Me.UsrCntlAuswertungenUIDPruefung1 = New SDL.usrCntlAuswertungenUIDPruefung()
-        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1 = New SDL.usrCntlAuswertungenKunden_Auftragsrueckgang()
         Me.TabPage3 = New System.Windows.Forms.TabPage()
-        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1 = New SDL.usrCntlAuswertungenFiskal_IntrastatMeldung()
-        Me.UsrCntlAuswertungenFiskalvertretung_42001 = New SDL.usrCntlAuswertungenFiskalvertretung_4200()
         Me.TabPage4 = New System.Windows.Forms.TabPage()
-        Me.UsrCntlAuswertungenAufschub_Abgabenliste1 = New SDL.usrCntlAuswertungenAufschub_Abgabenliste()
         Me.TabPage5 = New System.Windows.Forms.TabPage()
         Me.Label60 = New System.Windows.Forms.Label()
         Me.PictureBox8 = New System.Windows.Forms.PictureBox()
@@ -219,6 +215,11 @@ Partial Class usrCntlZOLLAuswertungen
         Me.Label67 = New System.Windows.Forms.Label()
         Me.Button14 = New System.Windows.Forms.Button()
         Me.pnl = New System.Windows.Forms.Panel()
+        Me.UsrCntlAuswertungenUIDPruefung1 = New SDL.usrCntlAuswertungenUIDPruefung()
+        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1 = New SDL.usrCntlAuswertungenKunden_Auftragsrueckgang()
+        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1 = New SDL.usrCntlAuswertungenFiskal_IntrastatMeldung()
+        Me.UsrCntlAuswertungenFiskalvertretung_42001 = New SDL.usrCntlAuswertungenFiskalvertretung_4200()
+        Me.UsrCntlAuswertungenAufschub_Abgabenliste1 = New SDL.usrCntlAuswertungenAufschub_Abgabenliste()
         Me.GroupBox1.SuspendLayout()
         Me.GroupBox2.SuspendLayout()
         CType(Me.picDurmaz, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -1216,7 +1217,7 @@ Partial Class usrCntlZOLLAuswertungen
         Me.tbcntr.Location = New System.Drawing.Point(0, 57)
         Me.tbcntr.Name = "tbcntr"
         Me.tbcntr.SelectedIndex = 0
-        Me.tbcntr.Size = New System.Drawing.Size(728, 1529)
+        Me.tbcntr.Size = New System.Drawing.Size(660, 1529)
         Me.tbcntr.TabIndex = 22
         '
         'TabPage1
@@ -1254,7 +1255,7 @@ Partial Class usrCntlZOLLAuswertungen
         Me.TabPage1.Location = New System.Drawing.Point(4, 22)
         Me.TabPage1.Name = "TabPage1"
         Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage1.Size = New System.Drawing.Size(720, 1503)
+        Me.TabPage1.Size = New System.Drawing.Size(652, 1503)
         Me.TabPage1.TabIndex = 0
         Me.TabPage1.Text = "Bürgschaften"
         Me.TabPage1.UseVisualStyleBackColor = True
@@ -1272,6 +1273,7 @@ Partial Class usrCntlZOLLAuswertungen
         '
         'GroupBox11
         '
+        Me.GroupBox11.Controls.Add(Me.Button19)
         Me.GroupBox11.Controls.Add(Me.Button18)
         Me.GroupBox11.Controls.Add(Me.PictureBox10)
         Me.GroupBox11.Controls.Add(Me.txtJahr_NCTSTR)
@@ -1289,6 +1291,17 @@ Partial Class usrCntlZOLLAuswertungen
         Me.GroupBox11.TabIndex = 32
         Me.GroupBox11.TabStop = False
         '
+        'Button19
+        '
+        Me.Button19.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button19.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.Button19.Location = New System.Drawing.Point(6, 57)
+        Me.Button19.Name = "Button19"
+        Me.Button19.Size = New System.Drawing.Size(121, 37)
+        Me.Button19.TabIndex = 15
+        Me.Button19.Text = "Auswertung starten" & Global.Microsoft.VisualBasic.ChrW(10) & "(MAVI)"
+        Me.Button19.UseVisualStyleBackColor = True
+        '
         'Button18
         '
         Me.Button18.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -1297,12 +1310,12 @@ Partial Class usrCntlZOLLAuswertungen
         Me.Button18.Name = "Button18"
         Me.Button18.Size = New System.Drawing.Size(121, 37)
         Me.Button18.TabIndex = 14
-        Me.Button18.Text = "Auswertung starten" & Global.Microsoft.VisualBasic.ChrW(10) & "(FREMDSYSTEM)"
+        Me.Button18.Text = "Auswertung starten" & Global.Microsoft.VisualBasic.ChrW(10) & "(OREGON)"
         Me.Button18.UseVisualStyleBackColor = True
         '
         'PictureBox10
         '
-        Me.PictureBox10.Image = Global.SDL.My.Resources.Resources.oregon
+        Me.PictureBox10.Image = Global.SDL.My.Resources.Resources.logo
         Me.PictureBox10.Location = New System.Drawing.Point(494, 12)
         Me.PictureBox10.Name = "PictureBox10"
         Me.PictureBox10.Size = New System.Drawing.Size(166, 44)
@@ -2052,29 +2065,11 @@ Partial Class usrCntlZOLLAuswertungen
         Me.TabPage2.Location = New System.Drawing.Point(4, 22)
         Me.TabPage2.Name = "TabPage2"
         Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage2.Size = New System.Drawing.Size(737, 1503)
+        Me.TabPage2.Size = New System.Drawing.Size(669, 1503)
         Me.TabPage2.TabIndex = 1
         Me.TabPage2.Text = "Kunden"
         Me.TabPage2.UseVisualStyleBackColor = True
         '
-        'UsrCntlAuswertungenUIDPruefung1
-        '
-        Me.UsrCntlAuswertungenUIDPruefung1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlAuswertungenUIDPruefung1.Location = New System.Drawing.Point(6, 259)
-        Me.UsrCntlAuswertungenUIDPruefung1.Name = "UsrCntlAuswertungenUIDPruefung1"
-        Me.UsrCntlAuswertungenUIDPruefung1.Size = New System.Drawing.Size(708, 176)
-        Me.UsrCntlAuswertungenUIDPruefung1.TabIndex = 1
-        '
-        'UsrCntlAuswertungenKunden_Auftragsrueckgang1
-        '
-        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Location = New System.Drawing.Point(6, 18)
-        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Name = "UsrCntlAuswertungenKunden_Auftragsrueckgang1"
-        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Size = New System.Drawing.Size(0, 235)
-        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.TabIndex = 0
-        '
         'TabPage3
         '
         Me.TabPage3.Controls.Add(Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1)
@@ -2082,45 +2077,21 @@ Partial Class usrCntlZOLLAuswertungen
         Me.TabPage3.Location = New System.Drawing.Point(4, 22)
         Me.TabPage3.Name = "TabPage3"
         Me.TabPage3.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage3.Size = New System.Drawing.Size(737, 1503)
+        Me.TabPage3.Size = New System.Drawing.Size(669, 1503)
         Me.TabPage3.TabIndex = 2
         Me.TabPage3.Text = "Fiskalvertretung"
         Me.TabPage3.UseVisualStyleBackColor = True
         '
-        'UsrCntlAuswertungenFiskal_IntrastatMeldung1
-        '
-        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Location = New System.Drawing.Point(3, 327)
-        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Name = "UsrCntlAuswertungenFiskal_IntrastatMeldung1"
-        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Size = New System.Drawing.Size(708, 235)
-        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.TabIndex = 1
-        '
-        'UsrCntlAuswertungenFiskalvertretung_42001
-        '
-        Me.UsrCntlAuswertungenFiskalvertretung_42001.BackColor = System.Drawing.Color.White
-        Me.UsrCntlAuswertungenFiskalvertretung_42001.Location = New System.Drawing.Point(3, 22)
-        Me.UsrCntlAuswertungenFiskalvertretung_42001.Name = "UsrCntlAuswertungenFiskalvertretung_42001"
-        Me.UsrCntlAuswertungenFiskalvertretung_42001.Size = New System.Drawing.Size(708, 234)
-        Me.UsrCntlAuswertungenFiskalvertretung_42001.TabIndex = 0
-        '
         'TabPage4
         '
         Me.TabPage4.Controls.Add(Me.UsrCntlAuswertungenAufschub_Abgabenliste1)
         Me.TabPage4.Location = New System.Drawing.Point(4, 22)
         Me.TabPage4.Name = "TabPage4"
-        Me.TabPage4.Size = New System.Drawing.Size(737, 1503)
+        Me.TabPage4.Size = New System.Drawing.Size(669, 1503)
         Me.TabPage4.TabIndex = 3
         Me.TabPage4.Text = "Aufschubdaten"
         Me.TabPage4.UseVisualStyleBackColor = True
         '
-        'UsrCntlAuswertungenAufschub_Abgabenliste1
-        '
-        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Location = New System.Drawing.Point(3, 22)
-        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Name = "UsrCntlAuswertungenAufschub_Abgabenliste1"
-        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Size = New System.Drawing.Size(708, 180)
-        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.TabIndex = 0
-        '
         'TabPage5
         '
         Me.TabPage5.Controls.Add(Me.Label60)
@@ -2129,7 +2100,7 @@ Partial Class usrCntlZOLLAuswertungen
         Me.TabPage5.Location = New System.Drawing.Point(4, 22)
         Me.TabPage5.Name = "TabPage5"
         Me.TabPage5.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage5.Size = New System.Drawing.Size(737, 1503)
+        Me.TabPage5.Size = New System.Drawing.Size(669, 1503)
         Me.TabPage5.TabIndex = 4
         Me.TabPage5.Text = "UNISPED"
         Me.TabPage5.UseVisualStyleBackColor = True
@@ -2337,9 +2308,51 @@ Partial Class usrCntlZOLLAuswertungen
         Me.pnl.Dock = System.Windows.Forms.DockStyle.Top
         Me.pnl.Location = New System.Drawing.Point(0, 0)
         Me.pnl.Name = "pnl"
-        Me.pnl.Size = New System.Drawing.Size(728, 57)
+        Me.pnl.Size = New System.Drawing.Size(660, 57)
         Me.pnl.TabIndex = 23
         '
+        'UsrCntlAuswertungenUIDPruefung1
+        '
+        Me.UsrCntlAuswertungenUIDPruefung1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlAuswertungenUIDPruefung1.Location = New System.Drawing.Point(6, 259)
+        Me.UsrCntlAuswertungenUIDPruefung1.Name = "UsrCntlAuswertungenUIDPruefung1"
+        Me.UsrCntlAuswertungenUIDPruefung1.Size = New System.Drawing.Size(708, 176)
+        Me.UsrCntlAuswertungenUIDPruefung1.TabIndex = 1
+        '
+        'UsrCntlAuswertungenKunden_Auftragsrueckgang1
+        '
+        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Location = New System.Drawing.Point(6, 18)
+        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Name = "UsrCntlAuswertungenKunden_Auftragsrueckgang1"
+        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Size = New System.Drawing.Size(0, 235)
+        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.TabIndex = 0
+        '
+        'UsrCntlAuswertungenFiskal_IntrastatMeldung1
+        '
+        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Location = New System.Drawing.Point(3, 327)
+        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Name = "UsrCntlAuswertungenFiskal_IntrastatMeldung1"
+        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Size = New System.Drawing.Size(708, 235)
+        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.TabIndex = 1
+        '
+        'UsrCntlAuswertungenFiskalvertretung_42001
+        '
+        Me.UsrCntlAuswertungenFiskalvertretung_42001.BackColor = System.Drawing.Color.White
+        Me.UsrCntlAuswertungenFiskalvertretung_42001.Location = New System.Drawing.Point(3, 22)
+        Me.UsrCntlAuswertungenFiskalvertretung_42001.Name = "UsrCntlAuswertungenFiskalvertretung_42001"
+        Me.UsrCntlAuswertungenFiskalvertretung_42001.Size = New System.Drawing.Size(708, 234)
+        Me.UsrCntlAuswertungenFiskalvertretung_42001.TabIndex = 0
+        '
+        'UsrCntlAuswertungenAufschub_Abgabenliste1
+        '
+        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Location = New System.Drawing.Point(3, 22)
+        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Name = "UsrCntlAuswertungenAufschub_Abgabenliste1"
+        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Size = New System.Drawing.Size(708, 180)
+        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.TabIndex = 0
+        '
         'usrCntlZOLLAuswertungen
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -2349,7 +2362,7 @@ Partial Class usrCntlZOLLAuswertungen
         Me.Controls.Add(Me.tbcntr)
         Me.Controls.Add(Me.pnl)
         Me.Name = "usrCntlZOLLAuswertungen"
-        Me.Size = New System.Drawing.Size(728, 926)
+        Me.Size = New System.Drawing.Size(660, 926)
         Me.GroupBox1.ResumeLayout(False)
         Me.GroupBox1.PerformLayout()
         Me.GroupBox2.ResumeLayout(False)
@@ -2599,4 +2612,5 @@ Partial Class usrCntlZOLLAuswertungen
     Friend WithEvents Label80 As Label
     Friend WithEvents datAuswertVon_NCTSTR As DateTimePicker
     Friend WithEvents Label81 As Label
+    Friend WithEvents Button19 As Button
 End Class

SDL/zoll/usrCntlZOLLAuswertungen.vb

@@ -103,6 +103,7 @@ Public Class usrCntlZOLLAuswertungen
         ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("05DE0000000009345 - DE Brg", "05DE0000000009345"))
         ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("05AT510000G000FP7 - AT Brg", "05AT510000G000FP7"))
         ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("16AT520000G000VA6 - AT Brg IMEX", "16AT520000G000VA6"))
+        ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("20AT520000G000092 - AT Brg ATILLA", "20AT520000G000092"))
         ComboBox2.SelectedIndex = 0
 
 
@@ -110,6 +111,7 @@ Public Class usrCntlZOLLAuswertungen
         cboEZOLLBrg.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", ""))
         cboEZOLLBrg.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("05AT510000G000FP7 - AT Brg", "05AT510000G000FP7"))
         cboEZOLLBrg.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("16AT520000G000VA6 - AT Brg IMEX", "16AT520000G000VA6"))
+        cboEZOLLBrg.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("20AT520000G000092 - AT Brg ATILLA", "20AT520000G000092"))
         cboEZOLLBrg.SelectedIndex = 1
 
         cboUnispedBrgDy.Items.Clear()
@@ -158,6 +160,7 @@ Public Class usrCntlZOLLAuswertungen
                 cboBrgDy.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("05DE0000000009345 - DE Brg", "05DE0000000009345"))
                 cboBrgDy.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("05AT510000G000FP7 - AT Brg", "05AT510000G000FP7"))
                 cboBrgDy.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("16AT520000G000VA6 - AT Brg IMEX", "16AT520000G000VA6"))
+                cboBrgDy.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("20AT520000G000092 - AT Brg ATILLA", "20AT520000G000092"))
                 cboBrgDy.SelectedIndex = 0
 
                 cboBrg_NCTSTR.Items.Clear()
@@ -165,6 +168,7 @@ Public Class usrCntlZOLLAuswertungen
                 cboBrg_NCTSTR.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("17DE0000000071678 - DE Brg (NEU)", "17DE0000000071678"))
                 cboBrg_NCTSTR.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("05AT510000G000FP7 - AT Brg", "05AT510000G000FP7"))
                 cboBrg_NCTSTR.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("16AT520000G000VA6 - AT Brg IMEX", "16AT520000G000VA6"))
+                cboBrg_NCTSTR.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("20AT520000G000092 - AT Brg ATILLA", "20AT520000G000092"))
                 cboBrg_NCTSTR.SelectedIndex = 0
 
         End Select
@@ -173,6 +177,7 @@ Public Class usrCntlZOLLAuswertungen
         cboBrgEZollTC.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("16AT520000G000VA6 - AT Brg IMEX", "16AT520000G000VA6"))
         cboBrgEZollTC.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("05AT510000G000FP7 - AT Brg VERAG", "05AT510000G000FP7"))
         cboBrgEZollTC.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("17DE0000000071678 - DE Brg (NEU)", "17DE0000000071678"))
+        cboBrgEZollTC.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("20AT520000G000092 - AT Brg ATILLA", "20AT520000G000092"))
         cboBrgEZollTC.SelectedIndex = 0
 
         datEZOLL_TC_Von.Value = Now ' d.AddMonths(-3)
@@ -364,8 +369,9 @@ Public Class usrCntlZOLLAuswertungen
             Dim brg_AT_IMEX As String = "16AT520000G000VA6"
             Dim brg_DE As String = "05DE0000000009345"
             Dim brg_DE_NEU As String = "17DE0000000071678"
+            Dim brg_AT_ATILLA As String = "20AT520000G000092"
 
-            brg = " AND nctsSA_GRN IN ( '" & brg_AT & "' , '" & brg_AT_IMEX & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "' ) "
+            brg = " AND nctsSA_GRN IN ( '" & brg_AT & "' , '" & brg_AT_IMEX & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "', '" & brg_AT_ATILLA & "' ) "
 
         End If
 
@@ -400,8 +406,9 @@ Public Class usrCntlZOLLAuswertungen
             Dim brg_AT_IMEX As String = "16AT520000G000VA6"
             Dim brg_DE As String = "05DE0000000009345"
             Dim brg_DE_NEU As String = "17DE0000000071678"
+            Dim brg_AT_ATILLA As String = "20AT520000G000092"
 
-            brg = " AND nctsSA_GRN IN ( '" & brg_AT & "' , '" & brg_AT_IMEX & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "' ) "
+            brg = " AND nctsSA_GRN IN ( '" & brg_AT & "' , '" & brg_AT_IMEX & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "', '" & brg_AT_ATILLA & "' ) "
 
         End If
 
@@ -435,8 +442,9 @@ Public Class usrCntlZOLLAuswertungen
             Dim brg_AT_IMEX As String = "16AT520000G000VA6"
             Dim brg_DE As String = "05DE0000000009345"
             Dim brg_DE_NEU As String = "17DE0000000071678"
+            Dim brg_AT_ATILLA As String = "20AT520000G000092"
 
-            brg = " AND nctsSA_GRN IN ( '" & brg_AT & "' , '" & brg_AT_IMEX & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "' ) "
+            brg = " AND nctsSA_GRN IN ( '" & brg_AT & "' , '" & brg_AT_IMEX & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "', '" & brg_AT_ATILLA & "' ) "
 
         End If
 
@@ -473,8 +481,9 @@ Public Class usrCntlZOLLAuswertungen
             Dim brg_AT_IMEX As String = "16AT520000G000VA6"
             Dim brg_DE As String = "05DE0000000009345"
             Dim brg_DE_NEU As String = "17DE0000000071678"
+            Dim brg_AT_ATILLA As String = "20AT520000G000092"
 
-            brg = " AND nctsSA_GRN IN ( '" & brg_AT & "' , '" & brg_AT_IMEX & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "' ) "
+            brg = " AND nctsSA_GRN IN ( '" & brg_AT & "' , '" & brg_AT_IMEX & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "' , '" & brg_AT_ATILLA & "' ) "
 
         End If
 
@@ -696,7 +705,13 @@ Public Class usrCntlZOLLAuswertungen
 
     Private Sub Button18_Click(sender As Object, e As EventArgs) Handles Button18.Click
         Dim frmPrintLayout As New frmPrintLayout()
-        frmPrintLayout.AuswertungKontrolleLKW_NCTSTR(datAuswertVon_NCTSTR.Text, datAuswertBis_NCTSTR.Text, "MAVI")
+        frmPrintLayout.AuswertungKontrolleLKW_NCTSTR(datAuswertVon_NCTSTR.Text, datAuswertBis_NCTSTR.Text, "VERIMEX_OREGON")
+        frmPrintLayout.Show()
+    End Sub
+
+    Private Sub Button19_Click(sender As Object, e As EventArgs) Handles Button19.Click
+        Dim frmPrintLayout As New frmPrintLayout()
+        frmPrintLayout.AuswertungKontrolleLKW_NCTSTR(datAuswertVon_NCTSTR.Text, datAuswertBis_NCTSTR.Text, "VERIMEX_MAVI")
         frmPrintLayout.Show()
     End Sub
 End Class

VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/KdSearchBox.vb

@@ -310,7 +310,7 @@ Public Class KdSearchBox
                     AvisoEmail = ", (SELECT CASE WHEN Count(*)>0 Then 'JA' ELSE '' END [Adressen] FROM [tblEmailBenachrichtigung] WHERE [eb_KundenNr]=AdressenNr) as [E-Mail] "
                 End If
                 Dim SQLstr As String = " SELECT top " & topAnz & " Ordnungsbegriff as Firma, AdressenNr as KdNr,Adressen.[LandKz] + ' ' + Adressen.[PLZ] + ' - ' + Adressen.[Ort] + ' ' + Adressen.[Straße] as Adresse " & AvisoEmail & "    "
-                If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Or _AlleFirmenCLUSTER Or _UseFIRMA <> "" Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO") Then SQLstr &= ",  Filialen.Firma as Firma_Intern "
+                If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Or _AlleFirmenCLUSTER Or _UseFIRMA <> "" Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Then SQLstr &= ",  Filialen.Firma as Firma_Intern "
                 SQLstr &= " FROM [Adressen] "
                 SQLstr &= "  INNER JOIN Kunden on KundenNr=AdressenNr  "
                 SQLstr &= "  INNER JOIN Filialen on Filialen.FilialenNr=isnull(Kunden.FilialenNr,4803) "
@@ -336,6 +336,9 @@ Public Class KdSearchBox
                     If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO") Then
                         SQLstr &= "  OR  Filialen.Firma IN ('IMEX') " ' Wenn die Firmenbezeichnung im CLUSter vorkommt .--> Frontoffice
                     End If
+                    If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Then
+                        SQLstr &= "  OR  Filialen.Firma IN ('IMEX','VERAG') " ' Wenn die OFFERTE_FREMD_VERAGIMEX --> Beide
+                    End If
                     If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_FRONTOFFICE", "SDL") Then
                         SQLstr &= "  OR  Filialen.Firma IN ('FRONTOFFICE') " ' Wenn die Firmenbezeichnung im CLUSter vorkommt .--> Frontoffice
                     End If
@@ -382,7 +385,7 @@ Public Class KdSearchBox
                 If srch2.StartsWith("*") Then srch2 = Replace(srch2, "*", "%", , 1) ' Suche mit beginnenden *
 
                 Dim SQLstr As String = " SELECT top 4 Ordnungsbegriff as Firma, AdressenNr as KdNr,Adressen.[LandKz] + ' ' + Adressen.[PLZ] + ' - ' + Adressen.[Ort] + ' ' + Adressen.[Straße] as Adresse   "
-                If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Or _AlleFirmenCLUSTER Or _UseFIRMA <> "" Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO") Then SQLstr &= ",  Filialen.Firma as Firma_Intern  "
+                If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Or _AlleFirmenCLUSTER Or _UseFIRMA <> "" Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Then SQLstr &= ",  Filialen.Firma as Firma_Intern  "
                 SQLstr &= " FROM [Adressen] "
                 SQLstr &= "  INNER JOIN Kunden on KundenNr=AdressenNr  "
                 SQLstr &= "  INNER JOIN Filialen on Filialen.FilialenNr=isnull(Kunden.FilialenNr,4803) "
@@ -416,6 +419,9 @@ Public Class KdSearchBox
                     If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO") Then
                         SQLstr &= "  OR  Filialen.Firma IN ('IMEX') " ' Wenn die Firmenbezeichnung im CLUSter vorkommt .--> Frontoffice
                     End If
+                    If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Then
+                        SQLstr &= "  OR  Filialen.Firma IN ('IMEX','VERAG') " ' Wenn die OFFERTE_FREMD_VERAGIMEX --> Beide
+                    End If
                     If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_FRONTOFFICE", "SDL") Then
                         SQLstr &= "  OR  Filialen.Firma IN ('FRONTOFFICE') " ' Wenn die Firmenbezeichnung im CLUSter vorkommt .--> Frontoffice
                     End If

VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb

@@ -36,6 +36,8 @@ Partial Class frmMessenger
         Me.Panel2 = New System.Windows.Forms.Panel()
         Me.cbxInaktiveChats = New System.Windows.Forms.CheckBox()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
         Me.lbl = New System.Windows.Forms.Label()
         Me.Button2 = New System.Windows.Forms.Button()
         Me.Button1 = New System.Windows.Forms.Button()
@@ -67,6 +69,7 @@ Partial Class frmMessenger
         CType(Me.dgvChats, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel2.SuspendLayout()
         Me.Panel1.SuspendLayout()
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainer1.Panel1.SuspendLayout()
         Me.SplitContainer1.Panel2.SuspendLayout()
@@ -95,7 +98,7 @@ Partial Class frmMessenger
         '
         Me.SplitContainer.Panel2.Controls.Add(Me.SplitContainer1)
         Me.SplitContainer.Size = New System.Drawing.Size(817, 728)
-        Me.SplitContainer.SplitterDistance = 272
+        Me.SplitContainer.SplitterDistance = 271
         Me.SplitContainer.TabIndex = 0
         '
         'dgvChats
@@ -125,7 +128,7 @@ Partial Class frmMessenger
         DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
         Me.dgvChats.DefaultCellStyle = DataGridViewCellStyle2
         Me.dgvChats.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.dgvChats.Location = New System.Drawing.Point(0, 42)
+        Me.dgvChats.Location = New System.Drawing.Point(0, 63)
         Me.dgvChats.Name = "dgvChats"
         Me.dgvChats.ReadOnly = True
         DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
@@ -141,7 +144,7 @@ Partial Class frmMessenger
         Me.dgvChats.RowsDefaultCellStyle = DataGridViewCellStyle4
         Me.dgvChats.RowTemplate.Height = 30
         Me.dgvChats.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvChats.Size = New System.Drawing.Size(272, 656)
+        Me.dgvChats.Size = New System.Drawing.Size(271, 635)
         Me.dgvChats.TabIndex = 0
         '
         'btnTEST
@@ -163,7 +166,7 @@ Partial Class frmMessenger
         Me.Panel2.Dock = System.Windows.Forms.DockStyle.Bottom
         Me.Panel2.Location = New System.Drawing.Point(0, 698)
         Me.Panel2.Name = "Panel2"
-        Me.Panel2.Size = New System.Drawing.Size(272, 30)
+        Me.Panel2.Size = New System.Drawing.Size(271, 30)
         Me.Panel2.TabIndex = 6
         '
         'cbxInaktiveChats
@@ -179,15 +182,50 @@ Partial Class frmMessenger
         'Panel1
         '
         Me.Panel1.BackColor = System.Drawing.Color.White
+        Me.Panel1.Controls.Add(Me.MyTextBox1)
+        Me.Panel1.Controls.Add(Me.PictureBox1)
         Me.Panel1.Controls.Add(Me.lbl)
         Me.Panel1.Controls.Add(Me.Button2)
         Me.Panel1.Controls.Add(Me.Button1)
         Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
         Me.Panel1.Location = New System.Drawing.Point(0, 0)
         Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(272, 42)
+        Me.Panel1.Size = New System.Drawing.Size(271, 63)
         Me.Panel1.TabIndex = 1
         '
+        'MyTextBox1
+        '
+        Me.MyTextBox1._DateTimeOnly = False
+        Me.MyTextBox1._numbersOnly = False
+        Me.MyTextBox1._numbersOnlyKommastellen = ""
+        Me.MyTextBox1._Prozent = False
+        Me.MyTextBox1._ShortDateNew = False
+        Me.MyTextBox1._ShortDateOnly = False
+        Me.MyTextBox1._TimeOnly = False
+        Me.MyTextBox1._value = ""
+        Me.MyTextBox1._Waehrung = False
+        Me.MyTextBox1._WaehrungZeichen = True
+        Me.MyTextBox1.ForeColor = System.Drawing.Color.Black
+        Me.MyTextBox1.Location = New System.Drawing.Point(20, 40)
+        Me.MyTextBox1.Margin = New System.Windows.Forms.Padding(2)
+        Me.MyTextBox1.MaxLineLength = -1
+        Me.MyTextBox1.MaxLines_Warning = ""
+        Me.MyTextBox1.MaxLines_Warning_Label = Nothing
+        Me.MyTextBox1.Name = "MyTextBox1"
+        Me.MyTextBox1.Size = New System.Drawing.Size(250, 20)
+        Me.MyTextBox1.TabIndex = 4
+        '
+        'PictureBox1
+        '
+        Me.PictureBox1.BackgroundImage = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.search
+        Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.PictureBox1.Location = New System.Drawing.Point(3, 40)
+        Me.PictureBox1.Margin = New System.Windows.Forms.Padding(2)
+        Me.PictureBox1.Name = "PictureBox1"
+        Me.PictureBox1.Size = New System.Drawing.Size(13, 18)
+        Me.PictureBox1.TabIndex = 5
+        Me.PictureBox1.TabStop = False
+        '
         'lbl
         '
         Me.lbl.AutoSize = True
@@ -237,8 +275,8 @@ Partial Class frmMessenger
         'SplitContainer1.Panel2
         '
         Me.SplitContainer1.Panel2.Controls.Add(Me.pnl)
-        Me.SplitContainer1.Size = New System.Drawing.Size(541, 728)
+        Me.SplitContainer1.Size = New System.Drawing.Size(542, 728)
-        Me.SplitContainer1.SplitterDistance = 464
+        Me.SplitContainer1.SplitterDistance = 446
         Me.SplitContainer1.TabIndex = 0
         '
         'MyFlowLayoutPanel1
@@ -252,14 +290,15 @@ Partial Class frmMessenger
         Me.MyFlowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill
         Me.MyFlowLayoutPanel1.Location = New System.Drawing.Point(0, 44)
         Me.MyFlowLayoutPanel1.Name = "MyFlowLayoutPanel1"
-        Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(541, 420)
+        Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(542, 402)
         Me.MyFlowLayoutPanel1.TabIndex = 0
         '
         'UsrCntlMessenger_ChatElement1
         '
         Me.UsrCntlMessenger_ChatElement1.BackColor = System.Drawing.Color.White
         Me.UsrCntlMessenger_ChatElement1.CHAT_MSG = Nothing
-        Me.UsrCntlMessenger_ChatElement1.Location = New System.Drawing.Point(3, 3)
+        Me.UsrCntlMessenger_ChatElement1.Location = New System.Drawing.Point(4, 5)
+        Me.UsrCntlMessenger_ChatElement1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.UsrCntlMessenger_ChatElement1.Name = "UsrCntlMessenger_ChatElement1"
         Me.UsrCntlMessenger_ChatElement1.Size = New System.Drawing.Size(378, 48)
         Me.UsrCntlMessenger_ChatElement1.TabIndex = 4
@@ -270,7 +309,8 @@ Partial Class frmMessenger
         Me.UsrCntlMessenger_ChatAnhang1.BackColor = System.Drawing.Color.White
         Me.UsrCntlMessenger_ChatAnhang1.BG_COLOR = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
         Me.UsrCntlMessenger_ChatAnhang1.CHAT_MSG = Nothing
-        Me.UsrCntlMessenger_ChatAnhang1.Location = New System.Drawing.Point(3, 57)
+        Me.UsrCntlMessenger_ChatAnhang1.Location = New System.Drawing.Point(4, 63)
+        Me.UsrCntlMessenger_ChatAnhang1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.UsrCntlMessenger_ChatAnhang1.Name = "UsrCntlMessenger_ChatAnhang1"
         Me.UsrCntlMessenger_ChatAnhang1.Size = New System.Drawing.Size(378, 72)
         Me.UsrCntlMessenger_ChatAnhang1.TabIndex = 3
@@ -279,7 +319,8 @@ Partial Class frmMessenger
         '
         Me.UsrCntlMessenger_ChatElement2.BackColor = System.Drawing.Color.White
         Me.UsrCntlMessenger_ChatElement2.CHAT_MSG = Nothing
-        Me.UsrCntlMessenger_ChatElement2.Location = New System.Drawing.Point(3, 135)
+        Me.UsrCntlMessenger_ChatElement2.Location = New System.Drawing.Point(4, 145)
+        Me.UsrCntlMessenger_ChatElement2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.UsrCntlMessenger_ChatElement2.Name = "UsrCntlMessenger_ChatElement2"
         Me.UsrCntlMessenger_ChatElement2.Size = New System.Drawing.Size(378, 48)
         Me.UsrCntlMessenger_ChatElement2.TabIndex = 5
@@ -288,7 +329,8 @@ Partial Class frmMessenger
         '
         Me.UsrCntlMessenger_ChatElement3.BackColor = System.Drawing.Color.White
         Me.UsrCntlMessenger_ChatElement3.CHAT_MSG = Nothing
-        Me.UsrCntlMessenger_ChatElement3.Location = New System.Drawing.Point(3, 189)
+        Me.UsrCntlMessenger_ChatElement3.Location = New System.Drawing.Point(4, 203)
+        Me.UsrCntlMessenger_ChatElement3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.UsrCntlMessenger_ChatElement3.Name = "UsrCntlMessenger_ChatElement3"
         Me.UsrCntlMessenger_ChatElement3.Size = New System.Drawing.Size(378, 48)
         Me.UsrCntlMessenger_ChatElement3.TabIndex = 6
@@ -303,7 +345,7 @@ Partial Class frmMessenger
         Me.Panel3.Dock = System.Windows.Forms.DockStyle.Top
         Me.Panel3.Location = New System.Drawing.Point(0, 0)
         Me.Panel3.Name = "Panel3"
-        Me.Panel3.Size = New System.Drawing.Size(541, 44)
+        Me.Panel3.Size = New System.Drawing.Size(542, 44)
         Me.Panel3.TabIndex = 9
         '
         'Button5
@@ -314,7 +356,7 @@ Partial Class frmMessenger
         Me.Button5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button5.ForeColor = System.Drawing.Color.White
-        Me.Button5.Location = New System.Drawing.Point(488, 4)
+        Me.Button5.Location = New System.Drawing.Point(489, 4)
         Me.Button5.Name = "Button5"
         Me.Button5.Size = New System.Drawing.Size(49, 33)
         Me.Button5.TabIndex = 8
@@ -327,7 +369,7 @@ Partial Class frmMessenger
         Me.Panel4.BackColor = System.Drawing.Color.Black
         Me.Panel4.Location = New System.Drawing.Point(4, 43)
         Me.Panel4.Name = "Panel4"
-        Me.Panel4.Size = New System.Drawing.Size(533, 1)
+        Me.Panel4.Size = New System.Drawing.Size(534, 1)
         Me.Panel4.TabIndex = 6
         '
         'lblChatName
@@ -346,7 +388,7 @@ Partial Class frmMessenger
         Me.lblOnlineOffline.BackColor = System.Drawing.Color.MediumSeaGreen
         Me.lblOnlineOffline.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
         Me.lblOnlineOffline.ForeColor = System.Drawing.Color.White
-        Me.lblOnlineOffline.Location = New System.Drawing.Point(376, 4)
+        Me.lblOnlineOffline.Location = New System.Drawing.Point(377, 4)
         Me.lblOnlineOffline.Name = "lblOnlineOffline"
         Me.lblOnlineOffline.Size = New System.Drawing.Size(106, 33)
         Me.lblOnlineOffline.TabIndex = 5
@@ -365,14 +407,14 @@ Partial Class frmMessenger
         Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill
         Me.pnl.Location = New System.Drawing.Point(0, 0)
         Me.pnl.Name = "pnl"
-        Me.pnl.Size = New System.Drawing.Size(541, 260)
+        Me.pnl.Size = New System.Drawing.Size(542, 278)
         Me.pnl.TabIndex = 0
         '
         'pic
         '
         Me.pic.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.pic.Location = New System.Drawing.Point(488, 93)
+        Me.pic.Location = New System.Drawing.Point(489, 94)
         Me.pic.Name = "pic"
         Me.pic.Size = New System.Drawing.Size(49, 26)
         Me.pic.TabIndex = 7
@@ -387,7 +429,7 @@ Partial Class frmMessenger
         Me.FlowLayoutPanel.AutoScroll = True
         Me.FlowLayoutPanel.Location = New System.Drawing.Point(4, 121)
         Me.FlowLayoutPanel.Name = "FlowLayoutPanel"
-        Me.FlowLayoutPanel.Size = New System.Drawing.Size(533, 136)
+        Me.FlowLayoutPanel.Size = New System.Drawing.Size(534, 136)
         Me.FlowLayoutPanel.TabIndex = 6
         '
         'Button3
@@ -421,7 +463,7 @@ Partial Class frmMessenger
         Me.rtbChatMessage.Font = New System.Drawing.Font("Comic Sans MS", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.rtbChatMessage.Location = New System.Drawing.Point(3, 3)
         Me.rtbChatMessage.Name = "rtbChatMessage"
-        Me.rtbChatMessage.Size = New System.Drawing.Size(452, 112)
+        Me.rtbChatMessage.Size = New System.Drawing.Size(453, 112)
         Me.rtbChatMessage.TabIndex = 0
         Me.rtbChatMessage.Text = ""
         '
@@ -435,6 +477,7 @@ Partial Class frmMessenger
         '
         'cntxt
         '
+        Me.cntxt.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.cntxt.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ChatDeaktivierenToolStripMenuItem})
         Me.cntxt.Name = "cntxt"
         Me.cntxt.Size = New System.Drawing.Size(167, 26)
@@ -464,6 +507,7 @@ Partial Class frmMessenger
         Me.Panel2.PerformLayout()
         Me.Panel1.ResumeLayout(False)
         Me.Panel1.PerformLayout()
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.SplitContainer1.Panel1.ResumeLayout(False)
         Me.SplitContainer1.Panel2.ResumeLayout(False)
         CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit()
@@ -508,4 +552,6 @@ Partial Class frmMessenger
     Friend WithEvents lblChatName As Label
     Friend WithEvents Panel4 As Panel
     Friend WithEvents Button5 As Button
+    Friend WithEvents PictureBox1 As PictureBox
+    Friend WithEvents MyTextBox1 As MyTextBox
 End Class

VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb

@@ -153,20 +153,29 @@ Public Class frmMessenger
     '    End If
     'End Sub
 
-    Sub intiDGVChats(Optional dgv_ChatID = -1, Optional reloadChat = True)
+    Sub intiDGVChats(Optional dgv_ChatID = -1, Optional reloadChat = True, Optional selFirst = False)
         With dgvChats
             Dim loadedTmp = loaded
             If Not reloadChat Then
                 loaded = False
             End If
-            .DataSource = SQL.loadDgvBySql("SELECT [chat_id],CASE WHEN chat_name<>'' THEN chat_name ELSE (SELECT TOP 1 mit_vname + ' ' + mit_nname FROM tblMessenger_ChatMembers INNER JOIN tblMitarbeiter ON mit_id=chatMb_maId where chatMb_chatId=chat_id AND chatMb_maId <>" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & ") END as chat_name 
+
-                                          ,(SELECT REPLACE(COUNT(*),'0','') FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE [chat_id]=chatMg_chatId AND chatMgSt_MaId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & " AND chatMgSt_gelesen=0)  as ungelesen 
+            Dim whereName = ""
-                                            FROM [tblMessenger_Chat] WHERE (SELECT COUNT(*) FROM tblMessenger_ChatMembers WHERE chatMB_chatId=chat_id AND chatMB_maId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & ")>0
+            If MyTextBox1.Text.Trim <> String.Empty Then
-                                            AND chat_aktiv='" & (Not cbxInaktiveChats.Checked) & "' ORDER BY chat_lastMsg DESC", "ADMIN")
+                whereName = " WHERE chat_name LIKE '%" & MyTextBox1.Text.Trim & "%' "
+            End If
+
+            .DataSource = SQL.loadDgvBySql("SELECT  * FROM(
+                                                SELECT [chat_id],CASE WHEN chat_name<>'' THEN chat_name ELSE (SELECT TOP 1 mit_vname + ' ' + mit_nname FROM tblMessenger_ChatMembers INNER JOIN tblMitarbeiter ON mit_id=chatMb_maId where chatMb_chatId=chat_id AND chatMb_maId <>" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & ") END as chat_name 
+                                               ,(SELECT REPLACE(COUNT(*),'0','') FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE [chat_id]=chatMg_chatId AND chatMgSt_MaId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & " AND chatMgSt_gelesen=0)  as ungelesen ,chat_lastMsg
+                                                FROM [tblMessenger_Chat] WHERE (SELECT COUNT(*) FROM tblMessenger_ChatMembers WHERE chatMB_chatId=chat_id AND chatMB_maId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & ")>0
+                                                AND chat_aktiv='" & (Not cbxInaktiveChats.Checked) & "'
+                                            ) as T  " & whereName & " ORDER BY chat_lastMsg DESC", "ADMIN")
 
             If .Columns.Count = 0 Then Exit Sub
 
             .Columns("chat_id").Visible = False
+            .Columns("chat_lastMsg").Visible = False
             .Columns("chat_name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
             .Columns("ungelesen").Width = 30
             .Columns("ungelesen").HeaderText = "neu"
@@ -176,32 +185,46 @@ Public Class frmMessenger
 
             dgvChats.GetOrder()
 
-            If Not reloadChat Then
+            If selFirst Then
                 dgvChats.ClearSelection()
-                If dgv_ChatID > 0 Then
+                SplitContainer1.Enabled = False
-                    For Each r As DataGridViewRow In .Rows
+
-                        If r.Cells("chat_id").Value = dgv_ChatID Then
+                If .Rows.Count > 0 Then
-                            dgvChats.ClearSelection()
+                    loaded = True
-                            r.Selected = True : Exit For
+                    SplitContainer1.Enabled = True
-                        End If
+                    .Rows(0).Selected = True
-                    Next
                 End If
                 loaded = loadedTmp
             Else
 
-                dgvChats.ClearSelection()
-                SplitContainer1.Enabled = False
 
-                If dgv_ChatID > 0 Then
+                If Not reloadChat Then
-                    For Each r As DataGridViewRow In .Rows
+                    dgvChats.ClearSelection()
-                        If r.Cells("chat_id").Value = dgv_ChatID Then
+                    If dgv_ChatID > 0 Then
-                            dgvChats.ClearSelection()
+                        For Each r As DataGridViewRow In .Rows
-                            SplitContainer1.Enabled = True
+                            If r.Cells("chat_id").Value = dgv_ChatID Then
-                            r.Selected = True : Exit For
+                                dgvChats.ClearSelection()
-                        End If
+                                r.Selected = True : Exit For
-                    Next
+                            End If
+                        Next
+                    End If
+                    loaded = loadedTmp
+                Else
+
+                    dgvChats.ClearSelection()
+                    SplitContainer1.Enabled = False
+
+                    If dgv_ChatID > 0 Then
+                        For Each r As DataGridViewRow In .Rows
+                            If r.Cells("chat_id").Value = dgv_ChatID Then
+                                dgvChats.ClearSelection()
+                                SplitContainer1.Enabled = True
+                                r.Selected = True : Exit For
+                            End If
+                        Next
+                    End If
+
                 End If
-
             End If
             dgvChats.SetOrder()
             If dgvChats.SelectedRows.Count > 0 Then dgvChats.FirstDisplayedCell = dgvChats.SelectedRows(0).Cells("chat_name")
@@ -218,8 +241,9 @@ Public Class frmMessenger
             '    Next
             'End If
 
+
         End With
-        rtbChatMessage.Focus()
+        If Not selFirst Then rtbChatMessage.Focus()
 
     End Sub
 
@@ -527,7 +551,7 @@ Public Class frmMessenger
         Try
 
             Dim Dt_New As DataTable = SQL.loadDgvBySql("SELECT [chat_id],CASE WHEN chat_name<>'' THEN chat_name ELSE (SELECT TOP 1 mit_vname + ' ' + mit_nname FROM tblMessenger_ChatMembers INNER JOIN tblMitarbeiter ON mit_id=chatMb_maId where chatMb_chatId=chat_id AND chatMb_maId <>" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & ") END as chat_name 
-                                          ,(SELECT REPLACE(COUNT(*),'0','') FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE [chat_id]=chatMg_chatId AND chatMgSt_MaId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & " AND chatMgSt_gelesen=0)  as ungelesen 
+                                          ,(SELECT REPLACE(COUNT(*),'0','') FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE [chat_id]=chatMg_chatId AND chatMgSt_MaId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & " AND chatMgSt_gelesen=0)  as ungelesen  
                                             FROM [tblMessenger_Chat] WHERE (SELECT COUNT(*) FROM tblMessenger_ChatMembers WHERE chatMB_chatId=chat_id AND chatMB_maId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & ")>0
                                             AND chat_aktiv='" & (Not cbxInaktiveChats.Checked) & "' ORDER BY chat_lastMsg DESC", "ADMIN")
             Dim Dt_Current As DataTable = dgvChats.DataSource
@@ -809,6 +833,23 @@ Public Class frmMessenger
 
     End Sub
 
+    Private Sub MyTextBox1_TextChanged(sender As Object, e As EventArgs) Handles MyTextBox1.Leave
+        intiDGVChats(, False, True)
+    End Sub
+
+    Private Sub MyTextBox1_KeyDown(sender As Object, e As KeyEventArgs) Handles MyTextBox1.KeyUp
+        If e.KeyCode = Keys.Return Or MyTextBox1.Text = "" Then
+            intiDGVChats(, False, True)
+        End If
+    End Sub
+
+    Private Sub PictureBox1_Click(sender As Object, e As EventArgs) Handles PictureBox1.Click
+        MyTextBox1.Text = ""
+        intiDGVChats(, False, True)
+    End Sub
+
+
+
     'Private Sub rtbChatMessage_TextChanged(sender As Object, e As EventArgs) Handles rtbChatMessage.TextChanged
     '    FlowLayoutPanel.Enabled = (rtbChatMessage.Text = "")
     'End Sub

VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb

@@ -149,17 +149,17 @@ Public Class cProgramFunctions
         Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
             Case "IMEX"
                 myCredentials.UserName = "support@verag.ag"
-                myCredentials.Password = "support"
+                myCredentials.Password = "$up0Rt2809!"
                 mySmtpsvr.Host = "owa.verag.ag"
                 mySmtpsvr.Port = 587
             Case "ATILLA"
                 myCredentials.UserName = "support@verag.ag"
-                myCredentials.Password = "support"
+                myCredentials.Password = "$up0Rt2809!"
                 mySmtpsvr.Host = "owa.verag.ag"
                 mySmtpsvr.Port = 587
             Case Else
                 myCredentials.UserName = "support@verag.ag"
-                myCredentials.Password = "support"
+                myCredentials.Password = "$up0Rt2809!"
                 mySmtpsvr.Host = "owa.verag.ag"
                 mySmtpsvr.Port = 587 '25 '587 '25
 
@@ -251,7 +251,7 @@ Public Class cProgramFunctions
         Dim Msg As New MailMessage
         Dim myCredentials As New System.Net.NetworkCredential
         myCredentials.UserName = "support@verag.ag"
-        myCredentials.Password = "support"
+        myCredentials.Password = "$up0Rt2809!"
         Msg.IsBodyHtml = True
         Dim mySmtpsvr As New SmtpClient()
         mySmtpsvr.Host = "owa.verag.ag"