From d3bfe37f961ae6283d9c891ce959812bbd159ddb Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 19 Aug 2025 08:28:07 +0200 Subject: [PATCH 1/2] bugfix --- SDL/Creditsafe/usrcntlVAT_ATEZ.vb | 2 +- SDL/Fakturierung/usrCntlFaktAbrechnung.vb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SDL/Creditsafe/usrcntlVAT_ATEZ.vb b/SDL/Creditsafe/usrcntlVAT_ATEZ.vb index 047305de..2c3f8e83 100644 --- a/SDL/Creditsafe/usrcntlVAT_ATEZ.vb +++ b/SDL/Creditsafe/usrcntlVAT_ATEZ.vb @@ -129,7 +129,7 @@ Public Class usrcntlVAT_ATEZ Next If dgvVAT.Rows(0).Cells("total_pages").Value <> pageCpunterCheck Then - lblLand.Text = "ACHTUNG, es wurden nur " & pageCpunterCheck & " von möglichen " & dgvVAT.Rows(0).Cells("total_pages").Value & " per KI ausgelesen, das kann uU zu fehlern beim Aufsplitten der Seiten führen!" + lblLand.Text = "ACHTUNG, es wurden nur " & pageCpunterCheck & " von möglichen " & dgvVAT.Rows(0).Cells("total_pages").Value & " Seiten per KI ausgelesen, das kann uU zu fehlern beim Aufsplitten der Seiten führen!" lblLand.ForeColor = Color.Red lblLand.Visible = True Else diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index 1cfbdf02..caa0429c 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -1186,7 +1186,7 @@ Public Class usrCntlFaktAbrechnung If FIRMA IsNot Nothing AndAlso FIRMA.Firma_ID = 19 AndAlso SPEDBUCH IsNot Nothing AndAlso SPEDBUCH.FilialenNr = 4817 Then landBez = CheckLandNr_getLandBezFromAntrag(landNr, antrag) Dim addFields As String = "" - Dim orderby As String = " AND MDM_Staffelpreis" + Dim orderby As String = "" If addFieldsBoolean Then addFields = ", MDM_Land as Land, MDM_RMC as RMC, MDM_Fremd as Fremd, MDM_VZ as VZ, MDM_Staffelpreis as Staffelpreis" From 1b2ab457a4e338ffae04f99caa48af63c40b48aa Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 19 Aug 2025 09:01:06 +0200 Subject: [PATCH 2/2] offert fix --- SDL/My Project/AssemblyInfo.vb | 4 ++-- VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index f116cdf5..8f4ace45 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb b/VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb index 692bee04..ad3a0647 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb @@ -245,7 +245,7 @@ Public Class cOfferte Case "RO" : leistBez = IIf(Not IsDBNull(r("LeistungsBez_RO")), r("LeistungsBez_RO"), "") Case "TR" : leistBez = IIf(Not IsDBNull(r("LeistungsBez_TR")), r("LeistungsBez_TR"), "") Case Else - P.LeistungsBez = r("LeistungsBez") + leistBez = r("LeistungsBez") End Select If leistBez.Length > 30 Then @@ -306,7 +306,7 @@ Public Class cOfferte Case "RO" : leistBez = r("LeistungsBez_RO") Case "TR" : leistBez = r("LeistungsBez_TR") Case Else - P.LeistungsBez = r("LeistungsBez") + leistBez = r("LeistungsBez") End Select If leistBez.Length > 30 Then @@ -433,7 +433,7 @@ Public Class cOffertPosition Property MDM_VZ As Object = Nothing Property MDM_RMC As Object = Nothing Property MDM_Fremd As Object = Nothing - Property MDM_Staffelpreis As Object = Nothing + Property MDM_Preisstaffel As Object = Nothing Dim SQL As New SQL @@ -505,14 +505,14 @@ Public Class cOffertPosition list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("MDM_VZ", MDM_VZ)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("MDM_RMC", MDM_RMC)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("MDM_Fremd", MDM_Fremd)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("MDM_Staffelpreis", MDM_Staffelpreis)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("MDM_Preisstaffel", MDM_Preisstaffel)) Return list End Function Public Function INSERT() As Boolean Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() - Return SQL.doSQLVarList(getInsertCmd, "FMZOLL", False, list) + Return SQL.doSQLVarList(getInsertCmd, "FMZOLL", True, list) End Function Public Function UPDATE(LEISTUNGSBEZ_ORG As String) As Boolean