neu

SDL/Classes/cGenWord.vb

@@ -15,7 +15,7 @@ Public Class cGenWord
         Dim odoc As Microsoft.Office.Interop.Word.Document
         Try
             oWord.Visible = visibleWord 'Word sehen zum Test?
-            '  MsgBox(pfadWord)
+            ' MsgBox(pfadWord)
             odoc = oWord.Documents.Open(pfadWord)
             odoc.SaveAs(tmpPath)
             odoc.Activate()

SDL/Fakturierung/cFakturierung.vb

@@ -543,6 +543,20 @@ Public Class cFakturierung
         Return doRechnungsDruck(New VERAG_PROG_ALLGEMEIN.cRechnungsausgang(RK_ID), RechnungsDatum, vorschau, Rechnugnsdruck, Path, PrinterName, SammelrechnungAnlagendruck, printStbVdb)
     End Function
 
+    Public Shared Function doRechnungsDruck_MAIL(RK_ID As Integer, Optional RechnungsDatum As Object = Nothing, Optional vorschau As Boolean = False, Optional Rechnugnsdruck As Integer = -1, Optional ByRef Path As String = "", Optional ByRef PrinterName As String = "", Optional SammelrechnungAnlagendruck As Boolean = False, Optional printStbVdb As Boolean = False) As Boolean
+        If RK_ID <= 0 Then Return False
+
+        Dim RG_TMP = New VERAG_PROG_ALLGEMEIN.cRechnungsausgang(RK_ID)
+        If RG_TMP Is Nothing Then Return False
+        Dim SPEDBUCH_TMP = New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch(RG_TMP.FilialenNr, RG_TMP.AbfertigungsNr, RG_TMP.SpeditionsbuchUnterNr)
+
+        If SPEDBUCH_TMP Is Nothing Then Return False
+        Dim f As New frmFaktEmail(New VERAG_PROG_ALLGEMEIN.cRechnungsausgang(RK_ID), SPEDBUCH_TMP, Nothing)
+        f.Show(RG_TMP)
+        Return True
+        '     Return doRechnungsDruck(New VERAG_PROG_ALLGEMEIN.cRechnungsausgang(RK_ID), RechnungsDatum, vorschau, Rechnugnsdruck, Path, PrinterName, SammelrechnungAnlagendruck, printStbVdb)
+    End Function
+
     Shared Sub initRgFirma(ByRef rpt As rptRechnungDruck, FIRMA As VERAG_PROG_ALLGEMEIN.cFirmen, Rechnung As VERAG_PROG_ALLGEMEIN.cRechnungsausgang)
 
         rpt.lblFirmaOrt.Text = If(FIRMA.Firma_Ort, "")
@@ -788,7 +802,7 @@ Public Class cFakturierung
             'End If
 
             Dim sum = 0
-            Select Case RECHNUNG.[BelegartenKz]
+            Select Case RECHNUNG.BelegartenKz
                 Case "AR"
                     rpt.lblUeberschriftRG_GS.Text = "RECHNUNG"
                 Case "AG"
@@ -2125,6 +2139,17 @@ Public Class cFakturierung
     End Function
 
     Shared Function getSBRgName(Firma_id As Integer, USRKURZNAME As String) As String
+
+        If USRKURZNAME Is Nothing Then Return ""
+        If USRKURZNAME Is DBNull.Value Then Return ""
+        If USRKURZNAME = "" Then USRKURZNAME = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
+        Dim txt = SQL.getValueTxtBySql("SELECT top 1 CASE WHEN mit_geschlecht='w' THEN 'Frau ' ELSE (CASE WHEN mit_geschlecht='m' THEN 'Herr ' ELSE '' END ) END + mit_nname  FROM [tblMitarbeiter] WHERE [mit_username]='" & USRKURZNAME & "'  ", "ADMIN")
+        If txt <> "" Then Return txt
+        Return USRKURZNAME
+    End Function
+
+
+    Shared Function getSBRgName_FirmaPruef(Firma_id As Integer, USRKURZNAME As String) As String
         Dim firma = ""
         Select Case Firma_id
             Case 20

SDL/Fakturierung/frmAbrechnungsMaske.Designer.vb

@@ -128,7 +128,6 @@ Partial Class frmAbrechnungsMaske
         Me.tbcntr.Dock = System.Windows.Forms.DockStyle.Fill
         Me.tbcntr.Location = New System.Drawing.Point(0, 170)
         Me.tbcntr.Name = "tbcntr"
-        Me.tbcntr.SelectedIndex = 0
         Me.tbcntr.Size = New System.Drawing.Size(575, 445)
         Me.tbcntr.TabIndex = 3
         '

SDL/Fakturierung/frmAbrechnungsMaske.vb

@@ -250,13 +250,19 @@ Public Class frmAbrechnungsMaske
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
         If checkSrchValues() Then
 
-            Dim dt = SQL.loadDgvBySql("SELECT RK_ID FROM Rechnungsausgang WHERE Status=0 " & getRGWhere("ER") & " ORDER BY /*[BelegartenKz] DESC,*/ FilialenNr, AbfertigungsNr, [RK_ID]", "FMZOLL")
+            Dim PARAM_printZollbeleg = VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("FAKTURIERUNG_PRINT_Zollbeleg")
+            Dim dt = SQL.loadDgvBySql("SELECT RK_ID,AD.Rechnungsdruck as Rechnungsdruck FROM Rechnungsausgang INNER JOIN Adressen ON AdressenNr=RechnungsKundenNr WHERE Status=0 " & getRGWhere("ER") & " ORDER BY /*[BelegartenKz] DESC,*/ FilialenNr, AbfertigungsNr, [RK_ID]", "FMZOLL")
             If dt IsNot Nothing Then
                 If vbYes = MsgBox("Es werden " & dt.Rows.Count & " Rechnungen gedruckt." & vbNewLine & "Möchten Sie fortfahren?", vbYesNoCancel) Then
                     Dim RechnungsDatum As Date = Now
                     If cFakturierung.getRgDatInput("Es werden " & dt.Rows.Count & " Rechnungen gedruckt." & vbNewLine & "Möchten Sie fortfahren?" & vbNewLine, [RechnungsDatum]) Then 'Now.ToShortDateString
                         For Each r In dt.Rows
-                            cFakturierung.doRechnungsDruck(r("RK_ID"), RechnungsDatum,,,, cboPrinter.Text)
+                            If r("Rechnungsdruck") = "2" Then
+                                cFakturierung.doRechnungsDruck_MAIL(r("RK_ID"), RechnungsDatum,,,, cboPrinter.Text,, PARAM_printZollbeleg)
+                            Else
+                                cFakturierung.doRechnungsDruck(r("RK_ID"), RechnungsDatum,,,, cboPrinter.Text,, PARAM_printZollbeleg)
+                            End If
+
                         Next
                         initDGV()
                     End If
@@ -481,7 +487,7 @@ Public Class frmAbrechnungsMaske
 
     Private Sub Button7_Click2(sender As Object, e As EventArgs) Handles Button7.Click
         If MyDatagridview1.SelectedRows.Count > 0 Then
-            If vbYes = MsgBox("Es werden " & MyDatagridview1.SelectedRows.Count & " Rechnungen ans Mail gedruckt." & vbNewLine & "Möchten Sie fortfahren?", vbYesNoCancel) Then
+            If vbYes = MsgBox("Es werden " & MyDatagridview1.SelectedRows.Count & " Rechnungen als Mail gedruckt." & vbNewLine & "Möchten Sie fortfahren?", vbYesNoCancel) Then
 
                 'Rechnungsdatum festlegen:
                 Dim RechnungsDatumTMP As Date = Now

SDL/Fakturierung/frmFaktAufschubSuche.vb

@@ -30,7 +30,12 @@
         btnMonat.Text = "Monat"
         btnJahr.Text = Now.Year
 
-        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+        Dim FirmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGIMEX", "SDL") Then
+            FirmaTmp = "VERAGIMEX"
+        End If
+
+        Select Case FirmaTmp
             Case "IMEX"
                 cboKonto.Items.Clear()
                 cboKonto.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("alle", "'002719','002718'"))
@@ -44,6 +49,15 @@
                 cboKonto.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ZOLL (006145)", "'006145'"))
                 cboKonto.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EUST AT (006077)", "'006077'"))
                 cboKonto.SelectedIndex = 0
+            Case "VERAGIMEX"
+                cboKonto.Items.Clear()
+                cboKonto.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("alle", "'006136','006128','3517233','002719','002718'"))
+                cboKonto.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG DE EUST (006136)", "'006136'"))
+                cboKonto.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG DE ZOLL (006128)", "'006128'"))
+                cboKonto.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG AT ZOLL/EUST (3517233)", "'3517233'"))
+                cboKonto.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX EUST (002719)", "'002719'"))
+                cboKonto.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX ZOLL (002718)", "'002718'"))
+                cboKonto.SelectedIndex = 0
             Case Else
                 cboKonto.Items.Clear()
                 cboKonto.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("alle", "'006136','006128','3517233'"))

