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

mergeconf-Auflösung

Browse Source
This commit is contained in:
d.breimaier
2023-08-21 16:16:29 +02:00
parent 6f5ff75024
commit c60d7a41d9
2 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Aviso/usrcntlAktDetailsATILLANeu.Designer.vb generated
View File

@@ -1,9 +1,9 @@
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
Partial Class usrcntlAktDetailsATILLANeu
Inherits System.Windows.Forms.UserControl
'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
<System.Diagnostics.DebuggerNonUserCode()> _
<System.Diagnostics.DebuggerNonUserCode()>
Protected Overrides Sub Dispose(ByVal disposing As Boolean)
Try
If disposing AndAlso components IsNot Nothing Then
@@ -20,7 +20,7 @@ Partial Class usrcntlAktDetailsATILLANeu
'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _
<System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
@@ -1728,20 +1728,16 @@ Partial Class usrcntlAktDetailsATILLANeu
Me.AusZwischenablageEinfügenPasteToolStripMenuItem.Size = New System.Drawing.Size(279, 30)
Me.AusZwischenablageEinfügenPasteToolStripMenuItem.Text = "Aus Zwischenablage einfügen (Paste)"
'
'Button12
'UsrCntlVermerkeATilla1
'
Me.Button12.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.Button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button12.Image = Global.AVISO.My.Resources.Resources.stift1
Me.Button12.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button12.Location = New System.Drawing.Point(337, 36)
Me.Button12.Name = "Button12"
Me.Button12.Size = New System.Drawing.Size(68, 40)
Me.Button12.TabIndex = 119
Me.Button12.Text = "SND" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "bearb."
Me.Button12.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.Button12.UseVisualStyleBackColor = True
Me.Button12.Visible = False
Me.UsrCntlVermerkeATilla1.AutoScroll = True
Me.UsrCntlVermerkeATilla1.BackColor = System.Drawing.SystemColors.Control
Me.UsrCntlVermerkeATilla1.Dock = System.Windows.Forms.DockStyle.Fill
Me.UsrCntlVermerkeATilla1.Location = New System.Drawing.Point(3, 3)
Me.UsrCntlVermerkeATilla1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.UsrCntlVermerkeATilla1.Name = "UsrCntlVermerkeATilla1"
Me.UsrCntlVermerkeATilla1.Size = New System.Drawing.Size(561, 151)
Me.UsrCntlVermerkeATilla1.TabIndex = 0
'
'usrcntlAktDetailsATILLANeu
'

7
Aviso/usrcntlAktDetailsATILLANeu.vb
View File

@@ -219,9 +219,6 @@ Public Class usrcntlAktDetailsATILLANeu
Try
Me.Cursor = Cursors.WaitCursor
If dgvZollAnmeldungen.SelectedRows.Count = 0 Then Exit Sub
Dim DY As DAKOSY_Worker.cDakosy_Zollanmeldungen = DAKOSY_Worker.cDakosy_Zollanmeldungen.LOADById(dgvZollAnmeldungen.SelectedRows(0).Cells("dy_Id").Value)
If DY IsNot Nothing Then
@@ -1671,4 +1668,8 @@ Public Class usrcntlAktDetailsATILLANeu
FUNC.openSnd(SENDUNG_LIST(0).tblSnd_SendungID, AvisoID)
End Sub
Dim frmAttilaATEZNCTS = New frmATEZ_NCTS(dgvATEZNCTS.SelectedRows(0).Cells("Id").Value)
frmAttilaATEZNCTS.Show(Me)
End Sub
End Class