Benachrichtungen, Hauptfenster (Filter Sendungen), etc.

Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb

@@ -23,7 +23,7 @@ Partial Class usrCntlBenachrichtigungen
     <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 DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.Panel2 = New System.Windows.Forms.Panel()
         Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.gridAvisoBenachrichtigungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
@@ -38,6 +38,7 @@ Partial Class usrCntlBenachrichtigungen
         Me.cbxTeams = New System.Windows.Forms.CheckBox()
         Me.Label22 = New System.Windows.Forms.Label()
         Me.Label25 = New System.Windows.Forms.Label()
+        Me.cbxFotoVerwahrung = New System.Windows.Forms.CheckBox()
         Me.Panel2.SuspendLayout()
         CType(Me.gridAvisoBenachrichtigungen, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel4.SuspendLayout()
@@ -80,8 +81,8 @@ Partial Class usrCntlBenachrichtigungen
         Me.gridAvisoBenachrichtigungen.AllowUserToDeleteRows = False
         Me.gridAvisoBenachrichtigungen.AllowUserToOrderColumns = True
         Me.gridAvisoBenachrichtigungen.AllowUserToResizeRows = False
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure
+        DataGridViewCellStyle4.BackColor = System.Drawing.Color.Azure
-        Me.gridAvisoBenachrichtigungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        Me.gridAvisoBenachrichtigungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
         Me.gridAvisoBenachrichtigungen.BackgroundColor = System.Drawing.Color.White
         Me.gridAvisoBenachrichtigungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.gridAvisoBenachrichtigungen.Dock = System.Windows.Forms.DockStyle.Fill
@@ -96,6 +97,7 @@ Partial Class usrCntlBenachrichtigungen
         '
         Me.Panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.Panel4.Controls.Add(Me.cbxTaskForce)
+        Me.Panel4.Controls.Add(Me.cbxFotoVerwahrung)
         Me.Panel4.Controls.Add(Me.cbxVerwarung)
         Me.Panel4.Controls.Add(Me.cbxNeukunden)
         Me.Panel4.Controls.Add(Me.Button10)
@@ -109,8 +111,9 @@ Partial Class usrCntlBenachrichtigungen
         'cbxTaskForce
         '
         Me.cbxTaskForce.AutoSize = True
+        Me.cbxTaskForce.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
         Me.cbxTaskForce.ForeColor = System.Drawing.Color.Black
-        Me.cbxTaskForce.Location = New System.Drawing.Point(174, 30)
+        Me.cbxTaskForce.Location = New System.Drawing.Point(265, 30)
         Me.cbxTaskForce.Name = "cbxTaskForce"
         Me.cbxTaskForce.Size = New System.Drawing.Size(77, 17)
         Me.cbxTaskForce.TabIndex = 33
@@ -121,8 +124,9 @@ Partial Class usrCntlBenachrichtigungen
         'cbxVerwarung
         '
         Me.cbxVerwarung.AutoSize = True
+        Me.cbxVerwarung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
         Me.cbxVerwarung.ForeColor = System.Drawing.Color.Black
-        Me.cbxVerwarung.Location = New System.Drawing.Point(85, 30)
+        Me.cbxVerwarung.Location = New System.Drawing.Point(84, 30)
         Me.cbxVerwarung.Name = "cbxVerwarung"
         Me.cbxVerwarung.Size = New System.Drawing.Size(83, 17)
         Me.cbxVerwarung.TabIndex = 32
@@ -133,8 +137,9 @@ Partial Class usrCntlBenachrichtigungen
         'cbxNeukunden
         '
         Me.cbxNeukunden.AutoSize = True
+        Me.cbxNeukunden.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
         Me.cbxNeukunden.ForeColor = System.Drawing.Color.Black
-        Me.cbxNeukunden.Location = New System.Drawing.Point(7, 30)
+        Me.cbxNeukunden.Location = New System.Drawing.Point(0, 30)
         Me.cbxNeukunden.Name = "cbxNeukunden"
         Me.cbxNeukunden.Size = New System.Drawing.Size(82, 17)
         Me.cbxNeukunden.TabIndex = 30
@@ -226,6 +231,18 @@ Partial Class usrCntlBenachrichtigungen
         Me.Label25.Text = "0 Akte vom Arbeitsplatz übernommen"
         Me.Label25.TextAlign = System.Drawing.ContentAlignment.TopRight
         '
+        'cbxFotoVerwahrung
+        '
+        Me.cbxFotoVerwahrung.AutoSize = True
+        Me.cbxFotoVerwahrung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.cbxFotoVerwahrung.ForeColor = System.Drawing.Color.Black
+        Me.cbxFotoVerwahrung.Location = New System.Drawing.Point(164, 30)
+        Me.cbxFotoVerwahrung.Name = "cbxFotoVerwahrung"
+        Me.cbxFotoVerwahrung.Size = New System.Drawing.Size(104, 17)
+        Me.cbxFotoVerwahrung.TabIndex = 34
+        Me.cbxFotoVerwahrung.Text = "FotoVerwahrung"
+        Me.cbxFotoVerwahrung.UseVisualStyleBackColor = True
+        '
         'usrCntlBenachrichtigungen
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -257,4 +274,5 @@ Partial Class usrCntlBenachrichtigungen
     Friend WithEvents txtVermerk As TextBox
     Friend WithEvents cbxVerwarung As CheckBox
     Friend WithEvents cbxTaskForce As CheckBox
+    Friend WithEvents cbxFotoVerwahrung As CheckBox
 End Class

Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb

@@ -33,6 +33,12 @@ Public Class usrCntlBenachrichtigungen
                 'End If
 
                 Dim whereMA = " AND  ( 1<>1 "
+                Dim whereVerwahrungsFotos = ""
+
+                If Not cbxFotoVerwahrung.Checked Then
+                    whereVerwahrungsFotos = " AND ab_BenachrichtigungCode <> 20 "
+                End If
+
 
                 'WARENORT
                 If VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG Then
@@ -93,7 +99,7 @@ Public Class usrCntlBenachrichtigungen
 
                 whereMA &= " ) "
 
-                Dim sqlStr As String = "SELECT tblAvisoBenachrichtigungen.*, LKW_Nr, Status, Grenzstelle  FROM [tblAvisoBenachrichtigungen] INNER JOIN AVISO on AvisoId=ab_AvisoID WHERE ab_status=0 " & whereMA & "  ORDER BY CASE WHEN ANKUNFT <'01.01.2001' THEN '01.01.2999' ELSE ANKUNFT end ASC,ab_Datum ASC"
+                Dim sqlStr As String = "SELECT tblAvisoBenachrichtigungen.*, LKW_Nr, Status, Grenzstelle  FROM [tblAvisoBenachrichtigungen] INNER JOIN AVISO on AvisoId=ab_AvisoID WHERE ab_status=0 " & whereMA & whereVerwahrungsFotos & "  ORDER BY CASE WHEN ANKUNFT <'01.01.2001' THEN '01.01.2999' ELSE ANKUNFT end ASC,ab_Datum ASC"
 
                 Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
                 ' List.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("maId", VERAG_PROG_ALLGEMEIN.cAllgemein.USRID))
@@ -248,7 +254,6 @@ Public Class usrCntlBenachrichtigungen
         'MyComboBox2.changeItem("Benutzer")
         '  MyComboBox2.chang 
 
-
         MyComboBox2.Items.Clear()
         MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG"))
         MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX"))
@@ -431,4 +436,7 @@ Public Class usrCntlBenachrichtigungen
 
     End Sub
 
+    Private Sub cbxFotoVerwahrung_CheckedChanged(sender As Object, e As EventArgs) Handles cbxFotoVerwahrung.CheckedChanged
+        initDgvAvisoBenachrichtigungen(True, Me.Font)
+    End Sub
 End Class

Aviso/Benachrichtigung/usrCntlBenachrichtigungenNEW.Designer.vb

@@ -23,8 +23,8 @@ Partial Class usrCntlBenachrichtigungenNEW
     <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 DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.Panel2 = New System.Windows.Forms.Panel()
         Me.gridAvisoBenachrichtigungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.Panel4 = New System.Windows.Forms.Panel()
@@ -35,16 +35,17 @@ Partial Class usrCntlBenachrichtigungenNEW
         Me.cbxVerwarung = New System.Windows.Forms.CheckBox()
         Me.cbxNeukunden = New System.Windows.Forms.CheckBox()
         Me.Panel3 = New System.Windows.Forms.Panel()
+        Me.txtSearch = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.txtDatumAb = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.CheckBox1 = New System.Windows.Forms.CheckBox()
         Me.Label22 = New System.Windows.Forms.Label()
         Me.Label25 = New System.Windows.Forms.Label()
         Me.txtVermerk = New System.Windows.Forms.TextBox()
         Me.Button10 = New System.Windows.Forms.Button()
-        Me.CheckBox1 = New System.Windows.Forms.CheckBox()
-        Me.txtDatumAb = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.Label1 = New System.Windows.Forms.Label()
-        Me.Label2 = New System.Windows.Forms.Label()
-        Me.txtSearch = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
+        Me.cbxFotoVerwahrung = New System.Windows.Forms.CheckBox()
         Me.Panel2.SuspendLayout()
         CType(Me.gridAvisoBenachrichtigungen, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel4.SuspendLayout()
@@ -69,18 +70,18 @@ Partial Class usrCntlBenachrichtigungenNEW
         Me.gridAvisoBenachrichtigungen.AllowUserToDeleteRows = False
         Me.gridAvisoBenachrichtigungen.AllowUserToOrderColumns = True
         Me.gridAvisoBenachrichtigungen.AllowUserToResizeRows = False
-        DataGridViewCellStyle7.BackColor = System.Drawing.Color.Azure
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure
-        Me.gridAvisoBenachrichtigungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
+        Me.gridAvisoBenachrichtigungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
         Me.gridAvisoBenachrichtigungen.BackgroundColor = System.Drawing.Color.White
         Me.gridAvisoBenachrichtigungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridAvisoBenachrichtigungen.DefaultCellStyle = DataGridViewCellStyle8
+        Me.gridAvisoBenachrichtigungen.DefaultCellStyle = DataGridViewCellStyle2
         Me.gridAvisoBenachrichtigungen.Dock = System.Windows.Forms.DockStyle.Fill
         Me.gridAvisoBenachrichtigungen.Location = New System.Drawing.Point(0, 76)
         Me.gridAvisoBenachrichtigungen.Name = "gridAvisoBenachrichtigungen"
@@ -93,6 +94,7 @@ Partial Class usrCntlBenachrichtigungenNEW
         '
         Me.Panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.Panel4.Controls.Add(Me.MyComboBox2)
+        Me.Panel4.Controls.Add(Me.cbxFotoVerwahrung)
         Me.Panel4.Controls.Add(Me.cbxCluster)
         Me.Panel4.Controls.Add(Me.cbxTaskForce)
         Me.Panel4.Controls.Add(Me.cbxTeams)
@@ -115,7 +117,7 @@ Partial Class usrCntlBenachrichtigungenNEW
         Me.MyComboBox2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.MyComboBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
         Me.MyComboBox2.FormattingEnabled = True
-        Me.MyComboBox2.Location = New System.Drawing.Point(185, -2)
+        Me.MyComboBox2.Location = New System.Drawing.Point(247, 0)
         Me.MyComboBox2.Name = "MyComboBox2"
         Me.MyComboBox2.Size = New System.Drawing.Size(71, 21)
         Me.MyComboBox2.TabIndex = 27
@@ -137,7 +139,7 @@ Partial Class usrCntlBenachrichtigungenNEW
         '
         Me.cbxTaskForce.AutoSize = True
         Me.cbxTaskForce.ForeColor = System.Drawing.Color.Black
-        Me.cbxTaskForce.Location = New System.Drawing.Point(174, 19)
+        Me.cbxTaskForce.Location = New System.Drawing.Point(169, 2)
         Me.cbxTaskForce.Name = "cbxTaskForce"
         Me.cbxTaskForce.Size = New System.Drawing.Size(77, 17)
         Me.cbxTaskForce.TabIndex = 33
@@ -198,6 +200,92 @@ Partial Class usrCntlBenachrichtigungenNEW
         Me.Panel3.Size = New System.Drawing.Size(319, 76)
         Me.Panel3.TabIndex = 3
         '
+        'txtSearch
+        '
+        Me.txtSearch._DateTimeOnly = False
+        Me.txtSearch._numbersOnly = False
+        Me.txtSearch._numbersOnlyKommastellen = ""
+        Me.txtSearch._numbersOnlyTrennzeichen = True
+        Me.txtSearch._Prozent = False
+        Me.txtSearch._ShortDateNew = False
+        Me.txtSearch._ShortDateOnly = False
+        Me.txtSearch._TimeOnly = False
+        Me.txtSearch._TimeOnly_Seconds = False
+        Me.txtSearch._value = ""
+        Me.txtSearch._Waehrung = False
+        Me.txtSearch._WaehrungZeichen = True
+        Me.txtSearch.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.txtSearch.ForeColor = System.Drawing.Color.Black
+        Me.txtSearch.Location = New System.Drawing.Point(50, 50)
+        Me.txtSearch.MaxLineLength = -1
+        Me.txtSearch.MaxLines_Warning = ""
+        Me.txtSearch.MaxLines_Warning_Label = Nothing
+        Me.txtSearch.Name = "txtSearch"
+        Me.txtSearch.Size = New System.Drawing.Size(128, 20)
+        Me.txtSearch.TabIndex = 35
+        Me.txtSearch.Visible = False
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.ForeColor = System.Drawing.Color.White
+        Me.Label2.Location = New System.Drawing.Point(5, 53)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(41, 13)
+        Me.Label2.TabIndex = 36
+        Me.Label2.Text = "Suche:"
+        Me.Label2.Visible = False
+        '
+        'Label1
+        '
+        Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label1.AutoSize = True
+        Me.Label1.ForeColor = System.Drawing.Color.White
+        Me.Label1.Location = New System.Drawing.Point(185, 53)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(22, 13)
+        Me.Label1.TabIndex = 34
+        Me.Label1.Text = "ab:"
+        Me.Label1.Visible = False
+        '
+        'txtDatumAb
+        '
+        Me.txtDatumAb._DateTimeOnly = False
+        Me.txtDatumAb._numbersOnly = False
+        Me.txtDatumAb._numbersOnlyKommastellen = ""
+        Me.txtDatumAb._numbersOnlyTrennzeichen = True
+        Me.txtDatumAb._Prozent = False
+        Me.txtDatumAb._ShortDateNew = True
+        Me.txtDatumAb._ShortDateOnly = False
+        Me.txtDatumAb._TimeOnly = False
+        Me.txtDatumAb._TimeOnly_Seconds = False
+        Me.txtDatumAb._value = ""
+        Me.txtDatumAb._Waehrung = False
+        Me.txtDatumAb._WaehrungZeichen = True
+        Me.txtDatumAb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.txtDatumAb.ForeColor = System.Drawing.Color.Black
+        Me.txtDatumAb.Location = New System.Drawing.Point(213, 50)
+        Me.txtDatumAb.MaxLength = 10
+        Me.txtDatumAb.MaxLineLength = -1
+        Me.txtDatumAb.MaxLines_Warning = ""
+        Me.txtDatumAb.MaxLines_Warning_Label = Nothing
+        Me.txtDatumAb.Name = "txtDatumAb"
+        Me.txtDatumAb.Size = New System.Drawing.Size(100, 20)
+        Me.txtDatumAb.TabIndex = 33
+        Me.txtDatumAb.Visible = False
+        '
+        'CheckBox1
+        '
+        Me.CheckBox1.AutoSize = True
+        Me.CheckBox1.ForeColor = System.Drawing.Color.White
+        Me.CheckBox1.Location = New System.Drawing.Point(3, 25)
+        Me.CheckBox1.Name = "CheckBox1"
+        Me.CheckBox1.Size = New System.Drawing.Size(86, 17)
+        Me.CheckBox1.TabIndex = 32
+        Me.CheckBox1.Text = "Alte Einträge"
+        Me.CheckBox1.UseVisualStyleBackColor = True
+        '
         'Label22
         '
         Me.Label22.AutoSize = True
@@ -247,95 +335,22 @@ Partial Class usrCntlBenachrichtigungenNEW
         Me.Button10.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         Me.Button10.UseVisualStyleBackColor = True
         '
-        'CheckBox1
-        '
-        Me.CheckBox1.AutoSize = True
-        Me.CheckBox1.ForeColor = System.Drawing.Color.White
-        Me.CheckBox1.Location = New System.Drawing.Point(3, 25)
-        Me.CheckBox1.Name = "CheckBox1"
-        Me.CheckBox1.Size = New System.Drawing.Size(86, 17)
-        Me.CheckBox1.TabIndex = 32
-        Me.CheckBox1.Text = "Alte Einträge"
-        Me.CheckBox1.UseVisualStyleBackColor = True
-        '
-        'txtDatumAb
-        '
-        Me.txtDatumAb._DateTimeOnly = False
-        Me.txtDatumAb._numbersOnly = False
-        Me.txtDatumAb._numbersOnlyKommastellen = ""
-        Me.txtDatumAb._numbersOnlyTrennzeichen = True
-        Me.txtDatumAb._Prozent = False
-        Me.txtDatumAb._ShortDateNew = True
-        Me.txtDatumAb._ShortDateOnly = False
-        Me.txtDatumAb._TimeOnly = False
-        Me.txtDatumAb._TimeOnly_Seconds = False
-        Me.txtDatumAb._value = ""
-        Me.txtDatumAb._Waehrung = False
-        Me.txtDatumAb._WaehrungZeichen = True
-        Me.txtDatumAb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.txtDatumAb.ForeColor = System.Drawing.Color.Black
-        Me.txtDatumAb.Location = New System.Drawing.Point(213, 50)
-        Me.txtDatumAb.MaxLineLength = -1
-        Me.txtDatumAb.MaxLines_Warning = ""
-        Me.txtDatumAb.MaxLines_Warning_Label = Nothing
-        Me.txtDatumAb.Name = "txtDatumAb"
-        Me.txtDatumAb.Size = New System.Drawing.Size(100, 20)
-        Me.txtDatumAb.TabIndex = 33
-        Me.txtDatumAb.Visible = False
-        '
-        'Label1
-        '
-        Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Label1.AutoSize = True
-        Me.Label1.ForeColor = System.Drawing.Color.White
-        Me.Label1.Location = New System.Drawing.Point(185, 53)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(22, 13)
-        Me.Label1.TabIndex = 34
-        Me.Label1.Text = "ab:"
-        Me.Label1.Visible = False
-        '
-        'Label2
-        '
-        Me.Label2.AutoSize = True
-        Me.Label2.ForeColor = System.Drawing.Color.White
-        Me.Label2.Location = New System.Drawing.Point(5, 53)
-        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(41, 13)
-        Me.Label2.TabIndex = 36
-        Me.Label2.Text = "Suche:"
-        Me.Label2.Visible = False
-        '
-        'txtSearch
-        '
-        Me.txtSearch._DateTimeOnly = False
-        Me.txtSearch._numbersOnly = False
-        Me.txtSearch._numbersOnlyKommastellen = ""
-        Me.txtSearch._numbersOnlyTrennzeichen = True
-        Me.txtSearch._Prozent = False
-        Me.txtSearch._ShortDateNew = False
-        Me.txtSearch._ShortDateOnly = False
-        Me.txtSearch._TimeOnly = False
-        Me.txtSearch._TimeOnly_Seconds = False
-        Me.txtSearch._value = ""
-        Me.txtSearch._Waehrung = False
-        Me.txtSearch._WaehrungZeichen = True
-        Me.txtSearch.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.txtSearch.ForeColor = System.Drawing.Color.Black
-        Me.txtSearch.Location = New System.Drawing.Point(50, 50)
-        Me.txtSearch.MaxLineLength = -1
-        Me.txtSearch.MaxLines_Warning = ""
-        Me.txtSearch.MaxLines_Warning_Label = Nothing
-        Me.txtSearch.Name = "txtSearch"
-        Me.txtSearch.Size = New System.Drawing.Size(128, 20)
-        Me.txtSearch.TabIndex = 35
-        Me.txtSearch.Visible = False
-        '
         'Timer1
         '
         Me.Timer1.Interval = 5000
         '
+        'cbxFotoVerwahrung
+        '
+        Me.cbxFotoVerwahrung.AutoSize = True
+        Me.cbxFotoVerwahrung.ForeColor = System.Drawing.Color.Black
+        Me.cbxFotoVerwahrung.Location = New System.Drawing.Point(169, 19)
+        Me.cbxFotoVerwahrung.Name = "cbxFotoVerwahrung"
+        Me.cbxFotoVerwahrung.Size = New System.Drawing.Size(107, 17)
+        Me.cbxFotoVerwahrung.TabIndex = 34
+        Me.cbxFotoVerwahrung.Text = "Foto Verwahrung"
+        Me.cbxFotoVerwahrung.UseVisualStyleBackColor = True
+        Me.cbxFotoVerwahrung.Visible = False
+        '
         'usrCntlBenachrichtigungenNEW
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -373,4 +388,5 @@ Partial Class usrCntlBenachrichtigungenNEW
     Friend WithEvents Label2 As Label
     Friend WithEvents Label1 As Label
     Friend WithEvents Timer1 As Timer
+    Friend WithEvents cbxFotoVerwahrung As CheckBox
 End Class

Aviso/Benachrichtigung/usrCntlBenachrichtigungenNEW.vb

@@ -34,6 +34,11 @@ Public Class usrCntlBenachrichtigungenNEW
                 If .Columns IsNot Nothing AndAlso .Columns.Count > 0 Then .Columns.Clear()
 
                 Dim whereMA = " AND  ( 1<>1 "
+                Dim whereVerwahrungsFotos = ""
+
+                If Not cbxFotoVerwahrung.Checked Then
+                    whereVerwahrungsFotos = " AND ab_BenachrichtigungCode <> 20 "
+                End If
 
                 'WARENORT
                 If VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG Then
@@ -130,6 +135,7 @@ Public Class usrCntlBenachrichtigungenNEW
                         "WHERE 1=1 " &
                         whereStatus &
                         whereMA &
+                        whereVerwahrungsFotos &
                         " ORDER BY CASE WHEN ANKUNFT<'20010101' THEN '29990101' ELSE ANKUNFT END ASC,ab_Datum ASC"
 
                 Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
@@ -527,4 +533,8 @@ Public Class usrCntlBenachrichtigungenNEW
             initDgvAvisoBenachrichtigungen(True, Me.Font)
         End If
     End Sub
+
+    Private Sub cbxFotoVerwahrung_CheckedChanged(sender As Object, e As EventArgs) Handles cbxFotoVerwahrung.CheckedChanged
+        initDgvAvisoBenachrichtigungen(True, Me.Font)
+    End Sub
 End Class

Aviso/frmHauptfenster.Designer.vb

@@ -82,6 +82,7 @@ Partial Class frmHauptfenster
         Me.UNBescheinigungAusTFEinlesenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.PrüfeBilderAufBase64ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.BerechtigungenNeuLadenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator()
         Me.FirmaWechselnToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.VERAGToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -319,6 +320,7 @@ Partial Class frmHauptfenster
         Me.Panel6 = New System.Windows.Forms.Panel()
         Me.cbx_My_Brexit = New System.Windows.Forms.CheckBox()
         Me.cbx_My_CBAM = New System.Windows.Forms.CheckBox()
+        Me.cbx_My_VW = New System.Windows.Forms.CheckBox()
         Me.btnColor = New System.Windows.Forms.Button()
         Me.lblMeineAviso = New System.Windows.Forms.Label()
         Me.cboMy_Grenzstelle = New VERAG_PROG_ALLGEMEIN.MyComboBox()
@@ -429,7 +431,6 @@ Partial Class frmHauptfenster
         Me.Panel7 = New System.Windows.Forms.Panel()
         Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen()
         Me.UsrCntlBenachrichtigungen2 = New AVISO.usrCntlBenachrichtigungen()
-        Me.BerechtigungenNeuLadenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
         Me.conMenuAviso.SuspendLayout()
         Me.MenuStrip1.SuspendLayout()
         Me.pnlDetailsRechts.SuspendLayout()
@@ -783,6 +784,12 @@ Partial Class frmHauptfenster
         Me.PrüfeBilderAufBase64ToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
         Me.PrüfeBilderAufBase64ToolStripMenuItem.Text = "Prüfe Bilder auf Base64"
         '
+        'BerechtigungenNeuLadenToolStripMenuItem1
+        '
+        Me.BerechtigungenNeuLadenToolStripMenuItem1.Name = "BerechtigungenNeuLadenToolStripMenuItem1"
+        Me.BerechtigungenNeuLadenToolStripMenuItem1.Size = New System.Drawing.Size(257, 22)
+        Me.BerechtigungenNeuLadenToolStripMenuItem1.Text = "Berechtigungen neu laden"
+        '
         'ToolStripSeparator4
         '
         Me.ToolStripSeparator4.Name = "ToolStripSeparator4"
@@ -961,26 +968,26 @@ Partial Class frmHauptfenster
         'GenerelleGestellungenDurchsuchenToolStripMenuItem
         '
         Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Name = "GenerelleGestellungenDurchsuchenToolStripMenuItem"
-        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Text = "Generelle Gestellungen durchsuchen"
         Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Visible = False
         '
         'KundenVonFremdenSpeditionenToolStripMenuItem
         '
         Me.KundenVonFremdenSpeditionenToolStripMenuItem.Name = "KundenVonFremdenSpeditionenToolStripMenuItem"
-        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.KundenVonFremdenSpeditionenToolStripMenuItem.Text = "Kunden von fremden Speditionen"
         '
         'KundenverwaltungToolStripMenuItem
         '
         Me.KundenverwaltungToolStripMenuItem.Name = "KundenverwaltungToolStripMenuItem"
-        Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.KundenverwaltungToolStripMenuItem.Text = "Kundenverwaltung"
         '
         'MDMParkplatzkartenToolStripMenuItem
         '
         Me.MDMParkplatzkartenToolStripMenuItem.Name = "MDMParkplatzkartenToolStripMenuItem"
-        Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.MDMParkplatzkartenToolStripMenuItem.Text = "MDM - Parkplatzkarten"
         '
         'SMSSendenToolStripMenuItem
@@ -988,7 +995,7 @@ Partial Class frmHauptfenster
         Me.SMSSendenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeueSMSSendenToolStripMenuItem, Me.GesendeteSMSToolStripMenuItem})
         Me.SMSSendenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.handy2
         Me.SMSSendenToolStripMenuItem.Name = "SMSSendenToolStripMenuItem"
