Smmelrechnung Splitting Abf.Art, Benachrichtigung Vorauskasse, Session Online

2023-01-21 23:07:52 +01:00
parent e57dc24cbb
commit 209bb3de50
12 changed files with 248 additions and 154 deletions
--- a/SDL/Fakturierung/cFakturierung.vb
+++ b/SDL/Fakturierung/cFakturierung.vb
@@ -1876,11 +1876,14 @@ Public Class cFakturierung
    ' 3-_> Sammel-Rg gedruckt
    ' 4-_> ? irgendwas mit SR 6 Maut/Diesel??

-    Public Shared Function GET_SR_SQLDT(Firma_ID As Integer, SammelrechungArt As Integer, DatumBis As Date, Optional whereKdNr As String = "", Optional SB As String = "", Optional AvisoIds As List(Of Integer) = Nothing, Optional FakturierungsGruppe As String = "") As DataTable
+    Public Shared Function GET_SR_SQLDT(Firma_ID As Integer, SammelrechungArt As Integer, DatumBis As Date, Optional whereKdNr As String = "", Optional SB As String = "", Optional AvisoIds As List(Of Integer) = Nothing, Optional FakturierungsGruppe As String = "", Optional Abfertigungsart As String = "") As DataTable
        If whereKdNr <> "" Then whereKdNr = " AND RechnungsKundenNr IN(" & whereKdNr & ") "
+        Dim whereAbfArt = ""
+        If Abfertigungsart <> "" Then whereAbfArt = " AND (SELECT Abfertigungsart FROM Speditionsbuch WHERE Speditionsbuch.FilialenNr=Rechnungsausgang.FilialenNr and Speditionsbuch.AbfertigungsNr=Rechnungsausgang.AbfertigungsNr and Speditionsbuch.UnterNr=Rechnungsausgang.SpeditionsbuchUnterNr)='" & Abfertigungsart & "'  "
+
        Dim sqlStr = " SELECT Rechnungsausgang.RK_ID, Rechnungsausgang.Firma_ID, Rechnungsausgang.FilialenNr, Rechnungsausgang.RechnungsKundenNr, Rechnungsausgang.BelegartenNr, Rechnungsausgang.[Steuersatz %], Rechnungsausgang.Lastschrift, Rechnungsausgang.Währungscode, Rechnungsausgang.AvisoID, Rechnungsausgang.RechnungsNr, Rechnungsausgang.RechnungsDatum, Rechnungsausgang.DruckDatumZeit, Rechnungsausgang.Status, Rechnungsausgang.Sammelrechnung, Rechnungsausgang.Abfertigungsdatum, Rechnungsausgang.Buchungsjahr,Rechnungsausgang.AbfertigungsNr,Rechnungsausgang.SpeditionsbuchUnterNr,[SteuerpflichtigerGesamtbetrag],[SteuerfreierGesamtbetrag]
 	                       From Rechnungsausgang
-                            WHERE Rechnungsausgang.Status IN(0, 2) And Rechnungsausgang.Firma_ID = " & Firma_ID & " And Rechnungsausgang.Sammelrechnung = '" & SammelrechungArt & "' And Rechnungsausgang.FakturierungsGruppe = '" & FakturierungsGruppe & "' And CONVERT(DATE,Rechnungsausgang.Abfertigungsdatum,104) <= '" & DatumBis.ToShortDateString & "' " & whereKdNr & " 
+                            WHERE Rechnungsausgang.Status IN(0, 2) And Rechnungsausgang.Firma_ID = " & Firma_ID & " And Rechnungsausgang.Sammelrechnung = '" & SammelrechungArt & "' And Rechnungsausgang.FakturierungsGruppe = '" & FakturierungsGruppe & "' And CONVERT(DATE,Rechnungsausgang.Abfertigungsdatum,104) <= '" & DatumBis.ToShortDateString & "' " & whereKdNr & whereAbfArt & " 
                         " & If(SammelrechungArt = 7 And SB <> "", " AND Sachbearbeiter='" & SB & "' ", "") & "" & getWhereAvisoId(AvisoIds)
        'Rechnungsausgang.Status IN(0, 2) --> vorher nur 2, da Anlagen vor der SR gedruckt wurden...
        If SammelrechungArt = 7 Then
@@ -1915,7 +1918,7 @@ Public Class cFakturierung
    End Function


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

            If SammelrechungArt = 7 And (AvisoIds IsNot Nothing AndAlso AvisoIds.Count = 0) Then Return False 'Prüfung, ob Daten vorhanden; Abbruch ZB wenn keine AvisoId

-            Dim dt = GET_SR_SQLDT(Firma_ID, SammelrechungArt, DatumBis, whereKdNr, SB, AvisoIds, FakturierungsGruppe) 'SQL.loadDgvBySql(sqlStr, "FMZOLL")
+            Dim dt = GET_SR_SQLDT(Firma_ID, SammelrechungArt, DatumBis, whereKdNr, SB, AvisoIds, FakturierungsGruppe, Abfertigungsart) 'SQL.loadDgvBySql(sqlStr, "FMZOLL")
            If dt Is Nothing Then MsgBox("ERR01: Keine Daten") : Return True
            If dt.Rows.Count = 0 Then MsgBox("ERR02: Keine Daten") : Return True
            If Not CHECK_SR_SQLDT(dt) Then MsgBox("ERR03: Es wurden Rechnungen mit einem 0-Betrag gefunden. Bitte prüfen Sie die Eingaben und starten Sie die Sammelabrechnung erneut.") : Return True
@@ -1968,7 +1971,7 @@ Public Class cFakturierung
                            If FIRMATmp < 0 Then FIRMATmp = RG.Firma_ID  'erstes Mal
                            If kdTmp <> RG.RechnungsKundenNr Or AvisoIdTmp <> RG.AvisoID Or FIRMATmp <> RG.Firma_ID Then 'Or FilialeTmp <> RG.FilialenNr
                                Dim path = ""
-                                doSAMMELRechnungsDruck_Abschnitt(Aktuelle_RgNr, Firma_ID, Buchungsjahr, DruckdatumUhrzeit, PrinterName, AnlageEinzelRg, Sammelrechnungsbericht, RechnungsdruckArt, path,, SB, AnlageExcelEvolog, SonstAnlagen, VorschauID, AnlageExcelTransferry360, FakturierungsGruppe) 'hier wird auch die RG Nr erhöht!
+                                doSAMMELRechnungsDruck_Abschnitt(Aktuelle_RgNr, Firma_ID, Buchungsjahr, DruckdatumUhrzeit, PrinterName, AnlageEinzelRg, Sammelrechnungsbericht, RechnungsdruckArt, path,, SB, AnlageExcelEvolog, SonstAnlagen, VorschauID, AnlageExcelTransferry360, FakturierungsGruppe, Abfertigungsart) 'hier wird auch die RG Nr erhöht!
                                Aktuelle_RgNr = getNewRgNr(Firma_ID, Buchungsjahr)
                                If path <> "" Then listPDFs.Add(path)
                            End If
