USTVA, Summenberechnung USTVA, , etc.

This commit is contained in:
2024-10-22 13:05:11 +02:00
parent f6de85f515
commit 4f7ac17921
10 changed files with 395 additions and 193 deletions

View File

@@ -1812,7 +1812,7 @@ Public Class frmKundenblatt
.DataSource = SQL.loadDgvBySql("SELECT [KundenNr] as KdNr,[Datum] as Datum,[Rechnung] as Nummer,[Saldo] as Betrag,'-' as [OP-Saldo],'EUR' as Währung ,'-' as [KumSaldoEUR],[Buchungstext] " &
" FROM [Offene_Posten_DVO] " &
" WHERE KundenNr='" & KUNDE.KundenNrZentrale & "' " & where & " order BY datum, [OP_ID] DESC", "FMZOLL")
" WHERE KundenNr='" & KUNDE.KundenNrZentrale & "' " & where & " order BY datum DESC, [OP_ID] DESC", "FMZOLL")
If .Columns.Count > 0 Then
.Columns("KdNr").Visible = False
@@ -1896,14 +1896,18 @@ Public Class frmKundenblatt
If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_FirmenDatenAnzeige Is Nothing Then Exit Sub
If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_FirmenDatenAnzeige = "" Then Exit Sub
Dim where = ""
Dim sort = "OP_ID DESC /*, Belegdatum DESC*/"
If cboFirmaFMZOLL._value <> "" Then
where = " AND Firma_ID=" & cboFirmaFMZOLL._value
If cboFirmaFMZOLL._value = "19" Then
sort = "Belegdatum ASC"
End If
Else
where = If(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_FirmenDatenAnzeige.contains("A"), "", " AND Firma_ID IN(" & VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_FirmenDatenAnzeige & ")")
End If
.DataSource = SQL.loadDgvBySql("SELECT [Kontonummer] as KdNr,[Belegdatum] as Datum,[Belegnummer] as Nummer,[Bruttobetrag] as Betrag,[Gesamtausstand] as [OP-Saldo],[Waehrung] as 'Währ.',[KumSaldoEUR],[Mahnstufe] as M, [Fälligkeitsdatum] as 'fällig am' ,[Buchungstext] as Referenz " &
" FROM [Offene Posten] " &
" WHERE [Kontonummer]='" & KUNDE.KundenNrZentrale & "' " & where & " ORDER BY OP_ID DESC /*, Belegdatum DESC*/", "FMZOLL")
" WHERE [Kontonummer]='" & KUNDE.KundenNrZentrale & "' " & where & " ORDER BY " & sort, "FMZOLL")
If .DataSource Is Nothing Then Exit Sub