diff --git a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb
index 0b7d120..8c9eb15 100644
--- a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb
+++ b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb
@@ -23,16 +23,16 @@ Partial Class usrCntlBenachrichtigungen
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 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)
         Me.Panel4 = New System.Windows.Forms.Panel()
         Me.cbxTaskForce = New System.Windows.Forms.CheckBox()
         Me.cbxVerwarung = New System.Windows.Forms.CheckBox()
-        Me.txtVermerk = New System.Windows.Forms.TextBox()
         Me.cbxNeukunden = New System.Windows.Forms.CheckBox()
         Me.Button10 = New System.Windows.Forms.Button()
+        Me.txtVermerk = New System.Windows.Forms.TextBox()
         Me.Panel3 = New System.Windows.Forms.Panel()
         Me.cbxCluster = New System.Windows.Forms.CheckBox()
         Me.cbxTeams = New System.Windows.Forms.CheckBox()
@@ -80,8 +80,8 @@ Partial Class usrCntlBenachrichtigungen
         Me.gridAvisoBenachrichtigungen.AllowUserToDeleteRows = False
         Me.gridAvisoBenachrichtigungen.AllowUserToOrderColumns = True
         Me.gridAvisoBenachrichtigungen.AllowUserToResizeRows = False
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Azure
-        Me.gridAvisoBenachrichtigungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure
+        Me.gridAvisoBenachrichtigungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
         Me.gridAvisoBenachrichtigungen.BackgroundColor = System.Drawing.Color.White
         Me.gridAvisoBenachrichtigungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.gridAvisoBenachrichtigungen.Dock = System.Windows.Forms.DockStyle.Fill
@@ -130,16 +130,6 @@ Partial Class usrCntlBenachrichtigungen
         Me.cbxVerwarung.UseVisualStyleBackColor = True
         Me.cbxVerwarung.Visible = False
         '
-        'txtVermerk
-        '
-        Me.txtVermerk.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.txtVermerk.Location = New System.Drawing.Point(7, -1)
-        Me.txtVermerk.Name = "txtVermerk"
-        Me.txtVermerk.ReadOnly = True
-        Me.txtVermerk.Size = New System.Drawing.Size(146, 20)
-        Me.txtVermerk.TabIndex = 31
-        '
         'cbxNeukunden
         '
         Me.cbxNeukunden.AutoSize = True
@@ -169,6 +159,16 @@ Partial Class usrCntlBenachrichtigungen
         Me.Button10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.Button10.UseVisualStyleBackColor = True
         '
+        'txtVermerk
+        '
+        Me.txtVermerk.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.txtVermerk.Location = New System.Drawing.Point(7, -1)
+        Me.txtVermerk.Name = "txtVermerk"
+        Me.txtVermerk.ReadOnly = True
+        Me.txtVermerk.Size = New System.Drawing.Size(146, 20)
+        Me.txtVermerk.TabIndex = 31
+        '
         'Panel3
         '
         Me.Panel3.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
diff --git a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb
index 49d364f..16949a9 100644
--- a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb
+++ b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb
@@ -4,7 +4,7 @@ Imports VERAG_PROG_ALLGEMEIN
 Public Class usrCntlBenachrichtigungen
     Dim VERAGSQL As New VERAG_PROG_ALLGEMEIN.SQL
     Dim ASF As New AvisoStatusFunctions
-
+    Dim See_Cbam As Boolean = False
 
     Public Event SelectionChanged()
 
@@ -71,6 +71,14 @@ Public Class usrCntlBenachrichtigungen
                         End Select
                     End If
 
+                    If See_Cbam Then
+                        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+                            Case "VERIMEX", "AMBAR"
+                            Case Else
+                                whereMA &= " OR (ab_TO_Art='T' AND ab_TO_Code='33') " 'TEAM_CBAM --> VERAG
+                        End Select
+                    End If
+
                     If cbxTeams.Checked Then
                         whereMA &= " Or (ab_TO_Art='T' AND ab_TO_Code IN (SELECT [team_id] FROM ADMIN.dbo.[tblTeams] WHERE team_firma = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "')) "
                     Else
@@ -256,6 +264,10 @@ Public Class usrCntlBenachrichtigungen
             cbxNeukunden.Visible = True
             'cbxNeukunden.Checked = True
         End If
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("BENACHRICHTIGUNGEN_SeeCBAM", "AVISO") Then
+            See_Cbam = True
+
+        End If
 
         If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("BENACHRICHTIGUNGEN_SeeVerwahrung", "AVISO") Then
             cbxVerwarung.Visible = True
diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb
index 334854a..89048b1 100644
--- a/Aviso/My Project/AssemblyInfo.vb	
+++ b/Aviso/My Project/AssemblyInfo.vb	
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("4.2.3.3")>
-<Assembly: AssemblyFileVersion("4.2.3.3")>
+<Assembly: AssemblyVersion("4.2.3.6")>
+<Assembly: AssemblyFileVersion("4.2.3.6")>