diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index bdbe9ef5..45468f5c 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb index 9466d8e3..75edb00e 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb @@ -864,15 +864,11 @@ Public Class frmBU_Mahnlauf Mail_BCC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(AD.AdressenNr, "Mahnung an (ATILLA)") Mail_HTMLBody = Mail_HTMLBody.ToString.Replace("rechnungsversand@verag.ag", FIRMA.Firma_E_Mail_Mahnungen) - Mail_BCC &= "buchhaltung@verag.ag;" - If Mail_To = "" AndAlso Mail_CC = "" Then 'fallback -> falls nicht korrekt hinterlegt!! Mail_To = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(AD.AdressenNr, "Mahnung an") Mail_CC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(AD.AdressenNr, "Mahnung an") Mail_BCC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(AD.AdressenNr, "Mahnung an") - Mail_BCC &= "buchhaltung@verag.ag;" - End If Else diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb index b7eb11dc..1863cce6 100644 --- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb +++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb @@ -195,7 +195,7 @@ Public Class frmMessenger Dim whereName = "" If MyTextBox1.Text.Trim <> String.Empty Then - whereName = " WHERE chat_name LIKE '%" & MyTextBox1.Text.Trim & "%' " + whereName = " WHERE y.chat_name LIKE '%" & MyTextBox1.Text.Trim & "%' " End If Dim where = "" @@ -217,7 +217,7 @@ Public Class frmMessenger ) as T " & whereName & " ORDER BY chat_lastMsg DESC" - Dim sqlQery_optimiced As String = "SELECT TOP 200 + Dim sqlQery_optimiced As String = " SELECT * FROM (SELECT TOP 200 c.chat_id, CASE @@ -259,7 +259,7 @@ Public Class frmMessenger WHERE msg.chatMg_chatId = c.chat_id AND s.chatMgSt_MaId = " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & " AND s.chatMgSt_gelesen = 0 - ) unread WHERE c.chat_aktiv = " & IIf(Not cbxInaktiveChats.Checked, 1, 0) & "" & where & "ORDER BY c.chat_lastMsg DESC" + ) unread WHERE c.chat_aktiv = " & IIf(Not cbxInaktiveChats.Checked, 1, 0) & "" & where & "ORDER BY c.chat_lastMsg DESC) y " & whereName