@@ -1982,7 +1985,7 @@ Public Class cFakturierung
                            If FIRMATmp < 0 Then FIRMATmp = RG.Firma_ID  'erstes Mal
                            If kdTmp <> RG.RechnungsKundenNr Or FIRMATmp <> RG.Firma_ID Then 'Or FilialeTmp <> RG.FilialenNr
                                Dim path = ""
-                                doSAMMELRechnungsDruck_Abschnitt(Aktuelle_RgNr, Firma_ID, Buchungsjahr, DruckdatumUhrzeit, PrinterName, AnlageEinzelRg, Sammelrechnungsbericht, RechnungsdruckArt, path,, SB, AnlageExcelEvolog, SonstAnlagen, VorschauID, AnlageExcelTransferry360, FakturierungsGruppe)
+                                doSAMMELRechnungsDruck_Abschnitt(Aktuelle_RgNr, Firma_ID, Buchungsjahr, DruckdatumUhrzeit, PrinterName, AnlageEinzelRg, Sammelrechnungsbericht, RechnungsdruckArt, path,, SB, AnlageExcelEvolog, SonstAnlagen, VorschauID, AnlageExcelTransferry360, FakturierungsGruppe, Abfertigungsart)
                                Aktuelle_RgNr = getNewRgNr(Firma_ID, Buchungsjahr)
                                If path <> "" Then listPDFs.Add(path)
                            End If
@@ -2009,7 +2012,7 @@ Public Class cFakturierung
            'Letzter Abschnitt:
            If found Then
                Dim path = ""
-                doSAMMELRechnungsDruck_Abschnitt(Aktuelle_RgNr, Firma_ID, Buchungsjahr, DruckdatumUhrzeit, PrinterName, AnlageEinzelRg, Sammelrechnungsbericht, RechnungsdruckArt, path,, SB, AnlageExcelEvolog, SonstAnlagen, VorschauID, AnlageExcelTransferry360, FakturierungsGruppe)
+                doSAMMELRechnungsDruck_Abschnitt(Aktuelle_RgNr, Firma_ID, Buchungsjahr, DruckdatumUhrzeit, PrinterName, AnlageEinzelRg, Sammelrechnungsbericht, RechnungsdruckArt, path,, SB, AnlageExcelEvolog, SonstAnlagen, VorschauID, AnlageExcelTransferry360, FakturierungsGruppe, Abfertigungsart)
                If path <> "" Then listPDFs.Add(path)
            End If
            lastAktuelle_RgNr = Aktuelle_RgNr
@@ -2030,7 +2033,7 @@ Public Class cFakturierung

    End Function

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

        Dim dt As DataTable
--- a/SDL/Fakturierung/frmFaktSammelRgDrucken.Designer.vb
+++ b/SDL/Fakturierung/frmFaktSammelRgDrucken.Designer.vb
@@ -55,6 +55,8 @@ Partial Class frmFaktSammelRgDrucken
        Me.cbxTransFerry = New System.Windows.Forms.CheckBox()
        Me.Label5 = New System.Windows.Forms.Label()
        Me.cboFaktGrp = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Label6 = New System.Windows.Forms.Label()
+        Me.cboAbfertigungsart = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.pnl.SuspendLayout()
        CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
@@ -154,15 +156,15 @@ Partial Class frmFaktSammelRgDrucken
        Me.cboFirma.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.cboFirma.FormattingEnabled = True
-        Me.cboFirma.Location = New System.Drawing.Point(252, 18)
+        Me.cboFirma.Location = New System.Drawing.Point(252, 17)
        Me.cboFirma.Name = "cboFirma"
-        Me.cboFirma.Size = New System.Drawing.Size(547, 21)
+        Me.cboFirma.Size = New System.Drawing.Size(183, 21)
        Me.cboFirma.TabIndex = 2
        '
        'lbl
        '
        Me.lbl.AutoSize = True
-        Me.lbl.Location = New System.Drawing.Point(147, 21)
+        Me.lbl.Location = New System.Drawing.Point(148, 20)
        Me.lbl.Name = "lbl"
        Me.lbl.Size = New System.Drawing.Size(35, 13)
        Me.lbl.TabIndex = 1
@@ -171,7 +173,7 @@ Partial Class frmFaktSammelRgDrucken
        'Label1
        '
        Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(147, 44)
+        Me.Label1.Location = New System.Drawing.Point(147, 45)
        Me.Label1.Name = "Label1"
        Me.Label1.Size = New System.Drawing.Size(94, 13)
        Me.Label1.TabIndex = 3
@@ -180,7 +182,7 @@ Partial Class frmFaktSammelRgDrucken
        'Label2
        '
        Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(147, 69)
+        Me.Label2.Location = New System.Drawing.Point(147, 67)
        Me.Label2.Name = "Label2"
        Me.Label2.Size = New System.Drawing.Size(67, 13)
        Me.Label2.TabIndex = 7
@@ -189,7 +191,7 @@ Partial Class frmFaktSammelRgDrucken
        'Label3
        '
        Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(148, 90)
+        Me.Label3.Location = New System.Drawing.Point(148, 93)
        Me.Label3.Name = "Label3"
        Me.Label3.Size = New System.Drawing.Size(47, 13)
        Me.Label3.TabIndex = 10
@@ -200,9 +202,10 @@ Partial Class frmFaktSammelRgDrucken
        Me.cboPrinter._allowedValuesFreiText = Nothing
        Me.cboPrinter._allowFreiText = False
        Me.cboPrinter._value = ""
+        Me.cboPrinter.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.cboPrinter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
        Me.cboPrinter.FormattingEnabled = True
-        Me.cboPrinter.Location = New System.Drawing.Point(12, 268)
+        Me.cboPrinter.Location = New System.Drawing.Point(12, 364)
        Me.cboPrinter.Name = "cboPrinter"
        Me.cboPrinter.Size = New System.Drawing.Size(113, 21)
        Me.cboPrinter.TabIndex = 17
@@ -212,15 +215,17 @@ Partial Class frmFaktSammelRgDrucken
        Me.txtRechnungsdatum._DateTimeOnly = False
        Me.txtRechnungsdatum._numbersOnly = False
        Me.txtRechnungsdatum._numbersOnlyKommastellen = ""
+        Me.txtRechnungsdatum._numbersOnlyTrennzeichen = True
        Me.txtRechnungsdatum._Prozent = False
        Me.txtRechnungsdatum._ShortDateNew = True
        Me.txtRechnungsdatum._ShortDateOnly = False
        Me.txtRechnungsdatum._TimeOnly = False
+        Me.txtRechnungsdatum._TimeOnly_Seconds = False
        Me.txtRechnungsdatum._value = ""
        Me.txtRechnungsdatum._Waehrung = False
        Me.txtRechnungsdatum._WaehrungZeichen = True
        Me.txtRechnungsdatum.ForeColor = System.Drawing.Color.Black
-        Me.txtRechnungsdatum.Location = New System.Drawing.Point(252, 41)
+        Me.txtRechnungsdatum.Location = New System.Drawing.Point(252, 42)
        Me.txtRechnungsdatum.MaxLength = 10
        Me.txtRechnungsdatum.MaxLineLength = -1
        Me.txtRechnungsdatum.MaxLines_Warning = ""