-        Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.SMSSendenToolStripMenuItem.Text = "SMS"
         '
         'NeueSMSSendenToolStripMenuItem
@@ -1006,57 +1013,57 @@ Partial Class frmHauptfenster
         'ZollprogrammeNachEORIDurchsuchenToolStripMenuItem
         '
         Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Name = "ZollprogrammeNachEORIDurchsuchenToolStripMenuItem"
-        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Text = "Zollprogramme nach EORI durchsuchen"
         '
         'MRNBarcodedruckToolStripMenuItem
         '
         Me.MRNBarcodedruckToolStripMenuItem.Name = "MRNBarcodedruckToolStripMenuItem"
-        Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.MRNBarcodedruckToolStripMenuItem.Text = "MRN Barcodedruck"
         '
         'NewsletterToolStripMenuItem
         '
         Me.NewsletterToolStripMenuItem.Name = "NewsletterToolStripMenuItem"
-        Me.NewsletterToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.NewsletterToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.NewsletterToolStripMenuItem.Text = "Newsletter"
         '
         'ToolStripSeparator12
         '
         Me.ToolStripSeparator12.Name = "ToolStripSeparator12"
-        Me.ToolStripSeparator12.Size = New System.Drawing.Size(388, 6)
+        Me.ToolStripSeparator12.Size = New System.Drawing.Size(380, 6)
         '
         'tool_BRGXLS
         '
         Me.tool_BRGXLS.Name = "tool_BRGXLS"
