fix ustva
This commit is contained in:
@@ -574,85 +574,85 @@ Public Class frmFaktEmail
|
||||
'Mail-Adressen eintragen
|
||||
'-----------------------------------------------------------------
|
||||
For Each r In dgvEmail.Rows
|
||||
If r.cells(0).value <> "" Then Mail.To &= r.cells(0).value & ";"
|
||||
Next
|
||||
For Each r In dgvEmailCC.Rows
|
||||
If r.cells(0).value <> "" Then Mail.CC &= r.cells(0).value & ";"
|
||||
Next
|
||||
For Each r In dgvEmailBCC.Rows
|
||||
If r.cells(0).value <> "" Then Mail.BCC &= r.cells(0).value & ";"
|
||||
Next
|
||||
If r.cells(0).value <> "" Then Mail.To &= r.cells(0).value & ";"
|
||||
Next
|
||||
For Each r In dgvEmailCC.Rows
|
||||
If r.cells(0).value <> "" Then Mail.CC &= r.cells(0).value & ";"
|
||||
Next
|
||||
For Each r In dgvEmailBCC.Rows
|
||||
If r.cells(0).value <> "" Then Mail.BCC &= r.cells(0).value & ";"
|
||||
Next
|
||||
|
||||
|
||||
RichTextBox.Text = RichTextBox.Text.Replace("%RgNr%", lastAktuelle_RgNr)
|
||||
txtSubject.Text = txtSubject.Text.Replace("%RgNr%", lastAktuelle_RgNr)
|
||||
RichTextBox.Text = RichTextBox.Text.Replace("%RgNr%", lastAktuelle_RgNr)
|
||||
txtSubject.Text = txtSubject.Text.Replace("%RgNr%", lastAktuelle_RgNr)
|
||||
|
||||
|
||||
Dim TextHTML = "<div style=""font-family:Calibri, Arial"">" & RichTextBox.Text.Replace(ControlChars.Lf, "<br>") & cFakturierung.getSignature(AD.LandKz, Firma_ID,,,, additionalLine,, IIf(Firma_ID = "24", True, False)) & "</div>"
|
||||
Dim TextHTML = "<div style=""font-family:Calibri, Arial"">" & RichTextBox.Text.Replace(ControlChars.Lf, "<br>") & cFakturierung.getSignature(AD.LandKz, Firma_ID,,,, additionalLine,, IIf(Firma_ID = "24", True, False)) & "</div>"
|
||||
|
||||
Mail.HTMLBody = TextHTML
|
||||
Mail.Subject = txtSubject.Text
|
||||
Mail.HTMLBody = TextHTML
|
||||
Mail.Subject = txtSubject.Text
|
||||
|
||||
ATTACHMENTS.Clear()
|
||||
'-----------------------------------------------------------------
|
||||
'Rechnungen anfügen
|
||||
'-----------------------------------------------------------------
|
||||
For Each l In listPDFs
|
||||
' Mail.Attachments.Add(l, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
|
||||
ATTACHMENTS.Clear()
|
||||
'-----------------------------------------------------------------
|
||||
'Rechnungen anfügen
|
||||
'-----------------------------------------------------------------
|
||||
For Each l In listPDFs
|
||||
' Mail.Attachments.Add(l, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
|
||||
|
||||
ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
|
||||
ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
|
||||
|
||||
|
||||
|
||||
Next
|
||||
For Each l In SonstAnlagen
|
||||
' Mail.Attachments.Add(l, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
|
||||
Next
|
||||
For Each l In SonstAnlagen
|
||||
' Mail.Attachments.Add(l, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
|
||||
|
||||
ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
|
||||
ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
|
||||
|
||||
Next
|
||||
addAttachments(Mail, lastAktuelle_RgNr, cbxMergeRg.Checked)
|
||||
Next
|
||||
addAttachments(Mail, lastAktuelle_RgNr, cbxMergeRg.Checked)
|
||||
|
||||
'-----------------------------------------------------------------
|
||||
'Steuerbescheid/VDB anfügen
|
||||
'-----------------------------------------------------------------
|
||||
getAnhaenge()
|
||||
'For Each l In listPDFs
|
||||
' ' Mail.Attachments.Add(l, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
|
||||
' ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
|
||||
'Next
|
||||
'-----------------------------------------------------------------
|
||||
'Steuerbescheid/VDB anfügen
|
||||
'-----------------------------------------------------------------
|
||||
getAnhaenge()
|
||||
'For Each l In listPDFs
|
||||
' ' Mail.Attachments.Add(l, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
|
||||
' ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
|
||||
'Next
|
||||
|
||||
'Rechnungsanhänge anfügen
|
||||
'-----------------------------------------------------------------
|
||||
If SR_DT IsNot Nothing AndAlso SR_DT.Rows.Count > 0 Then
|
||||
For Each r In SR_DT.Rows
|
||||
Dim RG_ANH = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.LOAD_ANHAENGE_LIST(r("RK_ID"))
|
||||
If RG_ANH IsNot Nothing Then
|
||||
For Each ANH In RG_ANH
|
||||
ATTACHMENTS.Add(New cFakt_MailATTach(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(ANH.dsId), ANH.Bezeichnung))
|
||||
Next
|
||||
End If
|
||||
'Rechnungsanhänge anfügen
|
||||
'-----------------------------------------------------------------
|
||||
If SR_DT IsNot Nothing AndAlso SR_DT.Rows.Count > 0 Then
|
||||
For Each r In SR_DT.Rows
|
||||
Dim RG_ANH = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.LOAD_ANHAENGE_LIST(r("RK_ID"))
|
||||
If RG_ANH IsNot Nothing Then
|
||||
For Each ANH In RG_ANH
|
||||
ATTACHMENTS.Add(New cFakt_MailATTach(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(ANH.dsId), ANH.Bezeichnung))
|
||||
Next
|
||||
End If
|
||||
'-----------------------------------------------------------------
|
||||
Next
|
||||
End If
|
||||
'-----------------------------------------------------------------
|
||||
|
||||
|
||||
addAttachments(Mail, lastAktuelle_RgNr, cbxMergePDF.Checked)
|
||||
addAttachments(Mail, lastAktuelle_RgNr, cbxMergePDF.Checked)
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
|
||||
Try
|
||||
Mail.SentOnBehalfOfName = "buchhaltung@ambarlog.com"
|
||||
Catch ex2 As Exception
|
||||
MsgBox(ex2.Message)
|
||||
End Try
|
||||
End If
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
|
||||
Try
|
||||
Mail.SentOnBehalfOfName = "buchhaltung@ambarlog.com"
|
||||
Catch ex2 As Exception
|
||||
MsgBox(ex2.Message)
|
||||
End Try
|
||||
End If
|
||||
|
||||
Mail.Display()
|
||||
'------------------------------------------------------------------------------------------
|
||||
' STB /FA SR: ABFRAGE FISKAL-VZ
|
||||
If isFiskal Then
|
||||
send_StbFAMail(AD.AdressenNr, " Rg-Nr.: " & lastAktuelle_RgNr, lastAktuelle_RgNr)
|
||||
End If
|
||||
Mail.Display()
|
||||
'------------------------------------------------------------------------------------------
|
||||
' STB /FA SR: ABFRAGE FISKAL-VZ
|
||||
If isFiskal Then
|
||||
send_StbFAMail(AD.AdressenNr, " Rg-Nr.: " & lastAktuelle_RgNr, lastAktuelle_RgNr)
|
||||
End If
|
||||
'------------------------------------------------------------------------------------------
|
||||
|
||||
End If
|
||||
@@ -830,6 +830,9 @@ Public Class frmFaktEmail
|
||||
If count_offene_importierteErstattungen > 0 Then
|
||||
SQL.doSQL("UPDATE [tblUStVErstattung] SET GutschriftsNr = " & RECHNUNG.RechnungsNr & ",GutschriftsDatum = '" & CDate(RECHNUNG.RechnungsDatum).ToShortDateString & "', UStVEr_RK_ID = " & RECHNUNG.RK_ID & " WHERE [UStVAn_ID] = " & USTV_ANTRAG.UStVAn_ID & " and [UStVEr_Importfilename] is not null and [GutschriftsNr] is null and [GutschriftsDatum] is null ", "FMZOLL")
|
||||
|
||||
Else
|
||||
insertNewErstattungsPos(USTV_ANTRAG)
|
||||
|
||||
End If
|
||||
|
||||
|
||||
@@ -851,15 +854,7 @@ Public Class frmFaktEmail
|
||||
End If
|
||||
|
||||
Else
|
||||
|
||||
Dim ANTR_ERSTATTUNG As New VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen(USTV_ANTRAG.UStVAn_ID, RECHNUNG.RechnungsNr, CDate(RECHNUNG.RechnungsDatum))
|
||||
If Not ANTR_ERSTATTUNG.hasEntry Then
|
||||
ANTR_ERSTATTUNG.UStVEr_ID = ANTR_ERSTATTUNG.getMaxPosNr()
|
||||
ANTR_ERSTATTUNG.GutschriftsDatum = RECHNUNG.RechnungsDatum
|
||||
ANTR_ERSTATTUNG.GutschriftsNr = RECHNUNG.RechnungsNr
|
||||
ANTR_ERSTATTUNG.UStVEr_RK_ID = RECHNUNG.RK_ID
|
||||
ANTR_ERSTATTUNG.SAVE()
|
||||
End If
|
||||
insertNewErstattungsPos(USTV_ANTRAG)
|
||||
|
||||
End If
|
||||
|
||||
@@ -888,7 +883,7 @@ Public Class frmFaktEmail
|
||||
End If
|
||||
|
||||
|
||||
End If
|
||||
End If
|
||||
|
||||
'------------------------------------------------------------------------------------------
|
||||
' STB /FA
|
||||
@@ -909,6 +904,21 @@ Public Class frmFaktEmail
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub insertNewErstattungsPos(USTV_ANTRAG As cUSTVAntrag)
|
||||
|
||||
|
||||
Dim ANTR_ERSTATTUNG As New VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen(USTV_ANTRAG.UStVAn_ID, RECHNUNG.RechnungsNr, CDate(RECHNUNG.RechnungsDatum))
|
||||
If Not ANTR_ERSTATTUNG.hasEntry Then
|
||||
ANTR_ERSTATTUNG.UStVEr_ID = ANTR_ERSTATTUNG.getMaxPosNr()
|
||||
ANTR_ERSTATTUNG.GutschriftsDatum = RECHNUNG.RechnungsDatum
|
||||
ANTR_ERSTATTUNG.GutschriftsNr = RECHNUNG.RechnungsNr
|
||||
ANTR_ERSTATTUNG.UStVEr_RK_ID = RECHNUNG.RK_ID
|
||||
ANTR_ERSTATTUNG.UStVEr_USteuerbetrag = 0
|
||||
ANTR_ERSTATTUNG.UStVEr_USteuerbetragEUR = 0
|
||||
ANTR_ERSTATTUNG.SAVE()
|
||||
End If
|
||||
End Sub
|
||||
|
||||
|
||||
Function addRgData_ZF_Passau(RechnungsLandKz) As String
|
||||
addRgData_ZF_Passau = vbNewLine & vbNewLine
|
||||
|
||||
@@ -761,6 +761,7 @@ Public Class frmMDM_USTVAntrag
|
||||
loadUSTVFrom_PLOSE(UStVAn_ID, Antrag_LandKz, cbxArchivierteEintracheNochmalsEinarbetien.Checked, IIf(item.Name = "ploseneu", True, False))
|
||||
init()
|
||||
ElseIf item.Name = "rmc" Then
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
|
||||
loadUSTVFrom_RMC(UStVAn_ID, Antrag_LandKz, cbxArchivierteEintracheNochmalsEinarbetien.Checked)
|
||||
init()
|
||||
ElseIf item.Name = "mse" Then
|
||||
@@ -1196,7 +1197,7 @@ Public Class frmMDM_USTVAntrag
|
||||
End If
|
||||
|
||||
|
||||
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
|
||||
If Not alreadyExists(USTV_ANTRAG.UStVAn_KuNr, USTV_ANTRAG.UStVAn_LandNr, USTV_POS) Then
|
||||
|
||||
USTV_POS.UStVPo_Schnittstelle = True
|
||||
|
||||
Reference in New Issue
Block a user