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

Abrechnungsmaske, Mailsender

Browse Source
This commit is contained in:
d.breimaier
2025-10-15 09:58:11 +02:00
parent e8ade89a6b
commit 0de64a837c
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
SDL/Fakturierung/frmAbrechnungsMaske.vb
View File

@@ -71,6 +71,11 @@ Public Class frmAbrechnungsMaske
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGAG_DE", "SDL") Then If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGAG_DE", "SDL") Then
whereFirma = " AND FIRMENGRUPPE In ('VERAG360','VERAGAG_DE') " whereFirma = " AND FIRMENGRUPPE In ('VERAG360','VERAGAG_DE') "
End If End If
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGAG", "SDL") Then
whereFirma &= " OR Firma_ID=1 "
End If
cboER_SR.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MSR", "MSR")) cboER_SR.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MSR", "MSR"))
cboFirma.fillWithSQL("Select [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE 1=1 " & whereFirma, False, "FMZOLL") cboFirma.fillWithSQL("Select [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE 1=1 " & whereFirma, False, "FMZOLL")
cboFirma.changeItem("1") cboFirma.changeItem("1")

20
SDL/Fakturierung/usrCntlFaktAbrechnung.vb
View File

@@ -67,6 +67,10 @@ Public Class usrCntlFaktAbrechnung
Firma = 17 Firma = 17
cboFiliale.changeItem(5801) cboFiliale.changeItem(5801)
Case "VERAG"
If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "MDM" Then
Firma = 19
End If
End Select End Select
@@ -602,18 +606,24 @@ Public Class usrCntlFaktAbrechnung
End If End If
pnlDocs.Visible = True pnlDocs.Visible = True
Case "VERAG360" Case "VERAG360"
Dim Firmengruppe As String = "'VERAG360'"
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGAG_DE", "SDL") Then If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGAG_DE", "SDL") Then
whereFirma = " AND FIRMENGRUPPE IN ('VERAG360','VERAGAG_DE') " : pnlDocs.Visible = True Firmengruppe &= " ,'VERAGAG_DE'"
Else
whereFirma = " AND FIRMENGRUPPE IN ('VERAG360') " : pnlDocs.Visible = True
End If End If
whereFirma = " AND FIRMENGRUPPE IN (" & Firmengruppe & ") " : pnlDocs.Visible = True
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGAG", "SDL") Then
whereFirma &= " OR Firma_ID=1 "
End If
End Select 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 cboFirma.SelectedIndex = 0