neu

2021-06-24 23:05:48 +02:00
parent e625acc609
commit f2f992547d
134 changed files with 72921 additions and 2011 deletions
--- a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.Designer.vb
+++ b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.Designer.vb
@@ -120,6 +120,7 @@ Partial Class frmNacherfassungNEU
        Me.Label34 = New System.Windows.Forms.Label()
        Me.btnFertig = New System.Windows.Forms.Button()
        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.Button4 = New System.Windows.Forms.Button()
        Me.txtKdAuftragsnummerEmpfaenger = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.txtKdAuftragsnummerFrachtfuehrer = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.txtKdAuftragsnummerAvisierer = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -228,7 +229,7 @@ Partial Class frmNacherfassungNEU
        Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.DataGridViewTextBoxColumn5 = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.Button4 = New System.Windows.Forms.Button()
+        Me.cbxEIDR = New System.Windows.Forms.CheckBox()
        Me.pnl.SuspendLayout()
        Me.Panel3.SuspendLayout()
        Me.GroupBox4.SuspendLayout()
@@ -1418,6 +1419,7 @@ Partial Class frmNacherfassungNEU
        'Panel1
        '
        Me.Panel1.AutoScroll = True
+        Me.Panel1.Controls.Add(Me.cbxEIDR)
        Me.Panel1.Controls.Add(Me.Button4)
        Me.Panel1.Controls.Add(Me.txtKdAuftragsnummerEmpfaenger)
        Me.Panel1.Controls.Add(Me.txtKdAuftragsnummerFrachtfuehrer)
@@ -1517,6 +1519,18 @@ Partial Class frmNacherfassungNEU
        Me.Panel1.Size = New System.Drawing.Size(883, 799)
        Me.Panel1.TabIndex = 1
        '
+        'Button4
+        '
+        Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button4.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+        Me.Button4.Location = New System.Drawing.Point(440, 265)
+        Me.Button4.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
+        Me.Button4.Name = "Button4"
+        Me.Button4.Size = New System.Drawing.Size(145, 27)
+        Me.Button4.TabIndex = 42
+        Me.Button4.Text = "Endempfänger Liste"
+        Me.Button4.UseVisualStyleBackColor = True
+        '
        'txtKdAuftragsnummerEmpfaenger
        '
        Me.txtKdAuftragsnummerEmpfaenger._DateTimeOnly = False
@@ -3235,17 +3249,16 @@ Partial Class frmNacherfassungNEU
        Me.DataGridViewTextBoxColumn5.HeaderText = "Anzahl"
        Me.DataGridViewTextBoxColumn5.Name = "DataGridViewTextBoxColumn5"
        '
-        'Button4
+        'cbxEIDR
        '
-        Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button4.ImageAlign = System.Drawing.ContentAlignment.TopCenter
-        Me.Button4.Location = New System.Drawing.Point(440, 265)
-        Me.Button4.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
-        Me.Button4.Name = "Button4"
-        Me.Button4.Size = New System.Drawing.Size(145, 27)
-        Me.Button4.TabIndex = 42
-        Me.Button4.Text = "Endempfänger Liste"
-        Me.Button4.UseVisualStyleBackColor = True
+        Me.cbxEIDR.AutoSize = True
+        Me.cbxEIDR.BackColor = System.Drawing.Color.White
+        Me.cbxEIDR.Location = New System.Drawing.Point(484, 70)
+        Me.cbxEIDR.Name = "cbxEIDR"
+        Me.cbxEIDR.Size = New System.Drawing.Size(106, 17)
+        Me.cbxEIDR.TabIndex = 93
+        Me.cbxEIDR.Text = "EIDR ausständig"
+        Me.cbxEIDR.UseVisualStyleBackColor = False
        '
        'frmNacherfassungNEU
        '
@@ -3483,4 +3496,5 @@ Partial Class frmNacherfassungNEU
    Friend WithEvents Label64 As Label
    Public WithEvents cboAbklärungFiliale As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents Button4 As Button
+    Friend WithEvents cbxEIDR As CheckBox
 End Class
--- a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb
+++ b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb
@@ -252,6 +252,7 @@ Public Class frmNacherfassungNEU
        End If

        cbxBar.Checked = SPEDITIONSBUCH.Bar
+        cbxEIDR.Checked = SPEDITIONSBUCH.UK_EIDR_ausstehend
        cbxFakturiert.Checked = SPEDITIONSBUCH.Fakturiert

        txtBelegNummerZAT1T2.Text = SPEDITIONSBUCH.BelegNr
@@ -622,14 +623,9 @@ Public Class frmNacherfassungNEU


        cboGrenze.Items.Clear()
-        cboGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
-        cboGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SUB", "SUB"))
-        cboGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SBG", "SBG"))
-        cboGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("WAI", "WAI"))
-        cboGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NKD", "NKD"))
-        cboGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SUA", "SUA"))
+        cboGrenze.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where [grz_Firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", True,, "ALLE")
        cboGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("???", "???"))
