Merge branch 'newMaster2024' of https://dev.azure.com/VeragAG/_git/SDL into newMaster2024

SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EXGestellung/usrCntlATLAS_EXGestellung.vb

@@ -56,7 +56,8 @@ Public Class usrCntlATLAS_EXGestellung
                 'Case "NKD" : txtDyNiederlassung.Text = "IMEX"
                 'End Select 
             Case "ATILLA" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "SUW"
-            Case "UNISPED" : txtDyMandant.Text = "UNAT" : txtDyNiederlassung.Text = "SUB"'"ATSPED"
+            Case "UNISPED" : txtDyMandant.Text = "UNAT" : txtDyNiederlassung.Text = "SUB" '"ATSPED" 
+                cbxNCTS.Checked = False
             Case "IMEX" : txtDyMandant.Text = "IMEX" : txtDyNiederlassung.Text = "IME"
             Case "AMBAR" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "AMBWO"
         End Select
@@ -129,12 +130,13 @@ Public Class usrCntlATLAS_EXGestellung
                 Dim NCTS_OUT As New DAKOSY_Worker.cDakosyNCTSOut004
 
                 Dim f As New frmDakosyStammreferenz("DE", "NCTS", False,,, FIRMA_DY)
-                    Dim Stammreferenz = Nothing
+                Dim Stammreferenz = Nothing
-                    If f.ShowDialog(Me) Then
+                f.selectForEXG = True
-                        Stammreferenz = f.STAMMREF
+                If f.ShowDialog(Me.FindForm) Then
-                        sentToDakosy = f.sentToDakosy
+                    Stammreferenz = f.STAMMREF
-                    End If
+                    sentToDakosy = f.sentToDakosy
-                    Try
+                End If
+                Try
 
                     BezugsNr = usrCntlATLAS_NCTS004.getBezugsnr(FIRMA_DY, SENDUNG, BezugsNr, "")
                     lblBezugsnummer.Text = BezugsNr

SDL/ZOLLSYSTEM/DAKOSY/Stammreferenz/frmDakosyStammreferenz.Designer.vb

@@ -38,6 +38,7 @@ Partial Class frmDakosyStammreferenz
         Me.txtSearch = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.Label5 = New System.Windows.Forms.Label()
         Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.Button2 = New System.Windows.Forms.Button()
         CType(Me.dgvStammref, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
@@ -46,7 +47,7 @@ Partial Class frmDakosyStammreferenz
         '
         Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK
         Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnOK.Image = Global.SDL.My.Resources.android_note12
+        Me.btnOK.Image = Global.SDL.My.Resources.Resources.android_note12
         Me.btnOK.ImageAlign = System.Drawing.ContentAlignment.TopCenter
         Me.btnOK.Location = New System.Drawing.Point(386, 581)
         Me.btnOK.Name = "btnOK"
@@ -139,7 +140,7 @@ Partial Class frmDakosyStammreferenz
         '
         Me.Button1.DialogResult = System.Windows.Forms.DialogResult.OK
         Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button1.Image = Global.SDL.My.Resources.dakosy1
+        Me.Button1.Image = Global.SDL.My.Resources.Resources.dakosy1
         Me.Button1.ImageAlign = System.Drawing.ContentAlignment.TopCenter
         Me.Button1.Location = New System.Drawing.Point(588, 581)
         Me.Button1.Name = "Button1"
@@ -172,12 +173,15 @@ Partial Class frmDakosyStammreferenz
         Me.txtSearch._DateTimeOnly = False
         Me.txtSearch._numbersOnly = False
         Me.txtSearch._numbersOnlyKommastellen = ""
+        Me.txtSearch._numbersOnlyTrennzeichen = True
         Me.txtSearch._Prozent = False
         Me.txtSearch._ShortDateNew = False
         Me.txtSearch._ShortDateOnly = False
         Me.txtSearch._TimeOnly = False
+        Me.txtSearch._TimeOnly_Seconds = False
         Me.txtSearch._value = ""
         Me.txtSearch._Waehrung = False
+        Me.txtSearch._WaehrungZeichen = True
         Me.txtSearch.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.txtSearch.BackColor = System.Drawing.SystemColors.Info
@@ -219,12 +223,29 @@ Partial Class frmDakosyStammreferenz
         Me.MyDatagridview1.Size = New System.Drawing.Size(773, 196)
         Me.MyDatagridview1.TabIndex = 27
         '
+        'Button2
+        '
+        Me.Button2.DialogResult = System.Windows.Forms.DialogResult.OK
+        Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button2.Image = Global.SDL.My.Resources.Resources.android_note12
+        Me.Button2.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+        Me.Button2.Location = New System.Drawing.Point(12, 581)
+        Me.Button2.Name = "Button2"
+        Me.Button2.Padding = New System.Windows.Forms.Padding(0, 8, 0, 0)
+        Me.Button2.Size = New System.Drawing.Size(197, 61)
+        Me.Button2.TabIndex = 28
+        Me.Button2.Text = "Auswählen (leer = Standard)"
+        Me.Button2.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+        Me.Button2.UseVisualStyleBackColor = True
+        Me.Button2.Visible = False
+        '
         'frmDakosyStammreferenz
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.White
         Me.ClientSize = New System.Drawing.Size(797, 654)
+        Me.Controls.Add(Me.Button2)
         Me.Controls.Add(Me.Label5)
         Me.Controls.Add(Me.MyDatagridview1)
         Me.Controls.Add(Me.txtSearch)
@@ -263,4 +284,5 @@ Partial Class frmDakosyStammreferenz
     Friend WithEvents txtSearch As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents Label5 As System.Windows.Forms.Label
     Friend WithEvents MyDatagridview1 As VERAG_PROG_ALLGEMEIN.MyDatagridview
+    Friend WithEvents Button2 As Button
 End Class

SDL/ZOLLSYSTEM/DAKOSY/Stammreferenz/frmDakosyStammreferenz.vb

@@ -10,6 +10,7 @@
     Dim freetoselect = False
     Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
 
+    Public selectForEXG As Boolean = False
     Dim SelectNL = False
     Dim FIRMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
 
@@ -75,6 +76,13 @@
         If Kdnr IsNot Nothing AndAlso IsNumeric(Kdnr) Then
             txtSearch.Text = Kdnr
         End If
+
+        If selectForEXG Then
+            Button2.Visible = True
+            btnOK.Visible = False
+            Button1.Visible = False
+        End If
+
     End Sub
 
     Private Sub cboVerfahren_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboVerfahren.SelectedIndexChanged, cboLand.SelectedIndexChanged