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

Merge branch 'newMaster2024' of https://dev.azure.com/VeragAG/_git/SDL into newMaster2024

Browse Source
This commit is contained in:
Andreas Luxbauer
2025-01-23 08:01:29 +01:00
parent 1c31601346 ad26cb0db9
commit 051f557c40
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SDL/mdm/frmMDMDatenverarbetiung.vb
View File

@@ -4024,7 +4024,7 @@ Public Class frmMDMDatenverarbetiung
pruefData_UTA = False
Dim hint As String = ""
If fehlendeRechnungen < 10 Then
hint &= SQL.getValueTxtBySql("select distinct(Rechnungsnummer_pro_Lieferland) from tblUTAImportNew where daId is null and cast(Rechnungsdatum as Date) = '" & DateTimePicker2.Text & "'", "FMZOLL")
hint &= SQL.getValueTxtBySql("select distinct(Rechnungsnummer_pro_Lieferland) from tblUTAImportNew where daId is null and cast(Rechnungsdatum as Date) = '" & DateTimePicker2.Text & "' and Lieferland <> 'ROM' and Steuerliches_Lieferland <> 'ROM'", "FMZOLL")
End If
MsgBox("Es fehlen " & fehlendeRechnungen & " PDF-Rechnungen in der Datenbank!" & vbNewLine & "Diese Dokumente (von Rechnung " & DateTimePicker2.Text & ") müssen nachgeladen werden (bitte an Administrator wenden)." & IIf(hint <> "", vbNewLine & hint, ""))
End If

4
VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb
View File

@@ -390,10 +390,10 @@ Public Class cMDMFunctionsAllgemein
If calcSummeNeueSchnittstelle Then
Dim sqlFMZollDatenNEU = "SELECT [tblIDSTransactionsNew].KdNrVERAG AS AdressenNr, dbo.tblSteuernummern.LandNr, SUM([tblIDSTransactionsNew].[VAT Amount]) AS Vorschaubetrag
Dim sqlFMZollDatenNEU = "SELECT [tblIDSTransactionsNew].KdNrVERAG AS AdressenNr, dbo.tblSteuernummern.LandNr, SUM([tblIDSTransactionsNew].[VATAmount]) AS Vorschaubetrag
FROM tblIDSTransactionsNew INNER JOIN
dbo.tblSteuernummern ON [tblIDSTransactionsNew].KdNrVERAG = dbo.tblSteuernummern.AdressenNr INNER JOIN
dbo.tbl_IDS_Länder ON dbo.tblSteuernummern.LandNr = dbo.tbl_IDS_Länder.LandNr AND [tblIDSTransactionsNew].[Outlet Country Code] = dbo.tbl_IDS_Länder.OutletCountryCode
dbo.tbl_IDS_Länder ON dbo.tblSteuernummern.LandNr = dbo.tbl_IDS_Länder.LandNr AND [tblIDSTransactionsNew].[OutletCountryCode] = dbo.tbl_IDS_Länder.OutletCountryCode
WHERE ([tblIDSTransactionsNew].KdNrVERAG = " & varUStVAn_KuNr & " ) AND ([tblIDSTransactionsNew].[YearMonthDay] >= '" & invoiceDate.ToShortDateString & "') AND ([tblIDSTransactionsNew].UStVAn_ID IS NULL) AND
(dbo.tblSteuernummern.UStV = 1)
GROUP BY [tblIDSTransactionsNew].KdNrVERAG, dbo.tblSteuernummern.LandNr