-
+        cboGrenze.changeItem("")

        If avisoLinkId > 0 Then
            Dim SQLAVISO As New VERAG_PROG_ALLGEMEIN.cavisoDAL
@@ -904,6 +900,7 @@ Public Class frmNacherfassungNEU
        End If


+        SPEDITIONSBUCH.UK_EIDR_ausstehend = cbxEIDR.Checked
        SPEDITIONSBUCH.Bar = cbxBar.Checked
        SPEDITIONSBUCH.Fakturiert = cbxFakturiert.Checked

@@ -1189,6 +1186,11 @@ Public Class frmNacherfassungNEU
        txtFraechter._UseFIRMA = FirmaTmp
        txtEndEmpf._UseFIRMA = FirmaTmp

+        If cboFiliale._value = 7001 Then
+            cbxEIDR.Visible = True
+        Else
+            cbxEIDR.Visible = False
+        End If
    End Sub


--- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb
+++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb
@@ -56,6 +56,10 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.dgvLKW = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.pnlOpt = New System.Windows.Forms.Panel()
        Me.pnlBerichte = New System.Windows.Forms.Panel()
+        Me.lblKdAusFortschritt = New System.Windows.Forms.Label()
+        Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
+        Me.KundenauswertungenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ZFFriedrichshafenAGZeitraumAuswä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()
@@ -176,10 +180,7 @@ 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.MenuStrip1 = New System.Windows.Forms.MenuStrip()
-        Me.KundenauswertungenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.lblKdAusFortschritt = New System.Windows.Forms.Label()
+        Me.cbxEIDR = New System.Windows.Forms.CheckBox()
        Me.cntxtCntxtSpeditionsbuch.SuspendLayout()
        Me.pnlRechts.SuspendLayout()
        CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -187,6 +188,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        CType(Me.dgvLKW, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.pnlOpt.SuspendLayout()
        Me.pnlBerichte.SuspendLayout()
+        Me.MenuStrip1.SuspendLayout()
        Me.Panel1.SuspendLayout()
        Me.pnl.SuspendLayout()
        Me.tbcntr.SuspendLayout()
@@ -201,7 +203,6 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.SplitContainer.Panel1.SuspendLayout()
        Me.SplitContainer.Panel2.SuspendLayout()
        Me.SplitContainer.SuspendLayout()
-        Me.MenuStrip1.SuspendLayout()
        Me.SuspendLayout()
        '
        'TabPage1
@@ -417,7 +418,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.txtPackstücke.MaxLines_Warning = ""
        Me.txtPackstücke.MaxLines_Warning_Label = Nothing
        Me.txtPackstücke.Name = "txtPackstücke"
-        Me.txtPackstücke.Size = New System.Drawing.Size(141, 20)
+        Me.txtPackstücke.Size = New System.Drawing.Size(110, 20)
        Me.txtPackstücke.TabIndex = 41
        '
        'Label36
@@ -701,6 +702,42 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.pnlBerichte.TabIndex = 6
        Me.pnlBerichte.Visible = False
        '
+        'lblKdAusFortschritt
+        '
+        Me.lblKdAusFortschritt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.lblKdAusFortschritt.Location = New System.Drawing.Point(767, 135)
+        Me.lblKdAusFortschritt.Name = "lblKdAusFortschritt"
+        Me.lblKdAusFortschritt.Size = New System.Drawing.Size(77, 14)
+        Me.lblKdAusFortschritt.TabIndex = 43
+        Me.lblKdAusFortschritt.TextAlign = System.Drawing.ContentAlignment.TopRight
+        '
+        'MenuStrip1
+        '
+        Me.MenuStrip1.Dock = System.Windows.Forms.DockStyle.None
+        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(163, 27)
+        Me.MenuStrip1.TabIndex = 89
+        Me.MenuStrip1.Text = "Kundenauswertungen"
+        '
+        'KundenauswertungenToolStripMenuItem1
+        '
+        Me.KundenauswertungenToolStripMenuItem1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.KundenauswertungenToolStripMenuItem1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem})
+        Me.KundenauswertungenToolStripMenuItem1.Font = New System.Drawing.Font("Segoe UI", 10.0!)
+        Me.KundenauswertungenToolStripMenuItem1.ForeColor = System.Drawing.Color.White
+        Me.KundenauswertungenToolStripMenuItem1.Name = "KundenauswertungenToolStripMenuItem1"
+        Me.KundenauswertungenToolStripMenuItem1.Size = New System.Drawing.Size(155, 23)
+        Me.KundenauswertungenToolStripMenuItem1.Text = "Kundenauswertungen"
+        '
+        'ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem
+        '
+        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(347, 24)
+        Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Text = "ZF Friedrichshafen AG (Zeitraum auswählen)"
+        '
        'cboHandlingssatz
        '
        Me.cboHandlingssatz._allowedValuesFreiText = Nothing