@@ -234,10 +239,12 @@ Partial Class frmFaktSammelRgDrucken
        Me.txtZeitraumBis._DateTimeOnly = False
        Me.txtZeitraumBis._numbersOnly = False
        Me.txtZeitraumBis._numbersOnlyKommastellen = ""
+        Me.txtZeitraumBis._numbersOnlyTrennzeichen = True
        Me.txtZeitraumBis._Prozent = False
        Me.txtZeitraumBis._ShortDateNew = True
        Me.txtZeitraumBis._ShortDateOnly = False
        Me.txtZeitraumBis._TimeOnly = False
+        Me.txtZeitraumBis._TimeOnly_Seconds = False
        Me.txtZeitraumBis._value = ""
        Me.txtZeitraumBis._Waehrung = False
        Me.txtZeitraumBis._WaehrungZeichen = True
@@ -263,20 +270,21 @@ Partial Class frmFaktSammelRgDrucken
            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.MyDatagridview1.BackgroundColor = System.Drawing.Color.White
        Me.MyDatagridview1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.MyDatagridview1.Location = New System.Drawing.Point(252, 88)
+        Me.MyDatagridview1.Location = New System.Drawing.Point(252, 91)
        Me.MyDatagridview1.Name = "MyDatagridview1"
        Me.MyDatagridview1.ReadOnly = True
        Me.MyDatagridview1.RowHeadersVisible = False
        Me.MyDatagridview1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.MyDatagridview1.Size = New System.Drawing.Size(547, 201)
+        Me.MyDatagridview1.Size = New System.Drawing.Size(547, 294)
        Me.MyDatagridview1.TabIndex = 18
        '
        'btn
        '
+        Me.btn.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.btn.BackgroundImage = Global.SDL.My.Resources.Resources.printer2
        Me.btn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
        Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btn.Location = New System.Drawing.Point(12, 166)
+        Me.btn.Location = New System.Drawing.Point(12, 262)
        Me.btn.Name = "btn"
        Me.btn.Size = New System.Drawing.Size(113, 60)
        Me.btn.TabIndex = 11
@@ -284,11 +292,12 @@ Partial Class frmFaktSammelRgDrucken
        '
        'Button9
        '
+        Me.Button9.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.Button9.BackgroundImage = Global.SDL.My.Resources.Resources.pdf
        Me.Button9.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
        Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.Button9.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button9.Location = New System.Drawing.Point(12, 225)
+        Me.Button9.Location = New System.Drawing.Point(12, 321)
        Me.Button9.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
        Me.Button9.Name = "Button9"
        Me.Button9.Padding = New System.Windows.Forms.Padding(20, 0, 0, 0)
@@ -299,11 +308,12 @@ Partial Class frmFaktSammelRgDrucken
        '
        'Button8
        '
+        Me.Button8.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.Button8.BackgroundImage = Global.SDL.My.Resources.Resources.email_big
        Me.Button8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
        Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button8.Location = New System.Drawing.Point(67, 225)
+        Me.Button8.Location = New System.Drawing.Point(67, 321)
        Me.Button8.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
        Me.Button8.Name = "Button8"
        Me.Button8.Padding = New System.Windows.Forms.Padding(20, 0, 0, 0)
@@ -314,8 +324,9 @@ Partial Class frmFaktSammelRgDrucken
        '
        'cbxEinzelAnlagen
        '
+        Me.cbxEinzelAnlagen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.cbxEinzelAnlagen.AutoSize = True
-        Me.cbxEinzelAnlagen.Location = New System.Drawing.Point(150, 195)
+        Me.cbxEinzelAnlagen.Location = New System.Drawing.Point(150, 291)
        Me.cbxEinzelAnlagen.Name = "cbxEinzelAnlagen"
        Me.cbxEinzelAnlagen.Size = New System.Drawing.Size(96, 17)
        Me.cbxEinzelAnlagen.TabIndex = 14
@@ -324,10 +335,11 @@ Partial Class frmFaktSammelRgDrucken
        '
        'cbxSammelbericht
        '
+        Me.cbxSammelbericht.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.cbxSammelbericht.AutoSize = True
        Me.cbxSammelbericht.Checked = True
        Me.cbxSammelbericht.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.cbxSammelbericht.Location = New System.Drawing.Point(150, 215)
+        Me.cbxSammelbericht.Location = New System.Drawing.Point(150, 311)
        Me.cbxSammelbericht.Name = "cbxSammelbericht"
        Me.cbxSammelbericht.Size = New System.Drawing.Size(95, 17)
        Me.cbxSammelbericht.TabIndex = 16
@@ -339,7 +351,7 @@ Partial Class frmFaktSammelRgDrucken
        Me.lkl.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.lkl.AutoSize = True
        Me.lkl.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.lkl.Location = New System.Drawing.Point(704, 69)
+        Me.lkl.Location = New System.Drawing.Point(704, 72)
        Me.lkl.Name = "lkl"
        Me.lkl.Size = New System.Drawing.Size(95, 13)
        Me.lkl.TabIndex = 9
@@ -348,8 +360,9 @@ Partial Class frmFaktSammelRgDrucken
        '
        'cbxZusammenfassen
        '
+        Me.cbxZusammenfassen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.cbxZusammenfassen.AutoSize = True
-        Me.cbxZusammenfassen.Location = New System.Drawing.Point(12, 251)
+        Me.cbxZusammenfassen.Location = New System.Drawing.Point(12, 347)
        Me.cbxZusammenfassen.Name = "cbxZusammenfassen"
        Me.cbxZusammenfassen.Size = New System.Drawing.Size(107, 17)
        Me.cbxZusammenfassen.TabIndex = 15
@@ -364,7 +377,7 @@ Partial Class frmFaktSammelRgDrucken
        Me.cboSB.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.cboSB.FormattingEnabled = True
-        Me.cboSB.Location = New System.Drawing.Point(532, 40)
+        Me.cboSB.Location = New System.Drawing.Point(532, 19)
        Me.cboSB.Name = "cboSB"
        Me.cboSB.Size = New System.Drawing.Size(267, 21)
        Me.cboSB.TabIndex = 6
@@ -373,7 +386,7 @@ Partial Class frmFaktSammelRgDrucken
        'lblSB
        '
        Me.lblSB.AutoSize = True
-        Me.lblSB.Location = New System.Drawing.Point(444, 44)
+        Me.lblSB.Location = New System.Drawing.Point(444, 23)
        Me.lblSB.Name = "lblSB"
        Me.lblSB.Size = New System.Drawing.Size(82, 13)
        Me.lblSB.TabIndex = 5
@@ -382,8 +395,9 @@ Partial Class frmFaktSammelRgDrucken
        '
        'cbxEVOLOG
        '
+        Me.cbxEVOLOG.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.cbxEVOLOG.AutoSize = True
-        Me.cbxEVOLOG.Location = New System.Drawing.Point(151, 253)
+        Me.cbxEVOLOG.Location = New System.Drawing.Point(151, 349)
        Me.cbxEVOLOG.Name = "cbxEVOLOG"
        Me.cbxEVOLOG.Size = New System.Drawing.Size(99, 17)
        Me.cbxEVOLOG.TabIndex = 19