-        Me.tool_BRGXLS.Size = New System.Drawing.Size(391, 30)
+        Me.tool_BRGXLS.Size = New System.Drawing.Size(383, 22)
         Me.tool_BRGXLS.Text = "Bürgschaften Excel"
         '
         'ToolStripMenuItem4
         '
         Me.ToolStripMenuItem4.Name = "ToolStripMenuItem4"
-        Me.ToolStripMenuItem4.Size = New System.Drawing.Size(391, 30)
+        Me.ToolStripMenuItem4.Size = New System.Drawing.Size(383, 22)
         Me.ToolStripMenuItem4.Text = "DE | Gesamtsicherheit VERAG GmbH - Excel"
         Me.ToolStripMenuItem4.Visible = False
         '
         'ToolStripMenuItem5
         '
         Me.ToolStripMenuItem5.Name = "ToolStripMenuItem5"
-        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(391, 30)
+        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(383, 22)
         Me.ToolStripMenuItem5.Text = "AT | Gesamtsicherheit VERAG AG - Excel"
         Me.ToolStripMenuItem5.Visible = False
         '
         'BürgschaftenExcelToolStripMenuItem
         '
         Me.BürgschaftenExcelToolStripMenuItem.Name = "BürgschaftenExcelToolStripMenuItem"