SDL/Fakturierung/usrCntlFaktAbrechnung.resx

@@ -135,24 +135,6 @@
   <metadata name="Aufschubkonto.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Leistung.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="Preis.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="SteuerpflichtigerBetrag.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="SteuerfreierBetrag.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Aufschubkonto.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="btnOK.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -184,6 +166,24 @@
   <metadata name="Timer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>109, 17</value>
   </metadata>
+  <metadata name="Leistung.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="Preis.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SteuerpflichtigerBetrag.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SteuerfreierBetrag.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Aufschubkonto.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>28</value>
   </metadata>

SDL/Fakturierung/usrCntlFaktAbrechnung.vb

@@ -318,6 +318,17 @@ Public Class usrCntlFaktAbrechnung
 
             Dim VK = VERAG_PROG_ALLGEMEIN.cVorauskasse.LOADByFilialeAbfNr(RECHNUNG.FilialenNr, RECHNUNG.AbfertigungsNr)
             btnVorauskasseAnzeigen.Enabled = (VK IsNot Nothing)
+            lblVK_Zahlungseingang.Text = ""
+            lblVK_ZahlungseingangBemerkung.Text = ""
+            picVK.Visible = False
+
+            If VK IsNot Nothing Then
+                If VK.vk_GeldEingetroffen Then
+                    picVK.Visible = True
+                    lblVK_Zahlungseingang.Text = VK.vk_Betrag
+                    lblVK_ZahlungseingangBemerkung.Text = VK.vk_BH_Bemerkung
+                End If
+            End If
 
             Dim pnlEnabled = (RECHNUNG.SpeditionsbuchUnterNr Is Nothing OrElse RECHNUNG.SpeditionsbuchUnterNr < 0)
             setControlsEnabled(pnlEmpfaenger, pnlEnabled)
@@ -493,15 +504,16 @@ Public Class usrCntlFaktAbrechnung
         End If
 
         Select Case FirmaTmp
-            Case "VERAG", "IMEX" : whereFirma = " AND FIRMENGRUPPE IN ('VERAG','ATILLA','FRONTOFFICE') " : pnlDocs.Visible = True
+            Case "VERAG" : whereFirma = " AND FIRMENGRUPPE IN ('VERAG','ATILLA','FRONTOFFICE') " : pnlDocs.Visible = True
+            Case "IMEX" : whereFirma = " AND FIRMENGRUPPE IN ('IMEX') " : pnlDocs.Visible = True
             'Case "VERAG" : whereFirma = " AND Firma_ID<>20 " : pnlDocs.Visible = True
             'Case "IMEX" : whereFirma = " AND Firma_ID=20 "
             Case "ATILLA" : whereFirma = " AND Firma_ID=7 " : pnlDocs.Visible = True
-            Case "UNISPED" : whereFirma = " AND FIRMENGRUPPE IN ('UNISPED') " : firstEmpty = True
+            Case "UNISPED" : whereFirma = " AND FIRMENGRUPPE IN ('UNISPED') " : firstEmpty = True : pnlDocs.Visible = True
 
-            Case "AMBAR" : whereFirma = " AND Firma_ID=24 "
+            Case "AMBAR" : whereFirma = " AND Firma_ID=24 " : pnlDocs.Visible = True
-            Case "FRONT-OFFICE" : whereFirma = " AND Firma_ID=17 "
+            Case "FRONT-OFFICE" : whereFirma = " AND Firma_ID=17 " : pnlDocs.Visible = True
-            Case "VERAGIMEX" : whereFirma = " AND FIRMENGRUPPE IN ('VERAG','IMEX','ATILLA','VERAGUNISPED','FRONTOFFICE') "
+            Case "VERAGIMEX" : whereFirma = " AND FIRMENGRUPPE IN ('VERAG','IMEX','ATILLA','VERAGUNISPED','FRONTOFFICE') " : pnlDocs.Visible = True
         End Select
 
         cboFirma.fillWithSQL("SELECT  [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE Firma_ID NOT IN(3) " & whereFirma & " ORDER BY Firma_ID  ", True, "FMZOLL", firstEmpty)
@@ -2976,11 +2988,14 @@ Nächste_Textzeile_lesen:
     End Sub
 
     Private Sub btnVorauskasseAnzeigen_Click(sender As Object, e As EventArgs) Handles btnVorauskasseAnzeigen.Click
-        If Not btnVorauskasseAnzeigen.Enabled Then Exit Sub
+        'If Not btnVorauskasseAnzeigen.Enabled Then Exit Sub
-        Dim VK = VERAG_PROG_ALLGEMEIN.cVorauskasse.LOADByFilialeAbfNr(RECHNUNG.FilialenNr, RECHNUNG.AbfertigungsNr)
+        'Dim VK = VERAG_PROG_ALLGEMEIN.cVorauskasse.LOADByFilialeAbfNr(RECHNUNG.FilialenNr, RECHNUNG.AbfertigungsNr)
-        If VK IsNot Nothing Then
+        'If VK IsNot Nothing Then
-            SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.Importaviso_VK, VK.vk_KdNr, {VK.vk_KdNr, Nothing, Nothing, Nothing, "", VK.vk_id})
+        '    SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.Importaviso_VK, VK.vk_KdNr, {VK.vk_KdNr, Nothing, Nothing, Nothing, "", VK.vk_id})
-        End If
+        'End If
+
+        Dim f As New SDL.frmVorauskasse(RECHNUNG.FilialenNr, RECHNUNG.AbfertigungsNr, Now.AddYears(-1))
+        f.Show(Me)
     End Sub
 
     Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click

SDL/Formulare/KDFormulare/FormulareBaukasten/subRptLaufzettelZollDE_Vorpapier.vb

@@ -20,6 +20,7 @@ Public Class subRptLaufzettelZollDE_Vorpapier
             ATAMRN = ATAMRN.Replace(" ", "")
             ATAMRN = ATAMRN.Replace("/", "")
             ATAMRN = ATAMRN.Replace("-", "")
+            ATAMRN = ATAMRN.Replace("XXXX", "")
 
             picBarcodeMRN.Image = Nothing
             picBarcodeMRN.Visible = False

SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen.Designer.vb

@@ -268,6 +268,7 @@ Partial Class usrcntlVerzollungsunterlagen
         '
         'txtFirma
         '
+        Me.txtFirma._AlleFirmenCLUSTER = False
         Me.txtFirma._AllowSetValue = True
         Me.txtFirma._autoSizeGross = False
         Me.txtFirma._display_Name1 = True
@@ -276,6 +277,7 @@ Partial Class usrcntlVerzollungsunterlagen
         Me.txtFirma._displayWoelflKd = False
         Me.txtFirma._hideIfListEmpty = True
         Me.txtFirma._loadKdData = True
+        Me.txtFirma._UseFIRMA = ""
         Me.txtFirma._ValueKdAndName = False
         Me.txtFirma.dgvpos = "LEFT"
         Me.txtFirma.KdName = Nothing
@@ -288,6 +290,7 @@ Partial Class usrcntlVerzollungsunterlagen
         Me.txtFirma.searchActive = True
         Me.txtFirma.Size = New System.Drawing.Size(709, 20)
         Me.txtFirma.TabIndex = 11
+        Me.txtFirma.TIMER_SEARCH = True
         Me.txtFirma.usrcntl = Nothing
         '
         'Label1
@@ -428,7 +431,7 @@ Partial Class usrcntlVerzollungsunterlagen
         Me.txtAnlage1._ShortDateNew = False
         Me.txtAnlage1._ShortDateOnly = False
         Me.txtAnlage1._TimeOnly = False
-        Me.txtAnlage1._value = Nothing
+        Me.txtAnlage1._value = "Zollbeleg"
         Me.txtAnlage1._Waehrung = False
         Me.txtAnlage1._WaehrungZeichen = True
         Me.txtAnlage1.ForeColor = System.Drawing.Color.Black
@@ -439,6 +442,7 @@ Partial Class usrcntlVerzollungsunterlagen
         Me.txtAnlage1.Name = "txtAnlage1"
         Me.txtAnlage1.Size = New System.Drawing.Size(310, 20)
         Me.txtAnlage1.TabIndex = 23
+        Me.txtAnlage1.Text = "Zollbeleg"
         '
         'txtAnlage2
         '
@@ -449,7 +453,7 @@ Partial Class usrcntlVerzollungsunterlagen
         Me.txtAnlage2._ShortDateNew = False
         Me.txtAnlage2._ShortDateOnly = False
         Me.txtAnlage2._TimeOnly = False
-        Me.txtAnlage2._value = Nothing
+        Me.txtAnlage2._value = "Lieferanten-Rechnung"
         Me.txtAnlage2._Waehrung = False
         Me.txtAnlage2._WaehrungZeichen = True
         Me.txtAnlage2.ForeColor = System.Drawing.Color.Black
@@ -460,6 +464,7 @@ Partial Class usrcntlVerzollungsunterlagen
         Me.txtAnlage2.Name = "txtAnlage2"
         Me.txtAnlage2.Size = New System.Drawing.Size(310, 20)
         Me.txtAnlage2.TabIndex = 26
