edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andreas Luxbauer
2025-12-22 08:52:38 +01:00
parent a7184c9c2a ca608ec141
commit 78cd18ec3f
3 changed files with 35 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
SDL/Fakturierung/cFakturierung.vb
View File

@@ -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.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"

26
SDL/mdm/usrcntlFremdrechnungen.Designer.vb generated
View File

@@ -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!)

24
VERAG_PROG_ALLGEMEIN/Classes/SQL.vb
View File

@@ -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