-        Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.BürgschaftenExcelToolStripMenuItem.Text = "AT | Gesamtsicherheit VERAG Customs Service - Excel"
         Me.BürgschaftenExcelToolStripMenuItem.Visible = False
         '
         'ToolStripMenuItem6
         '
         Me.ToolStripMenuItem6.Name = "ToolStripMenuItem6"
-        Me.ToolStripMenuItem6.Size = New System.Drawing.Size(391, 30)
+        Me.ToolStripMenuItem6.Size = New System.Drawing.Size(383, 22)
         Me.ToolStripMenuItem6.Text = "AT | Gesamtsicherheit IMEX Customs Service GmbH - Excel"
         Me.ToolStripMenuItem6.Visible = False
         '
@@ -1064,7 +1071,7 @@ Partial Class frmHauptfenster
         '
         Me.GesamtsicherheitenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ATVeragAGToolStripMenuItem, Me.ATImexCSToolStripMenuItem, Me.ATVeragCSToolStripMenuItem, Me.DEVeragGmbHToolStripMenuItem, Me.ATUnispedGmbHToolStripMenuItem, Me.DEAmbarToolStripMenuItem, Me.ATAtillaToolStripMenuItem, Me.DEZollernToolStripMenuItem, Me.ReferenzwerteToolStripMenuItem})
         Me.GesamtsicherheitenToolStripMenuItem.Name = "GesamtsicherheitenToolStripMenuItem"
