From daea9595ab8e44c2e366ad17925495130ca3e053 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 9 Oct 2025 16:15:37 +0200 Subject: [PATCH] faktMail, ustva --- SDL/Fakturierung/frmFaktEmail.vb | 14 +++++++++++-- SDL/USTV/frmMDM_USTVAntrag.vb | 35 +++++++++++++++++++++++++++++--- 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/SDL/Fakturierung/frmFaktEmail.vb b/SDL/Fakturierung/frmFaktEmail.vb index 5563ba06..8439ed38 100644 --- a/SDL/Fakturierung/frmFaktEmail.vb +++ b/SDL/Fakturierung/frmFaktEmail.vb @@ -386,7 +386,7 @@ Public Class frmFaktEmail If Not SR Then - If RECHNUNG.FilialenNr = 4817 And Firma_ID = 19 AndAlso RECHNUNG.ErfassungsNr IsNot Nothing Then + If RECHNUNG.FilialenNr = 4817 AndAlso RECHNUNG.ErfassungsNr IsNot Nothing Then Dim SPEDBUCH = New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch(RECHNUNG.FilialenNr, RECHNUNG.AbfertigungsNr, RECHNUNG.UnterNr) If SPEDBUCH.hasEntry AndAlso (SPEDBUCH.Abfertigungsart = 114 Or SPEDBUCH.Abfertigungsart = 115 Or SPEDBUCH.Abfertigungsart = 10) Then Dim USTV_ANTRAG As New cUSTVAntrag(RECHNUNG.ErfassungsNr) @@ -426,9 +426,19 @@ Public Class frmFaktEmail End If If mailText <> "" Then TextHTML &= mailText & vbNewLine - 'TextHTML &= "