+        Me.txtAnlage2.Text = "Lieferanten-Rechnung"
         '
         'txtAnlage3
         '
@@ -470,7 +475,7 @@ Partial Class usrcntlVerzollungsunterlagen
         Me.txtAnlage3._ShortDateNew = False
         Me.txtAnlage3._ShortDateOnly = False
         Me.txtAnlage3._TimeOnly = False
-        Me.txtAnlage3._value = Nothing
+        Me.txtAnlage3._value = "Original Präferenz"
         Me.txtAnlage3._Waehrung = False
         Me.txtAnlage3._WaehrungZeichen = True
         Me.txtAnlage3.ForeColor = System.Drawing.Color.Black
@@ -481,6 +486,7 @@ Partial Class usrcntlVerzollungsunterlagen
         Me.txtAnlage3.Name = "txtAnlage3"
         Me.txtAnlage3.Size = New System.Drawing.Size(310, 20)
         Me.txtAnlage3.TabIndex = 29
+        Me.txtAnlage3.Text = "Original Präferenz"
         '
         'txtAnlage4
         '
@@ -631,6 +637,7 @@ Partial Class usrcntlVerzollungsunterlagen
         '
         'KdInAuftrag
         '
+        Me.KdInAuftrag._AlleFirmenCLUSTER = False
         Me.KdInAuftrag._AllowSetValue = True
         Me.KdInAuftrag._autoSizeGross = False
         Me.KdInAuftrag._display_Name1 = True
@@ -639,6 +646,7 @@ Partial Class usrcntlVerzollungsunterlagen
         Me.KdInAuftrag._displayWoelflKd = False
         Me.KdInAuftrag._hideIfListEmpty = True
         Me.KdInAuftrag._loadKdData = True
+        Me.KdInAuftrag._UseFIRMA = ""
         Me.KdInAuftrag._ValueKdAndName = False
         Me.KdInAuftrag.dgvpos = "LEFT"
         Me.KdInAuftrag.KdName = Nothing
@@ -651,6 +659,7 @@ Partial Class usrcntlVerzollungsunterlagen
         Me.KdInAuftrag.searchActive = True
         Me.KdInAuftrag.Size = New System.Drawing.Size(319, 20)
         Me.KdInAuftrag.TabIndex = 5
+        Me.KdInAuftrag.TIMER_SEARCH = True
         Me.KdInAuftrag.usrcntl = Nothing
         '
         'cboFiliale
@@ -707,6 +716,7 @@ Partial Class usrcntlVerzollungsunterlagen
         '
         'kdRgEmpfaenger
         '
+        Me.kdRgEmpfaenger._AlleFirmenCLUSTER = False
         Me.kdRgEmpfaenger._AllowSetValue = True
         Me.kdRgEmpfaenger._autoSizeGross = False
         Me.kdRgEmpfaenger._display_Name1 = True
@@ -715,6 +725,7 @@ Partial Class usrcntlVerzollungsunterlagen
         Me.kdRgEmpfaenger._displayWoelflKd = False
         Me.kdRgEmpfaenger._hideIfListEmpty = True
         Me.kdRgEmpfaenger._loadKdData = True
+        Me.kdRgEmpfaenger._UseFIRMA = ""
         Me.kdRgEmpfaenger._ValueKdAndName = False
         Me.kdRgEmpfaenger.dgvpos = "LEFT"
         Me.kdRgEmpfaenger.KdName = Nothing
@@ -727,6 +738,7 @@ Partial Class usrcntlVerzollungsunterlagen
         Me.kdRgEmpfaenger.searchActive = True
         Me.kdRgEmpfaenger.Size = New System.Drawing.Size(310, 20)
         Me.kdRgEmpfaenger.TabIndex = 39
+        Me.kdRgEmpfaenger.TIMER_SEARCH = True
         Me.kdRgEmpfaenger.usrcntl = Nothing
         '
         'txtEmpfänger

SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen.vb

@@ -114,6 +114,8 @@
 
         cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG Spedition AG", "AG"))
         cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG Customs Service GmbH", "CS"))
+        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX Customs Service GmbH", "IMEX"))
+        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED Speditions GmbH", "UNISPED"))
         cboFirma.changeItem("AG")
         '  cboFiliale.fillWithSQL(" SELECT FilialenNr, Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", , "FMZOLL", True)
 
@@ -122,6 +124,7 @@
 
         Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
             Case "IMEX" : cboFiliale._allowedValuesFreiText = {"5501"}
+            Case "UNISPED" : cboFiliale._allowedValuesFreiText = {"5601"}
             Case "ATILLA" : cboFiliale._allowedValuesFreiText = {"4801"}
         End Select
 
@@ -413,4 +416,12 @@
         setValues(New VERAG_PROG_ALLGEMEIN.cPostversand)
         btnNEU.Visible = False
     End Sub
+
+    Private Sub cboFirma_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboFirma.SelectedIndexChanged
+        Select Case cboFirma._value
+            Case "IMEX" : txtFirma._UseFIRMA = cboFirma._value : KdInAuftrag._UseFIRMA = cboFirma._value
+            Case "UNISPED" : txtFirma._UseFIRMA = cboFirma._value : KdInAuftrag._UseFIRMA = cboFirma._value
+            Case Else : txtFirma._UseFIRMA = "VERAG" : KdInAuftrag._UseFIRMA = "VERAG"
+        End Select
+    End Sub
 End Class

SDL/Formulare/KDFormulare/frmFormulare.vb

@@ -1740,7 +1740,12 @@ Public Class FormularManagerNEU
         Dim AVISO = (New VERAG_PROG_ALLGEMEIN.cAvisoDAL).LesenAviso(AvisoId, "")
         If AVISO Is Nothing Then Return ""
         Dim SENDUNG_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cSendungen)
-        VERAG_PROG_ALLGEMEIN.cSendungen.LOAD_LIST_VP(SENDUNG_LIST, 0, AvisoId, Vorpapier) 'LÄDT alle SENDUNGSDATEN
+        If Vorpapier = "XXXX" Then
+            VERAG_PROG_ALLGEMEIN.cSendungen.LOAD_LIST_VP_EMPTY(SENDUNG_LIST, 0, AvisoId) 'LÄDT alle SENDUNGSDATEN
+        Else
+            VERAG_PROG_ALLGEMEIN.cSendungen.LOAD_LIST_VP(SENDUNG_LIST, 0, AvisoId, Vorpapier) 'LÄDT alle SENDUNGSDATEN
+        End If
+
         If SENDUNG_LIST Is Nothing OrElse SENDUNG_LIST.Count = 0 Then Return ""
         Return LaufzettelZollDE(AVISO, SENDUNG_LIST,,, Vorpapier)
     End Function
@@ -1862,6 +1867,7 @@ Public Class FormularManagerNEU
             Else
                 Dim VORPAPIERE As New List(Of VERAG_PROG_ALLGEMEIN.cAvisoVorpapier)
                 Dim VP As New VERAG_PROG_ALLGEMEIN.cAvisoVorpapier
+                '     VP.vp_Nr = Vorpapier.ToString.Replace("XXXX", "") : VORPAPIERE.Add(VP)
                 VP.vp_Nr = Vorpapier : VORPAPIERE.Add(VP)
 
                 Dim SubRptVP As New subRptLaufzettelZollDE_Vorpapier(VORPAPIERE)
@@ -1893,6 +1899,7 @@ Public Class FormularManagerNEU
                                                   rpt.txtPos.Text = If(SND.tblSnd_Vorpapier3_Pos, "").ToString.Trim
                                               End If
 
+
                                               If SND.tblSnd_Fremdspedition Then
                                                   rpt.txtAbfertigungsart.Text = "FREMD"
                                                   rpt.txtPosNr.Text = SND.tblSnd_FremdspeditionText
@@ -3191,10 +3198,15 @@ Public Class FormularManagerNEU
         Dim destPath = ""
 
         Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
-            Case "IMEX", "UNISPED", "AMBAR"
+            Case "IMEX", "AMBAR"
                 destPath = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "Importaviso_VK", listTowrite)
-            Case Else
+            Case "UNISPED"
 
+                Select Case usrCntl.cboFirma._value
+                    Case "21", "23" : destPath = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "VORAUSKASSE_AT", listTowrite)
+                    Case Else : destPath = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "Importaviso_VK", listTowrite)
+                End Select
+            Case Else
                 Select Case usrCntl.cboFirma._value
                     Case "11" : destPath = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "Importaviso_CS_NEU2", listTowrite)
                     Case Else : destPath = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "Importaviso_AG_NEU2", listTowrite)
@@ -3633,16 +3645,19 @@ Public Class FormularManagerNEU
         Dim oWord As New Microsoft.Office.Interop.Word.Application
         Dim striList As New List(Of String)
         Try
+            Dim uOrdner2 = ""
             Dim nameDispo = ""
             nameDispo = "VerzollungsunterlagenAG2"
             Select Case usrCntl.cboFirma._value
