From af7630f1df8500436dea364b5f7458a151e355b9 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 6 May 2025 10:38:39 +0200 Subject: [PATCH] MDMFunct., Fakt. --- SDL/Fakturierung/usrCntlFaktAbrechnung.vb | 8 ++++---- VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index e097862b..467f8901 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -1763,7 +1763,7 @@ Public Class usrCntlFaktAbrechnung 'Anhänge aus USTVA -> SPED-BUCH + Excel Pos-Liste If SPEDBUCH IsNot Nothing Then If FIRMA IsNot Nothing Then - If FIRMA.Firma_ID = 19 AndAlso SPEDBUCH.ErfassungsNr > 0 AndAlso (SPEDBUCH.Abfertigungsart = 114 Or SPEDBUCH.Abfertigungsart = 115) Then + If FIRMA.Firma_ID = 19 AndAlso SPEDBUCH.ErfassungsNr <> "" AndAlso SPEDBUCH.ErfassungsNr > 0 AndAlso (SPEDBUCH.Abfertigungsart = 114 Or SPEDBUCH.Abfertigungsart = 115) Then Dim func As New cMDMFunctionsAllgemein() Dim dt = SQL.loadDgvBySql("SELECT UStVPo_daId, UStVPo_ID,UStVPo_SchnittstellenNr, UStVPo_ReNr, UStVPo_ReDat FROM tblUStVPositionen where UStVAn_ID='" & SPEDBUCH.ErfassungsNr & "' AND UStVPo_SchnittstellenNr <> 1 order by UStVPo_ID", "FMZOLL") @@ -1798,14 +1798,14 @@ Public Class usrCntlFaktAbrechnung End If Dim pfadExcel As String = func.generateExcelPosList(USTV, "", "", "", False) 'soll immer alle POS bekommen! laut Lidya! 28.04.2025 - If pfadExcel <> "" Then + If pfadExcel <> "" Then - Dim FI As New FileInfo(pfadExcel) + Dim FI As New FileInfo(pfadExcel) Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "MDM", "POS_LISTE", "", "", SPEDBUCH.AbfertigungsNr & FI.Extension, USTV.UStVAn_KuNr, False) DS.uploadDataToDATENSERVER(pfadExcel, FI.Name, FI.Extension,,,, True) .Rows.Add(0, "POS-LIST", DS.da_name, DS.da_id, DS.da_id) - End If End If + End If End If End If diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb index 86d807dc..c17f8080 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb @@ -1098,7 +1098,7 @@ Public Class cMDMFunctionsAllgemein Dim header1 As String = "" Dim header2 As String = "" Dim AD As New cAdressen(USTV_ANTRAG.UStVAn_KuNr) - If Antrag_LandKz <> "" AndAlso SteuerNR <> "" Then + If Antrag_LandKz <> "" Then header1 = "Statement itemising VAT amounts relating to the period covered by this application" header2 = "VAT NO.: " & USTV_ANTRAG.UStVAn_Steuernummer & " " & "Name/Company: " & AD.Name_1 & " " & AD.Name_2 & " " & "VAT in " & Antrag_LandKz & ": " & SteuerNR End If