edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024

Browse Source
This commit is contained in:
Andreas Luxbauer
2026-02-25 11:10:30 +01:00
parent bbdefcf0eb 3132fa3d97
commit fd48a2b027
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SDL/My Project/AssemblyInfo.vb
View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.5.3.1")> <Assembly: AssemblyVersion("1.5.3.2")>
<Assembly: AssemblyFileVersion("1.5.3.1")> <Assembly: AssemblyFileVersion("1.5.3.2")>

4
SDL/buchhaltung/frmBU_Mahnlauf.vb
View File

@@ -864,15 +864,11 @@ Public Class frmBU_Mahnlauf
Mail_BCC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(AD.AdressenNr, "Mahnung an (ATILLA)") 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_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!! If Mail_To = "" AndAlso Mail_CC = "" Then 'fallback -> falls nicht korrekt hinterlegt!!
Mail_To = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(AD.AdressenNr, "Mahnung an") Mail_To = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(AD.AdressenNr, "Mahnung an")
Mail_CC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(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 = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(AD.AdressenNr, "Mahnung an")
Mail_BCC &= "buchhaltung@verag.ag;"
End If End If
Else Else

6
VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb
View File

@@ -195,7 +195,7 @@ Public Class frmMessenger
Dim whereName = "" Dim whereName = ""
If MyTextBox1.Text.Trim <> String.Empty Then 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 End If
Dim where = "" Dim where = ""
@@ -217,7 +217,7 @@ Public Class frmMessenger
) as T " & whereName & " ORDER BY chat_lastMsg DESC" ) 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, c.chat_id,
CASE CASE
@@ -259,7 +259,7 @@ Public Class frmMessenger
WHERE msg.chatMg_chatId = c.chat_id WHERE msg.chatMg_chatId = c.chat_id
AND s.chatMgSt_MaId = " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & " AND s.chatMgSt_MaId = " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "
AND s.chatMgSt_gelesen = 0 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