-        Me.GesamtsicherheitenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.GesamtsicherheitenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.GesamtsicherheitenToolStripMenuItem.Text = "Gesamtsicherheiten"
         Me.GesamtsicherheitenToolStripMenuItem.Visible = False
         '
@@ -1126,25 +1133,25 @@ Partial Class frmHauptfenster
         'ToolStripMenuItem10
         '
         Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10"
-        Me.ToolStripMenuItem10.Size = New System.Drawing.Size(391, 30)
+        Me.ToolStripMenuItem10.Size = New System.Drawing.Size(383, 22)
         Me.ToolStripMenuItem10.Text = "TICKET Parkplatz"
         '
         'TICKETWaidhausToolStripMenuItem
         '
         Me.TICKETWaidhausToolStripMenuItem.Name = "TICKETWaidhausToolStripMenuItem"
-        Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.TICKETWaidhausToolStripMenuItem.Text = "Infoschreiben Parkplatz"
         '
         'ToolStripSeparator10
         '
         Me.ToolStripSeparator10.Name = "ToolStripSeparator10"
-        Me.ToolStripSeparator10.Size = New System.Drawing.Size(388, 6)
+        Me.ToolStripSeparator10.Size = New System.Drawing.Size(380, 6)
         '
         'DAKOSYToolStripMenuItem
         '
         Me.DAKOSYToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StammreferenzenVerwaltenToolStripMenuItem})
         Me.DAKOSYToolStripMenuItem.Name = "DAKOSYToolStripMenuItem"