@@ -392,8 +406,9 @@ Partial Class frmFaktSammelRgDrucken
        '
        'Label4
        '
+        Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.Label4.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(148, 237)
+        Me.Label4.Location = New System.Drawing.Point(148, 333)
        Me.Label4.Name = "Label4"
        Me.Label4.Size = New System.Drawing.Size(41, 13)
        Me.Label4.TabIndex = 20
@@ -401,10 +416,11 @@ Partial Class frmFaktSammelRgDrucken
        '
        'Button1
        '
+        Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.Button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button1.Location = New System.Drawing.Point(150, 166)
+        Me.Button1.Location = New System.Drawing.Point(150, 262)
        Me.Button1.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
        Me.Button1.Name = "Button1"
        Me.Button1.Size = New System.Drawing.Size(91, 25)
@@ -414,8 +430,9 @@ Partial Class frmFaktSammelRgDrucken
        '
        'cbxTransFerry
        '
+        Me.cbxTransFerry.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.cbxTransFerry.AutoSize = True
-        Me.cbxTransFerry.Location = New System.Drawing.Point(151, 271)
+        Me.cbxTransFerry.Location = New System.Drawing.Point(151, 367)
        Me.cbxTransFerry.Name = "cbxTransFerry"
        Me.cbxTransFerry.Size = New System.Drawing.Size(105, 17)
        Me.cbxTransFerry.TabIndex = 22
@@ -424,7 +441,7 @@ Partial Class frmFaktSammelRgDrucken
        '
        'Label5
        '
-        Me.Label5.Location = New System.Drawing.Point(444, 67)
+        Me.Label5.Location = New System.Drawing.Point(444, 46)
        Me.Label5.Name = "Label5"
        Me.Label5.Size = New System.Drawing.Size(82, 17)
        Me.Label5.TabIndex = 23
@@ -438,17 +455,40 @@ Partial Class frmFaktSammelRgDrucken
        Me.cboFaktGrp.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.cboFaktGrp.FormattingEnabled = True
-        Me.cboFaktGrp.Location = New System.Drawing.Point(532, 63)
+        Me.cboFaktGrp.Location = New System.Drawing.Point(532, 42)
        Me.cboFaktGrp.Name = "cboFaktGrp"
        Me.cboFaktGrp.Size = New System.Drawing.Size(166, 21)
        Me.cboFaktGrp.TabIndex = 24
        '
+        'Label6
+        '
+        Me.Label6.Location = New System.Drawing.Point(444, 68)
+        Me.Label6.Name = "Label6"
+        Me.Label6.Size = New System.Drawing.Size(82, 17)
+        Me.Label6.TabIndex = 25
+        Me.Label6.Text = "Abfertigungsart:"
+        '
+        'cboAbfertigungsart
+        '
+        Me.cboAbfertigungsart._allowedValuesFreiText = Nothing
+        Me.cboAbfertigungsart._allowFreiText = False
+        Me.cboAbfertigungsart._value = ""
+        Me.cboAbfertigungsart.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.cboAbfertigungsart.FormattingEnabled = True
+        Me.cboAbfertigungsart.Location = New System.Drawing.Point(532, 64)
+        Me.cboAbfertigungsart.Name = "cboAbfertigungsart"
+        Me.cboAbfertigungsart.Size = New System.Drawing.Size(166, 21)
+        Me.cboAbfertigungsart.TabIndex = 26
+        '
        'frmFaktSammelRgDrucken
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.BackColor = System.Drawing.Color.White
-        Me.ClientSize = New System.Drawing.Size(811, 297)
+        Me.ClientSize = New System.Drawing.Size(811, 393)
+        Me.Controls.Add(Me.Label6)
+        Me.Controls.Add(Me.cboAbfertigungsart)
        Me.Controls.Add(Me.Label5)
        Me.Controls.Add(Me.cboFaktGrp)
        Me.Controls.Add(Me.Button1)
@@ -517,4 +557,6 @@ Partial Class frmFaktSammelRgDrucken
    Friend WithEvents cbxTransFerry As CheckBox
    Friend WithEvents Label5 As Label
    Friend WithEvents cboFaktGrp As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Label6 As Label
+    Friend WithEvents cboAbfertigungsart As VERAG_PROG_ALLGEMEIN.MyComboBox
 End Class
--- a/SDL/Fakturierung/frmFaktSammelRgDrucken.vb
+++ b/SDL/Fakturierung/frmFaktSammelRgDrucken.vb
@@ -55,11 +55,15 @@ Public Class frmFaktSammelRgDrucken

    Sub initDGV()
        With MyDatagridview1
+            Dim whereAbfArt = ""
+            If cboAbfertigungsart._value <> "" Then whereAbfArt = " AND (SELECT Abfertigungsart FROM Speditionsbuch WHERE Speditionsbuch.FilialenNr=Rechnungsausgang.FilialenNr and Speditionsbuch.AbfertigungsNr=Rechnungsausgang.AbfertigungsNr and Speditionsbuch.UnterNr=Rechnungsausgang.SpeditionsbuchUnterNr)='" & cboAbfertigungsart._value & "'  "
+
            Dim sqlStr = " SELECT Rechnungsausgang.RechnungsKundenNr, max(Rechnungsausgang.[RechnungsName 1]) as [RechnungsName 1]," & If(Sammelrechung = 7, "AvisoId", "0") & " as AvisoId,max(Rechnungsausgang.[RechnungsLandKz]) as [RechnungsLandKz] , count(*) as Anzahl" & If(Sammelrechung = 7, ",max([LKW Kennzeichen]) as LKW", "") & " 
                            ,(SELECT CASE WHEN Rechnungsdruck =0 THEN 'POST' WHEN Rechnungsdruck=1 THEN 'FAX' WHEN Rechnungsdruck=2 THEN 'E-MAIL' ELSE '-' END FROM Adressen WHERE AdressenNr=Rechnungsausgang.RechnungsKundenNr ) as Rechnungsdruck 
                             FROM Rechnungsausgang  
 	                         WHERE Rechnungsausgang.Status IN (0,2) And Rechnungsausgang.Firma_ID = '" & cboFirma._value & "' And Rechnungsausgang.Sammelrechnung = '" & Sammelrechung & "' And CONVERT(DATE,Rechnungsausgang.Abfertigungsdatum,104) <= '" & txtZeitraumBis._value & "'
                                " & If(Sammelrechung = 7 And cboSB._value <> "", " AND Rechnungsausgang.Sachbearbeiter='" & cboSB._value & "' ", "") & "
+                                " & whereAbfArt & "
                                AND Rechnungsausgang.FakturierungsGruppe='" & cboFaktGrp._value & "' 
                              GROUP BY RechnungsKundenNr " & If(Sammelrechung = 7, ",AvisoId", "") & "
                              ORDER BY Rechnungsausgang.RechnungsKundenNr "
