From 5af394ee85ee97acd180be802474ab78747ab0ec Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 25 Feb 2026 14:49:26 +0100 Subject: [PATCH 1/4] Version --- SDL/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 45468f5c..fc94fe5e 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: ' - - + + From 735dc12e2af152f54f97ce10302a271380cdbfe4 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 25 Feb 2026 16:08:39 +0100 Subject: [PATCH 2/4] linkedServer update --- SDL/buchhaltung/frmBU_Mahnlauf.vb | 4 ++-- VERAG_PROG_ALLGEMEIN/cAllgemein.vb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb index 5463588e..e05137b7 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb @@ -48,7 +48,7 @@ Public Class frmBU_Mahnlauf Dim sqlStr_New = "WITH EmailCTE AS ( SELECT kkd_KundenNr" & IIf(Firma_ID = 7, ",MAX(CASE WHEN kkd_kkaId = 18 THEN kkd_Email END) AS EmailMAhnungAtilla", "") & ",MAX(CASE WHEN kkd_kkaId = 10 THEN kkd_Email END) AS EmailMahnung - FROM [FMZOLL\SQLFMZOLL].[VERAG].[dbo].[tblKundenKontakt] + FROM " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".[VERAG].[dbo].[tblKundenKontakt] WHERE kkd_kkaId IN (" & IIf(Firma_ID = 7, "10, 18", "10") & ") GROUP BY kkd_KundenNr ) @@ -74,7 +74,7 @@ Public Class frmBU_Mahnlauf LEFT JOIN EmailCTE E ON E.kkd_KundenNr = OP.i_personenkonto LEFT JOIN ( SELECT KundenNr, Vorkasse AS VK - FROM [FMZOLL\SQLFMZOLL].[VERAG].[dbo].Kunden + FROM " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".[VERAG].[dbo].Kunden ) K ON K.KundenNr = OP.i_personenkonto WHERE OP.i_firm_refid = '" & Firma_ID & "' diff --git a/VERAG_PROG_ALLGEMEIN/cAllgemein.vb b/VERAG_PROG_ALLGEMEIN/cAllgemein.vb index 6ed238a9..d2672d54 100644 --- a/VERAG_PROG_ALLGEMEIN/cAllgemein.vb +++ b/VERAG_PROG_ALLGEMEIN/cAllgemein.vb @@ -23,7 +23,7 @@ Public Class cAllgemein Public Shared AVISO_SERVER As String = "[SQLGUIDE01.verag.ost.dmn]" '"[SQLGUIDE01.verag.ost.dmn]" - Public Shared FMZOLL_SERVER As String = "[FMZOLL\SQLFMZOLL]" '"[SQLGUIDE01.verag.ost.dmn]" + Public Shared FMZOLL_SERVER As String = "[SQLGUIDE01.verag.ost.dmn]" '"[sqlcluster\verag]" '"[FMZOLL\SQLFMZOLL]" Public Shared SQLGUIDE01_USED As Boolean = True 'FM-ZOLL Ablöse!!!! Public Shared AVISO_LAYOUT_NEW As Boolean = False From b92c370a3a2985f6c94f266455c9019047d39608 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 26 Feb 2026 10:25:51 +0100 Subject: [PATCH 3/4] CBAM-Sprache --- SDL/Formulare/KDFormulare/frmFormulare.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index a47f3130..ba3343f9 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -1862,11 +1862,11 @@ Public Class FormularManagerNEU Select Case usrCntl.cboSprache._value Case "EN" If usrCntl.cbxNeukunde.Checked Then - MsgBox("Cbam Checklist für Neukunden nicht in ENGLSICH verfügbar!") + MsgBox("CBAM Checklist für Neukunden nicht in ENGLSICH verfügbar!") End If - Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", usrCntl.cboFirma._value, "", Name & "_EN", listTowrite) + Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", usrCntl.cboFirma._value, "", Name & usrCntl.cboSprache._value, listTowrite) Case Else - Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", usrCntl.cboFirma._value, "", Name & "_EN", listTowrite) + Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", usrCntl.cboFirma._value, "", Name, listTowrite) End Select Return "" From f7c39391b858898bbeed8ec4ce38b1a77cf8ced8 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 26 Feb 2026 10:35:57 +0100 Subject: [PATCH 4/4] CBAM Sprachen, etc. --- SDL/Formulare/KDFormulare/frmFormulare.vb | 12 +++++++----- SDL/My Project/AssemblyInfo.vb | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index ba3343f9..40b254b5 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -1857,14 +1857,16 @@ Public Class FormularManagerNEU Dim Name As String = "CBAM_Checkliste" If usrCntl.cbxNeukunde.Checked Then Name &= "_Neukunde" + Dim Hinweismeldung As String = "" + If usrCntl.cbxNeukunde.Checked AndAlso usrCntl.cboSprache._value <> "DE" Then + Hinweismeldung = "CBAM Checklist für Neukunden nicht in " & usrCntl.cboSprache.SelectedItem.text & " verfügbar!" + End If Select Case usrCntl.cboSprache._value - Case "EN" - If usrCntl.cbxNeukunde.Checked Then - MsgBox("CBAM Checklist für Neukunden nicht in ENGLSICH verfügbar!") - End If - Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", usrCntl.cboFirma._value, "", Name & usrCntl.cboSprache._value, listTowrite) + Case "EN", "TR" + If Hinweismeldung <> "" Then MsgBox(Hinweismeldung) + Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", usrCntl.cboFirma._value, "", Name & "_" & usrCntl.cboSprache._value, listTowrite) Case Else Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", usrCntl.cboFirma._value, "", Name, listTowrite) End Select diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index fc94fe5e..a04d87d3 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: ' - - + +