diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb index 962526b4..81b7c397 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb @@ -830,7 +830,7 @@ Public Class frmBU_Mahnlauf 'Mail_HTMLBody &= "

" Mail_HTMLBody &= "Iyi calismalar diler, saygilarimizi sunariz" Mail_HTMLBody &= "


" - Mail_HTMLBody &= "If you are not responsible for this matter, please send us an e-mail address to buchhaltung@verag.ag, + Mail_HTMLBody &= "If you are not responsible for this matter, please send us an e-mail address to " & FIRMA.Firma_E_Mail_Mahnungen & ", to which future reminders should be sent.
In the meantime, we ask you to forward them to the responsible persons in your company.
" Mail_HTMLBody &= "


" & cFakturierung.getSignature(AD.LandKz, FIRMA.Firma_ID) @@ -840,7 +840,7 @@ Public Class frmBU_Mahnlauf Mail_Subject = MAHNTEXT & IIf(KdNr > 0, " - KdNr.: " & KdNr, "") Mail_HTMLBody = "Sehr geehrte Damen und Herren,

im Anhang finden Sie ihre Mahnung, mit der Bitte um Bearbeitung. " Mail_HTMLBody &= "


" - Mail_HTMLBody &= "Sollten Sie für diesen Sachverhalt nicht zuständig sein, teilen Sie uns bitte per Mail an buchhaltung@verag.ag eine Mailadresse mit, + Mail_HTMLBody &= "Sollten Sie für diesen Sachverhalt nicht zuständig sein, teilen Sie uns bitte per Mail an " & FIRMA.Firma_E_Mail_Mahnungen & " eine Mailadresse mit, an welche zukünftig die Mahnungen versandt werden sollen.
Derweil bitten wir um Weiterleitung an die zuständigen Personen in ihrem Haus.
" Mail_HTMLBody &= "


Mit freundlichen Grüßen

" & cFakturierung.getSignature(AD.LandKz, FIRMA.Firma_ID) @@ -850,7 +850,7 @@ Public Class frmBU_Mahnlauf Mail_Subject = "PAYMENT REMINDER" & IIf(KdNr > 0, " - Cust.: " & KdNr, "") Mail_HTMLBody = "Dear Sir or Madam,

attached we send you the invoice reminder." Mail_HTMLBody &= "


" - Mail_HTMLBody &= "If you are not responsible for this matter, please send us an e-mail address to buchhaltung@verag.ag, + Mail_HTMLBody &= "If you are not responsible for this matter, please send us an e-mail address to " & FIRMA.Firma_E_Mail_Mahnungen & ", to which future reminders should be sent.
In the meantime, we ask you to forward them to the responsible persons in your company.
" Mail_HTMLBody &= "


Best regards

" & cFakturierung.getSignature(AD.LandKz, FIRMA.Firma_ID) diff --git a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb index 862752af..817809ed 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb @@ -62,6 +62,8 @@ Public Class cUSTVAntrag Property UStVAn_Sicherheit As Object = Nothing Property POSITIONEN As New List(Of cUStVPositionen) '= Nothing + Public hasEntry = False + Dim SQL As New SQL Sub New() @@ -136,6 +138,9 @@ Public Class cUSTVAntrag Public Sub LOAD(UStVAn_ID, Optional loadPos = True) Try + + hasEntry = False + POSITIONEN.Clear() Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() Using cmd As New SqlCommand("SELECT * FROM tblUStVAntrag WHERE UStVAn_ID=@UStVAn_ID ", conn) @@ -151,6 +156,7 @@ Public Class cUSTVAntrag propInfo.SetValue(Me, dr.Item(i.Text)) End If Next + hasEntry = True If loadPos Then LOAD_POSITIONEN() End If dr.Close() @@ -355,12 +361,20 @@ Public Class cUStVPositionen Dim SQL As New SQL + Sub New(UStVAn_ID, UStVPo_ID, UStVPo_interneNr) + Me.UStVAn_ID = UStVAn_ID + Me.UStVPo_interneNr = UStVPo_interneNr + + LOAD(UStVAn_ID, UStVPo_interneNr) + End Sub + Sub New(UStVAn_ID, UStVPo_ID) Me.UStVAn_ID = UStVAn_ID Me.UStVPo_ID = UStVPo_ID LOAD(UStVAn_ID, UStVPo_ID) End Sub + Sub New() End Sub @@ -401,6 +415,36 @@ Public Class cUStVPositionen End Try End Sub + Public Sub LOADInterneNr(UStVAn_ID, UStVPo_interneNr) + Try + + hasEntry = False + + Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() + Using cmd As New SqlCommand("SELECT * FROM [tblUStVPositionen] WHERE UStVAn_ID=@UStVAn_ID AND UStVPo_interneNr=@UStVPo_interneNr ", conn) + cmd.Parameters.AddWithValue("@UStVAn_ID", UStVAn_ID) + cmd.Parameters.AddWithValue("@UStVPo_interneNr", UStVPo_interneNr) + Dim dr = cmd.ExecuteReader() + If dr.Read Then + 'Dim l As New cOfferte + For Each i In getParameterList() + Dim propInfo As PropertyInfo = Me.GetType.GetProperty(i.Scalarvariable) + If dr.Item(i.Text) Is DBNull.Value Then + propInfo.SetValue(Me, Nothing) + Else + propInfo.SetValue(Me, dr.Item(i.Text)) + End If + Next + hasEntry = True + End If + dr.Close() + End Using + End Using + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + End Sub + Public Function SAVE() As Boolean Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()