@@ -89,6 +93,8 @@ Public Class frmFaktSammelRgDrucken
        txtZeitraumBis.Text = Now.ToShortDateString
        txtRechnungsdatum.Text = Now.ToShortDateString

+        cboAbfertigungsart.fillWithSQL("SELECT Abfertigungsart,[Abfertigungsbezeichnung] FROM [Abfertigungsarten] ORDER BY Abfertigungsart  ", True, "FMZOLL", True)
+
        Dim FirmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Then
            FirmaTmp = "VERAGIMEX"
@@ -96,10 +102,10 @@ Public Class frmFaktSammelRgDrucken

        Select Case FirmaTmp
            Case "VERAG"
-                cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez]  FROM  [tblFirma] WHERE Firma_ID<>20", False, "FMZOLL")
+                cboFirma.fillWithSQL("Select [Firma_ID], [Firma_Bez]  FROM  [tblFirma] WHERE Firma_ID<>20", False, "FMZOLL")
                cboFirma.changeItem("1")
                cboSB.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where mit_firma IN ('VERAG'" & If(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN", ",'ALL'", "") & ") and mit_gekuendigt=0 AND  (mit_abteilung IN ('VRR','BH')	OR [mit_id] IN (SELECT  [beroz_bergrId]  FROM [tblBerechtigungsObjekteZuordnung]  where [beroz_beroId]=90 AND  beroz_art='B')) order by mit_username", False, "ADMIN", True)
-            Case "IMEX"
+        Case "IMEX"
                cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez]  FROM  [tblFirma] WHERE Firma_ID=20", False, "FMZOLL")
                cboFirma.changeItem("20")
                cboSB.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where  mit_firma='IMEX'  and mit_gekuendigt=0 AND  (mit_abteilung IN ('VRR','BH')	OR (SELECT COUNT(*)  FROM [tblBerechtigungsObjekteZuordnung]  where [beroz_beroId]=90 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0) order by mit_username", False, "ADMIN", True)
@@ -242,7 +248,7 @@ Public Class frmFaktSammelRgDrucken
            Me.Cursor = Cursors.WaitCursor
            Dim listPDFs As New List(Of String)
            Dim SonstAnlagen As New List(Of String)
-            cFakturierung.doSAMMELRechnungsDruck(cboFirma._value, Sammelrechung, CDate(txtZeitraumBis.Text), CDate(txtRechnungsdatum.Text), cboPrinter.Text, cbxEinzelAnlagen.Checked, cbxSammelbericht.Checked, getSelectionKdNr, If(ausgabeArt = 1, -1, 4), listPDFs, cboSB._value,,, getAvisoIds, cbxEVOLOG.Checked, SonstAnlagen, vorschau, cbxTransFerry.Checked, cboFaktGrp._value)
+            cFakturierung.doSAMMELRechnungsDruck(cboFirma._value, Sammelrechung, CDate(txtZeitraumBis.Text), CDate(txtRechnungsdatum.Text), cboPrinter.Text, cbxEinzelAnlagen.Checked, cbxSammelbericht.Checked, getSelectionKdNr, If(ausgabeArt = 1, -1, 4), listPDFs, cboSB._value,,, getAvisoIds, cbxEVOLOG.Checked, SonstAnlagen, vorschau, cbxTransFerry.Checked, cboFaktGrp._value, cboAbfertigungsart._value)

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

@@ -360,4 +366,8 @@ Public Class frmFaktSammelRgDrucken
    Private Sub cboFaktGrp_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboFaktGrp.SelectedIndexChanged
        initDGV()
    End Sub
+
+    Private Sub cboAbfertigungsart_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboAbfertigungsart.SelectedIndexChanged
+        initDGV()
+    End Sub
 End Class
--- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb
+++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb
@@ -23,12 +23,12 @@ Partial Class usrCntlSpeditionsBuchSuche
    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
-        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlSpeditionsBuchSuche))
        Me.TabPage1 = New System.Windows.Forms.TabPage()
        Me.cntxtCntxtSpeditionsbuch = New System.Windows.Forms.ContextMenuStrip(Me.components)
@@ -72,6 +72,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.KundenauswertungenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.cboHandlingssatz = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Button20 = New System.Windows.Forms.Button()
        Me.Label46 = New System.Windows.Forms.Label()
@@ -162,7 +163,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.Label3 = New System.Windows.Forms.Label()
        Me.Label12 = New System.Windows.Forms.Label()
        Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker()
-        Me.txtBestimmungszollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox()
+        Me.txtZollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox()
        Me.cbxEIDR = New System.Windows.Forms.CheckBox()
        Me.cbxCMR = New System.Windows.Forms.CheckBox()
        Me.Label41 = New System.Windows.Forms.Label()
@@ -194,7 +195,6 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.Label45 = New System.Windows.Forms.Label()
        Me.cboFilialeHandling = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.SplitContainer = New System.Windows.Forms.SplitContainer()
-        Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.cntxtCntxtSpeditionsbuch.SuspendLayout()
        Me.pnlRechts.SuspendLayout()
        CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -652,35 +652,35 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.DataGridView.AllowUserToDeleteRows = False
        Me.DataGridView.AllowUserToOrderColumns = True
        Me.DataGridView.AllowUserToResizeRows = False
-        DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.DataGridView.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle7
+        DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.DataGridView.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
        Me.DataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.DataGridView.ContextMenuStrip = Me.cntxtCntxtSpeditionsbuch
-        DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.DataGridView.DefaultCellStyle = DataGridViewCellStyle8
+        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.DataGridView.DefaultCellStyle = DataGridViewCellStyle2
        Me.DataGridView.Dock = System.Windows.Forms.DockStyle.Fill
        Me.DataGridView.Location = New System.Drawing.Point(450, 0)
        Me.DataGridView.Name = "DataGridView"
-        DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.DataGridView.RowHeadersDefaultCellStyle = DataGridViewCellStyle9
+        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.DataGridView.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
        Me.DataGridView.Size = New System.Drawing.Size(770, 227)
        Me.DataGridView.TabIndex = 0
        '
@@ -707,35 +707,35 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.dgvLKW.AllowUserToOrderColumns = True
        Me.dgvLKW.AllowUserToResizeRows = False
        Me.dgvLKW.BackgroundColor = System.Drawing.Color.WhiteSmoke
-        DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvLKW.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
+        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvLKW.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
        Me.dgvLKW.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvLKW.ContextMenuStrip = Me.cntxtCntxtSpeditionsbuch
-        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvLKW.DefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvLKW.DefaultCellStyle = DataGridViewCellStyle5
        Me.dgvLKW.Dock = System.Windows.Forms.DockStyle.Left
        Me.dgvLKW.Location = New System.Drawing.Point(0, 0)
        Me.dgvLKW.Name = "dgvLKW"
-        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
+        DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle6
        Me.dgvLKW.Size = New System.Drawing.Size(450, 227)
        Me.dgvLKW.TabIndex = 35
        Me.dgvLKW.Visible = False
@@ -866,7 +866,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KundenauswertungenToolStripMenuItem1})
        Me.MenuStrip1.Location = New System.Drawing.Point(601, 128)
        Me.MenuStrip1.Name = "MenuStrip1"
