From ca608ec14176c02f6e8667857bdebe94f9e8c1df Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 19 Dec 2025 13:51:31 +0100 Subject: [PATCH] bugfix --- SDL/Fakturierung/cFakturierung.vb | 22 ++++++++++------------ VERAG_PROG_ALLGEMEIN/Classes/SQL.vb | 24 ++++++++++++------------ 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index b45ccb2f..f4551198 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -618,11 +618,8 @@ Public Class cFakturierung End If - 'MsgBox("Firma:" & RECHNUNG.Firma_ID & " - Land:" & "" & RECHNUNG.RechnungsLandKz & " - OffertenNr:" & RECHNUNG.OffertenNr & " - TXT: " & strText) - - Return strText @@ -2116,20 +2113,21 @@ Public Class cFakturierung rpt.lblRgDatumUeberschrift.Text = "Data nota credit:" End Select - Case "TR" 'Todo: bekomme noch die Übersetzungen dazu: 2025-12-18 + Case "TR" Select Case RECHNUNG.BelegartenKz Case "AR" - rpt.lblUeberschriftRG_GS.Text = "INVOICE" - rpt.lblSummeUeberschrift.Text = "Invoice Amount:" - rpt.lblRgNrUeberschrift.Text = "Invoice No.:" - rpt.lblRgDatumUeberschrift.Text = "Invoice Date:" + rpt.lblUeberschriftRG_GS.Text = "FATURA" + rpt.lblSummeUeberschrift.Text = "Fatura tutari:" + rpt.lblRgNrUeberschrift.Text = " Fatura nr.:" + rpt.lblRgDatumUeberschrift.Text = "Fatura thrihi:" Case "AG" - rpt.lblUeberschriftRG_GS.Text = "CREDIT NOTE" - rpt.lblSummeUeberschrift.Text = "Credit Amount:" - rpt.lblRgNrUeberschrift.Text = "Credit Note No.:" - rpt.lblRgDatumUeberschrift.Text = "Credit Note Date:" + rpt.lblUeberschriftRG_GS.Text = "KREDI" + rpt.lblSummeUeberschrift.Text = "Kredi tutari:" + rpt.lblRgNrUeberschrift.Text = "Kredi nr.:" + rpt.lblRgDatumUeberschrift.Text = "Kredi thrihi:" End Select + Case Else Select Case RECHNUNG.BelegartenKz Case "AR" diff --git a/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb b/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb index 0ece6e43..4e454b32 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb @@ -993,20 +993,20 @@ Public Class SQL Else cmd.ExecuteNonQuery() - 'If id <= 0 Then - ' Dim newcmd As New SqlCommand("SELECT CONVERT(int,isnull(@@IDENTITY,0))", conn) - ' id = CInt(newcmd.ExecuteScalar) - ' If id = 0 Then - ' Dim newcmd2 As New SqlCommand("SELECT CONVERT(int,isnull(SCOPE_IDENTITY(),0))", conn) - ' id = CInt(newcmd2.ExecuteScalar) - - ' End If - 'End If If id <= 0 Then - Using newcmd2 As New SqlCommand("SELECT CONVERT(int, ISNULL(SCOPE_IDENTITY(),0))", conn) - id = CInt(newcmd2.ExecuteScalar()) - End Using + Dim newcmd As New SqlCommand("SELECT CONVERT(int,isnull(@@IDENTITY,0))", conn) + id = CInt(newcmd.ExecuteScalar) + If id = 0 Then + Dim newcmd2 As New SqlCommand("SELECT CONVERT(int,isnull(SCOPE_IDENTITY(),0))", conn) + id = CInt(newcmd2.ExecuteScalar) + + End If End If + 'If id <= 0 Then + ' Using newcmd2 As New SqlCommand("SELECT CONVERT(int, ISNULL(SCOPE_IDENTITY(),0))", conn) + ' id = CInt(newcmd2.ExecuteScalar()) + ' End Using + 'End If End If 'Return True