+                Case "IMEX" : nameDispo = "Verzollungsunterlagen" : uOrdner2 = "IMEX"
+                Case "UNISPED" : nameDispo = "Verzollungsunterlagen" : uOrdner2 = "UNISPED"
                 Case "CS" : nameDispo = "VerzollungsunterlagenCS"
                 Case Else : nameDispo = "VerzollungsunterlagenAG2"
             End Select
 
-            Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", nameDispo)
+            Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", uOrdner2, "", nameDispo)
             Dim pfadWord = DS.GET_TOP1_PATH(False)
-            ' MsgBox(pfadWord)
+
             Dim cGenWord As New cGenWord
 
             odoc = cGenWord.openWord(pfadWord, False, oWord)
@@ -4249,6 +4264,55 @@ Public Class FormularManagerNEU
 
     End Function
 
+
+
+    Shared Function Finish_AVISO(AVISO As VERAG_PROG_ALLGEMEIN.cAviso) As String
+        Dim fm As New VERAG_PROG_ALLGEMEIN.cFormularManager
+
+        Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues)
+        Dim top = 0
+        If AVISO.Grenzstelle = "SUB" Then
+
+            '  If AVISO.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_Freigegeben Then
+            'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+            '    Case "FRONTOFFICE", "VERAG"
+            listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(AVISO.LKW_Nr, 37, 46, 120, 12, "bold", 20, , iTextSharp.text.Element.ALIGN_LEFT))
+            'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(AVISO.Freigabe.ToShortDateString & " " & AVISO.Freigabe.ToShortTimeString, 141, 47, 50, 8, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
+            '    listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(Now.ToShortDateString & " " & Now.ToShortTimeString, 141, 47, 50, 12, "bold", 16, , iTextSharp.text.Element.ALIGN_LEFT))
+            listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(Now.ToShortDateString, 141, 47, 50, 12, "bold", 16, , iTextSharp.text.Element.ALIGN_LEFT))
+            Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", "FRONTOFFICE", "", "Finish_AVISO", listTowrite)
+            'End Select
+            '    End If
+        End If
+        Return ""
+    End Function
+
+
+
+
+    Shared Function zumZOLL_AVISO(AVISO As VERAG_PROG_ALLGEMEIN.cAviso, Optional Zollamt As String = "") As String
+        Dim fm As New VERAG_PROG_ALLGEMEIN.cFormularManager
+
+        Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues)
+        Dim top = 0
+
+        If AVISO.Grenzstelle = "SUB" Then
+            '  If AVISO.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_Freigegeben Then
+            'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+            '    Case "FRONTOFFICE", "VERAG"
+            listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(AVISO.LKW_Nr, 37, 46, 120, 12, "bold", 20, , iTextSharp.text.Element.ALIGN_LEFT))
+            'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(AVISO.Freigabe.ToShortDateString & " " & AVISO.Freigabe.ToShortTimeString, 141, 47, 50, 8, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
+            listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(Now.ToShortDateString & " " & Now.ToShortTimeString, 141, 47, 50, 12, "bold", 16, , iTextSharp.text.Element.ALIGN_LEFT))
+            If Zollamt = "DE" Then listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("X", 64, 216, 6, 6, "bold", 16, , iTextSharp.text.Element.ALIGN_CENTER))
+            If Zollamt = "AT" Then listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("X", 64, 265, 6, 6, "bold", 16, , iTextSharp.text.Element.ALIGN_CENTER))
+            Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", "FRONTOFFICE", "", "zumZoll_Aviso", listTowrite)
+            'End Select
+            '         End If
+        End If
+        Return ""
+    End Function
+
+
     Shared Function QS_UeDok(usrCntl As usrcntlQS_UeDok) As String
         Dim fm As New VERAG_PROG_ALLGEMEIN.cFormularManager
 

SDL/kunden/Vorauskasse/frmVorauskasse.vb

@@ -7,8 +7,29 @@
 
     Dim JAHR As Date = CDate("01.01." & Now.Year)
 
+    Sub New()
 
+        ' Dieser Aufruf ist für den Designer erforderlich.
+        InitializeComponent()
 
+        ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
+
+    End Sub
+    Dim FilialenNr = Nothing
+    Dim AbfertigungsNr = Nothing
+    Dim DatumVon = Nothing
+
+    Sub New(FilialenNr, AbfertigungsNr, DatumVon)
+
+        ' Dieser Aufruf ist für den Designer erforderlich.
+        InitializeComponent()
+
+        ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
+        Me.FilialenNr = FilialenNr
+        Me.AbfertigungsNr = AbfertigungsNr
+        Me.DatumVon = DatumVon
+
+    End Sub
     Private Sub frmVorauskasse_Load(sender As Object, e As EventArgs) Handles Me.Load
 
         txtAbfertDat.Text = Now.ToShortDateString 'CDate("01." & Now.ToString("MM.yyyy")).AddMonths(-1).ToShortDateString
@@ -17,20 +38,28 @@
         btnMonat.Text = MONAT.ToString("MMMM")
         btnJahr.Text = JAHR.Year
 
+
+        Dim FirmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGIMEX", "SDL") Then
+            FirmaTmp = "VERAGIMEX"
+        End If
+
         Dim QSwhere = ""
-        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+
+        Select Case FirmaTmp
+            Case "UNISPED" : QSwhere = " AND mit_firma IN ('UNISPED') "
             Case "ATILLA" : QSwhere = ""
+            Case "VERAGIMEX" : QSwhere = " AND mit_firma IN ('IMEX','BEIDE','VERAG','ATILLA') "
             Case "IMEX" : QSwhere = " AND mit_firma IN ('IMEX','BEIDE') "
             Case Else
                 QSwhere = " AND mit_firma <> 'IMEX' "
-
         End Select
 
 
         '  cboSachbearbeiterQS.fillWithSQL("SELECT  ID,/*cast(ID as nvarchar(3)) +' ' + Name as*/ Name FROM Personal WHERE [Status]<>'L' " & QSwhere & " ORDER BY Name ", False, "FMZOLL", True)
 
         Dim where = ""
-        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+        Select Case FirmaTmp
             Case "IMEX"
                 where = " AND FilialenNr IN (5501) "
             Case "ATILLA"
@@ -41,6 +70,8 @@
                 where = " AND FilialenNr IN (5701) "
             Case "FRONTOFFICE"
                 where = " AND FilialenNr IN (5801) "
+            Case "VERAGIMEX"
+                where = ""
             Case Else
                 where = " AND FilialenNr NOT IN (5501) "
         End Select
@@ -86,6 +117,17 @@
             btnVK_VERAG_VR.Visible = True
         End If
 
+        If Me.FilialenNr IsNot Nothing Then
+            cboFiliale.changeItem(FilialenNr)
+        End If
+
+        If Me.AbfertigungsNr IsNot Nothing Then
+            txtAbfertigungsnummer.Text = AbfertigungsNr
+        End If
+
+        If Me.DatumVon IsNot Nothing Then
+            DateTimePicker1.Value = CDate(DatumVon)
+        End If
 
     End Sub
 
@@ -519,6 +561,10 @@
                                                  End Sub
 
     End Sub
+
+    Private Sub frmVorauskasse_Shown(sender As Object, e As EventArgs) Handles Me.Shown
+        If FilialenNr IsNot Nothing Or AbfertigungsNr IsNot Nothing Or DatumVon IsNot Nothing Then btnSuche.PerformClick()
+    End Sub
 End Class
 
 

SDL/mdm/frmMDMDatenverarbetiung.vb

@@ -353,7 +353,7 @@ Public Class frmMDMDatenverarbetiung
             Dim displayFilter = False
             Dim sqlstr As String = ""
 
-            sqlstr &= " SELECT 	 'PLOSE',AdressenNr,plose_Kennzeichen,plose_DatumTransaktion,plp_Land,isnull([tblPLOSE_Produktbeschreibung].plp_Description_EN,plose_Produktbeschreibung) as plose_Produktbeschreibung ,isnull(plose_NummerKarteGeraet,plose_Kontonummer) as plose_NummerKarteGeraet ,plose_BeschreibungEinfahrt,plose_BeschreibungAusfahrt,plose_NettobetragWaehrungAbbuchung,(plose_BruttobetragWaehrungAbbuchung-plose_NettobetragWaehrungAbbuchung) as Steuer,plose_BruttobetragWaehrungAbbuchung "
+            sqlstr &= " SELECT 'PLOSE',AdressenNr,plose_Kennzeichen,plose_DatumTransaktion,plp_Land,isnull([tblPLOSE_Produktbeschreibung].plp_Description_EN,plose_Produktbeschreibung) as plose_Produktbeschreibung ,isnull(plose_NummerKarteGeraet,plose_Kontonummer) as plose_NummerKarteGeraet ,plose_BeschreibungEinfahrt,plose_BeschreibungAusfahrt,plose_NettobetragWaehrungAbbuchung,(plose_BruttobetragWaehrungAbbuchung-plose_NettobetragWaehrungAbbuchung) as Steuer,plose_BruttobetragWaehrungAbbuchung "
             sqlstr &= " FROM tblPLOSE_Details INNER JOIN [tblPLOSE_Produktbeschreibung] on plose_ProduktCode=plp_ProductCode  INNER JOIN Adressen on plose_POLSEKundennummer=PLOSEKundenNr  and plp_LeistungsNr is not null   "
             sqlstr &= " WHERE 1=1  "
             sqlstr &= " AND plose_Fakturiert=0   AND plp_Land NOT IN ('AT','DE') "