-        Me.MenuStrip1.Size = New System.Drawing.Size(283, 27)
+        Me.MenuStrip1.Size = New System.Drawing.Size(163, 27)
        Me.MenuStrip1.TabIndex = 89
        Me.MenuStrip1.Text = "Kundenauswertungen"
        '
@@ -884,17 +884,25 @@ Partial Class usrCntlSpeditionsBuchSuche
        '
        Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Image = CType(resources.GetObject("ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Image"), System.Drawing.Image)
        Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Name = "ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem"
-        Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(316, 30)
+        Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(308, 24)
        Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Text = "ZF Passau (Zeitraum auswählen)"
        Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Visible = False
        '
        'ZFThyrnauZeitraumAuswählenToolStripMenuItem
        '
        Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Name = "ZFThyrnauZeitraumAuswählenToolStripMenuItem"
-        Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(316, 30)
+        Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(308, 24)
        Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Text = "ZF Thyrnau (Zeitraum auswählen)"
        Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Visible = False
        '
+        'FlenderBocholtZeitraumAuswählenToolStripMenuItem
+        '
+        Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.Excel_logo
+        Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem.Name = "FlenderBocholtZeitraumAuswählenToolStripMenuItem"
+        Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(308, 24)
+        Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem.Text = "Flender Bocholt (Zeitraum auswählen)"
+        Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem.Visible = False
+        '
        'cboHandlingssatz
        '
        Me.cboHandlingssatz._allowedValuesFreiText = Nothing
@@ -1876,7 +1884,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        '
        'SplitContainer1.Panel2
        '
-        Me.SplitContainer1.Panel2.Controls.Add(Me.txtBestimmungszollstelle)
+        Me.SplitContainer1.Panel2.Controls.Add(Me.txtZollstelle)
        Me.SplitContainer1.Panel2.Controls.Add(Me.cbxEIDR)
        Me.SplitContainer1.Panel2.Controls.Add(Me.cbxCMR)
        Me.SplitContainer1.Panel2.Controls.Add(Me.Label41)
@@ -2185,32 +2193,32 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.DateTimePicker1.Size = New System.Drawing.Size(115, 20)
        Me.DateTimePicker1.TabIndex = 2
        '
-        'txtBestimmungszollstelle
+        'txtZollstelle
        '
-        Me.txtBestimmungszollstelle._allowFreitext = False
-        Me.txtBestimmungszollstelle._AllowSetValue = False
-        Me.txtBestimmungszollstelle._allowSpaceAsSplitter = False
-        Me.txtBestimmungszollstelle._autoSizeGross = False
-        Me.txtBestimmungszollstelle._hideIfListEmpty = True
-        Me.txtBestimmungszollstelle._value = Nothing
-        Me.txtBestimmungszollstelle.conn_art = "FMZOLL"
-        Me.txtBestimmungszollstelle.dgvpos = "LEFT"
-        Me.txtBestimmungszollstelle.DISPLAY_PARAM = Nothing
-        Me.txtBestimmungszollstelle.INVISIBLE_COLUMNS = Nothing
-        Me.txtBestimmungszollstelle.key_visible = False
-        Me.txtBestimmungszollstelle.KEYPARAM = Nothing
-        Me.txtBestimmungszollstelle.Location = New System.Drawing.Point(627, 192)
-        Me.txtBestimmungszollstelle.MaxLength = 50
-        Me.txtBestimmungszollstelle.Name = "txtBestimmungszollstelle"
-        Me.txtBestimmungszollstelle.searchActive = True
-        Me.txtBestimmungszollstelle.Size = New System.Drawing.Size(106, 20)
-        Me.txtBestimmungszollstelle.SQL_ORDER_BY = Nothing
-        Me.txtBestimmungszollstelle.SQL_SELECT = Nothing
-        Me.txtBestimmungszollstelle.SQL_WHERE = Nothing
-        Me.txtBestimmungszollstelle.SQL_WhereParamList = Nothing
-        Me.txtBestimmungszollstelle.TabIndex = 55
-        Me.txtBestimmungszollstelle.usrcntl = Nothing
-        Me.txtBestimmungszollstelle.Visible = False
+        Me.txtZollstelle._allowFreitext = False
+        Me.txtZollstelle._AllowSetValue = False
+        Me.txtZollstelle._allowSpaceAsSplitter = False
+        Me.txtZollstelle._autoSizeGross = False
+        Me.txtZollstelle._hideIfListEmpty = True
+        Me.txtZollstelle._value = Nothing
+        Me.txtZollstelle.conn_art = "FMZOLL"
+        Me.txtZollstelle.dgvpos = "LEFT"
+        Me.txtZollstelle.DISPLAY_PARAM = Nothing
+        Me.txtZollstelle.INVISIBLE_COLUMNS = Nothing
+        Me.txtZollstelle.key_visible = False
+        Me.txtZollstelle.KEYPARAM = Nothing
+        Me.txtZollstelle.Location = New System.Drawing.Point(627, 192)
+        Me.txtZollstelle.MaxLength = 50
+        Me.txtZollstelle.Name = "txtZollstelle"
+        Me.txtZollstelle.searchActive = True
+        Me.txtZollstelle.Size = New System.Drawing.Size(106, 20)
+        Me.txtZollstelle.SQL_ORDER_BY = Nothing
+        Me.txtZollstelle.SQL_SELECT = Nothing
+        Me.txtZollstelle.SQL_WHERE = Nothing
+        Me.txtZollstelle.SQL_WhereParamList = Nothing
+        Me.txtZollstelle.TabIndex = 55
+        Me.txtZollstelle.usrcntl = Nothing
+        Me.txtZollstelle.Visible = False
        '
        'cbxEIDR
        '
@@ -2708,14 +2716,6 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.SplitContainer.SplitterWidth = 2
        Me.SplitContainer.TabIndex = 3
        '
-        'FlenderBocholtZeitraumAuswählenToolStripMenuItem
-        '
-        Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.Excel_logo
-        Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem.Name = "FlenderBocholtZeitraumAuswählenToolStripMenuItem"
-        Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(316, 30)
-        Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem.Text = "Flender Bocholt (Zeitraum auswählen)"
-        Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem.Visible = False
-        '
        'usrCntlSpeditionsBuchSuche
        '
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None
@@ -2923,6 +2923,6 @@ Partial Class usrCntlSpeditionsBuchSuche
    Friend WithEvents Button21 As Button
    Friend WithEvents Button22 As Button
    Friend WithEvents Button23 As Button
-    Friend WithEvents txtBestimmungszollstelle As VERAG_PROG_ALLGEMEIN.MySearchBox
+    Friend WithEvents txtZollstelle As VERAG_PROG_ALLGEMEIN.MySearchBox
    Friend WithEvents FlenderBocholtZeitraumAuswählenToolStripMenuItem As ToolStripMenuItem
 End Class
--- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
+++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
@@ -279,8 +279,8 @@ Public Class usrCntlSpeditionsBuchSuche
            If cbxEIDR.CheckState = CheckState.Unchecked Then sqlstr &= " AND UK_EIDR_ausstehend=0 "
        End If

