Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024

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
 
 
@@ -2125,20 +2122,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.lblUeberschriftRG_GS.Text = "FATURA"
-                        rpt.lblSummeUeberschrift.Text = "Invoice Amount:"
+                        rpt.lblSummeUeberschrift.Text = "Fatura tutari:"
-                        rpt.lblRgNrUeberschrift.Text = "Invoice No.:"
+                        rpt.lblRgNrUeberschrift.Text = " Fatura nr.:"
-                        rpt.lblRgDatumUeberschrift.Text = "Invoice Date:"
+                        rpt.lblRgDatumUeberschrift.Text = "Fatura thrihi:"
                     Case "AG"
-                        rpt.lblUeberschriftRG_GS.Text = "CREDIT NOTE"
+                        rpt.lblUeberschriftRG_GS.Text = "KREDI"
-                        rpt.lblSummeUeberschrift.Text = "Credit Amount:"
+                        rpt.lblSummeUeberschrift.Text = "Kredi tutari:"
-                        rpt.lblRgNrUeberschrift.Text = "Credit Note No.:"
+                        rpt.lblRgNrUeberschrift.Text = "Kredi nr.:"
-                        rpt.lblRgDatumUeberschrift.Text = "Credit Note Date:"
+                        rpt.lblRgDatumUeberschrift.Text = "Kredi thrihi:"
                 End Select
 
+
             Case Else
                 Select Case RECHNUNG.BelegartenKz
                     Case "AR"

SDL/mdm/usrcntlFremdrechnungen.Designer.vb

@@ -39,6 +39,7 @@ Partial Class usrcntlFremdrechnungen
         Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.KundenblattAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.cbxTest = New System.Windows.Forms.CheckBox()
         Me.Label7 = New System.Windows.Forms.Label()
         Me.txtKundenNrbis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtKundenNrvon = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -69,7 +70,6 @@ Partial Class usrcntlFremdrechnungen
         Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.cbxTest = New System.Windows.Forms.CheckBox()
         Me.FlowLayoutPanel.SuspendLayout()
         Me.ContextMenuStrip1.SuspendLayout()
         Me.Panel1.SuspendLayout()
@@ -311,6 +311,17 @@ Partial Class usrcntlFremdrechnungen
         Me.Panel1.Size = New System.Drawing.Size(260, 907)
         Me.Panel1.TabIndex = 23
         '
+        'cbxTest
+        '
+        Me.cbxTest.AutoSize = True
+        Me.cbxTest.Location = New System.Drawing.Point(146, 214)
+        Me.cbxTest.Name = "cbxTest"
+        Me.cbxTest.Size = New System.Drawing.Size(61, 17)
+        Me.cbxTest.TabIndex = 61
+        Me.cbxTest.Text = "testmail"
+        Me.cbxTest.UseVisualStyleBackColor = True
+        Me.cbxTest.Visible = False
+        '
         'Label7
         '
         Me.Label7.AutoSize = True
@@ -388,7 +399,7 @@ Partial Class usrcntlFremdrechnungen
         'Label5
         '
         Me.Label5.AutoSize = True
-        Me.Label5.Location = New System.Drawing.Point(4, 20)
+        Me.Label5.Location = New System.Drawing.Point(3, 20)
         Me.Label5.Name = "Label5"
         Me.Label5.Size = New System.Drawing.Size(76, 13)
         Me.Label5.TabIndex = 55
@@ -657,17 +668,6 @@ Partial Class usrcntlFremdrechnungen
         Me.ContextMenuStrip2.Name = "ContextMenuStrip2"
         Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4)
         '
-        'cbxTest
-        '
-        Me.cbxTest.AutoSize = True
-        Me.cbxTest.Location = New System.Drawing.Point(146, 214)
-        Me.cbxTest.Name = "cbxTest"
-        Me.cbxTest.Size = New System.Drawing.Size(61, 17)
-        Me.cbxTest.TabIndex = 61
-        Me.cbxTest.Text = "testmail"
-        Me.cbxTest.UseVisualStyleBackColor = True
-        Me.cbxTest.Visible = False
-        '
         'usrcntlFremdrechnungen
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

VERAG_PROG_ALLGEMEIN/Classes/SQL.vb

@@ -993,21 +993,21 @@ 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)
+                        Dim newcmd As New SqlCommand("SELECT CONVERT(int,isnull(@@IDENTITY,0))", conn)
-                            id = CInt(newcmd2.ExecuteScalar())
+                        id = CInt(newcmd.ExecuteScalar)
-                        End Using
+                        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
             End Using