diff --git a/SDL/Fakturierung/frmFaktEmail.vb b/SDL/Fakturierung/frmFaktEmail.vb index 04f2f0e5..a1dd5710 100644 --- a/SDL/Fakturierung/frmFaktEmail.vb +++ b/SDL/Fakturierung/frmFaktEmail.vb @@ -313,49 +313,38 @@ Public Class frmFaktEmail End Select Else + Dim mailText As String = "" If steuerbetrag = 0 Then mailText &= (New SQL).getValueTxtBySql("SELECT Text FROM Rechnungstexte WHERE Firma_ID=0 AND EMailRechnung=1 AND Rechnungstexte.DrucksteuerungsKz='R' AND LandKZ='" & RechnungsLandKz & "'", "FMZOLL") End If + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + Dim listOfTextconserven As cTextkonserve_LIST = New cTextkonserve_LIST(4, "", Firma_ID) + + Dim spracheRechnung As String = "EN" 'Defaultsprache + Select Case RechnungsLandKz - Case "TR" - txtSubject.Text = If(BelegartenNr = 71, "Kredi Nr. ", "Fatura Nr. ") & txtRgNr - TextHTML = "Sayin yetkili," & vbNewLine & vbNewLine & "ekte yeni Faturanizi ve Dökümünü bulabilirsiniz." - TextHTML &= TextHTMLADD - TextHTML &= "" & vbNewLine & "Fatura kopileri kdv iadesi icin kullanilamaz." - If mailText <> "" Then TextHTML &= mailText & vbNewLine - TextHTML &= "" & vbNewLine & vbNewLine & vbNewLine & "Saygilarimizla" & vbNewLine & vbNewLine & "" - Case "A", "AT", "D", "DE", "CH" - txtSubject.Text = If(BelegartenNr = 71, "Gutschrift Nr. ", "Rechnung Nr. ") & txtRgNr - TextHTML = "Sehr geehrte Kunde" & vbNewLine & vbNewLine & "anbei unsere neue " & If(BelegartenNr = 71, "Gutschrift(en)", "Rechnung(en)") & " der letzten Abrechnungsperiode mit den dazugehörigen Anhängen." - TextHTML &= TextHTMLADD - TextHTML &= "" & vbNewLine & "Da es sich bei den beigefügten Rechnungen nur um Kopien handelt, dürfen diese NICHT zur MWST-Rückerstattung verwendet werden. " - If mailText <> "" Then TextHTML &= mailText & vbNewLine - TextHTML &= "" & vbNewLine & vbNewLine & vbNewLine & "Mit freundlichen Grüßen" & vbNewLine & vbNewLine & "" - Case "HR", "SRB", "SLO" - txtSubject.Text = If(BelegartenNr = 71, "Credit No. ", "Invoice No. ") & txtRgNr - TextHTML = "Postovani komitente" & vbNewLine & vbNewLine & "u prilogu novi " & If(BelegartenNr = 71, "kredit", "racun") & " sa specifikacijma za prethodni period. " - TextHTML &= TextHTMLADD - TextHTML &= "" & vbNewLine & "Prilozeni racuni nisu dopusteni za povrat PDV-a, jer su samo kopije." - If mailText <> "" Then TextHTML &= mailText & vbNewLine - TextHTML &= "" & vbNewLine & vbNewLine & vbNewLine & "Best regards" & vbNewLine & vbNewLine & "" - Case "RO" - txtSubject.Text = If(BelegartenNr = 71, "Credit No. ", "Invoice No. ") & txtRgNr - TextHTML = "Stimate client" & vbNewLine & vbNewLine & "Va transmitem factura " & If(BelegartenNr = 71, "kredit", "racun") & " referitoare ultimei perioade de decontare impreuna cu anexele aferente." - TextHTML &= TextHTMLADD - TextHTML &= "" & vbNewLine & "Prilozeni racuni nisu dopusteni za povrat PDV-a, jer su samo kopije." - If mailText <> "" Then TextHTML &= mailText & vbNewLine - TextHTML &= "" & vbNewLine & vbNewLine & vbNewLine & "Best regards" & vbNewLine & vbNewLine & "" - Case Else - txtSubject.Text = If(BelegartenNr = 71, "Credit No. ", "Invoice No. ") & txtRgNr - TextHTML = "Dear Customer" & vbNewLine & vbNewLine & "Enclosed is our new " & If(BelegartenNr = 71, "credit note", "invoice") & " for the last billing period with the associated attachments." - TextHTML &= TextHTMLADD - TextHTML &= "" & vbNewLine & "Since the attached invoices are only copies, the may NOT be used for VAT refunds." - If mailText <> "" Then TextHTML &= mailText & vbNewLine - TextHTML &= "" & vbNewLine & vbNewLine & vbNewLine & "Best regards" & vbNewLine & vbNewLine & "" + Case "TR" : spracheRechnung = RechnungsLandKz + Case "A", "AT", "D", "DE", "CH" : spracheRechnung = "DE" + Case "RO" : spracheRechnung = "RO" + Case "HR", "SRB", "SLO" : spracheRechnung = "SRB" End Select + If listOfTextconserven.LIST.Any(Function(c) c.txt_sprache = spracheRechnung) Then + + + Dim r As cTextkonserve = listOfTextconserven.LIST.Find(Function(c) c.txt_sprache = spracheRechnung) + If r IsNot Nothing Then + txtSubject.Text = r.txt_betreff + txtSubject.Text = txtSubject.Text.Replace("%BelegNr%", txtRgNr) + TextHTML &= r.txt_text + If mailText <> "" Then TextHTML &= mailText & vbNewLine + 'TextHTML &= "