-        If txtBestimmungszollstelle.Visible And txtBestimmungszollstelle._value <> "" Then
-            sqlstr &= " AND Bestimmungszollstelle='" & txtBestimmungszollstelle._value & "' "
+        If txtZollstelle.Visible And txtZollstelle._value <> "" Then
+            sqlstr &= " AND Zollstelle='" & txtZollstelle._value & "' "
        End If

        If cboSachbearbeiter._value <> "" Then sqlstr &= " AND Speditionsbuch.[Personalnummer] = @Personalnummer "
@@ -379,7 +379,7 @@ Public Class usrCntlSpeditionsBuchSuche
        cboFiliale.fillWithSQL("SELECT FilialenNr, Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
        '  cboFilialeHandling.fillWithSQL("SELECT FilialenNr, Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
        '  txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"})
-        txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"})
+        txtZollstelle.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"})

        cboHandlingssatz.fillWithSQL("SELECT [hs_Bezeichnung]   FROM [tblHandlingssaetzeIntern] group by [hs_Bezeichnung] ", False, "FMZOLL", True)

@@ -1317,9 +1317,9 @@ Public Class usrCntlSpeditionsBuchSuche

                                                 End Sub

-            Print.Viewer.LoadDocument(rpt)
-            Print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous
-            Print.Show()
+            print.Viewer.LoadDocument(rpt)
+            print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous
+            print.Show()
        End If
    End Sub

@@ -1894,7 +1894,7 @@ Public Class usrCntlSpeditionsBuchSuche
  	                          ,BelegNr
                              ,[FilialenNr],[AbfertigungsNr],Speditionsbuch.Abfertigungsart,Abfertigungsbezeichnung
                          FROM Speditionsbuch INNER JOIN [Abfertigungsarten] ON Speditionsbuch.Abfertigungsart=Abfertigungsarten.Abfertigungsart
-                          where EmpfängerKundenNr IN (" & kdNrsrch & ") and Abfertigungsdatum BETWEEN '" & txtAbfertDat.Text & "' AND '" & txtAbfertDatBis.Text & "' And Speditionsbuch.Abfertigungsart IN (1,29)", "FMZOLL")
+                          where EmpfängerKundenNr IN (" & kdnrsrch & ") and Abfertigungsdatum BETWEEN '" & txtAbfertDat.Text & "' AND '" & txtAbfertDatBis.Text & "' And Speditionsbuch.Abfertigungsart IN (1,29)", "FMZOLL")

            Dim Path = ""
            If dt IsNot Nothing And dt.Rows.Count > 0 Then
@@ -2259,12 +2259,12 @@ Public Class usrCntlSpeditionsBuchSuche
    End Sub

    Private Sub lstGrenze_SelectedIndexChanged(sender As Object, e As EventArgs) Handles lstGrenze.SelectedIndexChanged
-        txtBestimmungszollstelle.Visible = False
+        txtZollstelle.Visible = False

        For Each l In lstGrenze.SelectedItems
            If l.text <> "???" Then Exit Sub
        Next
-        txtBestimmungszollstelle.Visible = True
+        txtZollstelle.Visible = True
    End Sub

    Private Sub initToolStripMenu()
--- a/SDL/kunden/Vorauskasse/frmVorauskasse.vb
+++ b/SDL/kunden/Vorauskasse/frmVorauskasse.vb
@@ -1,4 +1,6 @@
-Public Class frmVorauskasse
+
+
+Public Class frmVorauskasse



@@ -304,7 +306,7 @@
            .Columns("vk_Datum").HeaderText = "Datum"
            .Columns("vk_Datum").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter

-              .Columns("vk_LKW").Width = 120
+            .Columns("vk_LKW").Width = 120
            .Columns("vk_LKW").HeaderText = "LKW Kennz."


@@ -340,7 +342,7 @@
            .Columns("vk_storno").HeaderText = "Storno"
            .Columns("vk_storno").Width = 45

-    '  lblErgebnis.Text = "Ergebnise: " & .RowCount
+            '  lblErgebnis.Text = "Ergebnise: " & .RowCount
        End With
    End Sub

@@ -487,7 +489,7 @@
        If MyDatagridview1.SelectedRows.Count > 0 Then
            Dim VK As New VERAG_PROG_ALLGEMEIN.cVorauskasse(MyDatagridview1.SelectedRows(0).Cells("vk_id").Value)
            If vbYes <> MsgBox("Möchten Sie die Vorauskasse wirklich löschen?", vbYesNoCancel) Then Exit Sub
-            VK.delete()
+            VK.DELETE()
            MyDatagridview1.RELOAD()
            setDGVOptions()
        End If
@@ -613,8 +615,8 @@ Public Class cVorauskasseOptions
            myVermerk.MitarbeiterId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
            Select Case VermerkCodeId
                Case 13 : myVermerk.Hinweis_Vermerk = "Vorauskasse angefordert" & If(CDbl(vk_Betrag) > 0, " (" & CDbl(vk_Betrag).ToString("C2") & ")", "")
-                Case 14 : myVermerk.Hinweis_Vermerk = "Vorauskasse erhalten"
-                Case 59 : myVermerk.Hinweis_Vermerk = "Vorauskasse freigegeben"
+                Case 14 : myVermerk.Hinweis_Vermerk = "Vorauskasse erhalten" : insertBenachrichtigung(myVermerk.Hinweis_Vermerk, myVermerk.AvisoID, myVermerk.SendungID)
+                Case 59 : myVermerk.Hinweis_Vermerk = "Vorauskasse freigegeben" : insertBenachrichtigung(myVermerk.Hinweis_Vermerk, myVermerk.AvisoID, myVermerk.SendungID)
                Case Else : Exit Sub
            End Select
            If VermerkCodeId IsNot Nothing Then myVermerk.VermerkCodeId = VermerkCodeId
@@ -631,7 +633,7 @@ Public Class cVorauskasseOptions
            Dim veragSQL As New VERAG_PROG_ALLGEMEIN.SQL
            Dim dt As DataTable = veragSQL.loadDgvBySql("SELECT TOP 1 [tblSnd_SendungID] FROM [tblSendungen]  where AbfertigungsNr='" & AbfertigungsNr & "' and FilialenNr='" & FilialenNr & "'", "AVISO")

-                    If dt.Rows.Count = 0 Then Exit Sub
+            If dt.Rows.Count = 0 Then Exit Sub
            If Not IsNumeric(dt.Rows(0)("tblSnd_SendungID")) Then Exit Sub

            veragSQL.doSQL("DELETE TOP (1) FROM [Vermerke]  where SendungID='" & dt.Rows(0)("tblSnd_SendungID") & "'  AND VermerkeCode='" & VermerkCodeId & "' ", "AVISO")
@@ -652,6 +654,22 @@ Public Class cVorauskasseOptions
            MsgBox(ex.Message & ex.StackTrace)
        End Try
    End Sub
+    Shared Sub insertBenachrichtigung(VermerkTxt, AvisoId, SendungID)
+        Try
+            Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+            Dim sendToID = SQL.DLookup("LetzterMitarbeiterId", "tblSendungen", "tblSnd_SendungID='" & SendungID & "'")
+            Dim art = "B"
+            If sendToID < 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID)) Then
+                sendToID = SQL.DLookup("tblSnd_TeamId", "tblSendungen", "tblSnd_SendungID='" & SendungID & "'")
+                art = "T"
+            End If
+
+            VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.INSERT_BENACHRICHTIGUNG(AvisoId, SendungID, 3, art, sendToID, "von '" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "'", 0, , VermerkTxt)
+
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
+    End Sub



