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

faktAbrechnung, email

Browse Source
This commit is contained in:
d.breimaier
2025-01-29 10:25:59 +01:00
parent 70134c898a
commit 936bcce7d6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SDL/Fakturierung/frmFaktEmail.vb
View File

@@ -382,7 +382,7 @@ Public Class frmFaktEmail
End If
lastAktuelle_RgNr = RechnungsNr
listPDFs.Add(path)
If path <> "" Then listPDFs.Add(path)
End If
If Not RechnungsNrisSet Then 'Abbruch bei fehlender RE-Nr
@@ -837,7 +837,7 @@ Public Class frmFaktEmail
If MergePDF And ATTACHMENTS.Count > 1 Then
Dim extension = ".pdf"
Dim zielPfadZusammenfassung = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Rechnungs_Anhänge_" & RgNr & extension, extension,, False, "Zusammenfassung")
Dim zielPfadZusammenfassung = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(IIf(SammelrechungArt <> 6, "Rechnungs_Anhänge_", "Rechnung_") & RgNr & extension, extension,, False, "Zusammenfassung")
Dim myList As New List(Of String)
For Each a In ATTACHMENTS : myList.Add(a.Pfad) : Next

4
SDL/Fakturierung/usrCntlFaktAbrechnung.vb
View File

@@ -603,7 +603,7 @@ Public Class usrCntlFaktAbrechnung
End Select
cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE Firma_ID NOT IN(3) " & whereFirma & " ORDER BY Firma_ID ", True, "FMZOLL", firstEmpty)
cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE Firma_ID NOT IN(3) " & whereFirma & " ORDER BY Firma_ID ", True, "FMZOLL", firstEmpty)
cboFirma.SelectedIndex = 0
@@ -1890,7 +1890,7 @@ Public Class usrCntlFaktAbrechnung
initRg_Anhaenhe_Default(RECHNUNG, SPEDBUCH)
If Not cboFirma._value = 19 Then
If cboFirma._value IsNot Nothing AndAlso cboFirma._value <> "" AndAlso Not cboFirma._value = 19 Then
If cboSammelrechnung.Items.Count > 7 Then