@@ -1666,6 +1703,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        '
        'SplitContainer1.Panel2
        '
+        Me.SplitContainer1.Panel2.Controls.Add(Me.cbxEIDR)
        Me.SplitContainer1.Panel2.Controls.Add(Me.cbxCMR)
        Me.SplitContainer1.Panel2.Controls.Add(Me.Label41)
        Me.SplitContainer1.Panel2.Controls.Add(Me.txtKdAuftragsNr)
@@ -1979,7 +2017,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.cbxCMR.BackColor = System.Drawing.Color.White
        Me.cbxCMR.Checked = True
        Me.cbxCMR.CheckState = System.Windows.Forms.CheckState.Indeterminate
-        Me.cbxCMR.Location = New System.Drawing.Point(669, 195)
+        Me.cbxCMR.Location = New System.Drawing.Point(627, 195)
        Me.cbxCMR.Name = "cbxCMR"
        Me.cbxCMR.Size = New System.Drawing.Size(50, 17)
        Me.cbxCMR.TabIndex = 49
@@ -1990,7 +2028,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        'Label41
        '
        Me.Label41.AutoSize = True
-        Me.Label41.Location = New System.Drawing.Point(666, 93)
+        Me.Label41.Location = New System.Drawing.Point(624, 93)
        Me.Label41.Name = "Label41"
        Me.Label41.Size = New System.Drawing.Size(44, 13)
        Me.Label41.TabIndex = 48
@@ -2022,10 +2060,10 @@ Partial Class usrCntlSpeditionsBuchSuche
        '
        Me.lstGrenze._value = ""
        Me.lstGrenze.FormattingEnabled = True
-        Me.lstGrenze.Location = New System.Drawing.Point(669, 108)
+        Me.lstGrenze.Location = New System.Drawing.Point(627, 108)
        Me.lstGrenze.Name = "lstGrenze"
        Me.lstGrenze.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple
-        Me.lstGrenze.Size = New System.Drawing.Size(63, 82)
+        Me.lstGrenze.Size = New System.Drawing.Size(105, 82)
        Me.lstGrenze.TabIndex = 47
        '
        'Label40
@@ -2119,7 +2157,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.cbxFakturiert.BackColor = System.Drawing.Color.White
        Me.cbxFakturiert.Checked = True
        Me.cbxFakturiert.CheckState = System.Windows.Forms.CheckState.Indeterminate
-        Me.cbxFakturiert.Location = New System.Drawing.Point(582, 180)
+        Me.cbxFakturiert.Location = New System.Drawing.Point(557, 180)
        Me.cbxFakturiert.Name = "cbxFakturiert"
        Me.cbxFakturiert.Size = New System.Drawing.Size(70, 17)
        Me.cbxFakturiert.TabIndex = 32
@@ -2328,7 +2366,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.txtErfassungsnNr.MaxLines_Warning = ""
        Me.txtErfassungsnNr.MaxLines_Warning_Label = Nothing
        Me.txtErfassungsnNr.Name = "txtErfassungsnNr"
-        Me.txtErfassungsnNr.Size = New System.Drawing.Size(141, 20)
+        Me.txtErfassungsnNr.Size = New System.Drawing.Size(110, 20)
        Me.txtErfassungsnNr.TabIndex = 14
        '
        'Label24
@@ -2441,41 +2479,19 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.SplitContainer.SplitterWidth = 2
        Me.SplitContainer.TabIndex = 3
        '
-        'MenuStrip1
+        'cbxEIDR
        '
