diff --git a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb index 8fd97228..62057e05 100644 --- a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb +++ b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb @@ -333,6 +333,9 @@ Public Class frmNacherfassungNEU Else btnATLASPOS.Visible = False End If + + Button5.Visible = True + End Sub @@ -1031,6 +1034,8 @@ Public Class frmNacherfassungNEU Private Sub cboAbfertigungsart_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboAbfertigungsart.SelectedIndexChanged, txtAnzahl.TextChanged + Button5.Visible = True + Button5.Visible = (cboAbfertigungsart._value = "52") If sender Is cboAbfertigungsart Then @@ -1701,6 +1706,8 @@ Class cSpedBuch_Aktendeckel If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("RPT_SND_BarcodeLKW") Then barcodeLKW = Code128Rendering.MakeBarcodeImage("/" & SPEDBUCH.AvisoID & "/", 1, True, 20) End If + + VALUES.LKW_ID = SPEDBUCH.AvisoID End If Dim abfertArt = "" @@ -1735,7 +1742,6 @@ Class cSpedBuch_Aktendeckel VALUES.KdAuftrNr = If(SPEDBUCH.KdAuftragsNr, "") - VALUES.Empfaenger_KdNr = IIf(SPEDBUCH.EmpfängerKundenNr > 0, SPEDBUCH.EmpfängerKundenNr, "") VALUES.Empfaenger_Firma = SPEDBUCH.Empfänger diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index 3f7e454f..873c617f 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -1822,7 +1822,7 @@ Public Class usrCntlUSTV Private Sub ExportToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ExportToolStripMenuItem.Click - Dim sqlStr As String = "SELECT [UStVAn_ID] as ID,[UStVAn_KuNr] as KDNR,[UStVAn_Name] as Kundename,Adressen.LandKz as LKZ_KD, case when UstIdKz is not null and UstIdNr is not null THEN UstIdKz +'' + UstIdNr ELSE isnull(Steuernummer,'') END as SteuerUIDNr, LfdA.LandKz as LKZ,cast([UStVAn_ReDatVon] as Date) as ReDatVon,cast([UStVAn_ReDatBis] as Date) as ReDatBis , cast(UStVAn_AntragEingereichtAm as Date) as EingereichtAm,[UStVAn_3470] as An3470 ,[UStVAn_Währungscode] as WKZ,[UStVAn_USteuerbetrag] as Steuerbetrag,[UStVAn_Erstattungsbetrag] as Erstattungsbetrag,[UStVAn_USteuerbetragEUR] as SteuerbetragEUR,[UStVAn_ErstattungsbetragEUR] as ErstattungsbetragEUR,(cast([UStVAn_USteuerbetragEUR] as decimal(17,2)) - cast( [UStVAn_ErstattungsbetragEUR] as decimal(17,2))) as DifferenzbetragEUR, [UStVAn_Sachbearbeiter] as Sachbearbeiter, UStVAn_AntragArt as Art, stnr.[StNrFürRückerstattungUSt] as SteuerNr,'' as BANK, ''as Diff, '' as BelNr,(isnull(UStVAn_VZBetrag,0) - isnull(UStVAn_RZBetragVZ,0)) as VZ, '' as '3470', '' as GS, '' as RZVZ, '' as Info, '' as VZDIFF,isnull(UStVAn_RGRetour,0) as 'RG Retour' FROM [tblUStVAntrag] + Dim sqlStr As String = "SELECT [UStVAn_ID] as ID,[UStVAn_KuNr] as KDNR,[UStVAn_Name] as Kundename,Adressen.LandKz as LKZ_KD, case when UstIdKz is not null and UstIdNr is not null THEN UstIdKz +'' + UstIdNr ELSE isnull(Steuernummer,'') END as SteuerUIDNr, LfdA.LandKz as LKZ,cast([UStVAn_ReDatVon] as Date) as ReDatVon,cast([UStVAn_ReDatBis] as Date) as ReDatBis , cast(UStVAn_AntragEingereichtAm as Date) as EingereichtAm,[UStVAn_3470] as An3470 ,[UStVAn_Währungscode] as WKZ,[UStVAn_USteuerbetrag] as Steuerbetrag,[UStVAn_Erstattungsbetrag] as Erstattungsbetrag,[UStVAn_USteuerbetragEUR] as SteuerbetragEUR,[UStVAn_ErstattungsbetragEUR] as ErstattungsbetragEUR,(cast([UStVAn_USteuerbetragEUR] as decimal(17,2)) - cast( [UStVAn_ErstattungsbetragEUR] as decimal(17,2))) as DifferenzbetragEUR,'' as BANK, ''as Diff, '' as BelNr,(isnull(UStVAn_VZBetrag,0) - isnull(UStVAn_RZBetragVZ,0)) as VZ, [UStVAn_Sachbearbeiter] as Sachbearbeiter, UStVAn_AntragArt as Art, stnr.[StNrFürRückerstattungUSt] as SteuerNr, '' as '3470', '' as GS, '' as RZVZ, '' as Info, '' as VZDIFF,isnull(UStVAn_RGRetour,0) as 'RG Retour' FROM [tblUStVAntrag] inner join [Länderverzeichnis für die Außenhandelsstatistik] as LfdA on UStVAn_LandNr=Landnr inner join Adressen on AdressenNr=UStVAn_KuNr left join [tblSteuernummern] as stnr on stnr.AdressenNr = UStVAn_KuNr and stnr.LandNr=UStVAn_LandNr @@ -1835,11 +1835,11 @@ Public Class usrCntlUSTV If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then Dim formeln As New Dictionary(Of String, String) From { - {"U", "=T{0}-P{0}"}, - {"AB", "=W{0}-T{0}"} + {"R", "=Q{0}-P{0}"}, + {"AB", "=T{0}-Q{0}"} } - cProgramFunctions.genExcelFromDT_NEW(dt, ,, "MWST Eingänge " & Today.ToShortDateString,,, False,,,,,, {"L1:AB" & (dt.Rows.Count + 1)}, {"D", "E", "I", "J", "M", "O", "N", "Q", "R", "S"}, formeln, True) + cProgramFunctions.genExcelFromDT_NEW(dt, ,, "MWST Eingänge " & Today.ToShortDateString,,, False,,,,,, {"L1:AB" & (dt.Rows.Count + 1)}, {"D", "E", "I", "J", "M", "O", "N", "U", "V", "W"}, formeln, True) Else diff --git a/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb b/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb index 586ddd91..67740f23 100644 --- a/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb +++ b/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb @@ -467,4 +467,40 @@ Public Class cSicherheiten End Function + Public Shared Function getDifferenz_alleAusgetragen(gs_gsnr As Integer) As Double + + Dim SQL_Query = "SELECT CASE + WHEN EXISTS ( + SELECT 1 + FROM tblGesamtsicherheit gs_waiting + INNER JOIN tblGesamtsicherheitsPositionen gsp_waiting + ON gs_waiting.gs_gsId = gsp_waiting.gsp_gsId + WHERE gs_waiting.gs_gsnr = 32041 + AND gs_waiting.gs_dakoyimport = 1 + AND gsp_waiting.gsp_freitext = 'DAKOSY-WAITING' + ) + THEN 0 + + WHEN MAX(CASE WHEN gs.gs_isRundungsdiff = 1 THEN 1 ELSE 0 END) = 1 + THEN 0 + + ELSE SUM(gs.gs_sicherheitsbetrag) + - SUM(gsp.gsp_sicherheitsbetrag) + END AS Differenzbetrag + FROM tblGesamtsicherheit gs + INNER JOIN tblGesamtsicherheitsPositionen gsp + ON gs.gs_gsId = gsp.gsp_gsId + WHERE gs.gs_gsnr = " & gs_gsnr & " + AND gs.gs_dakoyimport = 1 + GROUP BY gs.gs_gsnr" + + If gs_gsnr > 0 Then + Return CDbl((New SQL).getValueTxtBySql(SQL_Query, "AVISO",,, 0)) + Else + Return 0 + End If + + End Function + + End Class