@@ -366,7 +366,7 @@ Public Class frmMDMDatenverarbetiung
             Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
             Dim sqlstrAT As String = ""
 
-            sqlstrAT &= " SELECT 	 'PLOSE',AdressenNr,plose_Kennzeichen,plose_DatumTransaktion,plp_Land,'' as plose_Produktbeschreibung ,plose_NummerKarteGeraet as plose_NummerKarteGeraet ,'' as plose_BeschreibungEinfahrt,'' as plose_BeschreibungAusfahrt,sum(plose_NettobetragWaehrungAbbuchung) as plose_NettobetragWaehrungAbbuchung,sum(plose_BruttobetragWaehrungAbbuchung-plose_NettobetragWaehrungAbbuchung) as Steuer,sum(plose_BruttobetragWaehrungAbbuchung ) as plose_BruttobetragWaehrungAbbuchung "
+            sqlstrAT &= " SELECT 'PLOSE',AdressenNr,plose_Kennzeichen,plose_DatumTransaktion,plp_Land,'' as plose_Produktbeschreibung ,plose_NummerKarteGeraet as plose_NummerKarteGeraet ,'' as plose_BeschreibungEinfahrt,'' as plose_BeschreibungAusfahrt,sum(plose_NettobetragWaehrungAbbuchung) as plose_NettobetragWaehrungAbbuchung,sum(plose_BruttobetragWaehrungAbbuchung-plose_NettobetragWaehrungAbbuchung) as Steuer,sum(plose_BruttobetragWaehrungAbbuchung ) as plose_BruttobetragWaehrungAbbuchung "
             sqlstrAT &= " FROM tblPLOSE_Details INNER JOIN [tblPLOSE_Produktbeschreibung] on plose_ProduktCode=plp_ProductCode  INNER JOIN Adressen on plose_POLSEKundennummer=PLOSEKundenNr  and plp_LeistungsNr is not null  "
             sqlstrAT &= " WHERE 1=1  "
             sqlstrAT &= " AND plose_Fakturiert=0   AND plp_Land IN ('AT','DE') "

VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb

@@ -940,6 +940,7 @@ Public Class cAviso
     Property VoraussichtlichesEintreffen As Object = Nothing
     Property VORSYSTEM As Object = Nothing
     Property Warenort As Boolean = False
+    Property ZOLLDigitalEingereicht As Boolean = False
 
 
     Public VORPAPIERE As New List(Of cAvisoVorpapier)
@@ -1099,6 +1100,7 @@ Public Class cAvisoDAL
                     daten.VoraussichtlichesEintreffen = If(dr.Item("VoraussichtlichesEintreffen") Is DBNull.Value, Nothing, dr.Item("VoraussichtlichesEintreffen"))
                     daten.VORSYSTEM = If(dr.Item("VORSYSTEM") Is DBNull.Value, Nothing, dr.Item("VORSYSTEM"))
                     daten.Warenort = If(dr.Item("Warenort") Is DBNull.Value, Nothing, dr.Item("Warenort"))
+                    daten.ZOLLDigitalEingereicht = If(dr.Item("ZOLLDigitalEingereicht") Is DBNull.Value, Nothing, dr.Item("ZOLLDigitalEingereicht"))
 
 
 
@@ -1372,17 +1374,17 @@ Public Class cAvisoDAL
             hAuswahl = "INSERT INTO Aviso " &
                        "(Datum, LKW_Nr, Telefonisch, Änderungen, Info, Status, Auftraggeber, Frächter, letzterMitarbeiter, " &
                        "Vorbereitet,Vorgeschrieben, Ankunft, Freigabe, Dauer, AvisoEingang, Grenzstelle, LKW_fertig,letzterMitarbeiterId,Handling,Sendungen_Gesamtanzahl,Sammelakt,Frächter_KdNr,Auftraggeber_KdNr,AvisoTVHinweis,Buero,Imex,Abgeschlossen,FIRMA, " &
-                       " Durchgangszollstelle1,Durchgangszollstelle2,Durchgangszollstelle3,Durchgangszollstelle4,Durchgangszollstelle5,Durchgangszollstelle6,Ausgangszollstelle,Zollstelle,TransportTemperatur,Zugmaschine,FahrerHandy,LKW_Nationalitaet,DakosyRef,TeamId,Cluster,Freigabe_Info,KdAuftragsNr_Frachtfuehrer,KdAuftragsNr_Avisierer,FreigabeFiliale,VoraussichtlichesEintreffen,Warenort) VALUES (" &
+                       " Durchgangszollstelle1,Durchgangszollstelle2,Durchgangszollstelle3,Durchgangszollstelle4,Durchgangszollstelle5,Durchgangszollstelle6,Ausgangszollstelle,Zollstelle,TransportTemperatur,Zugmaschine,FahrerHandy,LKW_Nationalitaet,DakosyRef,TeamId,Cluster,Freigabe_Info,KdAuftragsNr_Frachtfuehrer,KdAuftragsNr_Avisierer,FreigabeFiliale,VoraussichtlichesEintreffen,Warenort,ZOLLDigitalEingereicht) VALUES (" &
                        "@Datum, @LKW_Nr, @Telefonisch, @Änderungen, @Info, @Status, @Auftraggeber, @Frächter, @letzterMitarbeiter, " &
                        "@Vorbereitet, @Vorgeschrieben, @Ankunft, @Freigabe, @Dauer, @AvisoEingang, @Grenzstelle, @LKW_fertig,@letzterMitarbeiterId,@Handling,@Sendungen_Gesamtanzahl,@Sammelakt,@Frächter_KdNr,@Auftraggeber_KdNr,@AvisoTVHinweis,@Buero,@Imex,@Abgeschlossen,@FIRMA," &
-                       "@Durchgangszollstelle1,@Durchgangszollstelle2,@Durchgangszollstelle3,@Durchgangszollstelle4,@Durchgangszollstelle5,@Durchgangszollstelle6,@Ausgangszollstelle,@Zollstelle,@TransportTemperatur,@Zugmaschine,@FahrerHandy,@LKW_Nationalitaet,@DakosyRef,@TeamId,@Cluster,@Freigabe_Info,@KdAuftragsNr_Frachtfuehrer,@KdAuftragsNr_Avisierer,@FreigabeFiliale,@VoraussichtlichesEintreffen,@Warenort); SELECT CAST(scope_identity() AS int);"
+                       "@Durchgangszollstelle1,@Durchgangszollstelle2,@Durchgangszollstelle3,@Durchgangszollstelle4,@Durchgangszollstelle5,@Durchgangszollstelle6,@Ausgangszollstelle,@Zollstelle,@TransportTemperatur,@Zugmaschine,@FahrerHandy,@LKW_Nationalitaet,@DakosyRef,@TeamId,@Cluster,@Freigabe_Info,@KdAuftragsNr_Frachtfuehrer,@KdAuftragsNr_Avisierer,@FreigabeFiliale,@VoraussichtlichesEintreffen,@Warenort,@ZOLLDigitalEingereicht); SELECT CAST(scope_identity() AS int);"
         Else
             id = d.AvisoID
             'Änderung
             hAuswahl = String.Format(
                        "UPDATE Aviso SET Datum = @Datum, LKW_Nr = @LKW_Nr, Telefonisch=@Telefonisch, Änderungen=@Änderungen, Info=@Info, Status=@Status, Auftraggeber=@Auftraggeber, Frächter=@Frächter, " &
                        " letzterMitarbeiter = @letzterMitarbeiter, Vorbereitet=@Vorbereitet,Vorgeschrieben=@Vorgeschrieben, Ankunft = @Ankunft, Freigabe = @Freigabe, Dauer = @Dauer, AvisoEingang = @AvisoEingang, Grenzstelle=@Grenzstelle, LKW_fertig=@LKW_fertig, letzterMitarbeiterId=@letzterMitarbeiterId, Handling=@Handling,Sendungen_Gesamtanzahl=@Sendungen_Gesamtanzahl,Sammelakt=@Sammelakt,Frächter_KdNr=@Frächter_KdNr,Auftraggeber_KdNr=@Auftraggeber_KdNr,AvisoTVHinweis=@AvisoTVHinweis,Buero=@Buero,Imex=@Imex,Abgeschlossen=@Abgeschlossen,  " &
-                       " Durchgangszollstelle1=@Durchgangszollstelle1,Durchgangszollstelle2=@Durchgangszollstelle2,Durchgangszollstelle3=@Durchgangszollstelle3,Durchgangszollstelle4=@Durchgangszollstelle4,Durchgangszollstelle5=@Durchgangszollstelle5,Durchgangszollstelle6=@Durchgangszollstelle6,Ausgangszollstelle=@Ausgangszollstelle,Zollstelle=@Zollstelle,TransportTemperatur=@TransportTemperatur,Zugmaschine=@Zugmaschine,FahrerHandy=@FahrerHandy, LKW_Nationalitaet=@LKW_Nationalitaet, DakosyRef=@DakosyRef,TeamId=@TeamId,Cluster=@Cluster,Freigabe_Info=@Freigabe_Info,KdAuftragsNr_Frachtfuehrer =@KdAuftragsNr_Frachtfuehrer,KdAuftragsNr_Avisierer=@KdAuftragsNr_Avisierer , FreigabeFiliale=@FreigabeFiliale,VoraussichtlichesEintreffen=@VoraussichtlichesEintreffen,Warenort=@Warenort,FIRMA=@FIRMA" &
+                       " Durchgangszollstelle1=@Durchgangszollstelle1,Durchgangszollstelle2=@Durchgangszollstelle2,Durchgangszollstelle3=@Durchgangszollstelle3,Durchgangszollstelle4=@Durchgangszollstelle4,Durchgangszollstelle5=@Durchgangszollstelle5,Durchgangszollstelle6=@Durchgangszollstelle6,Ausgangszollstelle=@Ausgangszollstelle,Zollstelle=@Zollstelle,TransportTemperatur=@TransportTemperatur,Zugmaschine=@Zugmaschine,FahrerHandy=@FahrerHandy, LKW_Nationalitaet=@LKW_Nationalitaet, DakosyRef=@DakosyRef,TeamId=@TeamId,Cluster=@Cluster,Freigabe_Info=@Freigabe_Info,KdAuftragsNr_Frachtfuehrer =@KdAuftragsNr_Frachtfuehrer,KdAuftragsNr_Avisierer=@KdAuftragsNr_Avisierer , FreigabeFiliale=@FreigabeFiliale,VoraussichtlichesEintreffen=@VoraussichtlichesEintreffen,Warenort=@Warenort,ZOLLDigitalEingereicht=@ZOLLDigitalEingereicht,FIRMA=@FIRMA" &
                        " WHERE AvisoID = @AvisoID")
         End If
 
