From 13bbf904f751266680d825f50f26f0d47699e746 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 17 Feb 2026 10:35:20 +0100 Subject: [PATCH] RKSV, Kassenbucht, etc. --- SDL/Classes/cRKSV.vb | 9 ++++-- SDL/USTV/frmMDM_USTVAntrag.vb | 2 +- SDL/kassenbuch/frmKassenbuch.Designer.vb | 36 ++++++++++++------------ SDL/kassenbuch/frmKassenbuch.resx | 31 ++++++++++---------- SDL/kassenbuch/frmKassenbuch.vb | 16 ++++++----- 5 files changed, 50 insertions(+), 44 deletions(-) diff --git a/SDL/Classes/cRKSV.vb b/SDL/Classes/cRKSV.vb index 7006a145..77c8f400 100644 --- a/SDL/Classes/cRKSV.vb +++ b/SDL/Classes/cRKSV.vb @@ -2353,7 +2353,12 @@ Public Class cRKSV KBEntryEC.Konto = PERSONAL.KassenbuchNr End If - KBEntryEC.Buchungstext = "Umb. BK/KASSA" + Dim Buchungstext As String = "Umb.BK / KASSA" + if BELEG.ECZahlungsNr IsNot Nothing AndAlso BELEG.ECZahlungsNr <> "" Then + Buchungstext &= " " & BELEG.ECZahlungsNr + End If + + KBEntryEC.Buchungstext = Buchungstext KBEntryEC.Buchungsdatum = Now.ToShortDateString KBEntryEC.BelegDat = BELEG.BelegDat.ToShortDateString @@ -2473,7 +2478,7 @@ Public Class cRKSV End If - End Sub + End Sub Private Shared Sub getDEBDaten(ByRef Mandant As String, ByRef DebKonto As Integer, ByRef c_sprache As String, ByRef c_ustidnr As String, ByRef c_zahlziel As String, ByRef si_tage As Integer, ByRef dec_skonto As Integer, ByRef si_ntage As Integer, ByRef SkontoDatum As Date, ByRef Nettodatum As Date) diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 0cf73924..0090532c 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -4281,7 +4281,7 @@ Public Class frmMDM_USTVAntrag .ReferenceNumber = row.Cells("UStVPo_ReNr").Value, ' "25/000616354/987", .IssuingDate = CDate(row.Cells("UStVPo_ReDat").Value).ToString("yyyy-MM-dd"),'"2025-11-30", .GoodsDescription = goods, - .TransactionDescription = New TransactionDescription With {.TaxableAmount = Nettobetrag.ToString.Replace(",", "."), .VATAmount = row.Cells("UStVPo_USteuerbetrag").Value.ToString.Replace(",", ".")}, + .TransactionDescription = New TransactionDescription With {.TaxableAmount = Nothing, .VATAmount = row.Cells("UStVPo_USteuerbetrag").Value.ToString.Replace(",", ".")}, .Deduction = New Deduction With {.ProRataRate = "", .DeductibleVATAmount = row.Cells("UStVPo_USteuerbetrag").Value.ToString.Replace(",", ".")}, .EUSupplier = New Party With { .NameFree = LeistenderName,'"DKV EURO SERVICE GMBH + CO KG", diff --git a/SDL/kassenbuch/frmKassenbuch.Designer.vb b/SDL/kassenbuch/frmKassenbuch.Designer.vb index 4dbbf849..eb297dcd 100644 --- a/SDL/kassenbuch/frmKassenbuch.Designer.vb +++ b/SDL/kassenbuch/frmKassenbuch.Designer.vb @@ -130,7 +130,7 @@ Partial Class frmKassenbuch Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label5.ForeColor = System.Drawing.Color.White - Me.Label5.Location = New System.Drawing.Point(542, 31) + Me.Label5.Location = New System.Drawing.Point(603, 31) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(151, 20) Me.Label5.TabIndex = 1 @@ -184,7 +184,7 @@ Partial Class frmKassenbuch Me.DataGridView2.ReadOnly = True Me.DataGridView2.RowHeadersVisible = False Me.DataGridView2.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.DataGridView2.Size = New System.Drawing.Size(705, 145) + Me.DataGridView2.Size = New System.Drawing.Size(766, 145) Me.DataGridView2.TabIndex = 5 ' 'datVon @@ -266,7 +266,7 @@ Partial Class frmKassenbuch Me.FlatButton7.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.FlatButton7.ForeColor = System.Drawing.Color.Black Me.FlatButton7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.FlatButton7.Location = New System.Drawing.Point(654, 20) + Me.FlatButton7.Location = New System.Drawing.Point(688, 20) Me.FlatButton7.Name = "FlatButton7" Me.FlatButton7.Size = New System.Drawing.Size(41, 34) Me.FlatButton7.TabIndex = 0 @@ -307,7 +307,7 @@ Partial Class frmKassenbuch Me.Label9.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label9.ForeColor = System.Drawing.Color.White - Me.Label9.Location = New System.Drawing.Point(390, 9) + Me.Label9.Location = New System.Drawing.Point(451, 9) Me.Label9.Name = "Label9" Me.Label9.Size = New System.Drawing.Size(305, 20) Me.Label9.TabIndex = 9 @@ -419,7 +419,7 @@ Partial Class frmKassenbuch Me.Button5.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Button5.ForeColor = System.Drawing.Color.Black Me.Button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button5.Location = New System.Drawing.Point(436, 36) + Me.Button5.Location = New System.Drawing.Point(458, 36) Me.Button5.Name = "Button5" Me.Button5.Size = New System.Drawing.Size(184, 42) Me.Button5.TabIndex = 19 @@ -434,7 +434,7 @@ Partial Class frmKassenbuch Me.btnDGVBelege.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnDGVBelege.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnDGVBelege.ForeColor = System.Drawing.Color.White - Me.btnDGVBelege.Location = New System.Drawing.Point(373, 24) + Me.btnDGVBelege.Location = New System.Drawing.Point(407, 24) Me.btnDGVBelege.Name = "btnDGVBelege" Me.btnDGVBelege.Size = New System.Drawing.Size(98, 30) Me.btnDGVBelege.TabIndex = 418 @@ -448,7 +448,7 @@ Partial Class frmKassenbuch Me.btnDGVKassenbuch.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnDGVKassenbuch.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnDGVKassenbuch.ForeColor = System.Drawing.Color.DimGray - Me.btnDGVKassenbuch.Location = New System.Drawing.Point(477, 24) + Me.btnDGVKassenbuch.Location = New System.Drawing.Point(511, 24) Me.btnDGVKassenbuch.Name = "btnDGVKassenbuch" Me.btnDGVKassenbuch.Size = New System.Drawing.Size(112, 30) Me.btnDGVKassenbuch.TabIndex = 419 @@ -477,7 +477,7 @@ Partial Class frmKassenbuch Me.btnStorno.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnStorno.ForeColor = System.Drawing.Color.Black Me.btnStorno.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnStorno.Location = New System.Drawing.Point(436, 84) + Me.btnStorno.Location = New System.Drawing.Point(458, 84) Me.btnStorno.Name = "btnStorno" Me.btnStorno.Size = New System.Drawing.Size(184, 42) Me.btnStorno.TabIndex = 420 @@ -498,7 +498,7 @@ Partial Class frmKassenbuch Me.pnlTop.Dock = System.Windows.Forms.DockStyle.Top Me.pnlTop.Location = New System.Drawing.Point(0, 0) Me.pnlTop.Name = "pnlTop" - Me.pnlTop.Size = New System.Drawing.Size(707, 60) + Me.pnlTop.Size = New System.Drawing.Size(768, 60) Me.pnlTop.TabIndex = 421 ' 'Label15 @@ -526,7 +526,7 @@ Partial Class frmKassenbuch ' Me.Label7.AutoSize = True Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label7.Location = New System.Drawing.Point(433, 20) + Me.Label7.Location = New System.Drawing.Point(455, 20) Me.Label7.Name = "Label7" Me.Label7.Size = New System.Drawing.Size(58, 13) Me.Label7.TabIndex = 422 @@ -544,7 +544,7 @@ Partial Class frmKassenbuch Me.pnlSuche.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlSuche.Location = New System.Drawing.Point(0, 470) Me.pnlSuche.Name = "pnlSuche" - Me.pnlSuche.Size = New System.Drawing.Size(707, 205) + Me.pnlSuche.Size = New System.Drawing.Size(768, 205) Me.pnlSuche.TabIndex = 423 ' 'pnlSearch @@ -566,7 +566,7 @@ Partial Class frmKassenbuch Me.pnlSearch.Dock = System.Windows.Forms.DockStyle.Top Me.pnlSearch.Location = New System.Drawing.Point(0, 0) Me.pnlSearch.Name = "pnlSearch" - Me.pnlSearch.Size = New System.Drawing.Size(705, 58) + Me.pnlSearch.Size = New System.Drawing.Size(766, 58) Me.pnlSearch.TabIndex = 420 ' 'btnExcel @@ -574,7 +574,7 @@ Partial Class frmKassenbuch Me.btnExcel.BackgroundImage = Global.SDL.My.Resources.Resources.Excel_logo Me.btnExcel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center Me.btnExcel.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnExcel.Location = New System.Drawing.Point(607, 20) + Me.btnExcel.Location = New System.Drawing.Point(641, 20) Me.btnExcel.Name = "btnExcel" Me.btnExcel.Size = New System.Drawing.Size(41, 34) Me.btnExcel.TabIndex = 420 @@ -584,7 +584,7 @@ Partial Class frmKassenbuch ' Me.Label14.AutoSize = True Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label14.Location = New System.Drawing.Point(375, 8) + Me.Label14.Location = New System.Drawing.Point(409, 8) Me.Label14.Name = "Label14" Me.Label14.Size = New System.Drawing.Size(56, 13) Me.Label14.TabIndex = 1 @@ -624,7 +624,7 @@ Partial Class frmKassenbuch Me.pnlMain.Dock = System.Windows.Forms.DockStyle.Top Me.pnlMain.Location = New System.Drawing.Point(0, 60) Me.pnlMain.Name = "pnlMain" - Me.pnlMain.Size = New System.Drawing.Size(707, 410) + Me.pnlMain.Size = New System.Drawing.Size(768, 410) Me.pnlMain.TabIndex = 425 ' 'Button10 @@ -669,7 +669,7 @@ Partial Class frmKassenbuch Me.pnl.Controls.Add(Me.Button8) Me.pnl.Controls.Add(Me.cboKassen) Me.pnl.Controls.Add(Me.Label18) - Me.pnl.Location = New System.Drawing.Point(420, 132) + Me.pnl.Location = New System.Drawing.Point(442, 132) Me.pnl.Name = "pnl" Me.pnl.Size = New System.Drawing.Size(287, 223) Me.pnl.TabIndex = 430 @@ -799,7 +799,7 @@ Partial Class frmKassenbuch Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Button1.ForeColor = System.Drawing.Color.Black Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button1.Location = New System.Drawing.Point(436, 197) + Me.Button1.Location = New System.Drawing.Point(458, 197) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(260, 42) Me.Button1.TabIndex = 434 @@ -812,7 +812,7 @@ Partial Class frmKassenbuch Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(707, 675) + Me.ClientSize = New System.Drawing.Size(768, 675) Me.Controls.Add(Me.pnlSuche) Me.Controls.Add(Me.pnlMain) Me.Controls.Add(Me.pnlTop) diff --git a/SDL/kassenbuch/frmKassenbuch.resx b/SDL/kassenbuch/frmKassenbuch.resx index 0d69e8a8..66ac4fbc 100644 --- a/SDL/kassenbuch/frmKassenbuch.resx +++ b/SDL/kassenbuch/frmKassenbuch.resx @@ -121,26 +121,25 @@ iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAABVSURBVEhL7c0xDgAgCMVQ7n9pjJGxI8WF4X1NFyIz - R2E0YTRhNGE0YTRhNGE0YTRhNL3PfSbU7sE+tXuwT+2Hg4MwmjCaMJowmjCaMJowmjCaMHoyDu1ZWBna - hF7mAAAAAElFTkSuQmCC + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAABSSURBVEhL7c0xDgAgCMVQ7n9pjJGtK8WF4X1NFyIz + YxKCDcGGYEOwIdgQbAg2BBuC7X3uM6F2D/ap3YN9aj8cHIRgQ7Ah2BBsCDYEG4INwYZgO+1ZWBm2HQ2i + AAAAAElFTkSuQmCC - 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 diff --git a/SDL/kassenbuch/frmKassenbuch.vb b/SDL/kassenbuch/frmKassenbuch.vb index 30d65784..10835f01 100644 --- a/SDL/kassenbuch/frmKassenbuch.vb +++ b/SDL/kassenbuch/frmKassenbuch.vb @@ -190,9 +190,9 @@ Public Class frmKassenbuch If PERSONAL.isLeihgeldkasse Then lgTxt = ",[Fahrer],[Passnummer] " End If - .SET_SQL("SELECT b.rksv_BelegId, b.BelegDat,isnull(durchfuehrender_Benutzer,'') as kassiertDurch, CASE WHEN b.Belegart=1 THEN 'E' ELSE 'A' END as Belegart,CASE WHEN b.Beleg_TYP='E' THEN rksv_umsatz ELSE (SELECT sum( betrag ) FROM tblEABelegposition WHERE (b.BelegNr = tblEABelegposition.BelegNr) AND (b.BelegDat = tblEABelegposition.BelegDat) AND (b.Benutzer = tblEABelegposition.Benutzer) AND (b.Niederlassung = tblEABelegposition.Niederlassung) AND (b.Mandant = tblEABelegposition.Mandant ) ) END as Betrag, b.Ordnungsbegriff, b.BelegNr, b.Frachtführer, " & - " CASE WHEN b.storniert=1 THEN 'JA' ELSE '' END as [storniert], b.Beleg_TYP ,b.Benutzer " & benutzerBezTMP & lgTxt & - " FROM tblEABelegnummer as b WHERE b.Mandant='" & PERSONAL.Mandant & "' AND b.Niederlassung='" & PERSONAL.Niederlassung & "' " & benutzerTMP & " AND BelegDat BETWEEN '" & datVon.Value.ToShortDateString & "' AND '" & datBis.Value.ToShortDateString & "' " & + .SET_SQL("SELECT b.rksv_BelegId, b.BelegDat, CASE WHEN b.Belegart=1 THEN 'E' ELSE 'A' END as Belegart,CASE WHEN b.Beleg_TYP='E' THEN rksv_umsatz ELSE (SELECT sum( betrag ) FROM tblEABelegposition WHERE (b.BelegNr = tblEABelegposition.BelegNr) AND (b.BelegDat = tblEABelegposition.BelegDat) AND (b.Benutzer = tblEABelegposition.Benutzer) AND (b.Niederlassung = tblEABelegposition.Niederlassung) AND (b.Mandant = tblEABelegposition.Mandant ) ) END as Betrag, b.Ordnungsbegriff, b.BelegNr, b.Frachtführer, " & + " CASE WHEN b.storniert=1 THEN 'JA' ELSE '' END as [storniert], b.Beleg_TYP ,b.Benutzer " & benutzerBezTMP & lgTxt & ", b.ECZahlungsPerAPI as EC,b.ECZahlungsNr as ECNr, mit_username as kassiert" & + " FROM tblEABelegnummer as b LEFT JOIN " & VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & " .[ADMIN].[dbo].[tblMitarbeiter] on durchfuehrender_Benutzer = mit_id WHERE b.Mandant='" & PERSONAL.Mandant & "' AND b.Niederlassung='" & PERSONAL.Niederlassung & "' " & benutzerTMP & " AND BelegDat BETWEEN '" & datVon.Value.ToShortDateString & "' AND '" & datBis.Value.ToShortDateString & "' " & " ORDER BY b.rksv_BelegId DESC, b.[upsize_ts] desc;", "FMZOLL") ' .DataSource = SQL.loadDgvBySql("SELECT b.rksv_BelegId, b.BelegDat, CASE WHEN b.Belegart=1 THEN 'E' ELSE 'A' END as Belegart,CASE WHEN b.Beleg_TYP='E' THEN rksv_umsatz ELSE (SELECT sum( betrag ) FROM tblEABelegposition WHERE (b.BelegNr = tblEABelegposition.BelegNr) AND (b.BelegDat = tblEABelegposition.BelegDat) AND (b.Benutzer = tblEABelegposition.Benutzer) AND (b.Niederlassung = tblEABelegposition.Niederlassung) AND (b.Mandant = tblEABelegposition.Mandant ) ) END as Betrag, b.Ordnungsbegriff, b.BelegNr, b.Frachtführer, " & ' " CASE WHEN b.storniert=1 THEN 'JA' ELSE '' END as [storniert], b.Beleg_TYP ,b.Benutzer " & benutzerBezTMP & @@ -220,8 +220,10 @@ Public Class frmKassenbuch .Columns("Beleg_TYP").Visible = False .Columns("storniert").HeaderText = "Storn." .Columns("storniert").Width = 45 + .Columns("EC").Width = 45 + .Columns("ECNr").Width = 60 .Columns("Benutzer").Visible = False - .Columns("kassiertDurch").Visible = False + '.Columns("kassiert").Visible = False If PERSONAL.isLeihgeldkasse Then .Columns("Fahrer").Visible = False @@ -253,8 +255,8 @@ Public Class frmKassenbuch End If - .SET_SQL("SELECT [JournalNr],[BelegDat],[BelegNr],isnull(durchfuehrender_Benutzer,'') as kassiertDurch,CASE WHEN Belegart=1 THEN 'E' ELSE 'A' END as Belegart,[Buchungstext],tblKassenbuch.Finanzwege as FW ,([Betrag]+[Steuerbetrag]) as Brutto,[Konto],[Soll],[Haben],Steuerbetrag as Steuer,tblKassenbuch.Benutzer " & - " FROM Personal INNER JOIN tblKassenbuch ON Personal.ID = tblKassenbuch.Benutzer " & + .SET_SQL("SELECT [JournalNr],[BelegDat],[BelegNr],CASE WHEN Belegart=1 THEN 'E' ELSE 'A' END as Belegart,[Buchungstext],tblKassenbuch.Finanzwege as FW ,([Betrag]+[Steuerbetrag]) as Brutto,[Konto],[Soll],[Haben],Steuerbetrag as Steuer,tblKassenbuch.Benutzer, mit_username as kassiert " & + " FROM Personal INNER JOIN tblKassenbuch ON Personal.ID = tblKassenbuch.Benutzer LEFT JOIN " & VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & " .[ADMIN].[dbo].[tblMitarbeiter] on durchfuehrender_Benutzer = mit_id" & " WHERE tblKassenbuch.Mandant='" & PERSONAL.Mandant & "' AND tblKassenbuch.Niederlassung='" & PERSONAL.Niederlassung & "' " & " " & benutzerTMP & " AND BelegDat BETWEEN '" & datVon.Value.ToShortDateString & "' AND '" & datBis.Value.ToShortDateString & "' ORDER BY JournalNr DESC", "FMZOLL") @@ -288,7 +290,7 @@ Public Class frmKassenbuch .Columns("Steuer").Width = 60 .Columns("Steuer").DefaultCellStyle.Format = "C" .Columns("Benutzer").Visible = False - .Columns("kassiertDurch").Visible = False + '.Columns("kassiert").Visible = False End If End With