--- a/VERAG_PROG_ALLGEMEIN/Classes/cGesamtsicherheitsPositionen.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cGesamtsicherheitsPositionen.vb
@@ -18,6 +18,7 @@ Public Class cGesamtsicherheitsPositionen
    Property gsp_erstellungsdatum As DateTime

    Property gsp_datum As Object = Nothing
+    Property gsp_isPosRundungsdiff As Boolean = False

    Public hasEntry = False

--- a/VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb
@@ -423,8 +423,8 @@ Public Class cSendungen
                    Me.tblSnd_FrachtkostenGesamt = SQL.checkNullReturnValue(dr.Item("tblSnd_FrachtkostenGesamt"), Nothing)
                    Me.tblSnd_AbfertigungTR = SQL.checkNullReturnValue(dr.Item("tblSnd_AbfertigungTR"), Nothing)
                    Me.tblSnd_AbfertigungTR_MA = SQL.checkNullReturnValue(dr.Item("tblSnd_AbfertigungTR_MA"), Nothing)
-                    Me.tblSnd_AbfertigungTRAnzahl = SQL.checkNullReturnValue(dr.Item("tblSnd_AbfertigungTRAnzahl"), Nothing)
-                    Me.tblSnd_AbfertigungTRAnzahlPos = SQL.checkNullReturnValue(dr.Item("tblSnd_AbfertigungTRAnzahlPos"), Nothing)
+                    Me.tblSnd_AbfertigungTRAnzahl = SQL.checkNullIntegerZero(dr.Item("tblSnd_AbfertigungTRAnzahl"))
+                    Me.tblSnd_AbfertigungTRAnzahlPos = SQL.checkNullIntegerZero(dr.Item("tblSnd_AbfertigungTRAnzahlPos"))

                End If

--- a/VERAG_PROG_ALLGEMEIN/Classes/cSession.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cSession.vb
@@ -125,6 +125,21 @@ Public Class cSession



+    Public Shared Function IS_ONLINE(sess_maId) As Boolean
+        Try
+            Dim SQL As New SQL
+            Dim sess_IdOnline = SQL.getValueTxtBySql("SELECT TOP 1 sess_Id FROM   tblSessions   where sess_lastRm > dateadd(MINUTE,-2, getdate()) AND sess_maId='" & sess_maId & "' ORDER BY sess_lastActivity DESC,sess_lastRm DESC", "ADMIN",,, -1)
+            If sess_IdOnline > 0 Then
+                Return True
+            End If
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
+        Return False
+
+    End Function
+
+
    Public Shared Function GET_IP_FROM_MAID(sess_maId) As String
        Dim SQL As New SQL
        Return SQL.getValueTxtBySql(" SELECT TOP 1 isnull(sess_ipaddress,'') as sess_ipaddress FROM [tblSessions] where sess_lastRm > DATEADD(SECOND,-70, GETDATE()) AND sess_maId=" & sess_maId, "ADMIN")
--- a/VERAG_PROG_ALLGEMEIN/Classes/cSpeditionsbuch.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cSpeditionsbuch.vb
@@ -185,6 +185,7 @@ Public Class cSpeditionsbuch
    Property PersonalnummerAbklTR As Object = Nothing
    Property UK_EIDR_ausstehend As Boolean = False

+    Property Zollstelle As Object = Nothing

    Property UNTERPOS As New List(Of cSpeditionsbuchUnterPos)
    Property VORKOSTEN As New List(Of cVorkosten)
@@ -350,6 +351,7 @@ Public Class cSpeditionsbuch
                        Me.HandlingZuKassieren = SQL.checkNulDbl(dr.Item("HandlingZuKassieren"))
                        Me.PersonalnummerAbklTR = SQL.checkNullReturnValue(dr.Item("PersonalnummerAbklTR"), Nothing)
                        Me.UK_EIDR_ausstehend = SQL.checkNullBool(dr.Item("UK_EIDR_ausstehend"))
+                        Me.Zollstelle = SQL.checkNullReturnValue(dr.Item("Zollstelle"), Nothing)

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

@@ -503,6 +505,7 @@ Public Class cSpeditionsbuch
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("HandlingZuKassieren", HandlingZuKassieren))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("PersonalnummerAbklTR", PersonalnummerAbklTR))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UK_EIDR_ausstehend", UK_EIDR_ausstehend))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Zollstelle", Zollstelle))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("SB_CMRNr", SB_CMRNr))


--- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb
@@ -24,6 +24,7 @@ Partial Class frmMessenger
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
@@ -38,11 +39,11 @@ Partial Class frmMessenger
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMessenger))
        Me.SplitContainer = New System.Windows.Forms.SplitContainer()
        Me.SplitContainer2 = New System.Windows.Forms.SplitContainer()
-        Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
+        Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.Panel6 = New System.Windows.Forms.Panel()
        Me.lblLKWChat_MsgCntInaktiv = New System.Windows.Forms.Label()
        Me.cbxInaktiveChats = New System.Windows.Forms.CheckBox()
-        Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
+        Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.Panel5 = New System.Windows.Forms.Panel()
        Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.PictureBox2 = New System.Windows.Forms.PictureBox()
@@ -63,7 +64,7 @@ Partial Class frmMessenger
        Me.btnNeu = New System.Windows.Forms.Button()
        Me.Button1 = New System.Windows.Forms.Button()
        Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
-        Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel()
+        Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components)
        Me.UsrCntlMessenger_ChatElement1 = New VERAG_PROG_ALLGEMEIN.usrCntlMessenger_ChatElement()
        Me.Panel3 = New System.Windows.Forms.Panel()
        Me.btnTeilnehmer = New System.Windows.Forms.Button()
@@ -90,9 +91,9 @@ Partial Class frmMessenger
        Me.btnSendAtt = New System.Windows.Forms.Button()
        Me.btnSenden = New System.Windows.Forms.Button()
        Me.rtbChatMessage = New System.Windows.Forms.RichTextBox()
-        Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer()
-        Me.Timer_REFRESH = New System.Windows.Forms.Timer()
-        Me.cntxt = New System.Windows.Forms.ContextMenuStrip()
+        Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer(Me.components)
+        Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components)
+        Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ChatDeaktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.toolChatReminder = New System.Windows.Forms.ToolStripMenuItem()
        Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
--- a/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb
+++ b/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb
@@ -22,6 +22,7 @@ Public Class cSicherheiten
    Property gs_atr As String = ""
    Property gs_warenort As String
    Property gs_zollsatz As Object
+    Property gs_isRundungsdiff As Boolean = False
    Property gs_avisoId As Integer

    Public hasEntry = False