-        Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.DAKOSYToolStripMenuItem.Text = "DAKOSY"
         '
         'StammreferenzenVerwaltenToolStripMenuItem
@@ -1156,76 +1163,76 @@ Partial Class frmHauptfenster
         'ToolStripSeparator23
         '
         Me.ToolStripSeparator23.Name = "ToolStripSeparator23"
-        Me.ToolStripSeparator23.Size = New System.Drawing.Size(388, 6)
+        Me.ToolStripSeparator23.Size = New System.Drawing.Size(380, 6)
         '
         'toolOriginalATR
         '
         Me.toolOriginalATR.Image = Global.AVISO.My.Resources.Resources.atr
         Me.toolOriginalATR.Name = "toolOriginalATR"
-        Me.toolOriginalATR.Size = New System.Drawing.Size(391, 30)
+        Me.toolOriginalATR.Size = New System.Drawing.Size(383, 22)
         Me.toolOriginalATR.Text = "Original-ATR"
         '
         'SDLAbholaufträgeToolStripMenuItem
         '
         Me.SDLAbholaufträgeToolStripMenuItem.Name = "SDLAbholaufträgeToolStripMenuItem"
-        Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.SDLAbholaufträgeToolStripMenuItem.Text = "SDL Abholaufträge"
         '
         'ToolStripMenuItem13
         '
         Me.ToolStripMenuItem13.Name = "ToolStripMenuItem13"