" & cFakturierung.getSignature(RechnungsLandKz, Firma_ID) + + End If + End If + End If diff --git a/SDL/frmdynMailvorlage.vb b/SDL/frmdynMailvorlage.vb index ad047908..83ff75cc 100644 --- a/SDL/frmdynMailvorlage.vb +++ b/SDL/frmdynMailvorlage.vb @@ -56,6 +56,7 @@ Public Class frmdynMailvorlagen cbxTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sendung", "1")) cbxTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Mahnung", "2")) cbxTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("OP-Liste", "3")) + cbxTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MDM-SR", "4")) cbxTyp.changeItem("") diff --git a/SDL/mdm/usrcntlFremdrechnungen.vb b/SDL/mdm/usrcntlFremdrechnungen.vb index 180ca658..9d5fafc2 100644 --- a/SDL/mdm/usrcntlFremdrechnungen.vb +++ b/SDL/mdm/usrcntlFremdrechnungen.vb @@ -370,7 +370,7 @@ Public Class usrcntlFremdrechnungen Dim counter = 0 Dim landBez As String = "" For Each row As DataRow In dtkeineMWST_ohneContraint.Rows - landBez = "'" & row.Item("Erstattungsland") & "'" + landBez &= "'" & row.Item("Erstattungsland") & "'" counter = counter + 1 If (dtkeineMWST_ohneContraint.Rows.Count <> 0 And counter <> dtkeineMWST_ohneContraint.Rows.Count) Then landBez &= "," Next @@ -382,7 +382,7 @@ Public Class usrcntlFremdrechnungen Dim counter = 0 Dim landBez As String = "" For Each row As DataRow In dtKundeMWST.Rows - landBez = "'" & row.Item("LandKz") & "'" + landBez &= "'" & row.Item("LandKz") & "'" counter = counter + 1 If (dtKundeMWST.Rows.Count <> 0 And counter <> dtKundeMWST.Rows.Count) Then landBez &= "," Next @@ -438,7 +438,7 @@ Public Class usrcntlFremdrechnungen Dim counter = 0 Dim landBez As String = "" For Each row As DataRow In dtkeineMWST_IDS.Rows - landBez = "'" & row.Item("Erstattungsland") & "'" + landBez &= "'" & row.Item("Erstattungsland") & "'" counter = counter + 1 If (dtkeineMWST_IDS.Rows.Count <> 0 And counter <> dtkeineMWST_IDS.Rows.Count) Then landBez &= "," Next @@ -452,7 +452,7 @@ Public Class usrcntlFremdrechnungen Dim counter = 0 Dim landBez As String = "" For Each row As DataRow In dtKundeMWST.Rows - landBez = "'" & row.Item("LandKz") & "'" + landBez &= "'" & row.Item("LandKz") & "'" counter = counter + 1 If (dtKundeMWST.Rows.Count <> 0 And counter <> dtKundeMWST.Rows.Count) Then landBez &= "," Next