Version, Mialbenachrichtungen, etc.

UID/Mitarbeiter/frmMitarbDetails.vb

@@ -166,7 +166,6 @@ Public Class frmMitarbDetails
 
         cbxClientTimas.SelectedIndex = 0
 
-        loadBenachrichtiungenListe()
 
         cboFirma.Items.Clear()
         cboFirma.Items.Add("VERAG")
@@ -448,6 +447,16 @@ Public Class frmMitarbDetails
 
         cbxTimasMehrereFirmen.Checked = mitarbeiter.mit_timasMehrereFirmen
 
+        If cboFirmaFMZOLL._value <> "" AndAlso IsNumeric(cboFirmaFMZOLL._value) Then
+            loadBenachrichtiungenListe(CInt(cboFirmaFMZOLL._value))
+
+        Else
+
+            loadBenachrichtiungenListe()
+
+        End If
+
+
         If mitarbeiter.mit_timasFirmen IsNot Nothing AndAlso mitarbeiter.mit_timasFirmen <> "" Then
             For Each f In mitarbeiter.mit_timasFirmen.ToString.Split(",")
                 For i = 0 To clbTimasMehreFirmen.Items.Count - 1
@@ -1867,7 +1876,7 @@ Public Class frmMitarbDetails
     End Sub
 
     Private Sub cbxeigeneFirma_CheckedChanged(sender As Object, e As EventArgs) Handles cbxeigeneFirma.CheckedChanged
-        If cbxeigeneFirma.Checked Then
+        If Not cbxeigeneFirma.Checked Then
 
             If cboFirmaFMZOLL._value <> "" AndAlso IsNumeric(cboFirmaFMZOLL._value) Then
                 loadBenachrichtiungenListe(CInt(cboFirmaFMZOLL._value))
@@ -1893,7 +1902,7 @@ Public Class frmMitarbDetails
                                           END as mb_object, mb_id
 
                                         FROM [ADMIN].[dbo].[tblEMailbenachrichtigungen]
-                                        inner join [VERAG].[dbo].[tblFirma] on [mb_firmaID] = [tblFirma].Firma_ID" & IIf(FIRMAID > 0, " AND [tblFirma].Firma_ID = " & FIRMAID, ""), "ADMIN")
+                                        inner join [VERAG].[dbo].[tblFirma] on [mb_firmaID] = [tblFirma].Firma_ID" & IIf(FIRMAID > 0, " AND [tblFirma].Firma_ID = " & FIRMAID, "") & " order by mb_object,mb_firmaID", "ADMIN")
         For Each r As DataRow In dt_Bebachrichtigungen.Rows
             clInterneMailBenachrichtigungen.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(r.Item("mb_object"), r.Item("mb_id")))
         Next