@@ -1452,6 +1454,7 @@ Public Class cAvisoDAL
             cmd.Parameters.AddWithValue("@FreigabeFiliale", If(d.FreigabeFiliale Is Nothing, DBNull.Value, d.FreigabeFiliale))
             cmd.Parameters.AddWithValue("@VoraussichtlichesEintreffen", If(d.VoraussichtlichesEintreffen Is Nothing, DBNull.Value, d.VoraussichtlichesEintreffen))
             cmd.Parameters.AddWithValue("@Warenort", d.Warenort)
+            cmd.Parameters.AddWithValue("@ZOLLDigitalEingereicht", d.ZOLLDigitalEingereicht)
 
 
             Try

VERAG_PROG_ALLGEMEIN/App.config

@@ -10,25 +10,25 @@
     </configSections>
   <connectionStrings>
     <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.FMZOLL_PRODConnectionString"
-      connectionString="Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=test;Password=BmWr501956;" />
+      connectionString="Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;" />
     <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.ATLASConnectionString"
       connectionString="Data Source=192.168.0.95\SQLATLAS;Initial Catalog=atlas;Integrated Security=false;User ID=sa;Password=BmWr501956;" />
     <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.ADMINConnectionString"
-      connectionString="Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;" />
+      connectionString="Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;" />
     <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.SDL_PRODConnectionString"
-      connectionString="Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=SDL;Integrated Security=false;User ID=sa;Password=BmWr501956;" />
+      connectionString="Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=SDL;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;" />
     <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.FMZOLLConnectionString"
-      connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956;" />
+      connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;" />
     <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.AVISOConnectionStringTEST"
-      connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=AVISO_new;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200" />
+      connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=AVISO_new;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;Pooling=true;Min Pool Size=5;Max Pool Size=200" />
     <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.AVISOConnectionString"
-      connectionString="Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200" />
+      connectionString="Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=AVISO;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;Pooling=true;Min Pool Size=5;Max Pool Size=200" />
     <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.SDLConnectionString"
-      connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=SDL;Integrated Security=False;Persist Security Info=True;User ID=sa;Password=BmWr501956;TrustServerCertificate=False" />
+      connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=SDL;Integrated Security=False;Persist Security Info=True;User ID=AppUser;Password=yp/THDd?xM+pZ$;TrustServerCertificate=False" />
     <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.EZOLLConnectionString"
-      connectionString="Data Source=BUCHHALTUNG.verag.ost.dmn;Initial Catalog=ezoll;Integrated Security=false;User ID=sa;Password=BmWr501956;" />
+      connectionString="Data Source=BUCHHALTUNG.verag.ost.dmn;Initial Catalog=ezoll;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;" />
     <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.AVISO_ATILLAConnectionString"
-      connectionString="Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200" />
+      connectionString="Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=AVISO;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;Pooling=true;Min Pool Size=5;Max Pool Size=200" />
     <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.ATLAS_SBGConnectionString"
       connectionString="Data Source=192.168.133.98;Initial Catalog=atlas;Integrated Security=false;User ID=sa;Password=BmWr501956;" />
     <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.UIDConnectionString"
@@ -40,7 +40,7 @@
     <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.FD_PRODConnectionString"
       connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=FD;Integrated Security=false;User ID=sa;Password=BmWr501956;" />
     <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.DISPOConnectionStringTEST"
-      connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=DISPO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200" />
+      connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=DISPO;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;Pooling=true;Min Pool Size=5;Max Pool Size=200" />
   </connectionStrings>
   <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
@@ -51,7 +51,7 @@
         <value>Data Source=192.168.0.99;Initial Catalog=Therefore;Integrated Security=false;User ID=sa;Password=BmWr501956;</value>
       </setting>
       <setting name="DISPOConnectionString" serializeAs="String">
-        <value>Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=DISPO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200</value>
+        <value>Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=DISPO;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;Pooling=true;Min Pool Size=5;Max Pool Size=200</value>
       </setting>
       <setting name="asdadasdasdasdasdasd" serializeAs="String">
         <value />

VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/MySearchBox.vb

@@ -262,13 +262,22 @@ Public Class MySearchBox
                 Dim SQLstr As String = "SELECT TOP " & topAnz & " " & SQL_SELECT & " WHERE 1=1 "
                 SQLstr &= If(SQL_WHERE <> "", " AND " & SQL_WHERE, "")
 
-                If SQL_WhereParamList.Count > 0 Then
+                If srch <> "" And SQL_WhereParamList.Count > 0 Then 'erster Suchparameter
                     SQLstr &= " AND ( 1<>1 "
                     For Each s In SQL_WhereParamList
                         SQLstr &= " OR " & s & " LIKE '" & srch & "%' "
                     Next
                     SQLstr &= " ) "
                 End If
+
+                If srch2 <> "" And SQL_WhereParamList.Count > 0 Then 'Wenn zweiter Suchparameter
+                    SQLstr &= " AND ( 1<>1 "
+                    For Each s In SQL_WhereParamList
+                        SQLstr &= " OR " & s & " LIKE '" & srch2 & "%' "
+                    Next
+                    SQLstr &= " ) "
+                End If
+
                 If SQL_ORDER_BY <> "" Then SQLstr &= " ORDER BY " & SQL_ORDER_BY
                 'MsgBox(SQLstr)
                 ' MsgBox(SQL.loadDgvBySql(SQLstr, conn_art).Rows.Count)

VERAG_PROG_ALLGEMEIN/Classes/SQL.vb

@@ -33,7 +33,8 @@ Public Class SQL
             Try
                 Return My.MySettings.Default.FMZOLLConnectionString
             Catch ex As Exception
-                Return "Data Source=DEVELOPER.verag.ost.dmn\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956;"
+                'Return "Data Source=DEVELOPER.verag.ost.dmn\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956;"
+                Return "Data Source=DEVELOPER.verag.ost.dmn\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;"
             End Try
 
 
@@ -41,6 +42,7 @@ Public Class SQL
             Try
                 Return My.MySettings.Default.FMZOLL_PRODConnectionString
             Catch ex As Exception
+                ' Return "Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=test;Password=BmWr501956;"
                 Return "Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=test;Password=BmWr501956;"
             End Try
         End If
@@ -51,9 +53,11 @@ Public Class SQL
         'Properties.Settings.Default.
 
         If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
-            Return "Data Source=192.168.0.90\DEVSQL;Initial Catalog=VERAG_HOMEPAGE;Integrated Security=false;User ID=sa;Password=BmWr501956;"
+            Return "Data Source=192.168.0.90\DEVSQL;Initial Catalog=VERAG_HOMEPAGE;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;"
+            '  Return "Data Source=192.168.0.90\DEVSQL;Initial Catalog=VERAG_HOMEPAGE;Integrated Security=false;User ID=sa;Password=BmWr501956;"
         Else