-        Me.MenuStrip1.Dock = System.Windows.Forms.DockStyle.None
-        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.TabIndex = 89
-        Me.MenuStrip1.Text = "Kundenauswertungen"
-        '
-        'KundenauswertungenToolStripMenuItem1
-        '
-        Me.KundenauswertungenToolStripMenuItem1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.KundenauswertungenToolStripMenuItem1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem})
-        Me.KundenauswertungenToolStripMenuItem1.Font = New System.Drawing.Font("Segoe UI", 10.0!)
-        Me.KundenauswertungenToolStripMenuItem1.ForeColor = System.Drawing.Color.White
-        Me.KundenauswertungenToolStripMenuItem1.Name = "KundenauswertungenToolStripMenuItem1"
-        Me.KundenauswertungenToolStripMenuItem1.Size = New System.Drawing.Size(155, 23)
-        Me.KundenauswertungenToolStripMenuItem1.Text = "Kundenauswertungen"
-        '
-        'ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem
-        '
-        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(347, 24)
-        Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Text = "ZF Friedrichshafen AG (Zeitraum auswählen)"
-        '
-        'lblKdAusFortschritt
-        '
-        Me.lblKdAusFortschritt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.lblKdAusFortschritt.Location = New System.Drawing.Point(767, 135)
-        Me.lblKdAusFortschritt.Name = "lblKdAusFortschritt"
-        Me.lblKdAusFortschritt.Size = New System.Drawing.Size(77, 14)
-        Me.lblKdAusFortschritt.TabIndex = 43
-        Me.lblKdAusFortschritt.TextAlign = System.Drawing.ContentAlignment.TopRight
+        Me.cbxEIDR.AutoSize = True
+        Me.cbxEIDR.BackColor = System.Drawing.Color.White
+        Me.cbxEIDR.Checked = True
+        Me.cbxEIDR.CheckState = System.Windows.Forms.CheckState.Indeterminate
+        Me.cbxEIDR.Location = New System.Drawing.Point(511, 197)
+        Me.cbxEIDR.Name = "cbxEIDR"
+        Me.cbxEIDR.Size = New System.Drawing.Size(106, 17)
+        Me.cbxEIDR.TabIndex = 54
+        Me.cbxEIDR.Text = "EIDR ausständig"
+        Me.cbxEIDR.ThreeState = True
+        Me.cbxEIDR.UseVisualStyleBackColor = False
        '
        'usrCntlSpeditionsBuchSuche
        '
@@ -2496,6 +2512,8 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.pnlOpt.PerformLayout()
        Me.pnlBerichte.ResumeLayout(False)
        Me.pnlBerichte.PerformLayout()
+        Me.MenuStrip1.ResumeLayout(False)
+        Me.MenuStrip1.PerformLayout()
        Me.Panel1.ResumeLayout(False)
        Me.Panel1.PerformLayout()
        Me.pnl.ResumeLayout(False)
@@ -2516,8 +2534,6 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.SplitContainer.Panel2.ResumeLayout(False)
        CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).EndInit()
        Me.SplitContainer.ResumeLayout(False)
-        Me.MenuStrip1.ResumeLayout(False)
-        Me.MenuStrip1.PerformLayout()
        Me.ResumeLayout(False)

    End Sub
@@ -2677,4 +2693,5 @@ Partial Class usrCntlSpeditionsBuchSuche
    Friend WithEvents KundenauswertungenToolStripMenuItem1 As ToolStripMenuItem
    Friend WithEvents ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents lblKdAusFortschritt As Label
+    Friend WithEvents cbxEIDR As CheckBox
 End Class
--- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
+++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
@@ -273,6 +273,10 @@ Public Class usrCntlSpeditionsBuchSuche
        If cbxFakturiert.CheckState = CheckState.Unchecked Then sqlstr &= " AND Fakturiert=0 "
        If cbxCMR.CheckState = CheckState.Unchecked Then sqlstr &= " AND SB_CMR=0 "

+        If cbxEIDR.Visible Then
+            If cbxEIDR.CheckState = CheckState.Checked Then sqlstr &= " AND UK_EIDR_ausstehend=1 "
+            If cbxEIDR.CheckState = CheckState.Unchecked Then sqlstr &= " AND UK_EIDR_ausstehend=0 "
+        End If


        If cboSachbearbeiter._value <> "" Then sqlstr &= " AND [Personalnummer] = @Personalnummer "
@@ -423,14 +427,19 @@ Public Class usrCntlSpeditionsBuchSuche
        'End Select

        '   lstGrenze.fillWithSQL(" SELECT distinct(Grenzstelle),distinct(Grenzstelle)   FROM [VERAG].[dbo].[Speditionsbuch] where Grenzstelle is not null  order by Grenzstelle  ", , "FMZOLL")
+        'lstGrenze.Items.Clear()
+        'lstGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SUB", "SUB"))
+        'lstGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SBG", "SBG"))
+        'lstGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("WAI", "WAI"))
+        'lstGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NKD", "NKD"))
+        'lstGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SUA", "SUA"))
+        'lstGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMB", "AMB"))
+        'lstGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("???", "???"))
        lstGrenze.Items.Clear()
-        lstGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SUB", "SUB"))
-        lstGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SBG", "SBG"))
-        lstGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("WAI", "WAI"))
-        lstGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NKD", "NKD"))
-        lstGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SUA", "SUA"))
-        lstGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMB", "AMB"))
+        lstGrenze.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where [grz_Firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO")
        lstGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("???", "???"))
+        lstGrenze.changeItem("")
+



@@ -1922,4 +1931,8 @@ Public Class usrCntlSpeditionsBuchSuche
        End Try
        Me.Cursor = Cursors.Default
    End Sub
+
+    Private Sub cboFiliale_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboFiliale.SelectedIndexChanged
+        cbxEIDR.Visible = cboFiliale._value = "7001"
+    End Sub
 End Class