From 6b76af93ea07393b3ac7e2c6e266ef9ec87667ef Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Tue, 29 Nov 2022 10:30:35 +0100 Subject: [PATCH] IMEX MySnd, RKSV DE Storno, Div.Bugfix --- .../Benachrichtigung/frmAvisoWeiterleiten.vb | 14 ++- Aviso/frmHauptfenster.vb | 22 +++- Aviso/usrcntlAktDetails.vb | 1 - Aviso/usrcntlAktDetailsATILLANeu.Designer.vb | 112 +++++++++--------- Aviso/usrcntlAktDetailsATILLANeu.vb | 5 +- 5 files changed, 91 insertions(+), 63 deletions(-) diff --git a/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb b/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb index 336efd5..5824070 100644 --- a/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb +++ b/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb @@ -154,10 +154,18 @@ Public Class frmAvisoWeiterleiten ASF.AktUebernehmen_Zuruecksetzen(AvisoId, WeiterleitungTextTV) End If - ' Me.Close() - ' End If - Me.Close() + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" And WLart = "A" And bezeichnung = "VERIMEX" Then + If vbYes = MsgBox("Akt auf Status 'VERIMEX' setzten?", vbYesNoCancel) Then + Dim FUNC As New AvisoStatusFunctions + FUNC.setVorbereitet(AvisoId) + End If + End If + + ' Me.Close() + ' End If + + Me.Close() Me.DialogResult = DialogResult.OK End Sub diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index 220549f..a29005e 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -2535,8 +2535,7 @@ Public Class frmHauptfenster If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("ALLOW_STATUS2_VERIMEX") Then tabVorbereitet.Text = "2. VERIMEX" - Else - tbcntrAviso.TabPages.RemoveAt(2) + ' tbcntrAviso.TabPages.RemoveAt(2) End If btnWichtigeStandort.Visible = False @@ -2596,6 +2595,8 @@ Public Class frmHauptfenster ' tabVorgeschrieben.Text = "VORGESCHR." End If + + tbcntrAviso.Width = Panel1.Width VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me) @@ -2778,6 +2779,23 @@ Public Class frmHauptfenster End Function Private Sub Button3_Click_1(sender As Object, e As EventArgs) Handles Button3.Click + Dim process As Process + Dim ProgrammID As Integer + Dim Programmname As String = "AVISO" + + For Each process In System.Diagnostics.Process.GetProcesses + If (InStr(process.ProcessName, Programmname)) Then + ProgrammID = process.Id + End If + Next + AppActivate(ProgrammID) + Exit Sub + + + VERAG_PROG_ALLGEMEIN.cTranslateAuto_LIST.DoToAllControls(Me, "TR") + 'VERAG_PROG_ALLGEMEIN.cTranslateAuto._Transle("What you deserve, is what you get World!!", "DE", "") + + Exit Sub Try diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index 913847a..7869f52 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -240,7 +240,6 @@ Public Class usrcntlAktDetails Button2.Visible = True End If - 'If VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME <> "ADMIN" Then ' tbcntlVermerke.TabPages.Remove(tbAnhang) 'End If diff --git a/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb b/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb index b16c3ca..b7c949e 100644 --- a/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb +++ b/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb @@ -107,7 +107,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.lblTimeErfasst = New System.Windows.Forms.Label() Me.Panel10 = New System.Windows.Forms.Panel() Me.Panel6 = New System.Windows.Forms.Panel() - Me.Button12 = New System.Windows.Forms.Button() + Me.btnVERIMEX = New System.Windows.Forms.Button() Me.Label7 = New System.Windows.Forms.Label() Me.Panel13 = New System.Windows.Forms.Panel() Me.btnVorgeschrieben = New System.Windows.Forms.Button() @@ -202,9 +202,9 @@ Partial Class usrcntlAktDetailsATILLANeu Me.Panel3.Controls.Add(Me.SplitContainer) Me.Panel3.Controls.Add(Me.Panel8) Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill - Me.Panel3.Location = New System.Drawing.Point(0, 198) + Me.Panel3.Location = New System.Drawing.Point(0, 160) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(575, 449) + Me.Panel3.Size = New System.Drawing.Size(575, 487) Me.Panel3.TabIndex = 91 ' 'SplitContainer @@ -226,8 +226,8 @@ Partial Class usrcntlAktDetailsATILLANeu Me.SplitContainer.Panel2.Controls.Add(Me.gridVermerke) Me.SplitContainer.Panel2.Controls.Add(Me.pnlVermerkeTop) Me.SplitContainer.Panel2.Controls.Add(Me.addVermerk) - Me.SplitContainer.Size = New System.Drawing.Size(575, 283) - Me.SplitContainer.SplitterDistance = 183 + Me.SplitContainer.Size = New System.Drawing.Size(575, 321) + Me.SplitContainer.SplitterDistance = 207 Me.SplitContainer.TabIndex = 91 ' 'tbcntr @@ -240,7 +240,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.tbcntr.Location = New System.Drawing.Point(0, 0) Me.tbcntr.Name = "tbcntr" Me.tbcntr.SelectedIndex = 0 - Me.tbcntr.Size = New System.Drawing.Size(575, 183) + Me.tbcntr.Size = New System.Drawing.Size(575, 207) Me.tbcntr.TabIndex = 100 ' 'tbVermerke @@ -249,7 +249,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.tbVermerke.Location = New System.Drawing.Point(4, 22) Me.tbVermerke.Name = "tbVermerke" Me.tbVermerke.Padding = New System.Windows.Forms.Padding(3) - Me.tbVermerke.Size = New System.Drawing.Size(567, 157) + Me.tbVermerke.Size = New System.Drawing.Size(567, 181) Me.tbVermerke.TabIndex = 0 Me.tbVermerke.Text = "Vermerk eintragen" Me.tbVermerke.UseVisualStyleBackColor = True @@ -262,7 +262,7 @@ Partial Class usrcntlAktDetailsATILLANeu 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.Size = New System.Drawing.Size(561, 175) Me.UsrCntlVermerkeATilla1.TabIndex = 0 ' 'tbZollanmeldungen @@ -612,7 +612,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.Panel7.Location = New System.Drawing.Point(4, 19) Me.Panel7.MaximumSize = New System.Drawing.Size(2, 250) Me.Panel7.Name = "Panel7" - Me.Panel7.Size = New System.Drawing.Size(1, 55) + Me.Panel7.Size = New System.Drawing.Size(1, 79) Me.Panel7.TabIndex = 15 ' 'gridVermerke @@ -664,7 +664,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.gridVermerke.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.gridVermerke.ShowCellErrors = False Me.gridVermerke.ShowRowErrors = False - Me.gridVermerke.Size = New System.Drawing.Size(575, 67) + Me.gridVermerke.Size = New System.Drawing.Size(575, 81) Me.gridVermerke.TabIndex = 70 Me.gridVermerke.TabStop = False ' @@ -1133,7 +1133,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.FlowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Top Me.FlowLayoutPanel.Location = New System.Drawing.Point(0, 36) Me.FlowLayoutPanel.Name = "FlowLayoutPanel" - Me.FlowLayoutPanel.Size = New System.Drawing.Size(575, 162) + Me.FlowLayoutPanel.Size = New System.Drawing.Size(575, 124) Me.FlowLayoutPanel.TabIndex = 13 ' 'Panel9 @@ -1143,7 +1143,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.Panel9.Controls.Add(Me.lblTimeErfasst) Me.Panel9.Location = New System.Drawing.Point(3, 3) Me.Panel9.Name = "Panel9" - Me.Panel9.Size = New System.Drawing.Size(117, 74) + Me.Panel9.Size = New System.Drawing.Size(100, 74) Me.Panel9.TabIndex = 15 ' 'btnErfasst @@ -1159,7 +1159,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.btnErfasst.Margin = New System.Windows.Forms.Padding(0) Me.btnErfasst.MinimumSize = New System.Drawing.Size(100, 0) Me.btnErfasst.Name = "btnErfasst" - Me.btnErfasst.Size = New System.Drawing.Size(117, 62) + Me.btnErfasst.Size = New System.Drawing.Size(100, 62) Me.btnErfasst.TabIndex = 12 Me.btnErfasst.Text = "1. " & Global.Microsoft.VisualBasic.ChrW(10) & "ERFASST" Me.btnErfasst.UseVisualStyleBackColor = False @@ -1170,7 +1170,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.lblTimeErfasst.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblTimeErfasst.Location = New System.Drawing.Point(0, 62) Me.lblTimeErfasst.Name = "lblTimeErfasst" - Me.lblTimeErfasst.Size = New System.Drawing.Size(117, 12) + Me.lblTimeErfasst.Size = New System.Drawing.Size(100, 12) Me.lblTimeErfasst.TabIndex = 0 Me.lblTimeErfasst.Text = "-" Me.lblTimeErfasst.TextAlign = System.Drawing.ContentAlignment.TopCenter @@ -1178,7 +1178,7 @@ Partial Class usrcntlAktDetailsATILLANeu 'Panel10 ' Me.Panel10.AutoSize = True - Me.Panel10.Location = New System.Drawing.Point(126, 3) + Me.Panel10.Location = New System.Drawing.Point(109, 3) Me.Panel10.Name = "Panel10" Me.Panel10.Size = New System.Drawing.Size(0, 0) Me.Panel10.TabIndex = 16 @@ -1186,30 +1186,30 @@ Partial Class usrcntlAktDetailsATILLANeu 'Panel6 ' Me.Panel6.AutoSize = True - Me.Panel6.Controls.Add(Me.Button12) + Me.Panel6.Controls.Add(Me.btnVERIMEX) Me.Panel6.Controls.Add(Me.Label7) - Me.Panel6.Location = New System.Drawing.Point(132, 3) + Me.Panel6.Location = New System.Drawing.Point(115, 3) Me.Panel6.Name = "Panel6" - Me.Panel6.Size = New System.Drawing.Size(117, 74) + Me.Panel6.Size = New System.Drawing.Size(100, 74) Me.Panel6.TabIndex = 19 ' - 'Button12 + 'btnVERIMEX ' - Me.Button12.AutoSize = True - Me.Button12.BackColor = System.Drawing.Color.DarkOrange - Me.Button12.Cursor = System.Windows.Forms.Cursors.Hand - Me.Button12.Dock = System.Windows.Forms.DockStyle.Fill - Me.Button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button12.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Button12.ForeColor = System.Drawing.Color.White - Me.Button12.Location = New System.Drawing.Point(0, 0) - Me.Button12.Margin = New System.Windows.Forms.Padding(0) - Me.Button12.MinimumSize = New System.Drawing.Size(100, 0) - Me.Button12.Name = "Button12" - Me.Button12.Size = New System.Drawing.Size(117, 62) - Me.Button12.TabIndex = 12 - Me.Button12.Text = "2. " & Global.Microsoft.VisualBasic.ChrW(10) & "VERIMEX" - Me.Button12.UseVisualStyleBackColor = False + Me.btnVERIMEX.AutoSize = True + Me.btnVERIMEX.BackColor = System.Drawing.Color.DarkOrange + Me.btnVERIMEX.Cursor = System.Windows.Forms.Cursors.Hand + Me.btnVERIMEX.Dock = System.Windows.Forms.DockStyle.Fill + Me.btnVERIMEX.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnVERIMEX.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnVERIMEX.ForeColor = System.Drawing.Color.White + Me.btnVERIMEX.Location = New System.Drawing.Point(0, 0) + Me.btnVERIMEX.Margin = New System.Windows.Forms.Padding(0) + Me.btnVERIMEX.MinimumSize = New System.Drawing.Size(100, 0) + Me.btnVERIMEX.Name = "btnVERIMEX" + Me.btnVERIMEX.Size = New System.Drawing.Size(100, 62) + Me.btnVERIMEX.TabIndex = 12 + Me.btnVERIMEX.Text = "2. " & Global.Microsoft.VisualBasic.ChrW(10) & "VERIMEX" + Me.btnVERIMEX.UseVisualStyleBackColor = False ' 'Label7 ' @@ -1217,7 +1217,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label7.Location = New System.Drawing.Point(0, 62) Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(117, 12) + Me.Label7.Size = New System.Drawing.Size(100, 12) Me.Label7.TabIndex = 0 Me.Label7.Text = "-" Me.Label7.TextAlign = System.Drawing.ContentAlignment.TopCenter @@ -1227,9 +1227,9 @@ Partial Class usrcntlAktDetailsATILLANeu Me.Panel13.AutoSize = True Me.Panel13.Controls.Add(Me.btnVorgeschrieben) Me.Panel13.Controls.Add(Me.lblTimeVorgeschreiben) - Me.Panel13.Location = New System.Drawing.Point(255, 3) + Me.Panel13.Location = New System.Drawing.Point(221, 3) Me.Panel13.Name = "Panel13" - Me.Panel13.Size = New System.Drawing.Size(209, 75) + Me.Panel13.Size = New System.Drawing.Size(112, 75) Me.Panel13.TabIndex = 17 ' 'btnVorgeschrieben @@ -1245,9 +1245,9 @@ Partial Class usrcntlAktDetailsATILLANeu Me.btnVorgeschrieben.Margin = New System.Windows.Forms.Padding(0) Me.btnVorgeschrieben.MinimumSize = New System.Drawing.Size(100, 0) Me.btnVorgeschrieben.Name = "btnVorgeschrieben" - Me.btnVorgeschrieben.Size = New System.Drawing.Size(209, 62) + Me.btnVorgeschrieben.Size = New System.Drawing.Size(112, 62) Me.btnVorgeschrieben.TabIndex = 14 - Me.btnVorgeschrieben.Text = "3." & Global.Microsoft.VisualBasic.ChrW(10) & "VORGESCHRIEBEN" + Me.btnVorgeschrieben.Text = "3." & Global.Microsoft.VisualBasic.ChrW(10) & "VORGESCHR." Me.btnVorgeschrieben.UseVisualStyleBackColor = False ' 'lblTimeVorgeschreiben @@ -1256,7 +1256,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.lblTimeVorgeschreiben.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblTimeVorgeschreiben.Location = New System.Drawing.Point(0, 62) Me.lblTimeVorgeschreiben.Name = "lblTimeVorgeschreiben" - Me.lblTimeVorgeschreiben.Size = New System.Drawing.Size(209, 13) + Me.lblTimeVorgeschreiben.Size = New System.Drawing.Size(112, 13) Me.lblTimeVorgeschreiben.TabIndex = 0 Me.lblTimeVorgeschreiben.Text = "-" Me.lblTimeVorgeschreiben.TextAlign = System.Drawing.ContentAlignment.TopCenter @@ -1266,9 +1266,9 @@ Partial Class usrcntlAktDetailsATILLANeu Me.Panel11.AutoSize = True Me.Panel11.Controls.Add(Me.btnAnkunft) Me.Panel11.Controls.Add(Me.lblTimeAnkunft) - Me.Panel11.Location = New System.Drawing.Point(3, 84) + Me.Panel11.Location = New System.Drawing.Point(339, 3) Me.Panel11.Name = "Panel11" - Me.Panel11.Size = New System.Drawing.Size(119, 75) + Me.Panel11.Size = New System.Drawing.Size(100, 75) Me.Panel11.TabIndex = 17 ' 'btnAnkunft @@ -1284,7 +1284,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.btnAnkunft.Margin = New System.Windows.Forms.Padding(0) Me.btnAnkunft.MinimumSize = New System.Drawing.Size(100, 0) Me.btnAnkunft.Name = "btnAnkunft" - Me.btnAnkunft.Size = New System.Drawing.Size(119, 62) + Me.btnAnkunft.Size = New System.Drawing.Size(100, 62) Me.btnAnkunft.TabIndex = 12 Me.btnAnkunft.Text = "4." & Global.Microsoft.VisualBasic.ChrW(10) & "ANKUNFT" Me.btnAnkunft.UseVisualStyleBackColor = False @@ -1295,7 +1295,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.lblTimeAnkunft.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblTimeAnkunft.Location = New System.Drawing.Point(0, 62) Me.lblTimeAnkunft.Name = "lblTimeAnkunft" - Me.lblTimeAnkunft.Size = New System.Drawing.Size(119, 13) + Me.lblTimeAnkunft.Size = New System.Drawing.Size(100, 13) Me.lblTimeAnkunft.TabIndex = 0 Me.lblTimeAnkunft.Text = "-" Me.lblTimeAnkunft.TextAlign = System.Drawing.ContentAlignment.TopCenter @@ -1305,9 +1305,9 @@ Partial Class usrcntlAktDetailsATILLANeu Me.Panel12.AutoSize = True Me.Panel12.Controls.Add(Me.btnFreigabe) Me.Panel12.Controls.Add(Me.lblTimeFreigabe) - Me.Panel12.Location = New System.Drawing.Point(128, 84) + Me.Panel12.Location = New System.Drawing.Point(445, 3) Me.Panel12.Name = "Panel12" - Me.Panel12.Size = New System.Drawing.Size(122, 74) + Me.Panel12.Size = New System.Drawing.Size(100, 74) Me.Panel12.TabIndex = 17 ' 'btnFreigabe @@ -1323,7 +1323,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.btnFreigabe.Margin = New System.Windows.Forms.Padding(0) Me.btnFreigabe.MinimumSize = New System.Drawing.Size(100, 0) Me.btnFreigabe.Name = "btnFreigabe" - Me.btnFreigabe.Size = New System.Drawing.Size(122, 62) + Me.btnFreigabe.Size = New System.Drawing.Size(100, 62) Me.btnFreigabe.TabIndex = 12 Me.btnFreigabe.Text = "5." & Global.Microsoft.VisualBasic.ChrW(10) & "FREIGABE" Me.btnFreigabe.UseVisualStyleBackColor = False @@ -1334,7 +1334,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.lblTimeFreigabe.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblTimeFreigabe.Location = New System.Drawing.Point(0, 62) Me.lblTimeFreigabe.Name = "lblTimeFreigabe" - Me.lblTimeFreigabe.Size = New System.Drawing.Size(122, 12) + Me.lblTimeFreigabe.Size = New System.Drawing.Size(100, 12) Me.lblTimeFreigabe.TabIndex = 0 Me.lblTimeFreigabe.Text = "-" Me.lblTimeFreigabe.TextAlign = System.Drawing.ContentAlignment.TopCenter @@ -1343,7 +1343,7 @@ Partial Class usrcntlAktDetailsATILLANeu ' Me.Panel2.AutoSize = True Me.Panel2.Controls.Add(Me.btnNichtEingetroffen) - Me.Panel2.Location = New System.Drawing.Point(256, 84) + Me.Panel2.Location = New System.Drawing.Point(3, 84) Me.Panel2.Name = "Panel2" Me.Panel2.Size = New System.Drawing.Size(66, 37) Me.Panel2.TabIndex = 18 @@ -1467,29 +1467,29 @@ Partial Class usrcntlAktDetailsATILLANeu 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(153, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(152, 6) ' 'NCTST2ToolStripMenuItem ' Me.NCTST2ToolStripMenuItem.Name = "NCTST2ToolStripMenuItem" - Me.NCTST2ToolStripMenuItem.Size = New System.Drawing.Size(156, 22) + Me.NCTST2ToolStripMenuItem.Size = New System.Drawing.Size(155, 22) Me.NCTST2ToolStripMenuItem.Text = "NCTS - Versand" ' 'AESToolStripMenuItem ' Me.AESToolStripMenuItem.Name = "AESToolStripMenuItem" - Me.AESToolStripMenuItem.Size = New System.Drawing.Size(156, 22) + Me.AESToolStripMenuItem.Size = New System.Drawing.Size(155, 22) Me.AESToolStripMenuItem.Text = "AES - Ausfuhr" ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(153, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(152, 6) ' 'SGSNCTSToolStripMenuItem ' Me.SGSNCTSToolStripMenuItem.Name = "SGSNCTSToolStripMenuItem" - Me.SGSNCTSToolStripMenuItem.Size = New System.Drawing.Size(156, 22) + Me.SGSNCTSToolStripMenuItem.Size = New System.Drawing.Size(155, 22) Me.SGSNCTSToolStripMenuItem.Text = "SGS - NCTS" Me.SGSNCTSToolStripMenuItem.Visible = False ' @@ -1498,7 +1498,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.cntxtZollantrag.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtZollantrag.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator2, Me.NCTST2ToolStripMenuItem, Me.AESToolStripMenuItem, Me.ToolStripSeparator1, Me.SGSNCTSToolStripMenuItem}) Me.cntxtZollantrag.Name = "cntxtZollantrag" - Me.cntxtZollantrag.Size = New System.Drawing.Size(157, 82) + Me.cntxtZollantrag.Size = New System.Drawing.Size(156, 82) Me.cntxtZollantrag.Text = "Zollantrag" ' 'cntxt @@ -1691,6 +1691,6 @@ Partial Class usrcntlAktDetailsATILLANeu Friend WithEvents Panel5 As Panel Friend WithEvents Button11 As Button Friend WithEvents Panel6 As Panel - Friend WithEvents Button12 As Button + Friend WithEvents btnVERIMEX As Button Friend WithEvents Label7 As Label End Class diff --git a/Aviso/usrcntlAktDetailsATILLANeu.vb b/Aviso/usrcntlAktDetailsATILLANeu.vb index e955a83..cad8186 100644 --- a/Aviso/usrcntlAktDetailsATILLANeu.vb +++ b/Aviso/usrcntlAktDetailsATILLANeu.vb @@ -249,6 +249,9 @@ Public Class usrcntlAktDetailsATILLANeu End If + + + dgvZollAnmeldungen.ClearSelection() End Sub @@ -1570,7 +1573,7 @@ Public Class usrcntlAktDetailsATILLANeu End If End Sub - Private Sub Button12_Click(sender As Object, e As EventArgs) Handles Button12.Click + Private Sub Button12_Click(sender As Object, e As EventArgs) Handles btnVERIMEX.Click If FUNC.setVorbereitet(AvisoID) Then frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)