-            Return "Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG_HOMEPAGE;Integrated Security=false;User ID=sa;Password=BmWr501956;"
+            Return "Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG_HOMEPAGE;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;"
+            '  Return "Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG_HOMEPAGE;Integrated Security=false;User ID=sa;Password=BmWr501956;"
         End If
 
 
@@ -66,6 +70,7 @@ Public Class SQL
             Try
                 Return My.MySettings.Default.FMZOLL_PRODConnectionString
             Catch ex As Exception
+                '   Return "Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=test;Password=BmWr501956;"
                 Return "Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=test;Password=BmWr501956;"
             End Try
         End If
@@ -121,7 +126,7 @@ Public Class SQL
                 Try
                     Return My.MySettings.Default.AVISOConnectionString
                 Catch ex As Exception
-                    Return "Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200"
+                    Return "Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=AVISO;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;Pooling=true;Min Pool Size=5;Max Pool Size=200"
                 End Try
             End If
         End If
@@ -144,7 +149,7 @@ Public Class SQL
             cn.Open()
             Return cn
         Catch ex As Exception
-            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******").Replace("yp/THDd?xM+pZ$", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
         End Try
         Return Nothing
 
@@ -166,7 +171,7 @@ Public Class SQL
             cn.Open()
             Return cn
         Catch ex As Exception
-            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******").Replace("yp/THDd?xM+pZ$", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
         End Try
         Return Nothing
 
@@ -187,7 +192,7 @@ Public Class SQL
             cn.Open()
             Return cn
         Catch ex As Exception
-            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******").Replace("yp/THDd?xM+pZ$", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
         End Try
         Return Nothing
 
@@ -200,7 +205,7 @@ Public Class SQL
             cn.Open()
             Return cn
         Catch ex As Exception
-            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******").Replace("yp/THDd?xM+pZ$", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
         End Try
         Return Nothing
 
@@ -212,7 +217,7 @@ Public Class SQL
             cn.Open()
             Return cn
         Catch ex As Exception
-            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******").Replace("yp/THDd?xM+pZ$", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
         End Try
         Return Nothing
 
@@ -224,7 +229,7 @@ Public Class SQL
             cn.Open()
             Return cn
         Catch ex As Exception
-            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******").Replace("yp/THDd?xM+pZ$", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
         End Try
         Return Nothing
 
@@ -244,7 +249,7 @@ Public Class SQL
             cn.Open()
             Return cn
         Catch ex As Exception
-            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******").Replace("yp/THDd?xM+pZ$", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
         End Try
         Return Nothing
 
@@ -264,7 +269,7 @@ Public Class SQL
             cn.Open()
             Return cn
         Catch ex As Exception
-            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******").Replace("yp/THDd?xM+pZ$", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
         End Try
         Return Nothing
 
@@ -278,7 +283,7 @@ Public Class SQL
             cn.Open()
             Return cn
         Catch ex As Exception
-            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******").Replace("yp/THDd?xM+pZ$", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
         End Try
         Return Nothing
 
@@ -291,7 +296,7 @@ Public Class SQL
             cn.Open()
             Return cn
         Catch ex As Exception
-            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******").Replace("yp/THDd?xM+pZ$", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
         End Try
         Return Nothing
 
@@ -305,7 +310,7 @@ Public Class SQL
             cn.Open()
             Return cn
         Catch ex As Exception
-            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******").Replace("yp/THDd?xM+pZ$", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
         End Try
         Return Nothing
 
@@ -318,7 +323,7 @@ Public Class SQL
             cn.Open()
             Return cn
         Catch ex As Exception
-            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******").Replace("yp/THDd?xM+pZ$", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
         End Try
         Return Nothing
 
@@ -332,7 +337,7 @@ Public Class SQL
             cn.Open()
             Return cn
         Catch ex As Exception
-            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******").Replace("yp/THDd?xM+pZ$", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
         End Try
         Return Nothing
 

VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb

@@ -191,6 +191,16 @@ Public Class cSendungen
         If allowchangeCurrIndex Then CURRENT_INDEX = IIf(SENDUNG_LIST.Count > 0, 0, -1)
     End Sub
 
+    Shared Sub LOAD_LIST_VP_EMPTY(ByRef SENDUNG_LIST As List(Of cSendungen), ByRef CURRENT_INDEX As Integer, AvisoId As Integer, Optional allowchangeCurrIndex As Boolean = True)
+        If SENDUNG_LIST Is Nothing Then SENDUNG_LIST = New List(Of cSendungen)
+        SENDUNG_LIST.Clear()
+        Dim SQL As New SQL
+        For Each r In SQL.loadDgvBySql("SELECT tblSnd_SendungID FROM tblSendungen WHERE tblSnd_AvisoID=" & AvisoId & " AND (isnull(tblSnd_Vorpapier,'')='' AND isnull(tblSnd_Vorpapier2,'')=''  AND isnull(tblSnd_Vorpapier3,'')='' ) ORDER BY tblSnd_PosUnterNr,tblSnd_SendungID", "AVISO").Rows
+            SENDUNG_LIST.Add(New VERAG_PROG_ALLGEMEIN.cSendungen(r("tblSnd_SendungID")))
+        Next
+        If allowchangeCurrIndex Then CURRENT_INDEX = IIf(SENDUNG_LIST.Count > 0, 0, -1)
+    End Sub
+
     Public Sub New(tblSnd_AvisoID, currentHisId, Optional FilialenNr = Nothing, Optional AbfertigungsNr = Nothing, Optional UnterNr = Nothing, Optional tblSnd_anzahlHandling = Nothing)
         Me.tblSnd_SendungID = -1
         Me.tblSnd_AvisoID = tblSnd_AvisoID

VERAG_PROG_ALLGEMEIN/My Project/Settings.Designer.vb

@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Public NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -69,7 +69,7 @@ Namespace My
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString),  _
          Global.System.Configuration.DefaultSettingValueAttribute("Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=fals"& _ 
-            "e;User ID=test;Password=BmWr501956;")>  _
+            "e;User ID=AppUser;Password=yp/THDd?xM+pZ$;")>  _
         Public ReadOnly Property FMZOLL_PRODConnectionString() As String
             Get
                 Return CType(Me("FMZOLL_PRODConnectionString"),String)
@@ -80,7 +80,7 @@ Namespace My
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString),  _
          Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=fa"& _ 
-            "lse;User ID=sa;Password=BmWr501956;")>  _
+            "lse;User ID=AppUser;Password=yp/THDd?xM+pZ$;")>  _
         Public ReadOnly Property ADMINConnectionString() As String
             Get
                 Return CType(Me("ADMINConnectionString"),String)
@@ -91,7 +91,7 @@ Namespace My
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString),  _
          Global.System.Configuration.DefaultSettingValueAttribute("Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=SDL;Integrated Security=false;"& _ 
-            "User ID=sa;Password=BmWr501956;")>  _
+            "User ID=AppUser;Password=yp/THDd?xM+pZ$;")>  _
         Public ReadOnly Property SDL_PRODConnectionString() As String
             Get
                 Return CType(Me("SDL_PRODConnectionString"),String)
@@ -102,19 +102,19 @@ Namespace My
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString),  _
          Global.System.Configuration.DefaultSettingValueAttribute("Data Source=192.168.0.90\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;U"& _ 
-            "ser ID=sa;Password=BmWr501956;")>  _
+            "ser ID=AppUser;Password=yp/THDd?xM+pZ$;")>  _
         Public ReadOnly Property FMZOLLConnectionString() As String
             Get
                 Return CType(Me("FMZOLLConnectionString"),String)
             End Get
         End Property
         
-        <Global.System.Configuration.ApplicationScopedSettingAttribute(),
+        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString),
+         Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=AVISO;Integrated Security=fa" &
+         Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=AVISO;Integrated Security=fa"& _ 
-            "lse;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=20" &
+            "lse;User ID=AppUser;Password=yp/THDd?xM+pZ$;Pooling=true;Min Pool Size=5;Max Poo"& _ 
-            "0")>
+            "l Size=200")>  _
         Public ReadOnly Property AVISOConnectionString() As String
             Get
                 Return CType(Me("AVISOConnectionString"),String)
@@ -125,8 +125,8 @@ Namespace My
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString),  _
          Global.System.Configuration.DefaultSettingValueAttribute("Data Source=192.168.0.90\DEVSQL;Initial Catalog=SDL;Integrated Security=False;Per"& _ 
-            "sist Security Info=True;User ID=sa;Password=BmWr501956;TrustServerCertificate=Fa"& _ 
+            "sist Security Info=True;User ID=AppUser;Password=yp/THDd?xM+pZ$;TrustServerCerti"& _ 
-            "lse")>  _
+            "ficate=False")>  _
         Public ReadOnly Property SDLConnectionString() As String
             Get
                 Return CType(Me("SDLConnectionString"),String)
