mergekonfl.

Aviso/frmSendungsdetailsNEU.vb

@@ -407,8 +407,8 @@ Public Class frmSendungsdetailsNEU
                 '   ToolStripMenuItem13.Enabled = True
             End If
 
-            If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", Me) Then
-                Button19.Visible = True
+            If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ATEZ_NCTS", Me) Then
+                Button20.Visible = True
             End If
 
 
@@ -3067,6 +3067,8 @@ Public Class frmSendungsdetailsNEU
             initVermerke()
         ElseIf TabControl1.SelectedTab Is tbAnhang Then
             initAnhang()
+        ElseIf TabControl1.SelectedTab Is tbKundenInfo Then
+            initdgvATEZ()
         ElseIf TabControl1.SelectedTab Is tbKundenInfo Then
             Dim kdSrc As VERAG_PROG_ALLGEMEIN.KdSearchBox = txtAuftraggeber
             If kdSrc.KdNr_value <= 0 Then kdSrc = txtEmpfaenger
@@ -6276,30 +6278,31 @@ Public Class frmSendungsdetailsNEU
         Me.Cursor = Cursors.Default
     End Sub
 
-    Private Sub Button19_Click(sender As Object, e As EventArgs) Handles Button19.Click, ToolStripMenuItem12.Click
 
         cntxAPI.Show(Cursor.Position)
 
 
 
-        'If Not atez.setData(atezData, dgvAnhang) Then MsgBox("Fehler beim Erstellen der Daten")
-
-        'atez.SendRequestWithAuthHeader("application/json", failreDesc)
-
-        'If failreDesc <> "" Then
-        '    atezData.status = failreDesc
-        '    atezData.SAVE()
-        '    MsgBox(failreDesc)
-        'Else
-        '    atezData.status = "Sent"
-        '    atezData.SAVE()
-        'End If
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
 
     End Sub
 
-    Private Sub ToolStripMenuItem31_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem31.Click
-        'MsgBox("Funktion noch nicht implementiert!")
-        'Exit Sub
+    Private Sub Button20_Click_1(sender As Object, e As EventArgs) Handles Button20.Click
+        SAVE_ME()
+
+        Try
+            If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then
+                Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(CURRENT_INDEX)
+                Dim frmAttilaATEZNCTS = New frmATEZ_NCTS(AVISO, SND, Now.ToString("yy"))
+                frmAttilaATEZNCTS.Show(Me)
+            End If
+
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
+        Me.Cursor = Cursors.Default
 
         SAVE_ME()
         If Not IsNumeric(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) OrElse CInt(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) < 100000 Then MsgBox("Abfertigungsnummer angeben!") : Exit Sub
@@ -6345,4 +6348,5 @@ Public Class frmSendungsdetailsNEU
     End Sub
 
 
+    End Sub
 End Class