mergeconfl.

This commit is contained in:
2023-09-08 13:35:01 +02:00

View File

@@ -5916,7 +5916,7 @@ Public Class frmSendungsdetailsNEU
Dim f As New frmAvisoWeiterleiten("S", AvisoId, VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID) '--> Weitereliten Dim f As New frmAvisoWeiterleiten("S", AvisoId, VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID) '--> Weitereliten
If f.ShowDialog(Me) = DialogResult.OK Then If f.ShowDialog(Me) = DialogResult.OK Then
Me.Close() Me.Close()
End If End If
@@ -6278,6 +6278,29 @@ Public Class frmSendungsdetailsNEU
Me.Cursor = Cursors.Default Me.Cursor = Cursors.Default
End Sub End Sub
Private Sub Button20_Click_1(sender As Object, e As EventArgs) Handles Button20.Click
SAVE_ME()
cntxAPI.Show(Cursor.Position)
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
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
End Try
End Sub
Private Sub Button20_Click_1(sender As Object, e As EventArgs) Handles Button20.Click Private Sub Button20_Click_1(sender As Object, e As EventArgs) Handles Button20.Click
SAVE_ME() SAVE_ME()
@@ -6336,7 +6359,7 @@ Public Class frmSendungsdetailsNEU
Me.Cursor = Cursors.Default Me.Cursor = Cursors.Default
End Sub End Sub
Sub initdgvATEZ() Sub initdgvATEZ()
With dgvATEZNCTS With dgvATEZNCTS
.Columns.Clear() .Columns.Clear()
.ReadOnly = False .ReadOnly = False
@@ -6367,14 +6390,10 @@ Public Class frmSendungsdetailsNEU
Private Sub dgvATEZNCTS_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvATEZNCTS.CellDoubleClick Private Sub dgvATEZNCTS_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvATEZNCTS.CellDoubleClick
Try Try
Me.Cursor = Cursors.WaitCursor
If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then
Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(0) Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(CURRENT_INDEX)
Dim frmAttilaATEZNCTS = New frmATEZ_NCTS(AVISO, SND, Now.ToString("yy"))
Dim frmAttilaATEZNCTS = New frmATEZ_NCTS(dgvATEZNCTS.SelectedRows(0).Cells("Id").Value, AVISO, SND, Now.ToString("yy"))
frmAttilaATEZNCTS.Show(Me) frmAttilaATEZNCTS.Show(Me)
Me.Refresh()
End If End If