@@ -137,7 +137,7 @@ Namespace My
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString),  _
          Global.System.Configuration.DefaultSettingValueAttribute("Data Source=BUCHHALTUNG.verag.ost.dmn;Initial Catalog=ezoll;Integrated Security=f"& _ 
-            "alse;User ID=sa;Password=BmWr501956;")>  _
+            "alse;User ID=AppUser;Password=yp/THDd?xM+pZ$;")>  _
         Public ReadOnly Property EZOLLConnectionString() As String
             Get
                 Return CType(Me("EZOLLConnectionString"),String)
@@ -148,8 +148,8 @@ Namespace My
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString),  _
          Global.System.Configuration.DefaultSettingValueAttribute("Data Source=192.168.0.90\DEVSQL;Initial Catalog=AVISO_new;Integrated Security=fal"& _ 
-            "se;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200"& _ 
+            "se;User ID=AppUser;Password=yp/THDd?xM+pZ$;Pooling=true;Min Pool Size=5;Max Pool"& _ 
-            "")>  _
+            " Size=200")>  _
         Public ReadOnly Property AVISOConnectionStringTEST() As String
             Get
                 Return CType(Me("AVISOConnectionStringTEST"),String)
@@ -237,8 +237,8 @@ Namespace My
         <Global.System.Configuration.UserScopedSettingAttribute(),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=DISPO;Integrated Security=fa"& _ 
-            "lse;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=20"& _ 
+            "lse;User ID=AppUser;Password=yp/THDd?xM+pZ$;Pooling=true;Min Pool Size=5;Max Poo"& _ 
-            "0")>  _
+            "l Size=200")>  _
         Public Property DISPOConnectionString() As String
             Get
                 Return CType(Me("DISPOConnectionString"),String)
@@ -252,7 +252,8 @@ Namespace My
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString),  _
          Global.System.Configuration.DefaultSettingValueAttribute("Data Source=192.168.0.90\DEVSQL;Initial Catalog=DISPO;Integrated Security=false;U"& _ 
-            "ser ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200")>  _
+            "ser ID=AppUser;Password=yp/THDd?xM+pZ$;Pooling=true;Min Pool Size=5;Max Pool Siz"& _ 
+            "e=200")>  _
         Public ReadOnly Property DISPOConnectionStringTEST() As String
             Get
                 Return CType(Me("DISPOConnectionStringTEST"),String)
@@ -295,8 +296,8 @@ Namespace My
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString),  _
          Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=AVISO;Integrated Security=fa"& _ 
-            "lse;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=20"& _ 
+            "lse;User ID=AppUser;Password=yp/THDd?xM+pZ$;Pooling=true;Min Pool Size=5;Max Poo"& _ 
-            "0")>  _
+            "l Size=200")>  _
         Public ReadOnly Property AVISO_ATILLAConnectionString() As String
             Get
                 Return CType(Me("AVISO_ATILLAConnectionString"),String)

VERAG_PROG_ALLGEMEIN/My Project/Settings.settings

@@ -12,58 +12,58 @@
     <Setting Name="FMZOLL_PRODConnectionString" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=test;Password=BmWr501956;&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;&lt;/ConnectionString&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=test;Password=BmWr501956;</Value>
+      <Value Profile="(Default)">Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;</Value>
     </Setting>
     <Setting Name="ADMINConnectionString" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;&lt;/ConnectionString&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;</Value>
+      <Value Profile="(Default)">Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;</Value>
     </Setting>
     <Setting Name="SDL_PRODConnectionString" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=SDL;Integrated Security=false;User ID=sa;Password=BmWr501956;&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=SDL;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;&lt;/ConnectionString&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=SDL;Integrated Security=false;User ID=sa;Password=BmWr501956;</Value>
+      <Value Profile="(Default)">Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=SDL;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;</Value>
     </Setting>
     <Setting Name="FMZOLLConnectionString" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=192.168.0.90\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956;&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=192.168.0.90\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;&lt;/ConnectionString&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=192.168.0.90\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956;</Value>
+      <Value Profile="(Default)">Data Source=192.168.0.90\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;</Value>
     </Setting>
     <Setting Name="AVISOConnectionString" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=AVISO;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;Pooling=true;Min Pool Size=5;Max Pool Size=200&lt;/ConnectionString&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200</Value>
+      <Value Profile="(Default)">Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=AVISO;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;Pooling=true;Min Pool Size=5;Max Pool Size=200</Value>
     </Setting>
     <Setting Name="SDLConnectionString" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=192.168.0.90\DEVSQL;Initial Catalog=SDL;Integrated Security=False;Persist Security Info=True;User ID=sa;Password=BmWr501956;TrustServerCertificate=False&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=192.168.0.90\DEVSQL;Initial Catalog=SDL;Integrated Security=False;Persist Security Info=True;User ID=AppUser;Password=yp/THDd?xM+pZ$;TrustServerCertificate=False&lt;/ConnectionString&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=192.168.0.90\DEVSQL;Initial Catalog=SDL;Integrated Security=False;Persist Security Info=True;User ID=sa;Password=BmWr501956;TrustServerCertificate=False</Value>
+      <Value Profile="(Default)">Data Source=192.168.0.90\DEVSQL;Initial Catalog=SDL;Integrated Security=False;Persist Security Info=True;User ID=AppUser;Password=yp/THDd?xM+pZ$;TrustServerCertificate=False</Value>
     </Setting>
     <Setting Name="EZOLLConnectionString" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=BUCHHALTUNG.verag.ost.dmn;Initial Catalog=ezoll;Integrated Security=false;User ID=sa;Password=BmWr501956;&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=BUCHHALTUNG.verag.ost.dmn;Initial Catalog=ezoll;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;&lt;/ConnectionString&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=BUCHHALTUNG.verag.ost.dmn;Initial Catalog=ezoll;Integrated Security=false;User ID=sa;Password=BmWr501956;</Value>
+      <Value Profile="(Default)">Data Source=BUCHHALTUNG.verag.ost.dmn;Initial Catalog=ezoll;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;</Value>
     </Setting>
     <Setting Name="AVISOConnectionStringTEST" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=192.168.0.90\DEVSQL;Initial Catalog=AVISO_new;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=192.168.0.90\DEVSQL;Initial Catalog=AVISO_new;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;Pooling=true;Min Pool Size=5;Max Pool Size=200&lt;/ConnectionString&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=192.168.0.90\DEVSQL;Initial Catalog=AVISO_new;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200</Value>
+      <Value Profile="(Default)">Data Source=192.168.0.90\DEVSQL;Initial Catalog=AVISO_new;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;Pooling=true;Min Pool Size=5;Max Pool Size=200</Value>
     </Setting>
     <Setting Name="ATLAS_SBGConnectionString" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
@@ -107,14 +107,14 @@
       <Value Profile="(Default)">http://ec.europa.eu/taxation_customs/vies/services/checkVatService</Value>
     </Setting>
     <Setting Name="DISPOConnectionString" Type="System.String" Scope="User">
-      <Value Profile="(Default)">Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=DISPO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200</Value>
+      <Value Profile="(Default)">Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=DISPO;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;Pooling=true;Min Pool Size=5;Max Pool Size=200</Value>
     </Setting>
     <Setting Name="DISPOConnectionStringTEST" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=192.168.0.90\DEVSQL;Initial Catalog=DISPO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=192.168.0.90\DEVSQL;Initial Catalog=DISPO;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;Pooling=true;Min Pool Size=5;Max Pool Size=200&lt;/ConnectionString&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=192.168.0.90\DEVSQL;Initial Catalog=DISPO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200</Value>
+      <Value Profile="(Default)">Data Source=192.168.0.90\DEVSQL;Initial Catalog=DISPO;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;Pooling=true;Min Pool Size=5;Max Pool Size=200</Value>
     </Setting>
     <Setting Name="VERAG_PROG_ALLGEMEIN_at_gv_bmf_finanzonline_uidAbfrageService" Type="(Web Service URL)" Scope="Application">
       <Value Profile="(Default)">https://finanzonline.bmf.gv.at/fon/ws/uidAbfrage/</Value>
@@ -128,9 +128,9 @@
     <Setting Name="AVISO_ATILLAConnectionString" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=AVISO;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;Pooling=true;Min Pool Size=5;Max Pool Size=200&lt;/ConnectionString&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200</Value>
+      <Value Profile="(Default)">Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=AVISO;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;Pooling=true;Min Pool Size=5;Max Pool Size=200</Value>
     </Setting>
   </Settings>
 </SettingsFile>

VERAG_PROG_ALLGEMEIN/Schnittstellen/cTherefore.vb

@@ -9,7 +9,9 @@ Public Class cTherefore
         Select Case FirmaId
             Case 7
                 Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Atilla ab Juni 2011",, deleteFileAfterImport)
-            Case 1, 11, 20 ', 15,20
+            Case 21,22,23
+                Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import ab Jänner 2021 UNISPED DE",, deleteFileAfterImport)
+            Case 1, 11, 20, 17 ', 15 
                 '   Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import an Jänner 2019", "Import ab Jänner 2019", deleteFileAfterImport)
                 Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import ab Jänner 2021", "Import ab Jänner 2021", deleteFileAfterImport)
                 '  Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import ab Jänner 2020", "Import ab Jänner 2020", deleteFileAfterImport)