From d78af068f7184926507d67205e721e4e535bb399 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 29 Jul 2026 08:51:02 +0200 Subject: [PATCH] berechtigung Sammelrechnung, etc. --- SDL/Fakturierung/cFakturierung.vb | 295 ++++++++++++------ SDL/Fakturierung/usrCntlFaktAbrechnung.vb | 2 +- SDL/cProgramFunctions.vb | 1 - .../usrCntlFakturierung.Designer.vb | 73 +++-- SDL/seriendruck/usrCntlFakturierung.vb | 55 +++- .../AuditFlow/frmFirmenuebersicht.vb | 2 +- 6 files changed, 294 insertions(+), 134 deletions(-) diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index 36c01e85..280eb77e 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -12,8 +12,11 @@ Imports VERAG_PROG_ALLGEMEIN Public Class cFakturierung + Shared useLogosFromDB As Boolean = False + Shared SQL As New VERAG_PROG_ALLGEMEIN.SQL + Public Shared Function fktSVSRVS(firmaId As Integer, varWert As Object, Optional varWährungscode As Object = "EUR") As Object Select Case firmaId Case 21, 22, 23 @@ -907,6 +910,93 @@ Public Class cFakturierung End Select + End Sub + + Shared Sub initLogos(ByRef rpt As Object, FIRMA As cFirmen, useLogosFromDB As Boolean) + + If useLogosFromDB AndAlso FIRMA.Firma_Logo IsNot Nothing Then + + Dim logoBytes As Byte() = DirectCast(FIRMA.Firma_Logo, Byte()) + + Using ms As New System.IO.MemoryStream(logoBytes) + Using tmp As Image = Image.FromStream(ms) + rpt.picVERAG.Image = New Bitmap(tmp) + End Using + End Using + + If FIRMA.Firma_Logo_Erweitert IsNot Nothing Then + + Dim logoExtBytes As Byte() = DirectCast(FIRMA.Firma_Logo_Erweitert, Byte()) + + Using ms As New System.IO.MemoryStream(logoExtBytes) + Using tmp As Image = Image.FromStream(ms) + rpt.Picture1.Image = New Bitmap(tmp) + End Using + End Using + + Else + rpt.Picture1.Image = Nothing + End If + + Else + + Select Case FIRMA.Firma_ID + + Case 1 + rpt.picVERAG.Image = My.Resources.Verag_AG_Logo + rpt.Picture1.Image = My.Resources.aeo_AT_imex + + Case 4 + rpt.picVERAG.Image = My.Resources.Verag_AG_Logo + rpt.Picture1.Image = Nothing + + Case 7 + rpt.picVERAG.Image = My.Resources.Atilla_big_med + rpt.Picture1.Image = Nothing + + Case 11 + rpt.picVERAG.Image = My.Resources.Verag_Customs_Service_GMBH_Logo + rpt.Picture1.Image = My.Resources.aeo_CS + + Case 17 + rpt.picVERAG.Image = My.Resources.FrontOfficeSUB_Horizontal + rpt.Picture1.Image = Nothing + + Case 19 + rpt.picVERAG.Image = My.Resources.VERAG_360 + rpt.Picture1.Image = Nothing + + Case 20 + rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple + rpt.Picture1.Image = My.Resources.aeo_AT_imex + + Case 21 + rpt.picVERAG.Image = My.Resources.Unisped_logo + rpt.Picture1.Image = My.Resources.unisped_aeo_AT + + Case 22 + rpt.picVERAG.Image = My.Resources.Unisped_DE_logo + rpt.Picture1.Image = My.Resources.unisped_aeo_DE + + Case 23 + rpt.picVERAG.Image = My.Resources.Unisped_ZS_logo + rpt.Picture1.Image = My.Resources.unisped_aeo_ZS_AT + + Case 24 + rpt.picVERAG.Image = My.Resources.ambar_boarder + rpt.Picture1.Image = Nothing + rpt.txtWarenwert.Visible = False + rpt.lblWarenWertUeberschrift.Visible = False + + Case 26 + rpt.picVERAG.Image = My.Resources.VERAG_UNISPED_Logo + rpt.Picture1.Image = Nothing + + End Select + + End If + + End Sub @@ -1421,22 +1511,25 @@ Public Class cFakturierung initRgFirma(rpt, firma, Rechnung) - Select Case Rechnung.Firma_ID - Case 1 ' rpt.picVERAG.Image= My.Resources.Verag_AG_Logo : rpt.Picture1.Image = My.Resources.aeo_AT_imex is eh standard - Case 4 : rpt.picVERAG.Image = My.Resources.Verag_AG_Logo : rpt.Picture1.Image = Nothing - Case 7 : rpt.picVERAG.Image = My.Resources.Atilla_big_med : rpt.Picture1.Image = Nothing - Case 11 : rpt.picVERAG.Image = My.Resources.Verag_Customs_Service_GMBH_Logo : rpt.Picture1.Image = My.Resources.aeo_CS - Case 17 : rpt.picVERAG.Image = My.Resources.FrontOfficeSUB_Horizontal : rpt.Picture1.Image = Nothing - 'Case 19 : rpt.picVERAG.Image = My.Resources.VERAG_360 : rpt.Picture1.Image = Nothing - Case 20 : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Picture1.Image = My.Resources.aeo_AT_imex - Case 21 : rpt.picVERAG.Image = My.Resources.Unisped_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_AT - Case 22 : rpt.picVERAG.Image = My.Resources.Unisped_DE_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_DE - Case 26 : rpt.picVERAG.Image = My.Resources.VERAG_UNISPED_Logo : rpt.Picture1.Image = Nothing - Case 23 : rpt.picVERAG.Image = My.Resources.Unisped_ZS_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_ZS_AT - Case 24 : rpt.picVERAG.Image = My.Resources.ambar_boarder : rpt.Picture1.Image = Nothing - rpt.txtAvisierer.Visible = False : rpt.lblAvisiererUeberschrift.Visible = False : rpt.txtWarenwert.Visible = False : rpt.lblWarenWertUeberschrift.Visible = False + initLogos(rpt, firma, useLogosFromDB) - End Select + + 'Select Case Rechnung.Firma_ID + ' Case 1 ' rpt.picVERAG.Image= My.Resources.Verag_AG_Logo : rpt.Picture1.Image = My.Resources.aeo_AT_imex is eh standard + ' Case 4 : rpt.picVERAG.Image = My.Resources.Verag_AG_Logo : rpt.Picture1.Image = Nothing + ' Case 7 : rpt.picVERAG.Image = My.Resources.Atilla_big_med : rpt.Picture1.Image = Nothing + ' Case 11 : rpt.picVERAG.Image = My.Resources.Verag_Customs_Service_GMBH_Logo : rpt.Picture1.Image = My.Resources.aeo_CS + ' Case 17 : rpt.picVERAG.Image = My.Resources.FrontOfficeSUB_Horizontal : rpt.Picture1.Image = Nothing + ' 'Case 19 : rpt.picVERAG.Image = My.Resources.VERAG_360 : rpt.Picture1.Image = Nothing + ' Case 20 : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Picture1.Image = My.Resources.aeo_AT_imex + ' Case 21 : rpt.picVERAG.Image = My.Resources.Unisped_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_AT + ' Case 22 : rpt.picVERAG.Image = My.Resources.Unisped_DE_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_DE + ' Case 26 : rpt.picVERAG.Image = My.Resources.VERAG_UNISPED_Logo : rpt.Picture1.Image = Nothing + ' Case 23 : rpt.picVERAG.Image = My.Resources.Unisped_ZS_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_ZS_AT + ' Case 24 : rpt.picVERAG.Image = My.Resources.ambar_boarder : rpt.Picture1.Image = Nothing + ' rpt.txtAvisierer.Visible = False : rpt.lblAvisiererUeberschrift.Visible = False : rpt.txtWarenwert.Visible = False : rpt.lblWarenWertUeberschrift.Visible = False + + 'End Select Dim ZZTage = 10 Dim ZZTageVL = 10 @@ -2205,22 +2298,24 @@ Public Class cFakturierung initRgFirma_MDM(rpt, firma, RECHNUNG) - Select Case RECHNUNG.Firma_ID - Case 1 ' rpt.picVERAG.Image= My.Resources.Verag_AG_Logo : rpt.Picture1.Image = My.Resources.aeo_AT_imex is eh standard - Case 4 : rpt.picVERAG.Image = My.Resources.Verag_AG_Logo : rpt.Picture1.Image = Nothing - Case 7 : rpt.picVERAG.Image = My.Resources.Atilla_big_med : rpt.Picture1.Image = Nothing - Case 11 : rpt.picVERAG.Image = My.Resources.Verag_Customs_Service_GMBH_Logo : rpt.Picture1.Image = My.Resources.aeo_CS - Case 17 : rpt.picVERAG.Image = My.Resources.FrontOfficeSUB_Horizontal : rpt.Picture1.Image = Nothing - Case 19 : rpt.picVERAG.Image = My.Resources.VERAG_360 : rpt.Picture1.Image = Nothing - Case 20 : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Picture1.Image = My.Resources.aeo_AT_imex - Case 21 : rpt.picVERAG.Image = My.Resources.Unisped_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_AT - Case 22 : rpt.picVERAG.Image = My.Resources.Unisped_DE_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_DE - Case 26 : rpt.picVERAG.Image = My.Resources.VERAG_UNISPED_Logo : rpt.Picture1.Image = Nothing - Case 23 : rpt.picVERAG.Image = My.Resources.Unisped_ZS_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_ZS_AT - Case 24 : rpt.picVERAG.Image = My.Resources.ambar_boarder : rpt.Picture1.Image = Nothing - rpt.txtWarenwert.Visible = False : rpt.lblWarenWertUeberschrift.Visible = False + initLogos(rpt, firma, useLogosFromDB) - End Select + 'Select Case RECHNUNG.Firma_ID + ' Case 1 ' rpt.picVERAG.Image= My.Resources.Verag_AG_Logo : rpt.Picture1.Image = My.Resources.aeo_AT_imex is eh standard + ' Case 4 : rpt.picVERAG.Image = My.Resources.Verag_AG_Logo : rpt.Picture1.Image = Nothing + ' Case 7 : rpt.picVERAG.Image = My.Resources.Atilla_big_med : rpt.Picture1.Image = Nothing + ' Case 11 : rpt.picVERAG.Image = My.Resources.Verag_Customs_Service_GMBH_Logo : rpt.Picture1.Image = My.Resources.aeo_CS + ' Case 17 : rpt.picVERAG.Image = My.Resources.FrontOfficeSUB_Horizontal : rpt.Picture1.Image = Nothing + ' Case 19 : rpt.picVERAG.Image = My.Resources.VERAG_360 : rpt.Picture1.Image = Nothing + ' Case 20 : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Picture1.Image = My.Resources.aeo_AT_imex + ' Case 21 : rpt.picVERAG.Image = My.Resources.Unisped_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_AT + ' Case 22 : rpt.picVERAG.Image = My.Resources.Unisped_DE_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_DE + ' Case 26 : rpt.picVERAG.Image = My.Resources.VERAG_UNISPED_Logo : rpt.Picture1.Image = Nothing + ' Case 23 : rpt.picVERAG.Image = My.Resources.Unisped_ZS_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_ZS_AT + ' Case 24 : rpt.picVERAG.Image = My.Resources.ambar_boarder : rpt.Picture1.Image = Nothing + ' rpt.txtWarenwert.Visible = False : rpt.lblWarenWertUeberschrift.Visible = False + + 'End Select Dim ZZTage = 10 Dim ZZTageVL = 10 @@ -2646,7 +2741,7 @@ Public Class cFakturierung End If - End If + End If End If @@ -4048,28 +4143,28 @@ Public Class cFakturierung If RECHNUNG.Buchungsjahr < 2000 Then VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Bei Beleg " & RECHNUNG.RechnungsNr & " hat das Buchungsjahr " & RECHNUNG.Buchungsjahr & " das falsche Format! RK_ID:" & RECHNUNG.RK_ID, "Bei Beleg " & RECHNUNG.RechnungsNr & " hat das Buchungsjahr das falsche Format!! RK_ID:" & RECHNUNG.RK_ID, System.Reflection.MethodInfo.GetCurrentMethod.Name) Return False - End If - - RECHNUNG.[RechnungsNr] = getNewRgNr(RECHNUNG.Firma_ID, RECHNUNG.Buchungsjahr) - - 'Dim RG_NR As New VERAG_PROG_ALLGEMEIN.cRechnungsnummern(RECHNUNG.Firma_ID, RECHNUNG.Buchungsjahr) - '' Nächste Rechnungsnummer speichern. - 'RG_NR.INCREASE_RGNR() ' SOFORT Speichern, Sonst gibt es wieder eine Doppelvergabe! - '' Prüfung, ob RgNr schon vergeben wurde --> dann +1, bis freie Nr. (sollte EÜGENTLICH nicht vorkommen) - 'RG_NR.CHECK_RGNR() - 'RECHNUNG.[RechnungsNr] = RG_NR.LfdRechnungsNr - - 'RECHNUNG.[LfdRechnungsNr] = RG_NR.LfdRechnungsNr - If RECHNUNG.SAVE Then - Else - VERAG_PROG_ALLGEMEIN.cRechnungsnummern.DECREASE_RGNR_NEW(RECHNUNG.Firma_ID, RECHNUNG.Buchungsjahr) ' Bei Fehler --> LfdRgNr um eins mindern. - Return False - End If - - 'Rechnungsnummer UPDATEN - '..................... End If - Else + + RECHNUNG.[RechnungsNr] = getNewRgNr(RECHNUNG.Firma_ID, RECHNUNG.Buchungsjahr) + + 'Dim RG_NR As New VERAG_PROG_ALLGEMEIN.cRechnungsnummern(RECHNUNG.Firma_ID, RECHNUNG.Buchungsjahr) + '' Nächste Rechnungsnummer speichern. + 'RG_NR.INCREASE_RGNR() ' SOFORT Speichern, Sonst gibt es wieder eine Doppelvergabe! + '' Prüfung, ob RgNr schon vergeben wurde --> dann +1, bis freie Nr. (sollte EÜGENTLICH nicht vorkommen) + 'RG_NR.CHECK_RGNR() + 'RECHNUNG.[RechnungsNr] = RG_NR.LfdRechnungsNr + + 'RECHNUNG.[LfdRechnungsNr] = RG_NR.LfdRechnungsNr + If RECHNUNG.SAVE Then + Else + VERAG_PROG_ALLGEMEIN.cRechnungsnummern.DECREASE_RGNR_NEW(RECHNUNG.Firma_ID, RECHNUNG.Buchungsjahr) ' Bei Fehler --> LfdRgNr um eins mindern. + Return False + End If + + 'Rechnungsnummer UPDATEN + '..................... + End If + Else ' Anlage zur Sammelrechnung RECHNUNG.[Status] = 2 @@ -5124,20 +5219,23 @@ Public Class cFakturierung initRgFirmaSammelRg_Bericht(rpt, Firma, RechnungsNr, Row("RechnungsLandKz"), Row("Buchungsjahr")) - Select Case Row("Firma_ID") - Case 1 ' rpt.picVERAG.Image= My.Resources.Verag_AG_Logo : rpt.Picture1.Image = My.Resources.aeo_AT_imex is eh standard - Case 4 : rpt.picVERAG.Image = My.Resources.Verag_AG_Logo : rpt.Picture1.Image = Nothing - Case 7 : rpt.picVERAG.Image = My.Resources.Atilla_big_med : rpt.Picture1.Image = Nothing - Case 11 : rpt.picVERAG.Image = My.Resources.Verag_Customs_Service_GMBH_Logo : rpt.Picture1.Image = My.Resources.aeo_CS - Case 19 : rpt.picVERAG.Image = My.Resources.VERAG_360 : rpt.Picture1.Image = Nothing - Case 20 : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Picture1.Image = My.Resources.aeo_AT_imex - Case 21 : rpt.picVERAG.Image = My.Resources.Unisped_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_AT - Case 22 : rpt.picVERAG.Image = My.Resources.Unisped_DE_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_DE - Case 23 : rpt.picVERAG.Image = My.Resources.Unisped_ZS_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_ZS_AT - Case 24 : rpt.picVERAG.Image = My.Resources.ambar_simple : rpt.Picture1.Image = Nothing - Case 26 : rpt.picVERAG.Image = My.Resources.VERAG_UNISPED_Logo : rpt.Picture1.Image = Nothing - Case 17 : rpt.picVERAG.Image = My.Resources.FrontOfficeSUB_Horizontal : rpt.Picture1.Image = Nothing - End Select + initLogos(rpt, Firma, useLogosFromDB) + + + 'Select Case Row("Firma_ID") + ' Case 1 ' rpt.picVERAG.Image= My.Resources.Verag_AG_Logo : rpt.Picture1.Image = My.Resources.aeo_AT_imex is eh standard + ' Case 4 : rpt.picVERAG.Image = My.Resources.Verag_AG_Logo : rpt.Picture1.Image = Nothing + ' Case 7 : rpt.picVERAG.Image = My.Resources.Atilla_big_med : rpt.Picture1.Image = Nothing + ' Case 11 : rpt.picVERAG.Image = My.Resources.Verag_Customs_Service_GMBH_Logo : rpt.Picture1.Image = My.Resources.aeo_CS + ' Case 19 : rpt.picVERAG.Image = My.Resources.VERAG_360 : rpt.Picture1.Image = Nothing + ' Case 20 : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Picture1.Image = My.Resources.aeo_AT_imex + ' Case 21 : rpt.picVERAG.Image = My.Resources.Unisped_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_AT + ' Case 22 : rpt.picVERAG.Image = My.Resources.Unisped_DE_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_DE + ' Case 23 : rpt.picVERAG.Image = My.Resources.Unisped_ZS_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_ZS_AT + ' Case 24 : rpt.picVERAG.Image = My.Resources.ambar_simple : rpt.Picture1.Image = Nothing + ' Case 26 : rpt.picVERAG.Image = My.Resources.VERAG_UNISPED_Logo : rpt.Picture1.Image = Nothing + ' Case 17 : rpt.picVERAG.Image = My.Resources.FrontOfficeSUB_Horizontal : rpt.Picture1.Image = Nothing + 'End Select rpt.lblKundenNr.Text = If(Row("RechnungsKundenNr") > 0, Row("RechnungsKundenNr"), "") @@ -5545,20 +5643,23 @@ Public Class cFakturierung initRgFirmaSammelRg_MDM_Bericht(rpt, Firma, RechnungsNr, Row("RechnungsLandKz"), Row("Buchungsjahr")) - Select Case Row("Firma_ID") - Case 1 ' rpt.picVERAG.Image= My.Resources.Verag_AG_Logo : rpt.Picture1.Image = My.Resources.aeo_AT_imex is eh standard - Case 4 : rpt.picVERAG.Image = My.Resources.Verag_AG_Logo : rpt.Picture1.Image = Nothing - Case 7 : rpt.picVERAG.Image = My.Resources.Atilla_big_med : rpt.Picture1.Image = Nothing - Case 11 : rpt.picVERAG.Image = My.Resources.Verag_Customs_Service_GMBH_Logo : rpt.Picture1.Image = My.Resources.aeo_CS - Case 19 : rpt.picVERAG.Image = My.Resources.VERAG_360 : rpt.Picture1.Image = Nothing - Case 20 : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Picture1.Image = My.Resources.aeo_AT_imex - Case 21 : rpt.picVERAG.Image = My.Resources.Unisped_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_AT - Case 22 : rpt.picVERAG.Image = My.Resources.Unisped_DE_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_DE - Case 23 : rpt.picVERAG.Image = My.Resources.Unisped_ZS_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_ZS_AT - Case 24 : rpt.picVERAG.Image = My.Resources.ambar_simple : rpt.Picture1.Image = Nothing - Case 26 : rpt.picVERAG.Image = My.Resources.VERAG_UNISPED_Logo : rpt.Picture1.Image = Nothing - Case 17 : rpt.picVERAG.Image = My.Resources.FrontOfficeSUB_Horizontal : rpt.Picture1.Image = Nothing - End Select + + initLogos(rpt, Firma, useLogosFromDB) + + 'Select Case Row("Firma_ID") + ' Case 1 ' rpt.picVERAG.Image= My.Resources.Verag_AG_Logo : rpt.Picture1.Image = My.Resources.aeo_AT_imex is eh standard + ' Case 4 : rpt.picVERAG.Image = My.Resources.Verag_AG_Logo : rpt.Picture1.Image = Nothing + ' Case 7 : rpt.picVERAG.Image = My.Resources.Atilla_big_med : rpt.Picture1.Image = Nothing + ' Case 11 : rpt.picVERAG.Image = My.Resources.Verag_Customs_Service_GMBH_Logo : rpt.Picture1.Image = My.Resources.aeo_CS + ' Case 19 : rpt.picVERAG.Image = My.Resources.VERAG_360 : rpt.Picture1.Image = Nothing + ' Case 20 : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Picture1.Image = My.Resources.aeo_AT_imex + ' Case 21 : rpt.picVERAG.Image = My.Resources.Unisped_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_AT + ' Case 22 : rpt.picVERAG.Image = My.Resources.Unisped_DE_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_DE + ' Case 23 : rpt.picVERAG.Image = My.Resources.Unisped_ZS_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_ZS_AT + ' Case 24 : rpt.picVERAG.Image = My.Resources.ambar_simple : rpt.Picture1.Image = Nothing + ' Case 26 : rpt.picVERAG.Image = My.Resources.VERAG_UNISPED_Logo : rpt.Picture1.Image = Nothing + ' Case 17 : rpt.picVERAG.Image = My.Resources.FrontOfficeSUB_Horizontal : rpt.Picture1.Image = Nothing + 'End Select rpt.lblKundenNr.Text = If(Row("RechnungsKundenNr") > 0, Row("RechnungsKundenNr"), "") @@ -5859,8 +5960,8 @@ Public Class cFakturierung Shared Function addYeartoRgNr(Firma_ID, Buchungsjahr) 'If Buchungsjahr <= 2026 Then 'angedacht das zu korrigieren mit Jahreswechsel -> wird auch eig. im BMD-Export gesetzt, lieber so lassen! : Breimaier 10.06.2026 Select Case Firma_ID - Case "21", "22", "23" : Return Buchungsjahr.ToString.Substring(2) & "-" - End Select + Case "21", "22", "23" : Return Buchungsjahr.ToString.Substring(2) & "-" + End Select 'End If Return "" End Function @@ -5952,20 +6053,22 @@ Public Class cFakturierung 'rpt.lblFirmaFax.Text = If(FIRMA.Firma_Telefax, "") 'rpt.lblFirmaEmail.Text = If(FIRMA.Firma_E_Mail, "") - Select Case ROW("Firma_ID") - Case 1 ' rpt.picVERAG.Image= My.Resources.Verag_AG_Logo : rpt.Picture1.Image = My.Resources.aeo_AT_imex is eh standard - Case 4 : rpt.picVERAG.Image = My.Resources.Verag_AG_Logo : rpt.Picture1.Image = Nothing - Case 7 : rpt.picVERAG.Image = My.Resources.Atilla_big_med : rpt.Picture1.Image = Nothing - Case 11 : rpt.picVERAG.Image = My.Resources.Verag_Customs_Service_GMBH_Logo : rpt.Picture1.Image = My.Resources.aeo_CS - Case 19 : rpt.picVERAG.Image = My.Resources.VERAG_360 : rpt.Picture1.Image = Nothing - Case 20 : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Picture1.Image = My.Resources.aeo_AT_imex - Case 21 : rpt.picVERAG.Image = My.Resources.Unisped_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_AT - Case 22 : rpt.picVERAG.Image = My.Resources.Unisped_DE_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_DE - Case 23 : rpt.picVERAG.Image = My.Resources.Unisped_ZS_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_ZS_AT - Case 24 : rpt.picVERAG.Image = My.Resources.ambar_boarder : rpt.Picture1.Image = Nothing - Case 26 : rpt.picVERAG.Image = My.Resources.VERAG_UNISPED_Logo : rpt.Picture1.Image = Nothing - Case 17 : rpt.picVERAG.Image = My.Resources.FrontOfficeSUB_Horizontal : rpt.Picture1.Image = Nothing - End Select + initLogos(rpt, FIRMA, useLogosFromDB) + + 'Select Case ROW("Firma_ID") + ' Case 1 ' rpt.picVERAG.Image= My.Resources.Verag_AG_Logo : rpt.Picture1.Image = My.Resources.aeo_AT_imex is eh standard + ' Case 4 : rpt.picVERAG.Image = My.Resources.Verag_AG_Logo : rpt.Picture1.Image = Nothing + ' Case 7 : rpt.picVERAG.Image = My.Resources.Atilla_big_med : rpt.Picture1.Image = Nothing + ' Case 11 : rpt.picVERAG.Image = My.Resources.Verag_Customs_Service_GMBH_Logo : rpt.Picture1.Image = My.Resources.aeo_CS + ' Case 19 : rpt.picVERAG.Image = My.Resources.VERAG_360 : rpt.Picture1.Image = Nothing + ' Case 20 : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Picture1.Image = My.Resources.aeo_AT_imex + ' Case 21 : rpt.picVERAG.Image = My.Resources.Unisped_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_AT + ' Case 22 : rpt.picVERAG.Image = My.Resources.Unisped_DE_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_DE + ' Case 23 : rpt.picVERAG.Image = My.Resources.Unisped_ZS_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_ZS_AT + ' Case 24 : rpt.picVERAG.Image = My.Resources.ambar_boarder : rpt.Picture1.Image = Nothing + ' Case 26 : rpt.picVERAG.Image = My.Resources.VERAG_UNISPED_Logo : rpt.Picture1.Image = Nothing + ' Case 17 : rpt.picVERAG.Image = My.Resources.FrontOfficeSUB_Horizontal : rpt.Picture1.Image = Nothing + 'End Select Dim strText = "" diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index 9e2d99f7..a988fa21 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -596,7 +596,7 @@ Public Class usrCntlFaktAbrechnung Dim firstEmpty = False 'If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then - 'FirmaTmp = "AMBAR" + ' FirmaTmp = "AMBAR" 'End If Select Case FirmaTmp diff --git a/SDL/cProgramFunctions.vb b/SDL/cProgramFunctions.vb index 1d7e9102..5b9b4ac3 100644 --- a/SDL/cProgramFunctions.vb +++ b/SDL/cProgramFunctions.vb @@ -1,5 +1,4 @@ Imports System.ComponentModel -Imports System.Data.SqlClient Imports System.Reflection Imports System.Text.RegularExpressions Imports System.Threading diff --git a/SDL/seriendruck/usrCntlFakturierung.Designer.vb b/SDL/seriendruck/usrCntlFakturierung.Designer.vb index 59d539fb..565cfdc7 100644 --- a/SDL/seriendruck/usrCntlFakturierung.Designer.vb +++ b/SDL/seriendruck/usrCntlFakturierung.Designer.vb @@ -24,7 +24,7 @@ Partial Class usrcntlFakturierung Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrcntlFakturierung)) - Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.gb_fakturierung = New System.Windows.Forms.GroupBox() Me.btnLieferantenrechnungen = New System.Windows.Forms.Button() Me.btnMDMSammelrechnung = New System.Windows.Forms.Button() Me.btnFakturierung = New System.Windows.Forms.Button() @@ -105,7 +105,9 @@ Partial Class usrcntlFakturierung Me.btnRePos = New System.Windows.Forms.Button() Me.Validation1 = New SDL.EORI.validation() Me.btnWikiStatusmails = New System.Windows.Forms.Button() - Me.GroupBox1.SuspendLayout() + Me.gb_MDM_Rechnungen = New System.Windows.Forms.GroupBox() + Me.Label14 = New System.Windows.Forms.Label() + Me.gb_fakturierung.SuspendLayout() Me.GBMautberichte.SuspendLayout() CType(Me.dgvMautbericht, System.ComponentModel.ISupportInitialize).BeginInit() Me.GBSammelrechnung.SuspendLayout() @@ -121,28 +123,27 @@ Partial Class usrcntlFakturierung CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.gb_MDM_Rechnungen.SuspendLayout() Me.SuspendLayout() ' - 'GroupBox1 + 'gb_fakturierung ' - Me.GroupBox1.Controls.Add(Me.btnLieferantenrechnungen) - Me.GroupBox1.Controls.Add(Me.btnMDMSammelrechnung) - Me.GroupBox1.Controls.Add(Me.btnFakturierung) - Me.GroupBox1.Controls.Add(Me.btnRechnugnsdaten) - Me.GroupBox1.Location = New System.Drawing.Point(14, 20) - Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(876, 69) - Me.GroupBox1.TabIndex = 0 - Me.GroupBox1.TabStop = False + Me.gb_fakturierung.Controls.Add(Me.btnMDMSammelrechnung) + Me.gb_fakturierung.Controls.Add(Me.btnFakturierung) + Me.gb_fakturierung.Location = New System.Drawing.Point(14, 20) + Me.gb_fakturierung.Name = "gb_fakturierung" + Me.gb_fakturierung.Size = New System.Drawing.Size(430, 69) + Me.gb_fakturierung.TabIndex = 0 + Me.gb_fakturierung.TabStop = False ' 'btnLieferantenrechnungen ' Me.btnLieferantenrechnungen.Enabled = False Me.btnLieferantenrechnungen.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnLieferantenrechnungen.ForeColor = System.Drawing.Color.Black - Me.btnLieferantenrechnungen.Location = New System.Drawing.Point(708, 17) + Me.btnLieferantenrechnungen.Location = New System.Drawing.Point(230, 16) Me.btnLieferantenrechnungen.Name = "btnLieferantenrechnungen" - Me.btnLieferantenrechnungen.Size = New System.Drawing.Size(139, 44) + Me.btnLieferantenrechnungen.Size = New System.Drawing.Size(175, 44) Me.btnLieferantenrechnungen.TabIndex = 52 Me.btnLieferantenrechnungen.Text = "MDM Lieferantenrechnungen" Me.btnLieferantenrechnungen.UseVisualStyleBackColor = True @@ -152,9 +153,9 @@ Partial Class usrcntlFakturierung Me.btnMDMSammelrechnung.Enabled = False Me.btnMDMSammelrechnung.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnMDMSammelrechnung.ForeColor = System.Drawing.Color.Black - Me.btnMDMSammelrechnung.Location = New System.Drawing.Point(442, 18) + Me.btnMDMSammelrechnung.Location = New System.Drawing.Point(247, 17) Me.btnMDMSammelrechnung.Name = "btnMDMSammelrechnung" - Me.btnMDMSammelrechnung.Size = New System.Drawing.Size(121, 44) + Me.btnMDMSammelrechnung.Size = New System.Drawing.Size(170, 44) Me.btnMDMSammelrechnung.TabIndex = 51 Me.btnMDMSammelrechnung.Text = "MDM Sammelrechnung" Me.btnMDMSammelrechnung.UseVisualStyleBackColor = True @@ -164,9 +165,9 @@ Partial Class usrcntlFakturierung Me.btnFakturierung.Enabled = False Me.btnFakturierung.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnFakturierung.ForeColor = System.Drawing.Color.Black - Me.btnFakturierung.Location = New System.Drawing.Point(6, 18) + Me.btnFakturierung.Location = New System.Drawing.Point(6, 17) Me.btnFakturierung.Name = "btnFakturierung" - Me.btnFakturierung.Size = New System.Drawing.Size(121, 43) + Me.btnFakturierung.Size = New System.Drawing.Size(174, 43) Me.btnFakturierung.TabIndex = 6 Me.btnFakturierung.Text = "Fakturierung" Me.btnFakturierung.UseVisualStyleBackColor = True @@ -176,9 +177,9 @@ Partial Class usrcntlFakturierung Me.btnRechnugnsdaten.Enabled = False Me.btnRechnugnsdaten.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnRechnugnsdaten.ForeColor = System.Drawing.Color.Black - Me.btnRechnugnsdaten.Location = New System.Drawing.Point(227, 17) + Me.btnRechnugnsdaten.Location = New System.Drawing.Point(6, 17) Me.btnRechnugnsdaten.Name = "btnRechnugnsdaten" - Me.btnRechnugnsdaten.Size = New System.Drawing.Size(121, 44) + Me.btnRechnugnsdaten.Size = New System.Drawing.Size(164, 44) Me.btnRechnugnsdaten.TabIndex = 4 Me.btnRechnugnsdaten.Text = "Rechnungsdaten" Me.btnRechnugnsdaten.UseVisualStyleBackColor = True @@ -1016,21 +1017,44 @@ Partial Class usrcntlFakturierung Me.btnWikiStatusmails.TabIndex = 72 Me.btnWikiStatusmails.UseVisualStyleBackColor = True ' + 'gb_MDM_Rechnungen + ' + Me.gb_MDM_Rechnungen.Controls.Add(Me.btnLieferantenrechnungen) + Me.gb_MDM_Rechnungen.Controls.Add(Me.btnRechnugnsdaten) + Me.gb_MDM_Rechnungen.Location = New System.Drawing.Point(460, 20) + Me.gb_MDM_Rechnungen.Name = "gb_MDM_Rechnungen" + Me.gb_MDM_Rechnungen.Size = New System.Drawing.Size(430, 69) + Me.gb_MDM_Rechnungen.TabIndex = 53 + Me.gb_MDM_Rechnungen.TabStop = False + ' + 'Label14 + ' + Me.Label14.AutoSize = True + Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label14.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Label14.Location = New System.Drawing.Point(457, 3) + Me.Label14.Name = "Label14" + Me.Label14.Size = New System.Drawing.Size(130, 17) + Me.Label14.TabIndex = 73 + Me.Label14.Text = "Rechnungsdaten" + ' 'usrcntlFakturierung ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White + Me.Controls.Add(Me.Label14) + Me.Controls.Add(Me.gb_MDM_Rechnungen) Me.Controls.Add(Me.btnWikiStatusmails) Me.Controls.Add(Me.Label61) Me.Controls.Add(Me.GBMautberichte) Me.Controls.Add(Me.Label44) Me.Controls.Add(Me.GBSammelrechnung) Me.Controls.Add(Me.Label3) - Me.Controls.Add(Me.GroupBox1) + Me.Controls.Add(Me.gb_fakturierung) Me.Name = "usrcntlFakturierung" Me.Size = New System.Drawing.Size(1149, 774) - Me.GroupBox1.ResumeLayout(False) + Me.gb_fakturierung.ResumeLayout(False) Me.GBMautberichte.ResumeLayout(False) Me.GBMautberichte.PerformLayout() CType(Me.dgvMautbericht, System.ComponentModel.ISupportInitialize).EndInit() @@ -1048,11 +1072,12 @@ Partial Class usrcntlFakturierung CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() + Me.gb_MDM_Rechnungen.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() End Sub - Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox + Friend WithEvents gb_fakturierung As System.Windows.Forms.GroupBox Friend WithEvents btnRechnugnsdaten As System.Windows.Forms.Button Friend WithEvents btnFakturierung As System.Windows.Forms.Button Friend WithEvents Label3 As System.Windows.Forms.Label @@ -1133,4 +1158,6 @@ Partial Class usrcntlFakturierung Friend WithEvents brnSR_abgeschlossen As Button Friend WithEvents PictureBox12 As PictureBox Friend WithEvents Label13 As Label + Friend WithEvents gb_MDM_Rechnungen As GroupBox + Friend WithEvents Label14 As Label End Class diff --git a/SDL/seriendruck/usrCntlFakturierung.vb b/SDL/seriendruck/usrCntlFakturierung.vb index 83ab726e..e812a0b4 100644 --- a/SDL/seriendruck/usrCntlFakturierung.vb +++ b/SDL/seriendruck/usrCntlFakturierung.vb @@ -34,17 +34,18 @@ Public Class usrcntlFakturierung cbxMautbericht.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Mautsummenbericht CSV (erzeugen)", "Gesamtbericht_CSV")) cbxDateMautbericht.Items.Clear() - cbxDateMautbericht.fillWithSQL("select distinct(cast(BillingDate as Date)) From tblMautbericht order by cast(BillingDate as Date) desc", False, "FMZOLL") + cbxDateMautbericht.fillWithSQL("select TOP(15) cast(BillingDate as Date) From tblMautbericht group by cast(BillingDate as Date) order by cast(BillingDate as Date) desc", False, "FMZOLL") - cboSachbearbeiter.fillWithSQL("select distinct(UPPER(sachbearbeiter)) from Rechnungsausgang where Sammelrechnung=6 and Firma_ID=19", False, "FMZOLL", True) + cboSachbearbeiter.fillWithSQL("SELECT UPPER([mit_nname]) FROM [ADMIN].[dbo].[tblMitarbeiter] where mit_firmaFMZoll = 19 and mit_abteilung = 'MDM' and isnull(mit_gekuendigt,0) = 0 and (SELECT COUNT(*) FROM [tblBerechtigungsObjekteZuordnung] where [beroz_beroId]=90 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0", False, "ADMIN", True) PathMautberichte = (New SQL).getValueTxtBySql("SELECT TOP 1 [Param_value] FROM [tblPartnersystem_Paramter] WHERE Param_system='GESAMTMAUT' AND [Param_name]='ANLAGE_PFAD' AND Param_testsystem = " & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, 1, 0), "FMZOLL") cbxMautanh.Checked = False - 'PathMautberichte = "C:\Users\d.breimaier\Desktop\MDM\Mautgesamtberichte\" - Dim FaktAbt As Boolean = VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_Fakturierung", "SDL") + Dim faktAbteilung As Boolean + + setBerechtigungen(faktAbteilung) countCSV = 0 countPDF = 0 @@ -56,11 +57,41 @@ Public Class usrcntlFakturierung Next End If Else - If FaktAbt Then MsgBox("Mautbericht-Pfad " & PathMautberichte & " nicht verfügbar!") + If faktAbteilung Then MsgBox("Mautbericht-Pfad " & PathMautberichte & " nicht verfügbar!") End If lblAnzahlMautberichte.Text = countCSV + countPDF & "x Mautberichte (" & countCSV & "x CSV " & countPDF & "x PDF )" + + + + End Sub + + Private Sub setBerechtigungen(FaktAbt As Boolean) + + + gb_fakturierung.Enabled = False + gb_MDM_Rechnungen.Enabled = False + + btnMDMSammelrechnung.Enabled = False + GBMautberichte.Enabled = False + GBSammelrechnung.Enabled = False + btnFakturierung.Enabled = False + btnRechnugnsdaten.Enabled = False + btnLieferantenrechnungen.Enabled = False + + btnAbfdruck.Enabled = False + + btnREJdruck.Enabled = False + + Button2.Visible = False + Button3.Visible = False + btnRE_Text.Visible = False + + + + FaktAbt = VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_FAKTURIERUNG", "SDL") + If FaktAbt Then btnMDMSammelrechnung.Enabled = True @@ -69,18 +100,18 @@ Public Class usrcntlFakturierung btnFakturierung.Enabled = True btnRechnugnsdaten.Enabled = True btnLieferantenrechnungen.Enabled = True - GroupBox1.Enabled = True + gb_fakturierung.Enabled = True btnAbfdruck.Enabled = True btnREJdruck.Enabled = True + gb_MDM_Rechnungen.Enabled = True End If - If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_LIEFERANTENRECHNUNGEN", "SDL") Then - GroupBox1.Enabled = True + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_LIEFERANTENRECHNUNGEN", "SDL") Then + gb_fakturierung.Enabled = True btnLieferantenrechnungen.Enabled = True - ' btnMDMSammelrechnung.Enabled = False - ' btnFakturierung.Enabled = False - ' btnRechnugnsdaten.Enabled = True + btnRechnugnsdaten.Enabled = True + gb_MDM_Rechnungen.Enabled = True End If If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMINFUNCTIONS", "SDL") Then @@ -100,7 +131,7 @@ Public Class usrcntlFakturierung Dim deleted As Boolean = False If rechnungsdatum > Today() Then - MsgBox("Rechnungsdatum liegt in der Zukunft, nicht möglich") + MsgBox("Rechnungsdatum liegt in der Zukunft, nicht möglich!") Exit Sub End If diff --git a/VERAG_PROG_ALLGEMEIN/AuditFlow/frmFirmenuebersicht.vb b/VERAG_PROG_ALLGEMEIN/AuditFlow/frmFirmenuebersicht.vb index 35719602..8488b71b 100644 --- a/VERAG_PROG_ALLGEMEIN/AuditFlow/frmFirmenuebersicht.vb +++ b/VERAG_PROG_ALLGEMEIN/AuditFlow/frmFirmenuebersicht.vb @@ -10,7 +10,7 @@ Public Class frmFirmenuebersicht Private Sub frminterneEmailBenachrichtigungen_Load(sender As Object, e As EventArgs) Handles Me.Load - VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True loadDGVMailbenachrichtigungen()