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

Compare commits

base: edv:71248e97a9dda5ffd0a2234e3aabfa616f0cacbf
Branches Tags
edv:master edv:newMaster2024 edv:Logikänderung_VM
..
compare: edv:7352833aa0f2a72832feb238c41f9a503e442adf
Branches Tags
edv:newMaster2024 edv:master edv:Logikänderung_VM

3 Commits
71248e97a9 ... 7352833aa0

Author SHA1 Message Date
d.breimaier
7352833aa0 ustv 2025-10-10 08:55:52 +02:00
d.breimaier
63522bad39 ustv 2025-10-09 16:17:04 +02:00
d.breimaier
daea9595ab faktMail, ustva 2025-10-09 16:15:37 +02:00
3 changed files with 73 additions and 10 deletions
Expand all files Collapse all files

14
SDL/Fakturierung/frmFaktEmail.vb
View File

@@ -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 &= "<br><br><br>" & 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

4
SDL/My Project/AssemblyInfo.vb
View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.4.6.2")>
<Assembly: AssemblyFileVersion("1.4.6.2")>
<Assembly: AssemblyVersion("1.4.6.3")>
<Assembly: AssemblyFileVersion("1.4.6.3")>

65
SDL/USTV/frmMDM_USTVAntrag.vb
View File

@@ -1666,14 +1666,40 @@ Public Class frmMDM_USTVAntrag
End If
'check if already existing 'überschneidungen prüfen!!!!
'Start neue Version
'check if already existing 'überschneidungen prüfen!!!! -> jz wieder doch nicht..........
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 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"))
'Ende neue Version
'alte Version wieder aktiviert.
'Start alte Version --------------------------------------
'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")
'Ende alte Version --------------------------------------
If dt_existingUSTVA.Rows.Count = 1 Then
@@ -1691,7 +1717,34 @@ 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 existieren bereits " & dt_existingUSTVA.Rows.Count & " " & cboAntragArt._value & "-Einträge in diesem Zeitbereich von " & vbNewLine
Dim IDnichteingereicht As Integer = -1
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! ", "")
If IsDBNull(r.Item("UStVAn_AntragEingereichtAm")) OrElse IsDate(r.Item("UStVAn_AntragEingereichtAm")) Then
IDnichteingereicht = (r.Item("UStVAn_ID"))
End If
Next
testInfo &= vbNewLine & vbNewLine & "von " & ADR.Name_1 & " für " & cbxLand.SelectedItem.ToString
Dim result As MsgBoxResult = MsgBox(testInfo & vbNewLine & "Ja = Antrag speichern" & vbNewLine & "Nein = existierenden Antrag öffnen", vbYesNoCancel)
Select Case result
Case MsgBoxResult.Cancel : Exit Sub
Case MsgBoxResult.No
Me.Close()
If IDnichteingereicht > 0 Then
Dim frm = New frmMDM_USTVAntrag(IDnichteingereicht)
frm.ShowDialog()
Exit Sub
Else
'Exit Sub
End If
End Select
End If