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-03-02 08:25:56 +01:00
parent 61a7b3d011 f7c39391b8
commit 6434bcf08e
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
SDL/Formulare/KDFormulare/frmFormulare.vb
View File

@@ -1857,16 +1857,18 @@ Public Class FormularManagerNEU
Dim Name As String = "CBAM_Checkliste" Dim Name As String = "CBAM_Checkliste"
If usrCntl.cbxNeukunde.Checked Then Name &= "_Neukunde" 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 Select Case usrCntl.cboSprache._value
Case "EN" Case "EN", "TR"
If usrCntl.cbxNeukunde.Checked Then If Hinweismeldung <> "" Then MsgBox(Hinweismeldung)
MsgBox("Cbam Checklist für Neukunden nicht in ENGLSICH verfügbar!") Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", usrCntl.cboFirma._value, "", Name & "_" & usrCntl.cboSprache._value, listTowrite)
End If
Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", usrCntl.cboFirma._value, "", Name & "_EN", listTowrite)
Case Else 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 End Select
Return "" Return ""

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.2")> <Assembly: AssemblyVersion("1.5.3.4")>
<Assembly: AssemblyFileVersion("1.5.3.2")> <Assembly: AssemblyFileVersion("1.5.3.4")>

4
SDL/buchhaltung/frmBU_Mahnlauf.vb
View File

@@ -48,7 +48,7 @@ Public Class frmBU_Mahnlauf
Dim sqlStr_New = "WITH EmailCTE AS ( Dim sqlStr_New = "WITH EmailCTE AS (
SELECT 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 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") & ") WHERE kkd_kkaId IN (" & IIf(Firma_ID = 7, "10, 18", "10") & ")
GROUP BY kkd_KundenNr 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 EmailCTE E ON E.kkd_KundenNr = OP.i_personenkonto
LEFT JOIN ( LEFT JOIN (
SELECT KundenNr, Vorkasse AS VK SELECT KundenNr, Vorkasse AS VK
FROM [FMZOLL\SQLFMZOLL].[VERAG].[dbo].Kunden FROM " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".[VERAG].[dbo].Kunden
) K ) K
ON K.KundenNr = OP.i_personenkonto ON K.KundenNr = OP.i_personenkonto
WHERE OP.i_firm_refid = '" & Firma_ID & "' WHERE OP.i_firm_refid = '" & Firma_ID & "'

2
VERAG_PROG_ALLGEMEIN/cAllgemein.vb
View File

@@ -23,7 +23,7 @@ Public Class cAllgemein
Public Shared AVISO_SERVER As String = "[SQLGUIDE01.verag.ost.dmn]" '"[SQLGUIDE01.verag.ost.dmn]" 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 SQLGUIDE01_USED As Boolean = True 'FM-ZOLL Ablöse!!!!
Public Shared AVISO_LAYOUT_NEW As Boolean = False Public Shared AVISO_LAYOUT_NEW As Boolean = False