" & cFakturierung.getSignature(RechnungsLandKz, Firma_ID) + End If + + Else + 'sonst alles weg! + replaceKZ("nichtRMC", TextHTML) + replaceKZ("RMC", TextHTML) + replaceKZ("KZ1", TextHTML) + replaceKZ("KZ4", TextHTML) + TextHTML = TextHTML.ToString.Replace("%", "") + + End If End If diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 5ebe7e1b..cf8d213f 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -1668,9 +1668,31 @@ Public Class frmMDM_USTVAntrag 'check if already existing 'überschneidungen prüfen!!!! + Dim StringSQL As String = "SELECT + UStVAn_ID, + UStVAn_ReDatVon, + UStVAn_ReDatBis, + UStVAn_AntragEingereichtAm + FROM tblUStVAntrag b + WHERE + b.UStvAN_KuNr = " & KundenNr & " + AND (ISNULL(b.UStVAn_AntragArt,'MWST') = '" & cboAntragArt._value & "' OR b.UStVAn_AntragArt = '') + AND b.UStVAn_LandNr = " & USTV_ANTRAG.UStVAn_LandNr & " + -- Überschneidungstest (inklusive Grenzen) + AND NOT ( + COALESCE(CAST(b.UStVAn_ReDatBis AS date), '9999-12-31') < '" & CDate(txtVon._value).ToShortDateString & "' + OR COALESCE(CAST(b.UStVAn_ReDatVon AS date), '1900-01-01') > '" & CDate(txtBis._value).ToShortDateString & "' + ) + -- optional: die exakt gleiche Periode ausschließen (wenn gewünscht) + AND NOT ( + COALESCE(CAST(b.UStVAn_ReDatVon AS date),'1900-01-01') = '" & CDate(txtVon._value).ToShortDateString & "' + AND COALESCE(CAST(b.UStVAn_ReDatBis AS date),'9999-12-31') = '" & CDate(txtBis._value).ToShortDateString & "') order by UStVAn_ReDatVon" - Dim dt_existingUSTVA As DataTable = SQL.loadDgvBySql("Select UStVAn_ID,UStVAn_ReDatvon, UStVAn_ReDatBis, UStVAn_AntragEingereichtAm from tblUStVAntrag where UStvAN_KuNr = " & KundenNr & " and (isnull(UStVAn_AntragArt,'MWST') = '" & cboAntragArt._value & "' or UStVAn_AntragArt = '') and UStVAn_LandNr = " & USTV_ANTRAG.UStVAn_LandNr & " - AND not ((cast(UStVAn_ReDatvon as date) > '" & CDate(txtVon._value).ToShortDateString & "' or cast(UStVAn_ReDatBis as date) <= '" & CDate(txtVon._value).ToShortDateString & "' ) and (cast(UStVAn_ReDatBis as date) < '" & CDate(txtBis._value).ToShortDateString & "' or cast(UStVAn_ReDatvon as date) >= '" & CDate(txtBis._value).ToShortDateString & "'))", "FMZOLL") + Dim dt_existingUSTVA As DataTable = SQL.loadDgvBySql(StringSQL, "FMZOLL") + + + 'Dim dt_existingUSTVA As DataTable = SQL.loadDgvBySql("Select UStVAn_ID,UStVAn_ReDatvon, UStVAn_ReDatBis, UStVAn_AntragEingereichtAm from tblUStVAntrag where UStvAN_KuNr = " & KundenNr & " and (isnull(UStVAn_AntragArt,'MWST') = '" & cboAntragArt._value & "' or UStVAn_AntragArt = '') and UStVAn_LandNr = " & USTV_ANTRAG.UStVAn_LandNr & " + ' AND not ((cast(UStVAn_ReDatvon as date) > '" & CDate(txtVon._value).ToShortDateString & "' or cast(UStVAn_ReDatBis as date) <= '" & CDate(txtVon._value).ToShortDateString & "' ) and (cast(UStVAn_ReDatBis as date) < '" & CDate(txtBis._value).ToShortDateString & "' or cast(UStVAn_ReDatvon as date) >= '" & CDate(txtBis._value).ToShortDateString & "'))", "FMZOLL") 'Dim anzUSTVA = CInt((New SQL).getValueTxtBySql("Select count(*) from tblUStVAntrag where UStvAN_KuNr = " & KundenNr & " and (isnull(UStVAn_AntragArt,'MWST') = '" & cboAntragArt._value & "' or UStVAn_AntragArt = '') and UStVAn_LandNr = " & USTV_ANTRAG.UStVAn_LandNr & " ' AND not ((cast(UStVAn_ReDatvon as date) > '" & CDate(txtVon._value).ToShortDateString & "' and cast(UStVAn_ReDatBis as date) <= '" & CDate(txtVon._value).ToShortDateString & "') or (cast(UStVAn_ReDatvon as date) < '" & CDate(txtBis._value).ToShortDateString & "' and cast(UStVAn_ReDatBis as date) >= '" & CDate(txtBis._value).ToShortDateString & "'))", "FMZOLL")) @@ -1691,7 +1713,14 @@ Public Class frmMDM_USTVAntrag End Select ElseIf dt_existingUSTVA.Rows.Count > 1 Then - If Not vbYes = MsgBox("Es existiert bereits mind. ein " & cboAntragArt._value & "-Eintrag in diesem Zeitbereich von " & ADR.Name_1 & " für " & cbxLand.SelectedItem.ToString & vbNewLine & "Trotzdem Antrag speichern?", vbYesNoCancel) Then Exit Sub + Dim testInfo As String = "Es existiert bereits " & dt_existingUSTVA.Rows.Count & " " & cboAntragArt._value & "-Einträge in diesem Zeitbereich von " & vbNewLine + For Each r In dt_existingUSTVA.Rows + testInfo &= vbNewLine & r.Item("UStVAn_ReDatvon") & " - " & r.Item("UStVAn_ReDatbis") & IIf(Not IsDBNull(r.Item("UStVAn_AntragEingereichtAm")) AndAlso IsDate(r.Item("UStVAn_AntragEingereichtAm")), " bereits eingereicht! ", "") + Next + + testInfo &= vbNewLine & vbNewLine & "von " & ADR.Name_1 & " für " & cbxLand.SelectedItem.ToString + + If Not vbYes = MsgBox(testInfo & vbNewLine & "Trotzdem Antrag speichern?", vbYesNoCancel) Then Exit Sub End If