-        Me.ToolStripMenuItem13.Size = New System.Drawing.Size(391, 30)
+        Me.ToolStripMenuItem13.Size = New System.Drawing.Size(383, 22)
         Me.ToolStripMenuItem13.Text = "Postversand (Einschreiben)"
         '
         'VerträgeToolStripMenuItem
         '
         Me.VerträgeToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.spedbuch_small
         Me.VerträgeToolStripMenuItem.Name = "VerträgeToolStripMenuItem"
-        Me.VerträgeToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.VerträgeToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.VerträgeToolStripMenuItem.Text = "Verträge"
         '
         'VorauskassenToolStripMenuItem
         '
         Me.VorauskassenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.vorauszahlung
         Me.VorauskassenToolStripMenuItem.Name = "VorauskassenToolStripMenuItem"
-        Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.VorauskassenToolStripMenuItem.Text = "Vorauskassen"
         '
         'ToolStripSeparator11
         '
         Me.ToolStripSeparator11.Name = "ToolStripSeparator11"
-        Me.ToolStripSeparator11.Size = New System.Drawing.Size(388, 6)
+        Me.ToolStripSeparator11.Size = New System.Drawing.Size(380, 6)
         '
         'EssensbestellungenToolStripMenuItem
         '
         Me.EssensbestellungenToolStripMenuItem.Name = "EssensbestellungenToolStripMenuItem"
-        Me.EssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.EssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.EssensbestellungenToolStripMenuItem.Text = "Essensbestellungen"
         Me.EssensbestellungenToolStripMenuItem.Visible = False
         '
         'AdministrationEssensbestellungenToolStripMenuItem
         '
         Me.AdministrationEssensbestellungenToolStripMenuItem.Name = "AdministrationEssensbestellungenToolStripMenuItem"
-        Me.AdministrationEssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.AdministrationEssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.AdministrationEssensbestellungenToolStripMenuItem.Text = "Administration Essensbestellungen"
         Me.AdministrationEssensbestellungenToolStripMenuItem.Visible = False
         '
         'ToolStripSeparator24
         '
         Me.ToolStripSeparator24.Name = "ToolStripSeparator24"
-        Me.ToolStripSeparator24.Size = New System.Drawing.Size(388, 6)
+        Me.ToolStripSeparator24.Size = New System.Drawing.Size(380, 6)
         '
         'WarenorteToolStripMenuItem
         '
         Me.WarenorteToolStripMenuItem.Name = "WarenorteToolStripMenuItem"
-        Me.WarenorteToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.WarenorteToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.WarenorteToolStripMenuItem.Text = "Warenorte"
         '
         'DatevBuchungsexportToolStripMenuItem
         '
         Me.DatevBuchungsexportToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.EMAILToolStripMenuItem, Me.FTPToolStripMenuItem})
         Me.DatevBuchungsexportToolStripMenuItem.Name = "DatevBuchungsexportToolStripMenuItem"
-        Me.DatevBuchungsexportToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.DatevBuchungsexportToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.DatevBuchungsexportToolStripMenuItem.Text = "Datev  Buchungsexport"
         Me.DatevBuchungsexportToolStripMenuItem.Visible = False
         '
@@ -1244,13 +1251,13 @@ Partial Class frmHauptfenster
         'APIToolStripMenuItem
         '
         Me.APIToolStripMenuItem.Name = "APIToolStripMenuItem"
-        Me.APIToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.APIToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.APIToolStripMenuItem.Text = "API"
         '
         'FIBUSachkontenToolStripMenuItem
         '
         Me.FIBUSachkontenToolStripMenuItem.Name = "FIBUSachkontenToolStripMenuItem"
-        Me.FIBUSachkontenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.FIBUSachkontenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.FIBUSachkontenToolStripMenuItem.Text = "FIBU Sachkonten"
         Me.FIBUSachkontenToolStripMenuItem.Visible = False
         '
@@ -2762,7 +2769,7 @@ Partial Class frmHauptfenster
         DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
         Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle3
         Me.gridMyAviso.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.gridMyAviso.Location = New System.Drawing.Point(0, 21)
+        Me.gridMyAviso.Location = New System.Drawing.Point(0, 22)
         Me.gridMyAviso.Name = "gridMyAviso"
         Me.gridMyAviso.ReadOnly = True
         DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
@@ -2775,7 +2782,7 @@ Partial Class frmHauptfenster
         Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle4
         Me.gridMyAviso.RowHeadersVisible = False
         Me.gridMyAviso.RowHeadersWidth = 62
-        Me.gridMyAviso.Size = New System.Drawing.Size(328, 279)
+        Me.gridMyAviso.Size = New System.Drawing.Size(328, 278)
         Me.gridMyAviso.TabIndex = 0
         '
         'Panel6
@@ -2783,6 +2790,7 @@ Partial Class frmHauptfenster
         Me.Panel6.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
         Me.Panel6.Controls.Add(Me.cbx_My_Brexit)
         Me.Panel6.Controls.Add(Me.cbx_My_CBAM)
+        Me.Panel6.Controls.Add(Me.cbx_My_VW)
         Me.Panel6.Controls.Add(Me.btnColor)
         Me.Panel6.Controls.Add(Me.lblMeineAviso)
         Me.Panel6.Controls.Add(Me.cboMy_Grenzstelle)
@@ -2796,7 +2804,7 @@ Partial Class frmHauptfenster
         Me.Panel6.Dock = System.Windows.Forms.DockStyle.Top
         Me.Panel6.Location = New System.Drawing.Point(0, 0)
         Me.Panel6.Name = "Panel6"
