From cd45295d63d6b9c2ae04d233e7fe10dc127c46ba Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 13 Jan 2026 16:37:10 +0100 Subject: [PATCH] Leihgeld, etc. --- SDL/Classes/cRKSV.vb | 5 +- .../BelegReports/rptLeihgeldBeleg.Designer.vb | 59 ++++++++++--------- SDL/kassenbuch/frmBelegNeu.vb | 2 +- SDL/kassenbuch/frmNacherfassungLeihgeld.vb | 3 +- 4 files changed, 35 insertions(+), 34 deletions(-) diff --git a/SDL/Classes/cRKSV.vb b/SDL/Classes/cRKSV.vb index 8453e854..cc136193 100644 --- a/SDL/Classes/cRKSV.vb +++ b/SDL/Classes/cRKSV.vb @@ -1339,15 +1339,16 @@ Public Class cRKSV If PERSONAL.isLeihgeldkasse AndAlso BELEG.Niederlassung = "SUA" Then - Dim fontAtilla As New Font("Arial", 14, FontStyle.Bold) + Dim fontAtilla As New Font("Arial", 12, FontStyle.Bold) rpt.lblFahrer.Font = fontAtilla - rpt.lblFahrer2.Font = fontAtilla + rpt.txtFrachtfuhrer.Font = fontAtilla rpt.lblLKWKz.Font = fontAtilla rpt.lblPassnummer.Font = fontAtilla rpt.Label12.Font = fontAtilla rpt.Label15.Font = fontAtilla rpt.Label14.Font = fontAtilla + rpt.Label7.Font = fontAtilla End If diff --git a/SDL/kassenbuch/BelegReports/rptLeihgeldBeleg.Designer.vb b/SDL/kassenbuch/BelegReports/rptLeihgeldBeleg.Designer.vb index 0be3f944..3afe615f 100644 --- a/SDL/kassenbuch/BelegReports/rptLeihgeldBeleg.Designer.vb +++ b/SDL/kassenbuch/BelegReports/rptLeihgeldBeleg.Designer.vb @@ -440,24 +440,24 @@ Partial Public Class rptLeihgeldBeleg ' Me.Label12.Height = 0.1968501! Me.Label12.HyperLink = Nothing - Me.Label12.Left = 0.01732284! + Me.Label12.Left = 0.01023622! Me.Label12.Name = "Label12" Me.Label12.Style = "font-size: 10pt; font-weight: normal; text-align: left" Me.Label12.Text = "Fahrer:" - Me.Label12.Top = 3.478741! - Me.Label12.Width = 1.28937! + Me.Label12.Top = 3.572441! + Me.Label12.Width = 1.76811! ' 'lblFahrer ' Me.lblFahrer.DataField = "" Me.lblFahrer.Height = 0.1968501! Me.lblFahrer.HyperLink = Nothing - Me.lblFahrer.Left = 1.49252! + Me.lblFahrer.Left = 1.833465! Me.lblFahrer.Name = "lblFahrer" Me.lblFahrer.Style = "color: Black; font-size: 12pt; font-weight: normal; text-align: left" Me.lblFahrer.Text = "-" - Me.lblFahrer.Top = 3.478741! - Me.lblFahrer.Width = 3.756299! + Me.lblFahrer.Top = 3.572441! + Me.lblFahrer.Width = 3.408268! ' 'lblFrachtf ' @@ -472,49 +472,50 @@ Partial Public Class rptLeihgeldBeleg ' 'Label15 ' + Me.Label15.DataField = "" Me.Label15.Height = 0.1968501! Me.Label15.HyperLink = Nothing - Me.Label15.Left = 0.01732286! + Me.Label15.Left = 0.01023625! Me.Label15.Name = "Label15" - Me.Label15.Style = "font-size: 10pt; font-weight: normal; text-align: left" + Me.Label15.Style = "color: Black; font-size: 10pt; font-weight: normal; text-align: left" Me.Label15.Text = "LKW-Kennzeichen:" - Me.Label15.Top = 3.28189! - Me.Label15.Width = 1.28937! + Me.Label15.Top = 3.323622! + Me.Label15.Width = 1.76811! ' 'lblLKWKz ' Me.lblLKWKz.DataField = "" Me.lblLKWKz.Height = 0.1968501! Me.lblLKWKz.HyperLink = Nothing - Me.lblLKWKz.Left = 1.49252! + Me.lblLKWKz.Left = 1.833465! Me.lblLKWKz.Name = "lblLKWKz" Me.lblLKWKz.Style = "color: Black; font-size: 12pt; font-weight: normal; text-align: left" Me.lblLKWKz.Text = "-" - Me.lblLKWKz.Top = 3.28189! - Me.lblLKWKz.Width = 3.756299! + Me.lblLKWKz.Top = 3.323622! + Me.lblLKWKz.Width = 3.408268! ' 'Label14 ' Me.Label14.Height = 0.1968501! Me.Label14.HyperLink = Nothing - Me.Label14.Left = 0.01732284! + Me.Label14.Left = 0! Me.Label14.Name = "Label14" Me.Label14.Style = "font-size: 10pt; font-weight: normal; text-align: left" Me.Label14.Text = "Passnummer:" - Me.Label14.Top = 3.675591! - Me.Label14.Width = 1.28937! + Me.Label14.Top = 3.852756! + Me.Label14.Width = 1.76811! ' 'lblPassnummer ' Me.lblPassnummer.DataField = "" Me.lblPassnummer.Height = 0.1968501! Me.lblPassnummer.HyperLink = Nothing - Me.lblPassnummer.Left = 1.49252! + Me.lblPassnummer.Left = 1.823228! Me.lblPassnummer.Name = "lblPassnummer" Me.lblPassnummer.Style = "color: Black; font-size: 12pt; font-weight: normal; text-align: left" Me.lblPassnummer.Text = "-" - Me.lblPassnummer.Top = 3.675591! - Me.lblPassnummer.Width = 3.756299! + Me.lblPassnummer.Top = 3.852756! + Me.lblPassnummer.Width = 3.408268! ' 'Label20 ' @@ -525,13 +526,13 @@ Partial Public Class rptLeihgeldBeleg Me.Label20.Style = "font-size: 10pt; font-weight: normal; text-align: left" Me.Label20.Text = "UID-Nr.:" Me.Label20.Top = 2.726772! - Me.Label20.Width = 1.28937! + Me.Label20.Width = 1.609055! ' 'lblUID ' Me.lblUID.Height = 0.1968501! Me.lblUID.HyperLink = Nothing - Me.lblUID.Left = 1.49252! + Me.lblUID.Left = 1.788583! Me.lblUID.Name = "lblUID" Me.lblUID.Style = "font-size: 10pt; font-weight: normal; text-align: left" Me.lblUID.Text = "-" @@ -609,24 +610,24 @@ Partial Public Class rptLeihgeldBeleg ' 'txtFrachtfuhrer ' - Me.txtFrachtfuhrer.Height = 0.148031! - Me.txtFrachtfuhrer.Left = 1.49252! + Me.txtFrachtfuhrer.Height = 0.2000005! + Me.txtFrachtfuhrer.Left = 1.788583! Me.txtFrachtfuhrer.Name = "txtFrachtfuhrer" Me.txtFrachtfuhrer.Style = "font-size: 12pt" Me.txtFrachtfuhrer.Text = Nothing - Me.txtFrachtfuhrer.Top = 3.07008! - Me.txtFrachtfuhrer.Width = 3.756299! + Me.txtFrachtfuhrer.Top = 3.018111! + Me.txtFrachtfuhrer.Width = 3.991339! ' 'Label7 ' - Me.Label7.Height = 0.148031! + Me.Label7.Height = 0.2000005! Me.Label7.HyperLink = Nothing Me.Label7.Left = 0.02047244! Me.Label7.Name = "Label7" Me.Label7.Style = "font-size: 10pt; font-weight: bold; text-align: left" Me.Label7.Text = "Frächter:" - Me.Label7.Top = 3.07008! - Me.Label7.Width = 1.28937! + Me.Label7.Top = 3.018111! + Me.Label7.Width = 1.76811! ' 'Label13 ' @@ -946,7 +947,7 @@ Partial Public Class rptLeihgeldBeleg Public WithEvents lblFahrer2 As GrapeCity.ActiveReports.SectionReportModel.TextBox Public WithEvents lblFirma As GrapeCity.ActiveReports.SectionReportModel.TextBox Public WithEvents lblKbNr As GrapeCity.ActiveReports.SectionReportModel.Label - Private WithEvents Label7 As GrapeCity.ActiveReports.SectionReportModel.Label + Public WithEvents Label7 As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents txtFrachtfuhrer As GrapeCity.ActiveReports.SectionReportModel.TextBox Private WithEvents Label10 As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents lblKdNr As GrapeCity.ActiveReports.SectionReportModel.Label diff --git a/SDL/kassenbuch/frmBelegNeu.vb b/SDL/kassenbuch/frmBelegNeu.vb index d2a6429e..373cbb04 100644 --- a/SDL/kassenbuch/frmBelegNeu.vb +++ b/SDL/kassenbuch/frmBelegNeu.vb @@ -330,7 +330,7 @@ Public Class frmBelegNeu ' btnNeueAbfNr.Visible = True If PERSONAL.isLeihgeldkasse Then - cboFiliale.changeItem(4806) + cboFiliale.changeItem(4813) Else cboFiliale.changeItem(4801) End If diff --git a/SDL/kassenbuch/frmNacherfassungLeihgeld.vb b/SDL/kassenbuch/frmNacherfassungLeihgeld.vb index 8c2bac3e..d15b8a30 100644 --- a/SDL/kassenbuch/frmNacherfassungLeihgeld.vb +++ b/SDL/kassenbuch/frmNacherfassungLeihgeld.vb @@ -591,8 +591,7 @@ Public Class frmNacherfassungLeihgeld Dim OFFERTE As New VERAG_PROG_ALLGEMEIN.cOfferte(KdNr, OffertenNr, True) RG.LOAD_OFFERT_POSITIONEN() ' --> OFFERTE MIT ANZAHL >0 und Preis >0 - - allPos(RG, OFFERTE, 110, summeBRUTTO, summeNETTO, (summeBRUTTO - summeNETTO), " (" & BARBELEG.LKW_Kennzeichen & " " & BARBELEG.Fahrer & ")") + allPos(RG, OFFERTE, 110, summeBRUTTO, summeNETTO, (summeBRUTTO - summeNETTO), "Leihgeldauszahlung (" & BARBELEG.LKW_Kennzeichen & " " & BARBELEG.Fahrer & ")") Dim dtSt As DataTable = SQL.loadDgvBySql("SELECT TOP 1 isnull([Steuersatz %],0),isnull([Steuerbezeichnung],'') FROM [Steuertabelle] WHERE [Steuerschlüssel]='" & RG.Steuerschlüssel & "'", "FMZOLL") If dtSt IsNot Nothing AndAlso dtSt.Rows.Count > 0 Then