-        Me.Panel6.Size = New System.Drawing.Size(328, 21)
+        Me.Panel6.Size = New System.Drawing.Size(328, 22)
         Me.Panel6.TabIndex = 1
         '
         'cbx_My_Brexit
@@ -2825,6 +2833,19 @@ Partial Class frmHauptfenster
         Me.cbx_My_CBAM.UseVisualStyleBackColor = True
         Me.cbx_My_CBAM.Visible = False
         '
+        'cbx_My_VW
+        '
+        Me.cbx_My_VW.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.cbx_My_VW.AutoSize = True
+        Me.cbx_My_VW.ForeColor = System.Drawing.Color.White
+        Me.cbx_My_VW.Location = New System.Drawing.Point(-370, 3)
+        Me.cbx_My_VW.Name = "cbx_My_VW"
+        Me.cbx_My_VW.Size = New System.Drawing.Size(44, 17)
+        Me.cbx_My_VW.TabIndex = 30
+        Me.cbx_My_VW.Text = "VW"
+        Me.cbx_My_VW.UseVisualStyleBackColor = True
+        Me.cbx_My_VW.Visible = False
+        '
         'btnColor
         '
         Me.btnColor.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -4099,12 +4120,6 @@ Partial Class frmHauptfenster
         Me.UsrCntlBenachrichtigungen2.Size = New System.Drawing.Size(252, 243)
         Me.UsrCntlBenachrichtigungen2.TabIndex = 1
         '
-        'BerechtigungenNeuLadenToolStripMenuItem1
-        '
-        Me.BerechtigungenNeuLadenToolStripMenuItem1.Name = "BerechtigungenNeuLadenToolStripMenuItem1"
-        Me.BerechtigungenNeuLadenToolStripMenuItem1.Size = New System.Drawing.Size(257, 22)
-        Me.BerechtigungenNeuLadenToolStripMenuItem1.Text = "Berechtigungen neu laden"
-        '
         'frmHauptfenster
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -4575,4 +4590,5 @@ Partial Class frmHauptfenster
     Friend WithEvents ToolStripMenuItem25 As ToolStripMenuItem
     Friend WithEvents DEZollernToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents BerechtigungenNeuLadenToolStripMenuItem1 As ToolStripMenuItem
+    Friend WithEvents cbx_My_VW As CheckBox
 End Class

Aviso/frmHauptfenster.vb

@@ -512,6 +512,10 @@ Public Class frmHauptfenster
             cbx_My_CBAM.Checked = True
         End If
 
+        'If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("CBAM", "AVISO") Then
+        '    cbx_My_VW.Checked = True
+        'End If
+
         'If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Speditionsbuch", "AVISO") Then
         '    btnSpedBuch.Visible = False
         'End If
@@ -1241,6 +1245,7 @@ ELSE_ATILLA:
 
             If cbx_My_Brexit.Visible AndAlso Not cbx_My_Brexit.Checked Then hSQL &= " AND FilialenNr NOT IN ('7001','7002','7003') "
             If cbx_My_CBAM.Visible AndAlso Not cbx_My_CBAM.Checked Then hSQL &= " AND tblSnd_Abfertigungsart_ID NOT IN (65) "
+            If cbx_My_VW.Visible AndAlso Not cbx_My_VW.Checked Then sqlStr &= " AND tblSnd_Abfertigungsart_ID NOT IN (67,68,69) "
 
             'Farbe
             If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then
@@ -1614,6 +1619,7 @@ ELSE_ATILLA:
 
                 If cbx_My_Brexit.Visible AndAlso Not cbx_My_Brexit.Checked Then sqlStr &= " AND FilialenNr NOT IN ('7001','7002','7003') "
                 If cbx_My_CBAM.Visible AndAlso Not cbx_My_CBAM.Checked Then sqlStr &= " AND tblSnd_Abfertigungsart_ID NOT IN (65) "
+                If cbx_My_VW.Visible AndAlso Not cbx_My_VW.Checked Then sqlStr &= " AND tblSnd_Abfertigungsart_ID NOT IN (67,68,69) "
 
                 'Farbe
                 If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then
@@ -4478,7 +4484,7 @@ ELSE_ATILLA:
 
     End Sub
 
-    Private Sub cboMyAvisoAnzeige_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboMyAvisoAnzeige.SelectedIndexChanged, cbx_My_LKW.CheckedChanged, cbx_My_Brexit.CheckedChanged, cboMy_Grenzstelle.SelectedIndexChanged, cboMy_QS.CheckStateChanged, cboMy_VB.CheckStateChanged, cbx_My_CBAM.CheckStateChanged
+    Private Sub cboMyAvisoAnzeige_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboMyAvisoAnzeige.SelectedIndexChanged, cbx_My_LKW.CheckedChanged, cbx_My_Brexit.CheckedChanged, cboMy_Grenzstelle.SelectedIndexChanged, cboMy_QS.CheckStateChanged, cboMy_VB.CheckStateChanged, cbx_My_CBAM.CheckStateChanged, cbx_My_VW.CheckStateChanged
         If Grid_aktiv Then
             'Wenn VERIMEX/T1 und cboMyAvisoAnzeige geändert --> Checkboxes richtig setzen
             If sender Is cboMyAvisoAnzeige Then
@@ -4512,10 +4518,12 @@ ELSE_ATILLA:
             lblMeineAviso.Text = "Meine Aviso:"
             cbx_My_Brexit.Visible = False
             cbx_My_CBAM.Visible = False
+            cbx_My_VW.Visible = False
         Else
             lblMeineAviso.Text = "Meine Sendungen:"
             cbx_My_Brexit.Visible = True
             cbx_My_CBAM.Visible = True
+            cbx_My_VW.Visible = True
         End If
     End Sub